org editing, uploader
Merge branch 'master' into orgs_work

Conflicts:
	application/controllers/org.php
	application/models/administration.php
	application/models/organizations.php