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
wip1018_2
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
add png files and delete unnecessary files
wip
Merge remote-tracking branch 'Yoshida/testMerge'
wip