admin jobs
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ch/zhaw/softwareEng/io/Output.java
	src/main/java/ch/zhaw/softwareEng/io/console/ConsoleOutPut.java
	src/main/java/ch/zhaw/softwareEng/logic/admin/showLog/ShowLog.java