Bower support
Merge origin/master