だめだ～
Merge branch 'develop' into gh-pages

Conflicts:
	target/gls2.js
bugfix
build