Merge remote-tracking branch 'mainline/master' into minions

Conflicts:
	src/Avatar.cpp
	src/Enemy.cpp
	src/EnemyManager.cpp
	src/Entity.cpp
	src/Entity.h
	src/Utils.cpp