Add bower support
Add bower support
Merge branch 'bower-support'