styling, use thema colors
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/webapp/resources/app/css/addis-drugis.css