Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	GlasAanHuis/assets/webapp/pages/district.html