test
Merge remote-tracking branch 'yosida/test_merge' into akatuka10_9
wip modified selectScreen and create test file
wip_layer
wip 　delete test file and add layer manage
Merge remote-tracking branch 'akatsuka/akatuka10_9' into test_merge
2013-10-22-17-37 file merge
Merge remote-tracking branch 'yamanishi/master' into test_merge

Conflicts:
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/MapEditorScreen.java
wip back_ground
wip Jsondata