Remove disconncet message modal
Merge branch 'master' into temp/disabled_registration

Conflicts:
	templates/modals.html