Updated some stuff
Merge remote-tracking branch 'origin/development' into development

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