Merge branch 'devise' of github.com:fatfreecrm/fat_free_crm into devise

Conflicts:
	Gemfile.lock
	app/controllers/passwords_controller.rb
	app/controllers/registrations_controller.rb
	app/models/users/user.rb
	app/views/devise/sessions/new.html.haml
	config/routes.rb
	fat_free_crm.gemspec
	spec/support/auth_macros.rb