Allow storing icons for entities
Move servlets around
Implement icon upload