fix location issue
Merge branch 'master' into location

Conflicts:
	beike_project/user/views.py
fix more location issue