wip
Merge remote-tracking branch 'Yoshida/test_merge'
wip
途中経過のマージ
Merge remote-tracking branch 'yamanishi/master' into test_merge

Conflicts:
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/Layer.java
wip1028_2