fixed conflicts in bower.json
fixed conflict on tasks/pipeline.js