Bumped version numbers to post-release.
Upgraded Django REST Framework to 2.3.6
Merge branch 'dev'