update
update
Merge remote-tracking branch 'origin/pengw' into weix_cms

Conflicts:
	.gitignore
	caches/caches_commons/caches_data/category_content_1.cache.php
	caches/caches_commons/caches_data/category_items_1.cache.php
	caches/caches_commons/caches_data/category_items_12.cache.php
	caches/caches_commons/caches_data/model.cache.php
	caches/caches_commons/caches_data/modules.cache.php
	caches/caches_commons/caches_data/position.cache.php
	caches/caches_commons/caches_data/vote.cache.php
	caches/caches_linkage/caches_data/1.cache.php
	caches/caches_search/caches_data/search_model_1.cache.php
	caches/caches_search/caches_data/type_model_1.cache.php
	caches/caches_template/default/content/category_salesnet.php
	caches/caches_template/default/content/index.php
	caches/configs/modules.php
	caches/error_log.php
	framework/templates/default/content/show_news.html
	statics/images/jionDetailBg.png
	statics/images/newsItemBg.png
	statics/images/temp5