Merge remote-tracking branch 'origin/GCS_Enhancements' into GCS_Enhancements

Conflicts:
	ground/gcs/src/plugins/config/modules.ui
Merge branch 'GCS_Enhancements' of https://github.com/cGiesen/TauLabs into GCS_Enhancements