build
Merge branch 'release/1.0'
Merge branch 'release/1.1'
build
add ss
Merge commit '5161fc0e7b2211d713e36115c399bd3ff0888c85' into develop

Conflicts:
	target/gls2.js
Merge branch 'release/1.2'

Conflicts:
	target/gls2.js
bug fix
add copyright
Merge commit '3f8a12974ce2e72a12b0da03c9a2b78767242a51' into develop
Merge remote-tracking branch 'minimo/Stage3' into develop
bug fix
english
add beginner style
add particle setting
add economy mode
Merge branch 'feature/economy-mode' into develop
Merge branch 'feature/easy-mode' into develop
Merge branch 'english' into develop
hot fix
hot fix and build