added bower support
updated bower support
Merge remote-tracking branch 'origin/master'