Fixed bug with ammo and life pickup
Merge branch 'develop' of github.com:7drl/QuakeRL into develop

Conflicts:
	source/entity/playerentity.cpp