merged web and webapp projects
merged web and webapp projects


Former-commit-id: fae58d5820518a426ddd7e48dccacdd01306e0c9
julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine,julie-sullivan/phytomine