50e844b563
# Conflicts: # components/bower.json # components/handlebars.js.nuspec # components/package.json # package.json