Merge remote-tracking branch 'remotes/origin/master'

Conflicts:
	polls/__init__.pyc
	polls/models.pyc
	youtune/__init__.pyc
	youtune/settings.py
	youtune/settings.pyc
	youtune/urls.py
	youtune/urls.pyc
	youtune/wsgi.pyc
Merge remote-tracking branch 'remotes/WorkingRepo/master' into CustomAdminSite_and_404/500

Conflicts:
	polls/__init__.pyc
	polls/models.pyc
	youtune/__init__.pyc
	youtune/settings.py
	youtune/settings.pyc
	youtune/urls.py
	youtune/urls.pyc
	youtune/wsgi.pyc