Merge branch 'master' of https://github.com/geomajor56/bct-leaflet

Conflicts:
	assets/js/app.js