Fix
Remove spring-docker
Merge pull request #48 from DanielReid/develop

tests fixed
Revert "remove shared dir"

This reverts commit c9c072c396b65b545ce2e399bcad74276f7a4e1e.
Merge pull request #49 from DanielReid/develop

Revert "remove shared dir"
Merge branch 'develop' of github.com:drugis/mcda-elicitation-web into develop
Make workspace.defaultScenario FK deferrable

 - because its circular
Move heatmap css to _main instead of drugis
Merge branch 'develop' of github.com:drugis/mcda-elicitation-web into develop
genaral error page, and config in the web.xml for common error pages