Merge branch 'release/0.5'
quick update before feature branch
Merge branch 'master' into feature/WebGL

Conflicts:
	.idea/workspace.xml
	app/static/js/App.js
	app/static/js/Matchstick/Nitro/Objects/DisplayObject3D.js