Merge branch 'develop'
fix footer
Merge branch 'master' into develop