final chat, user settings and pre chatsrvmsg
Merge branch 'master'

Conflicts:
	app/Resources/views/base.html.twig
	src/Cron/CronBundle/Resources/views/Chat/chatwindow.html.twig