footer now finished
Merge remote-tracking branch 'origin/static' into static