update bower.json
Merge branch '2.x' into 2.6
update version in bower.json