Merge branch 'hotfix/footer-fix' into develop
ipad fix
Merge branch 'develop'