first cut at resolving #122
Merge branch 'master' of https://github.com/monarch-initiative/monarch-app
Merge remote-tracking branch 'upstream/master'