Merge branch 'master' of github.com:SEL-Columbia/formhub
Merge branch 'master' of https://github.com/vernondcole/formhub into develop_ribalba

# Via vernondcole
* 'master' of https://github.com/vernondcole/formhub: