fixed merge issues
Merge branch 'master' of https://github.com/tmzhuang/pvz-reloaded
Merge branch 'master' of https://github.com/tmzhuang/pvz-reloaded