根据反馈的意见修改完善功能
Merge branch 'master' of https://github.com/AlloVince/phalcon

Conflicts:
	apps/WscnGold/views/index/index.phtml
	apps/WscnGold/views/market/index.phtml