1214

修改bug
Merge branch 'xavier' of https://github.com/Qasocial/qasocial into xavier

Conflicts:
	Pro/App/Modules/Index/Action/WjAction.class.php
	Pro/App/Modules/Index/Tpl/default/Wj/all.html
	Pro/App/Modules/Index/Tpl/default/Wj/detials.html
	Pro/App/Modules/Index/Tpl/default/Wj/did.html
	Pro/App/Modules/Member/Action/FabuAction.class.php
	Pro/App/Modules/Member/Tpl/default/Fabu/show2.html