Fixed the nested model serializers in case of the related_name isn’t set...

Conflicts:
	docs/api-guide/routers.md

third-party package: wq.db

Add required imports to Generating Tokens example, and update with get_user_model()

Because that's a better way of doing it.

Previously we were missing User and post_save.

Update routers.md

Reference to ```DefaultRouter``` should be ```SimpleRouter```

Refine model manager behavior so as not to use the behavior in incorrect...

Added REST Condition to 3rd party permissions packages list.

Fix typo "Not" -> "Note"

Merge branch 'issue-1231-jsonencoder' of git://github.com/mbox/django-rest-framework into mbox-issue-1231-jsonencoder

Catch errors during parsing and set empty .DATA/.FILES before re-raising.

RelatedField is function of serializer class

Minor grammar fix -- 'team' is singular

docfix: update installation example to work with django 1.6

looks like django.conf.urls.defaults was deprecated as of django 1.6