Added map_data view to return users and associated locations as JSON when accessed at /map_data
Merge branch 'master' of https://github.com/ciaran-phillips/emain

Conflicts:
	emain/urls.py