Added bower locally.
Updated merge conflicts.