Added bower component.json
Merge branch 'develop'