switch to using our own scss files to generate css
merge origin/master and update styles