NestedSimpleRouter accepts 'lookup' parameter
Merge remote-tracking branch 'origin/nested-routers' into nested-routers

Conflicts:
	rest_framework/routers.py