changes to user
Merge branch 'cleanup' of github.com:jasonknight/salor-retail into cleanup

Conflicts:
	salor-retail/app/controllers/users_controller.rb