Added .bowerrc file.
Fixed package.json merge conflicts.