#update
Merge branch 'master' of https://github.com/hust/pingjia_repo_dev.git

Conflicts:
	pingjia/templates/base.html