Fix
Fix... again...
Merge branch 'holster-rework' of github.com:desrik/Cataclysm-DDA into holster-rework

Conflicts:
	src/iuse.cpp