Aenderungen
Konflikt geloest

Merge branch 'master' of https://github.com/zinnen/HSRM

Conflicts:
	documentation/testAZ.txt