merge 3.1.3.5
Merge branch 'master' of https://github.com/sd-demon/herofactory

Conflicts:
	life_server/Functions/MySQL/fn_queryRequest.sqf