User authentication
Merge branch 'master' of github.com:godot/crm-2000

Conflicts:
	Gemfile.lock
	app/controllers/application_controller.rb
	config/routes.rb
Merge branch 'master' of github.com:godot/crm-2000