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

Conflicts:
	public/resultapp/app/directives.js
Merge branch 'master' of https://github.com/marcbaechinger/firewire.git
Merge branch 'master' of https://github.com/marcbaechinger/firewire.git

Conflicts:
	app.js
	public/admin-client/application-controller.js
	public/resultapp/index.html
	public/resultapp/partials/results/overview.html