Set parent to GridManager
Merge remote-tracking branch 'origin/master'
Evening merge, need to eliminate shared_ptr<>