testing bower
Bower version update
upgrade bower version
Merge branch 'master' into 2.x