Merge branch 'master' into vanity-pages

Conflicts:
	admin.py
	urls.py
exclude links from admin for orgs
initial work on #768, org mgt of maps/layers/users

allow populating org page with favorites
Merge branch 'iss-768-org-favorites' into integration