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
Merge branch 'develop' into gh-pages

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

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

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

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

Conflicts:
	target/gls2.js
Stage3 add
Stage3 modified
Hoshizora chenged
Stage3 update
Stage3 update
Stage3 update
Stage3 Extend carrier add test
Merge pull request #1 from daishihmr/develop
Stage3 update