updates
ksoe update
cleanup after-ksoe
Merge branch 'elephant'

Conflicts:
	src/main/java/scudo/thales/server/controllers/ServicesController.java
	src/main/webapp/js/services.js
	src/main/webapp/lib/aguiria/v0.0.1/js/aguiria-config.js
	src/main/webapp/lib/ol2/heatmap.js