Footer has been updated
Merge branch 'develop' into develop-michal