added bootstrap-sass for ember-cli
fixed bootstrap dependency merge conflict in package.json