Added Bower package manager support
Merge branch 'updates'