changes
Merge branch 'develop' of https://github.com/agile-geoscience/modelr into develop
fixed trace control mismapping, kwinkunks/modelr_app #80
merge