Merge remote-tracking branch 'upstream/master' into SBRF-Dev

Merge remote-tracking branch 'upstream/master' into SBRF-Dev

Includes the following commits:
Feb 20, 2013
	domuk 	Version 2.9b - Hotfix 	 	 	 	 	 	 	dbdd82d
	domuk 	Version 2.9b (Arma2Net + Non Arma2Net Version) 	d680fa1
Mar 13, 2013
	pulsebox 	attempted to fix arma2net 	 	 	 	 	 	98fbd67 

Conflicts:
 ArmANet/Wasteland_United_Chernarus.Chernarus/Loading.jpg
 ArmANet/Wasteland_United_Chernarus.Chernarus/client/functions/playerSetup.sqf
 ArmANet/Wasteland_United_Chernarus.Chernarus/mission.sqm
 ArmANet/Wasteland_United_Chernarus.Chernarus/stringtable.xml
 Standard/Wasteland_United_Chernarus.Chernarus/Loading.jpg
 Standard/Wasteland_United_Chernarus.Chernarus/client/functions/playerSetup.sqf
 Standard/Wasteland_United_Chernarus.Chernarus/mission.sqm
 Standard/Wasteland_United_Chernarus.Chernarus/stringtable.xml
 client/functions/playerSetup.sqf
 Loading.jpg
 mission.sqm
 stringtable.xml