Merge branch 'develop'
Added jquery minicolors
Change css
Change some scss
Fix extension
Tweaked assets
Merge branch 'master' into develop