renamed to scss
Merge remote-tracking branch 'origin/master'

Conflicts:
	vendor/assets/stylesheets/jquery.modal.css
	vendor/assets/stylesheets/jquery.modal.scss
	vendor/assets/stylesheets/jquery.modal.scss.css