scss includes css
added paperclip configuration
there is still the cache problem
scss includes css
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	mods/standard/sets/right/machine_output.rb
	mods/standard/sets/type/css.rb
	mods/standard/sets/type/scss.rb
fixed scss inheritance problems
fixed "formtat" typo