Not sure. I'm just commiting something.
Merge branch 'master' of https://github.com/sdc50/geotimeline
js changes
Merge branch 'master' of https://github.com/sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/static/js/timemap.js
Merge branch 'master' of https://github.com/sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/static/js/timemap.js
Set editing image for markers when editing and add "editOn" attribute to all overlays to check during mouseon and mouseout events.