updated version with working servlet, widgets, templates, pages etc