Add Node border display
Merge branch '19630' of github.com:huffman/hifi into 19630

Conflicts:
	interface/src/Menu.h