Merge branch 'dev' into homepage
Fix footer style bug
Merge branch 'homepage' into dev