Moved mainGrid control to controller
Merge conflit
Merge branch 'master' of github.com:amyzou/RubeWorks