Updated some examples
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	examples/timeline/03_much_data.html
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	examples/timeline/03_much_data.html