fix
fix
Merge branch 'develop' into gh-pages

Conflicts:
	build/cannon-stg.min.js
	build/cannon-stg.min.js.map