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

Conflicts:
	Django_Tut/mysite/mysite/__init__.pyc
	Django_Tut/mysite/mysite/settings.pyc
	Django_Tut/mysite/mysite/wsgi.pyc
	Django_Tut/mysite/polls/__init__.pyc
	Django_Tut/mysite/polls/models.pyc