Add bower.json to resolve injection issues
Merge branch 'rebase-test'