Todo - Deployment Settings
Org: Represent Translated Organisations uses bulk lookup
Merge pull request #975 from gauravmittal1995/todo_deployment

[Todo] - Deployment Settings
Merge branch 'master' of github.com:flavour/eden, bug fix S3LocationSelector

Conflicts:
	modules/s3db/org.py