Merge branch 'hotfix/1.0.1'
Renamed bower.json to component.json and used 1.0 version number without specifying patch
Merge branch 'hotfix/1.0.2' into develop