Now using counties to link users and memorgs
Merge branch 'master' into Member-organization-profile-page---static

Conflicts:
	memberorgs/forms.py
	memberorgs/urls.py
	memberorgs/views.py
fixing conflict
Merge remote-tracking branch 'origin/Member-organization-profile-page---static' into Member-Orgs-coordinators

Conflicts:
	userprofile/templates/userprofile/userLists.html
conflict fix