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