Merge branch 'develop' into gh-pages

Conflicts:
	index.html
	target/gls2.js
Merge branch 'develop' into gh-pages

Conflicts:
	target/gls2.js
bomb item
ok
bomb maximum
hyper effect
bg
iroiro
boss2
update shot image
boss2
boss2
boss2
boss2
Merge commit '27a93b5e57b46714ec2ffbb91283d78daa86adc2' into develop
stage4
stage4
boss2
Merge commit 'eabdbfd2b83e341084405374b0f02e721d83098b' into develop

Conflicts:
	src/stage/Stage.js
update tmlib.js