undo now uniform style
Merge branch 'cgdevelop' into 191-trip-options-issues
Merge pull request #104 from CG-CamSys/191-trip-options-issues

undo now uniform style
Merge remote-tracking branch 'origin/cgdevelop' into 215-icons-missing