changed view
Merge remote-tracking branch 'origin/master'
added back in sys.path.append
Merge remote-tracking branch 'origin/master'

Conflicts:
	NavigatorBeta/NavigatorView.fbp
added splitter window