Merge branch 'arshidni-hotfixes'
The main class causes a boarder line to be shown at the top under the navbar.  The footer looks fine without it.
Merge branch 'footer-class-hotfix' into develop