Added basic Maps.
Finished Map Points
name removal
Finished map locations
Update
Merge remote-tracking branch 'Github/master' into Development

Conflicts:
	Podfile.lock