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/users_new_interface/_form.html.erb

@@ -11,7 +11,7 @@
       </div>
       <label>
     <%= f.check_box :admin %>
-  <span><%= t('admin.admin') %>：</span>
+  <span><%= t(:admin) %>：</span>
   </label>
   </div>
 

app/views/admin/users_new_interface/_infos.html.erb

@@ -1,4 +1,4 @@
-  <!--<span><%#= t('admin.email') %>：</span> -->
-  <%#= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t('admin.email')};}", :value => (@user.email.blank? ? t('admin.email') : @user.email), :class => 'user_mail' %>
+  <!--<span><%#= t(:email) %>：</span> -->
+  <%#= f.text_field :email, :onfocus => "this.value='';", :onblur => "if(this.value==''){this.value=#{t(:email)};}", :value => (@user.email.blank? ? t(:email) : @user.email), :class => 'user_mail' %>
 
 <%=render :partial=>"info",:collection=>Info.all%>