Added bower.json
Merge branch 'bower'