Merge branch 'develop'
stylesheets are sass mixinize