styling, use thema colors
Fix select2 with foundation
Merge branch 'develop' of https://github.com/DanielReid/addis-core into develop
load outcomes into select
WIP criteria selection
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/resources/app/css/addis-drugis.css
Merge remote-tracking branch 'remotes/origin/feature/selectedCriteria' into develop
styling, use thema colors
(cherry picked from commit a1025fe)
styling, use thema colors
(cherry picked from commit a1025fe)