Added support for bower
Merge branch 'patch-1' into develop