updated bower version
Merge branch 'master' into spring