changed grid to mainGrid; misc controller changes
Merge branch 'master' of https://github.com/amyzou/RubeWorks