[Clare] Fixed the problem in Android
Merge branch 'master' of https://github.com/TimeZTeam/RagingRock
Merge branch 'kedou'

Conflicts:
	Classes/Scene/SnagForestLayer.cpp
balloon finish