Bump bower version number
Merge branch 'release/2.6' into develop