sarah_branch

UPDATE on January 15: New commit (8cadb2a) merges all those CSS files into four main ones. Please use this for the January release instead of just the one monarch-common.css because I think that broke some things.

I'm not sure if I did this right because this is my first time sending a pull request, so I apologize in advance if things are incorrect. The following files are the ones that should be different (I think I merged my upstream with my HEAD, which somehow changed things that should not have changed eek):

lib/monarch/web/webapp.js (added navlist_disease & navlist_phenotype to core renderer)

templates/disease.mustache
templates/disease_main.mustache
templates/phenotype.mustache
templates/phenotype_main.mustache
templates/model_main.mustache
templates/anatomy_main.mustache
templates/main.mustache

templates/page/tour.mustache (tour page accessed from the main page)
templates/page/team.mustache (page of Monarch development team)

templates/navbar.mustache
templates/navlist.mustache
templates/navlist_disease.mustache (special navigation list for disease pages)
templates/navlist_phenotype.mustache (special navigation list for phenotype pages)
templates/rightlist.mustache (part of navigation list for recent searches)

css/monarch-common.css (CSS file for all pages - navbar & sidebar)
css/monarch-main.css (CSS file for main pages - disease, phenotype, model, anatomy)
css/disease.css (CSS file for specific disease pages)
css/phenotype.css (CSS file for specific phenotype pages)

css/tour.css (CSS file for tour page)
css/team.css (CSS file for development team page)
css/script.js (used for panels/tabs in specific diseases pages)