hop
Merge branch 'development' of https://github.com/FrankyGP/g0tit.de_Toolz into development

Conflicts:
	js/funktionen.js