Moar bower updates
Merge remote-tracking branch 'origin/v2'