Accounts can be enabled or not. Admins can edit this property.
Merge branch 'master' into feature/disable_account
Add tests for enabling/deactivating.
Merge branch 'master' into feature/disable_account

Conflicts:
	users/app/controllers/users_controller.rb
	users/app/helpers/users_helper.rb
	users/app/views/users/edit.html.haml
	users/app/views/users/show.html.haml
	users/config/locales/en.yml
Cleanup to show enable/deactivate account functionality in new UI.
Merge pull request #56 from leapcode/feature/disable_account

Feature/disable account
Merge branch 'master' into feature/authentication_generic_error
Clear authentication errors before displaying new ones.