qDebug and log removed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Revenge_of_the_Penguins/inventory/inventory.cpp