Passing context to controls.
Merge branch 'query-workflow' of github.com:cbmi/cilantro into query-workflow