timeline adjust
Merge branch 'master' of github.com:sdc50/geotimeline

Conflicts:
	GeoTimeline/geotimeline/static/js/timemap.js