Merge branch 'master' into ANTARCTICLE-249-notifications-on-comments

Conflicts:
	app/migrations/Migrations.scala