Update bower.json
Update component.json
merged latest changes from master