Fixed issues with database OR mapping
Moved HTML processing to HTMLService, inheritance changes in entities
Added tables for finalizing annotations to DB