Add disabled registration flag
Merge branch 'master' into temp/disabled_registration

Conflicts:
	app/server.js
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'temp/disabled_registration' of github.com:sdelements/lets-chat into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration
Add really rough desktop notification support
Merge branch 'feature/desktop_notifications' into temp/disabled_registration
Merge branch 'temp/disabled_registration' of github.com:sdelements/lets-chat into temp/disabled_registration
Merge branch 'master' into temp/disabled_registration

Conflicts:
	templates/modals.html