More stuff, Untested. WIP
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/main/java/ist/fourtwelve/backend/RunInfo.java
	src/main/java/ist/fourtwelve/backend/Setup.java