no message
Merge branch 'master' of github.com:msveshnikov/notifier

Conflicts:
	app/controllers/sites_controller.rb