Merge branch 'release/1.5' into develop
Merge branch 'hotfix/training-gameover' into develop
update build script
update build script
fix
fix
fix
build
build
Merge branch 'release/1.5.2'

Conflicts:
	target/gls2.js