Edit button.
Edit modal populates
Merge branch 'master' of github.com:sdc50/geotimeline

Conflicts:
	GeoTimeline/GeoTimeline.sqlite
	GeoTimeline/geotimeline/static/js/timemap.js
merged
Edit Button