Merge pull request #46 from cdondrup/hydro-devel

Removing marathon_gui from strands_ui