Merge branch 'master' of https://github.com/zhongwei0752/dream

Conflicts:
	dream/home/data/data_config.php
	dream/home/data/tpl_cache/template_green_cp_littlenews.php
	dream/home/data/tpl_cache/template_green_cp_profile.php
	dream/home/data/tpl_cache/template_green_do_ajax.php
	dream/home/data/tpl_cache/template_green_do_login.php
	dream/home/data/tpl_cache/template_green_network.php
	dream/home/data/tpl_cache/template_green_showmessage.php
	dream/home/data/tpl_cache/template_green_space_activity.php
	dream/home/data/tpl_cache/template_green_space_discussion_list.php
	dream/home/data/tpl_cache/template_green_space_feed.php
	dream/home/data/tpl_cache/template_green_space_joke.php
	dream/home/data/tpl_cache/template_green_space_news.php
	dream/home/data/tpl_cache/template_green_space_subject.php