Merge branch 'weix_cms' into pengw

Conflicts:
	caches/caches_commons/caches_data/category_content.cache.php
	caches/caches_commons/caches_data/category_content_1.cache.php
	caches/error_log.php
	phpsso_server/framework/libs/functions/global.func.php
update
update
Merge remote-tracking branch 'origin/pengw' into weix_cms
add files

Conflicts:
	.gitignore
	caches/caches_commons/caches_data/category_content.cache.php
	caches/caches_commons/caches_data/category_content_1.cache.php
	caches/caches_commons/caches_data/category_items_1.cache.php
	caches/caches_template/default/content/category_news.php
	caches/caches_template/default/content/list_join_us.php
	caches/error_log.php