Merge branch 'master' of git://github.com/galoo/django-rest-swagger into feature/docs-rst

Conflicts:
	rest_framework_swagger/__init__.py
	rest_framework_swagger/views.py