CHange
change ?
Merge github.com:wangzhi01417/xiaojiaqian

Conflicts:
	App/Tpl/Home/default/Public_header.html