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

Conflicts:
	pingjia/static/css/price.css
	pingjia/templates/price.html