dimagi.utils.web.render_to_response -> django.shortcuts.render
Merge branch 'master' into render_to_response
merge master
additional render_to_response replacements
add organization information to users and settings
Merge pull request #608 from dimagi/settings-org

add organization information to users and settings
fix remove domain membership bugs
minor fix to test; was logically wrong but only fails somtimes due to an off-by-a-second problem
Merge pull request #612 from dimagi/mobile-auth-test

minor fix to test; was logically wrong but only fails somtimes due to an...
add translations
Merge pull request #613 from dimagi/cz

Revert "optimizations meant to streamline location import"
Merge branch 'master' into render_to_response

Conflicts:
	corehq/apps/orgs/views.py
	corehq/apps/users/views/mobile/users.py
Merge pull request #558 from dimagi/render_to_response

Render to response
Merge pull request #611 from dimagi/rm-dm

fix remove domain membership bugs
Revert "Revert "optimizations meant to streamline location import""

This reverts commit 3d676d59f15f140113a937bca17757559797640d.
responses to pull request comments and bugfix to add function
display eula and cda in the context of CommCareHQ
hopefully final bugfix for LocationCache
add __repr__ to locations
migration to get old commtrack domains working again