Organization: return Query objects from contacts and primary_contacts properties
Replace /admin-single-organization with newly modal /admin-edit-organization
/admin-edit-organization : integrate edit/add contacts
Improve browse sites (tabulate, filtering)

Link from /incident-statistics
/admin-edit-organization : fix and duplicate edit button
Merge branch 'org-contacts-combined'
Merge branch 'browse-sites'

Conflicts:
	sandy-disaster-recovery/sites_handler.py