add to and delete from bookmarks menu
Merge branch 'david'

Conflicts:
	MappingMashupApp/APIManager.m