Fixed bower components.
Merge branch.