add some comment
clean up
clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	beike_project/static/js/scripts.js
clean up
fix db issue
Merge branch 'master' of github.com:yurenji/beike
fix typo