3.1.4

Mise à Jour 01/06/2014 (00h00)
Merge branch 'master' of https://github.com/Gekloecht/Altis_Life.Altis

Conflicts:
	Functions.h
	core/shops/fn_clothingFilter.sqf
	core/shops/fn_clothingMenu.sqf
	mission.sqm