sua lai duong dan

//
Merge remote-tracking branch 'origin/master'

Conflicts:
	Classes/layerLevel/LevelScene.cpp
	proj.android/jni/Android.mk