Merge branch 'dev'
Bump version
bump version
Fix Serializers to work with multiple content_types
Test that content-type works with a charset
bump version
Merge branch 'master' into dev

Conflicts:
	docs/conf.py
	setup.py
Fixed syntax error in the tutorial.
Can now skip following the location header.
Allow different accepts from content type and allow sending files in post.