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

Conflicts:
	app/helpers/attribute_fields_helper.rb
	app/views/admin/infos/_form.html.erb
	config/locales/zh_tw.yml

app/views/admin/infos/_form.html.erb

@@ -1,10 +1,10 @@
 <div class="attributes_block <%= @class %>">
-	<h2><%= t("admin.#{@attribute_type}") %></h2>
+	<h2><%= t("#{@attribute_type}") %></h2>
 	<div class="info_input">
 		<table border="0" cellspacing="0" cellpadding="0">
 			<thead class="list_head">
 				<tr>
-					<td><%= t('admin.key') %></td>
+					<td><%= t(:key) %></td>
 					<% @site_valid_locales.each do |locale| %>
 			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 			    <% end %>
@@ -36,7 +36,7 @@
 					<% @site_valid_locales.each do |locale| %>
 			      <td><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %></td>
 			    <% end %>
-					<td><%= t('admin.type')%></td>
+					<td><%= t(:type)%></td>
 					<td>&nbsp;</td>
 				</tr>
 			</thead>