More compile error fixes
Merge branch 'master' of github.com:tmzhuang/pvz-reloaded