some changes for pysite
some changes for pysite
change some files for mysite
Merge branch 'master' of https://github.com/gengjie/pytest

Conflicts:
	mysite/mysite/settings.pyc
	mysite/mysite/urls.pyc
	mysite/polls/templates/polls/detail.html
	mysite/polls/templates/polls/index.html
	mysite/polls/urls.pyc
	mysite/polls/views.py
	mysite/polls/views.pyc