bider
Merge branch 'master' of https://github.com/dapianzi/jianzhi

Conflicts:
	App/Lib/Model/MemberModel.class.php
	App/Tpl/Home/Project/drafts.html
	App/Tpl/Home/Project/index.html
	App/Tpl/Home/Project/receiveBids.html