Merge remote-tracking branch 'upstream/master'
Adding first prototype of a List/Create API view.
Merge remote-tracking branch 'origin/master' into rest-api

Conflicts:
	djadmin2/core.py
	djadmin2/models.py
Merge remote-tracking branch 'greg/rest-api' into rest-api
Changed blog.tests into a directory. WARNING: remove test.pyc
Added basic test for api index view
Merge remote-tracking branch 'upstream/master'
Adding a detail based view.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into rest-api

Conflicts:
	djadmin2/models.py
Fixing tests for API urls.
Merge remote-tracking branch 'greg/rest-api' into rest-api
Added test for unicode field in rest api
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'greg/rest-api' into rest-api-tests
Added test for unicode field in rest api
Remove spurious print statement
Just commiting to be able to merge
Merge remote-tracking branch 'greg/rest-api' into rest-api-tests
Renaming 'api-index' view to 'api-list' makes more sense, since the index will be a list of all available models.