Footer changes
Merge branch 'footer' into develop
Merging into develop