renaming
Merge remote-tracking branch 'origin/master'

Conflicts:
	NavigatorBeta/WxNavigatorController.py
typecolors to colors