Lots more changes, all going towards the new graphing interface goal
Merge branch 'dev' of https://github.com/pmlrsg/GISportal into dev

Conflicts:
	build.py
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
Fix to enable content selection in indicator panel
change the layer opacity during sliding rather than when sliding had ended
remove the 10% step from opacity slider
Improve performance on layers with lots of time slices
Fixed the zoom level bug with the selection tool and updates the timebar to no show show unneeded SVG lines
Merge branch 'collaboration' into dev-collab

Conflicts:
	src/indicators.js
Merge branch 'dev-collab' into collaboration