Component and Bower support
Merge branch 'develop'