Fix me!!!!!!
message.js to message.coffee
fix js
Merge branch 'fixedJSPart2' into develop

Conflicts:
	app/assets/javascripts/user.js
	app/controllers/application_controller.rb
	app/controllers/message_controller.rb
	app/models/message.rb
	app/models/room.rb
	app/models/user.rb
	app/models/user_stat.rb
	app/views/errors/error_404.html.haml
	config/initializers/omniauth.rb
	config/routes.rb
	public/assets/manifest-275d4d819917d298e76c402edb90c9a1.json