Merge branch 'master' of https://github.com/ferstaberinde/F3

Conflicts:
	README.md
	description.ext
	f/cache/fn_gCache.sqf
	f/cache/fn_gUncache.sqf
	f/common/f_setMissionConditions.sqf
	f/common/folk_setGroupIDs.sqf
	f/common/folk_setLocalGroupMarkers.sqf
	init.sqf
	mission.sqm
	stringtable.xml
Updated to 3-1-0 RC1
* setAISkill bugfix: wouldn't set civ skill properly
no message
* fixed spec ops uniform for FIA
* changed FIA MAT to RPG32
* changed MATmag2 for CSAT and FIA to HE rocket (was same as MATmag1 before)
Re-added JIP groups

We can close #176 now ;)
Merge pull request #288 from Wolfenswan/dev

SetAISkill bugfix: wouldn't set civ skill properly
Updated README.md for v3-1-0 RC1
Merge pull request #289 from ferstaberinde/dev

v3-1-0 RC1
Merge branch 'master' of https://github.com/Wolfenswan/F3

Conflicts:
	README.md
	description.ext
	mission.sqm
* fixed preMount in modules for CSAT
Merge pull request #294 from Wolfenswan/dev

fixed preMount in modules for CSAT
* fixed script path in acre component
* removed superfluous ;
* removed blank between assignGear and ; in unit inits
* removed nul = for unit init assignGear
* fixed debug string paths (several were still referring to f\common)
* fixed JIP group paths (were still referring to f\common)
Merge branch 'master' of https://github.com/Wolfenswan/A3-Missions into F3_ws

Conflicts:
	README.md
	description.ext
	init_onPlayerRespawn.sqf
	mission.sqm
Made sure code spawned by E&E and CasCap happens globally
Merge pull request #295 from Wolfenswan/dev

Fixed script path in acre component
Merge pull request #296 from Wolfenswan/dev-CasCapLocality

Dev cas cap locality