Merge branch 'develop' into gh-pages

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

Conflicts:
	target/gls2.js
だめだ～
Merge branch 'develop' into gh-pages

Conflicts:
	target/gls2.js
bugfix
build
調整
update dependencies
bug fix
fix
pine
fix
Merge branch 'develop' into gh-pages

Conflicts:
	target/gls2.js
update
build
Merge commit 'df438ac5caf6f6895761e15f57d9318c86148f9b' into gh-pages

Conflicts:
	target/gls2.js
build
update ui
Merge branch 'develop' into gh-pages

Conflicts:
	target/gls2.js
bug fix