Fix the SuperTransport body type to be SUPER HEAVY, not HEAVY.
Try harder not to have them be on top of each other (only in MultiPlayer games).
Fix explosion type.
Fix damage calculations when they are on the ground.
Try to better balance the Super Transport, hitpoints now at 500, Armor types changed to 35 & 20 and make weapon MG1-VTOL instead of MG3-VTOL.
Fix picky compile issue reported by buildbot. :P
Merge branch 'bugfixes'

Conflicts:
	data/mp/stats/assignweapons.txt
	data/mp/stats/body.txt
Only need to show the UPnP stuff for Hosts.
Portable Warzone fixes for windows.
Fix windows paths.

Windows portable icon by forum member Duda.
Portable header & welcome images from forum member Aubergine.
Image fixes supplied by Berg.

Note: In configure stage (Windows only!), you can specify --enable-portable [default no] to
      create a portable installer. (That is, everything is self-contained in the directory
      you install Warzone 2100 to.  It will *not* use any other directory on the system.)
      If you pass --with-videos [default no], then it will add the videos with the portable
      installer and looks for the video file in \opt\sequences.wz

FIXME: Need: RUSSIAN, GERMAN, DUTCH, tranlations fixes for the warzone2100.nsi file.
(cherry picked from commit c1b29c1f5e6e6331ab5a96f27ba963192e709d81)

Conflicts:
	src/Makefile.am
Add filter icon by duha
Add refresh icon by slate

Fix button states.
Merge branch 'bugfixes'

Conflicts:
	data/base/images/frontend.img
	src/Makefile.am
	src/frend.h
	src/multiint.cpp
Fix bad C&P from previous commit
Add explanatory headers to ini files. Patch by Duha. Closes ticket:4101.
Fix merge clobber
Add a wzDelay function to be used to delay things
Show kick message when kicked, and show host has quit message if host quit (in lobby).

Fixes ticket:4007
Remove/hide filter icon when needed.
Updata changelog
Merge branch 'bugfixes'

Conflicts:
	src/multiint.cpp
Update NullBot to the latest version, include Turtle and Hover AI
Merge branch 'bugfixes'

Conflicts:
	data/mp/multiplay/skirmish/nullbot-main.js.inc
Reformat some messages to fit correctly in the console area.
Don't retry UPnP configuration after it failed, and while still in the game lobby screen.
(You need to exit out of the game lobby screen to retry UPnP configuration.)
Remove UPnP entry in router on game quit.
Merge branch 'bugfixes'

Conflicts:
	src/multiint.cpp
French translation update by machintruc/cpasmoi.