quick refactoring
Merge branch 'devise-hacks' of github.com:azendoo/poc_api_app into devise-hacks

Conflicts:
	app/models/user.rb