Merge branch '787395' of github.com:erikvold/addon-pathfinder into 787395

Conflicts:
	lib/sdk/ui/sidebar.js
	lib/sdk/ui/sidebar/utils.js
	test/test-sidebar.js