use marionette
use jade
Merge branch 'MarionetteJS' into develop

Conflicts:
	package.json
scss
fixes
delete compass.rb