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

Conflicts:
	app/controllers/admin/users_new_interface_controller.rb
	app/views/admin/users_new_interface/show.html.erb

config/application.rb

@@ -34,6 +34,9 @@ module Orbit
     config.autoload_paths += %W(#{config.root}/app/models/purchase)
     config.autoload_paths += %W(#{config.root}/app/models/user)
 
+    # Include all helpers
+    # 'helper :all' must be removed in ApplicationController
+    config.action_controller.include_all_helpers = false
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.

config/locales/en.yml

@@ -130,6 +130,7 @@ en:
     attributes: Attributes
     author: Author
     calendar: Calendar
+    gprs: GPRS
     cant_delete_self: You can not delete yourself.
     cant_revoke_self_admin: You can not revoke your admin role yourself.
     category: Category