Upgraded Django REST Framework to 2.3.6
Merge branch 'dev'
Bumped version numbers to 0.10.4
Merge branch 'master' into dev
Bumped version numbers to post-release
Merge branch 'dev' into multilingual

Conflicts:
	setup.py