add sass support
Merge remote-tracking branch 'origin/master'

Conflicts:
	vendor/assets/stylesheets/bootstrap-colorpicker.scss
remove sass support