lagrer farmer automatisk
Merge branch 'dev' of https://github.com/chunfantasy/farmville into dev

Conflicts:
	.idea/workspace.xml
	farmville/sheep/admin.py
	farmville/sheep/models.py