Fixing assets compilation.
Fixed scss.
Merge remote-tracking branch 'origin/master'