layout fixes
Merge branch 'master' of https://github.com/TobiasScharnowski/OrderIT

Conflicts:
	src/main/webapp/WEB-INF/tags/article.tag