Initial fix to make a POST request when deleting a facility.
Merge branch 'release-0.12.0' into hotfix/2198-Deleting-a-facility-should-NOT-use-a-GET-request
Add tastypie package.
Merge pull request #2382 from mrpau/hotfix/2198-Deleting-a-facility-should-NOT-use-a-GET-request

Fix to make a POST request when deleting a facility.
Handle function or list from psutil
Add comment to help future maintainers
Merge pull request #2409 from dylanjbarth/fix_psutil

Handle function or list from psutil
Revert "Add tastypie package."

This reverts commit b0712abe5ee4dabacba57fbe521cf3a6f2027bee.
checkout tastypie from nalanda-rct2
Merge branch 'release-0.12.0' into nalanda-rct2

Conflicts:
	kalite/facility/api_views.py
Merge branch 'nalanda-rct2' into nalanda-rct3
Add midyear exams
Add device log resource option to CSV export
Merge pull request #2411 from learningequality/nalanda-rct2

Nalanda rct2 to nalanda-rct3
Prevent students from changing their group
Add `mimeparse.py` from `nalanda-rct3` because `tastypie` needs it.
Disable exam mode when teacher logs out.
Disable timeout for teachers & admins.
Test that exam mode is turned off when teachers log out.
Move khanload app to contentload.
Clean up some Khanspecific code.