updated with edits from Pablo
Merge branch 'master' of https://github.com/OHI-Science/ohi-webapps