set base-url on controller
Merge branch 'spring' of github.com:ConnorStroomberg/mcda-elicitation-web into spring
Merge branch 'spring' of github.com:gertvv/mcda-elicitation-web into spring
Merge branch 'spring' of github.com:ConnorStroomberg/mcda-elicitation-web into spring
Merge branch 'spring' of github.com:gertvv/mcda-elicitation-web into spring
using theirs
Merge branch 'spring' of github.com:ConnorStroomberg/mcda-elicitation-web into spring
Merge branch 'spring' of github.com:gertvv/mcda-elicitation-web into spring
klaar voor update naar develop
Merge branch 'develop' of https://github.com/DanielReid/mcda-elicitation-web into develop
remove shared dir
Merge branch 'develop' of github.com:gertvv/mcda-elicitation-web into develop
karma test setup, test/unit/controller test are ignored
Merge branch 'develop' of github.com:ConnorStroomberg/mcda-elicitation-web into develop
Merge branch 'develop' of github.com:ConnorStroomberg/mcda-elicitation-web into develop
Support PostgreSQL
change to setup config for use with Jenkens
edit karma config to use phantonjs for use on CI server
Manage requirements using Bower
Bower support in unit tests