修改header footer
Merge remote-tracking branch 'origin/dev'
fixed header footer bugs