Template: Textanzeige und Scrollen
Merge branch 'master' of https://github.com/ManaLaziss/Website.git

Conflicts:
	template_onepage/templateDetails.xml