my version
Merge branch 'dev' of https://github.com/chunfantasy/farmville into dev