Renamed component.json to bower.json as per the new guidelines.
Merge remote-tracking branch 'origin/master'