Add js for map on organisation pages
Use correct mapit_area for organisation location
Display location on organisation map if present
Merge branch 'master' into design-organisation-pages

Conflicts:
	pombola/south_africa/templates/core/organisation_detail.html