clean up
clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	beike_project/static/js/scripts.js