Merge branch 'master' of https://github.com/sun12520/tc

Conflicts:
	application/views/pages/fenye.php
Merge branch 'master' of https://github.com/sun12520/tc