updted
Merge remote-tracking branch 'origin/pengw' into weix_cms
add sql
cm
deal header and change the file right
about ss
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