drop bootstrap and angular-bootstrap from bower dependencies since we're now using bootstrap3
update some component dependencies
Merge branch 'master' of github.com:Bauble/bauble2

Conflicts:
	bower.json
Merge branch 'master' of github.com:Bauble/bauble2

Conflicts:
	bower.json