mint updates
Merge branch 'master' of https://github.com/nharsch/Django_Projects

Conflicts:
	mysite/db.sqlite3
	mysite/polls/admin.pyc
	mysite/polls/models.pyc