mobile working
Merge branch 'master' of github.com:Betapond/visualisation-tool

Conflicts:
	scripts/desktop/timeline.js