start cn code
Bird grass wave
limit fall tick number
before test on IOS
Bird before
bird Free
Merge branch 'grasswave' of http://github.com/liyonghelpme/mywangguo into bird
Merge branch 'bird' of github.com:liyonghelpme/mywangguo into iosbird

Conflicts:
	Classes/iniReader.cpp
	Resources/LuaScript/BirdMenu.lua
Merge branch 'bird' of github.com:liyonghelpme/mywangguo into iosbird
fix ios shader bug