Changes made by Matthias Tallarek (Mr_Nice83@hotmail.com).
Merge branch 'master' of https://github.com/Talosz/ppabewRZ.git

Conflicts:
	ZR App/js/myjs.js
Merge branch 'master' of https://github.com/Talosz/ppabewRZ.git
Merge branch 'master' of https://github.com/Talosz/ppabewRZ.git
Merge branch 'master' of https://github.com/Talosz/ppabewRZ.git
Changes made by Matthias Tallarek (matthias.tallarek@digital-spirit.de).
Changes made by Matthias Tallarek (matthias.tallarek@digital-spirit.de).