Added some sass variables
Merge branch 'master' into FH-13-auth