worked on farmer page
Merge branch 'dev' of github.com:chunfantasy/farmville into dev