Merge branch 'develop'
Merge branch 'develop'
Renamed component.json to bower.json
Merge branch 'hotfix/1.0.1' into develop