Unified framework instead
Merge branch 'recoil' of https://github.com/acreloaded/acr into recoil

Conflicts:
	source/src/weapon.cpp