updted
add sql
cm
deal header and change the file right
add links
Merge branch 'weix_cms' into pengw

Conflicts:
	caches/caches_template/default/content/index.php
	caches/error_log.php
	framework/templates/default/content/index.html
add some file
update
update
update
update
Merge remote-tracking branch 'origin/pengw' into weix_cms

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