First integration attempt of the timeline slider.
Merge branch 'master' of https://github.com/tarnacious/DataMe

Conflicts:
	maps.js