Updating the Parent controller
Merge branch 'master' of github.com:simon-peacock/gee-framework