upgrade to rails 4
Merge branch 'upgrade_rails' of github.com:byzg/brainchat into upgrade_rails

Conflicts:
	app/controllers/application_controller.rb
	app/models/user.rb