Initial commit with updated entities and sample servlet