adding checks to _sortByLabel, see #603
fixing layout and working towards phenogrid issues 26
fixed phenogrid layout bugs
Merge branch 'master' of https://github.com/monarch-initiative/monarch-app
fixing issue #578
Merge branch 'master' into production