bug fix
Merge branch 'master' of https://github.com/ischweizer/phdpapertool

Conflicts:
	public/javascripts/timeline.js