O_proekte 50%
Merge branch 'omarr' into develop

Conflicts:
	www/css/style.css
	www/css/style.css.map
	www/o_proekte.html