More style adjustments
SASS compiled files
Merge branch 'master' into test