chat changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	GlasAanHuis/assets/webapp/js/Development/district.js