wip1028_2
modified source code
10-28-17-59 途中経過のマージ
Merge remote-tracking branch 'akatsuka/akatuka10_9' into test_merge

Conflicts:
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/MapEditorStage.java
wip
Merge remote-tracking branch 'Yoshida/test_merge'
wip