finally merged
Merge branch 'master' of https://github.com/marcbaechinger/firewire.git

Conflicts:
	public/resultapp/partials/results/overview.html
	public/resultapp/stylesheets/styles.css