stuff
Merge branch 'betterAuthorTools' of https://github.com/MachDeinSpiel/MdsAuthorTools into betterAuthorTools

Conflicts:
	index.html
	js/editor/application/StateManager.js