change index
change header
Merge branch 'master' of https://github.com/pinganlida/daigou.git

Conflicts:
	templates/header.tpl
	
bug ignore
add new header.tpl
change header
preliminary design