Changes to view menu #570
Merge remote-tracking branch 'origin/master' into esChris

Conflicts:
	src/Interface/Modules/Visualization/ShowField.ui
	src/Interface/Modules/Visualization/ShowFieldDialog.cc
merge viewScene