Finish JARVIS-399

Conflicts:
	lib/joolaio.visualisation.report.Timeline.js
Merge branch 'origin/develop'

Conflicts:
	lib/joolaio.visualisation.report.Timeline.js