17 - Cluster openlayers activated
Merge branch 'master' of https://github.com/CIRB/django-fixmystreet

Conflicts:
	django_fixmystreet/fixmystreet/static/js/fixmystreetmap.js