Fixed logic wrt to dragging photos into markers.  Works from map markers as well as from the side bar
Fixed the bug with dragging photos into markers, from both the sidebar and the map
Fixed a bug where things were still highlighted as if editable when you reverted to view mode
Merge branch 'master' into menus
Resolved more conflicts between master and menus

Conflicts:
	static/scripts/map/overlays/point.js