Merge remote-tracking branch 'origin/jonas' into lucas

Conflicts:
	Revenge_of_the_Penguins/aicontrol.cpp
Merge remote-tracking branch 'origin/jonas' into lucas
merge
merge from master
View

Klasse mainwindow durch window(QWidget) ersetzt
merge from master
merge from Lukas
Merge remote-tracking branche `orgin ` into Lucas
Merge from master
Merge remote-tracking branch 'origin/master'

Conflicts:
	Revenge_of_the_Penguins/inventory/kevlar.h
Merge branch 'master' into lucas
Merge remote-tracking branch 'origin/master' into lucas
j
fd