Develop

Two small fixes: 

Issue #99: updates choice fields to work with newer django-rest-framework versions.

Issue #62: uses field's help_text to set description field in swagger (from gecko-landmarks:master, duplicates pull request #88)