Merge branch 'bugfixes' of github.com:Warzone2100/warzone2100

Conflicts:
	data/mp/stats/research/multiplayer/prresearch.txt

ChangeLog

@@ -1,8 +1,9 @@
-2013-11-xx: Version xxxx
+2013-11-23: Version 3.1.1_rc3
 
  *Multiplayer:
-   * Revert VTOL avoidance & collision checks (commit:e3279f6d033b4967b955dcaaf2ce3c5e21ed7579 commit:75ede1da1d77b6326b9897b59d5d394d3ef533f0)
-
+   * Change: Differentiate between maps and maps that have mods in them. Map-mods will now be shown in red. (commit:fdd2524f1b9d425955e40c03c1447ccea6e02872)
+   * Change: Revert VTOL avoidance & collision checks (commit:e3279f6d033b4967b955dcaaf2ce3c5e21ed7579 commit:75ede1da1d77b6326b9897b59d5d394d3ef533f0)
+   * Change: Flashlight now requires sensor upgrade Mk2, while Pulse Laser still requires sensor upgrade Mk3. (commit:109ee4d7b9598a6696211338599eff6b1a891173)
 
 2013-11-15: Version 3.1.1_rc2
  * Multiplayer:

data/mp/stats/research.ini

@@ -1464,7 +1464,7 @@ keyTopic = 1
 msgName = RES_W_LAS1
 iconID = IMAGE_RES_WEAPONTECH
 statID = Laser3BEAMMk1
-requiredResearch = R-Struc-Research-Upgrade07,R-Sys-Sensor-Upgrade03
+requiredResearch = R-Struc-Research-Upgrade07,R-Sys-Sensor-Upgrade02
 resultComponents = Cyb-Wpn-Laser,Laser3BEAM-VTOL,Laser3BEAMMk1
 
 [R-Wpn-Laser02]
@@ -1475,7 +1475,7 @@ keyTopic = 1
 msgName = RES_W_LAS2
 iconID = IMAGE_RES_WEAPONTECH
 statID = Laser2PULSEMk1
-requiredResearch = R-Wpn-Laser01
+requiredResearch = R-Wpn-Laser01,R-Sys-Sensor-Upgrade03
 redComponents = Laser3BEAM-VTOL,Laser3BEAMMk1
 resultComponents = Laser2PULSE-VTOL,Laser2PULSEMk1