Test from sneg-17 fixed, footer links done. #sneg-21 fixed
Merge remote-tracking branch 'origin/master'