Added ContactList and ContactChoice fields
Merge branch 'master' of git://github.com/vincentfretin/collective.contact.content