test network
Merge remote-tracking branch 'origin/master'

Conflicts:
	mysite/mysite/settings.pyc
	mysite/mysite/urls.pyc
	mysite/mysite/views.py
	mysite/mysite/views.pyc

resloved conflict