Fixes for merge conflicts
Renamed bower name
Makes {id} > {dataset_id}