fix bower
Merge branch 'master' into develop