S3 file upload patch applied
Removed devDependencies
Conflicts:
	package.json
Using gulp-contrib-sass instead of gulp-sass
Conflicts:
	package.json
Fix sass sintax
Fix bower dependencies
Conflicts:
	bower.json
Removed submodule init
fix ember data version
change keymaster version
Fix keymaster version
Revert requirements to libsass
Downgrade to grunt-sass 0.15.0