Merge branch 'master' of https://github.com/Ksul/Verteilung

Conflicts:
	TestVerteilung/web/TestVerteilung.html
	TestVerteilung/web/src/main/javascript/alfrescoClient.js
	TestVerteilung/web/src/main/javascript/dialoge.js
	TestVerteilung/web/src/main/javascript/jquery.themeswitcher.js