UPT
Merge branch 'master' of https://github.com/alexvonnemann/IMD

Conflicts:
	css/imd.css
	img/startseite/splitter_5.jpg
	index.html
	scss/theme_mediumup.scss