update version number
Merge branch 'bower'