添加etf 和 cftc
Merge branch 'master' of https://github.com/AlloVince/phalcon

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