Merge remote-tracking branch 'refs/remotes/whilke/feature/guiGrid' into development.
- Updated the formatting for the guiGridCtrl source to coincide with the coding standard used in other parts of the engine.