first
框架调整
框架调整
test
test
test
test
test
Merge branch 'master' of https://github.com/bulekinght/bkshop

Conflicts:
	ThinkPHP/Common/functions.php
	bkshop.txt
	html/admin/welcome.html
	html/css/core.css
	html/css/default.css
	html/css/overlay.css
	html/index.html
	html/js/dialogize.js
	html/js/notify.js
	html/login.html
	html/ocard/index.html
	index.php