hot fix
Merge branch 'master' into develop

Conflicts:
	src/plugins/tmlib.bulletml.js