fix bower.json 'angular'
Merge branch 'master' of github.com:nickperkinslondon/angular-bootstrap-nav-tree

Conflicts:
	bower.json