Fix footer css bug
Merge branch 'Develop'