Develop webapp

Merge in latest changes to the database