wip
Merge remote-tracking branch 'akatsuka/akatuka10_9' into testMerge

Conflicts:
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/MapEditorScreen.java
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/MapObject.java
wip
wip
Merge remote-tracking branch 'akatsuka/akatuka10_9' into testMerge
Merge remote-tracking branch 'yamanishi/master' into testMerge

Conflicts:
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/MapEditorScreen.java
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/MapObject.java
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/ScrollNinjaEditor.java
wip
for merge yosida/testMerge
Merge branch 'testMerge' into akatuka10_9