Layer re-ordering
Merge branch 'dev' of https://github.com/pmlrsg/GISportal into dev

Conflicts:
	html/templates/indicator.mst
	src/indicators.js
Missing closing div tag
Ability to re-order layers