Update SASS
Merge branch 'spring' of github.com:ConnorStroomberg/mcda-elicitation-web into spring

Conflicts:
	sass-shared
Make `mvn tomcat:run` work; use env for configuration
Use JNDI / tomcat to get DB
Use maven to set system properties for tomcat
added more test for WorkspaceController"