Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509

Conflicts:
	config/locales/zh_tw.yml

vendor/built_in_modules/page_content/app/views/panel/page_content/back_end/page_contexts/_page_context.html.erb

@@ -1,7 +1,7 @@
 
 			<tr id="<%= dom_id page_context %>" class="with_action">
 				<td>
-					<%= page_context.page.i18n_variable[I18n.locale] %>
+					<%= page_context.page.path %>
 					<div class="quick-edit">
 						<ul class="nav nav-pills hide">
 							<%if is_manager? || is_admin? ||  page_context.authed_users(:edit).include?(current_user)%>