Merge branch 'master' of https://github.com/lhr530124/cocos2d-x into mergeLhr

Conflicts:
	nozomi/Resources/Mould/Build/Nozomi.lua
	nozomi/Resources/Scene/BattleMenuLayer.lua
	nozomi/Resources/main.lua
fix barrack produce soldier bug
fix world big soldier across wall bug
fix building picture error
fix path finding bug
when path length <= 1  path={}  lastPoint = nil
fix zombie crowd bug
zombie should setPathCount and clear PathCound
fix zombie crowd bug
add MyDepthNode support
fix android compile
distinguish obstacle and wall objects
battle scene find path to attack
recover wall
if there is no wall game speed will be 24fps
myDepthNode
adjust vertexZ draw method
export CCShaderCache interface
give up vertexZ ideas
give up  buildView
fix world path finding bug
generate some predefine path
soldier will goto closed pathPoint and try to find target
if isPath smell will disappear by time has a Time cofficient
where modify world?
fix soldier calcG bug
soldier fisrt search favorite building
if not
then find all building
soldier find favorite building
make searchPath multiple stage
first search Big Grid
go one by one each big grid
when collider with wall or 1 big grid left with target grid
stop just attack target