wip
Merge remote-tracking branch 'Yoshida/test_merge'
wip LayerManager
2013-10-24-17-43
Merge remote-tracking branch 'yamanishi/master' into test_merge

Conflicts:
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/Camera.java
	ScrollNinjaEditor/src/org/genshin/scrollninjaeditor/MapEditorScreen.java
wipzoom