user feed, user watch, user_home template
Signed-off-by: crab <craber234@sina.cn>
Merge branch 'master' of https://github.com/superbogy/cargo

Conflicts:
	www/app/component/BaseDao.php