Update collection.py

Modified some labels and required fields
Update entity.py

Added genre and format choices.
Merge branch 'master' into newfile