Merge branch 'master' of https://github.com/ayziao/testpy

Conflicts:
	myapp/common/request.py