Reverted to PickleSerializer until django-merlin can be replaced. (#62)
Upgraded to django-json-field 0.5.5. (#64)
Merge branch 'dev'

Conflicts:
	requirements.txt
Updated version string.