Added new fields for projects and servers
Annotated models
Merge branch 'new_fields' into develop