Adds a sticky footer and removes forgot your password link
Fixes merge conflicts