Added container-divs to html-pages
Merge branch 'develop' of https://github.com/Diversify/webroti into develop

Conflicts:
	src/main/webapp/index.html