project configure
Merge branch 'master' of https://github.com/lhr530124/cocos2d-x
Merge branch 'master' of https://github.com/lhr530124/cocos2d-x
nozimi win32 project
fix setGrids add param obj Wall
bombChip use false bombClip file
path bug fix
Merge branch 'master' of https://github.com/lhr530124/cocos2d-x

Conflicts:
	nozomi/Resources/main.lua
show nozomi leaf
Merge branch 'master' of https://github.com/lhr530124/cocos2d-x

Conflicts:
	.gitignore
	nozomi/Resources/Util/World.lua
adjust those buildings light and other components with plist file

	modified:   Mould/Build/Barrack.lua
	modified:   Mould/Build/Clan.lua
	modified:   Mould/Build/FoodFactory.lua
	modified:   Mould/Build/Laboratory.lua
	modified:   Mould/Build/Nozomi.lua
	modified:   Mould/Build/OilFactory.lua
	modified:   Scene/BattleMenuLayer.lua
	new file:   Util/MySpriteSheet.lua
	modified:   Util/Util.lua
	modified:   Util/World.lua
adjust World SearchAttack
setBuild building distance exits bug
fix Nozomi remove plugin picture show error
fix oilFactory picture show
remove Person soldier showGrid
test World fat boy  attack building
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