Updates to the layer re-ordering (to fix it!)
fixes scrolling whilst dragging issue
Merge branch 'dev' of https://github.com/pmlrsg/GISportal into dev

Conflicts:
	html/css/indicators.css