Reorganized map layers and directory.
Merge remote-tracking branch 'origin/master'

Conflicts:
	android/assets/basic_map/classRoomBeta.tmx