Fixed six version
changed str → unicode in the flatten list+dict
Merge branch 'master' of https://github.com/APSL/django-rest-framework-csv into APSL-master

Conflicts:
	rest_framework_csv/renderers.py