Update to bower, models and collections