Line breaks
Updated bower.json
Updated dependencies
Updated dist files
Resolved conflicts that should not been there