fixed sticky footer m.m.
Merge branch 'master' of https://github.com/josefinenilsson/Nagelwebbshop

Conflicts:
about.php
Conflict fixed