Fixed problem with user navigation between map, detail view, and ODK [Delivers #70971570]
Merge branch 'master' of github.com:SEL-Columbia/Facilitator