fixed footer
header fix and some changes to header
Merge branch 'dev'