Add API token info to user detail view.
Hide API tokens from other non-superusers.
Merge branch 'test_django-rest-framework2' into api_user_detail_view

Conflicts:
	cyder/api/authtoken/templates/authtoken/token_detail.html
Merge branch 'master' into api_user_detail_view

Conflicts:
	cyder/core/cyuser/templates/cyuser/user_detail.html
	cyder/core/cyuser/views.py
Merge branch 'test_django-rest-framework2' into api_user_detail_view
Fix token request form.
Merge pull request #276 from zeeman/api_user_detail_view

Update user detail view to include API token information. All tests pass, fully functional.