Merge branch 'master' of https://github.com/nanarchrist/Mistery into TF_ery_render

Conflicts:
	build/main.js
	src/manifest.js
Merge branch 'TF_ery_render'

Conflicts:
	build/main.js
	level.json
	src/level.js
	src/manifest.js
	src/modules/animator_module.js
commit final