Revert "Removed notifications"

This reverts commit bea48d9eb74b68f4228df728aec1babab5c3c46d.

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/channels_controller.rb
	app/views/messages/index.html.haml
Sublime project meta files
Bugfixes
Bugfixes