Added dependencies to bower.json and removed/organized imports.
Merge remote-tracking branch 'origin/master' into ui-prototype-2