Upgraded bower.json
Added resolutions to bower.json