Some experimenting
Merge branch 'master' of github.com:GeoKnow/Sponate

Conflicts:
	jassa-js/src/main/webapp/WEB-INF/jsp/jassa-sponate.index.jsp