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
SHEEEEEP
SHEEEEEP2
SHEEEEEP3
login out
Merge branch 'dev' of github.com:chunfantasy/farmville into dev
fixed backup
fixed backup
Validations
Update models.py
Validations
Update models.py
Validations
Merge branch 'dev' of https://github.com/chunfantasy/farmville into dev
Update views.py
Update urls.py
Update models.py
Create urls.py
Update views.py