Fixes for various bugs noticed by Coverity static analysis tool.
Add new maps: Gamma (3p) and Melting (6p)
Update changelog

(cherry picked from commit 6b0ceca623f710dc5444d35cb1e1fa7965ee684a)
Update Changelog

(cherry picked from commit 8d015ad27b5317877b8b9ee8f69c1a291c9278e8)
Move build fix in ChangeLog to correct location
Merge branch 'bugfixes'

Conflicts:
	src/scriptfuncs.cpp
Fix compile issue broken in 5f32c3eafe26c959045f10b21bea2efc69c770d2
fix flickering of trees (and some other objections) see 5ef1eff3eaffd63bbd1a7f3e0d8e1971c9d78f2e for initial changes.
Upgrade miniupnp to miniupnpc-1.8.20131007 *NOTE* mimiupnp source has been modified so we can compile it without errors!

Fix UPnP so it actually works on windows & linux & most likely mac.
Add more information about UPnP progress in console.

closes ticket:4095
Update ChangeLog
Merge branch 'bugfixes'

Conflicts:
	src/multiint.cpp
Only display the UPnP messages for MP games, not for skirmish.
Fix the mac build for 8f4adda2.

Refs. ticket:4095.
Merge branch 'bugfixes'

Conflicts:
	src/multiint.cpp
Merge branch 'bugfixes'
Fix off-by-one memory error

(cherry picked from commit 1e6e097e7ab5112b4e603c2996ced41dccf77df9)
Fix AI picking to show at most 8 AIs, because of the limitations of the GUI. closes ticket:3147

(cherry picked from commit 20c7024a9bfff73ce3a9338a17381cfb110a1d40)
Fix a off by one error for AI count.
Merge branch 'bugfixes'

Conflicts:
	src/multiint.cpp
(Note, this merge is more or less a dummy commit, since most of this was already
in master anyway... just trying to sync everything up)