Add spring-mvc to model wrapper with basic freemarker page setup & httpbasic+bcrypt for auth.
Rejig the IntelliJ artifacts to allow partial redeployment
Unit tests
Make the test dir of ant match intellij
Integration tests for index controller
Minor cleanup.
Fix security regression
Resolve issue of empty feature collections causing invalid geojson
Update libs
Pull request comment fixes, and bump some library versions
Username/password from properties file.
Merge branch 'master' into 95-spring-for-modelwrapper

Conflicts:
	src/build-module.xml
Merge pull request #33 from SEEG-Oxford/56-45-map-base-layers-and-points

Add map base layer, and location points
Merge pull request #35 from SEEG-Oxford/95-spring-for-modelwrapper

Spring for modelwrapper
Merge branch 'master' into 50-display-datapoint-details
Merge pull request #36 from SEEG-Oxford/minor-spring-issues

Minor spring issues
Merge branch 'master' into 50-display-datapoint-details
Cluster marker