Merge branch 'master' of github.com:toastdriven/django-tastypie into upstream

Conflicts:
	tastypie/api.py
	tastypie/resources.py