Remove useless parameter from PIE button display functions.
Merge implementations of displayStructureStatButton() and displayStructureButton().
Remove unused/useless code from console code
Unify muzzle flash drawing code between structures and droids to reduce code duplication.
Fix saving of effects
Only check for OpenGL errors in debug builds.

Might speed up rendering a bit.
Remove duplicate model files. Closes ticket:4088
Merge branch 'bugfixes'
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)
remove names present in ini files from names.txt
Revert "remove names present in ini files from names.txt"

This reverts commit 21482dc96a87c42b412c658faf97d73e04f96630.
remove names present in ini files from names.txt
Merge pull request #45 from Cjkjvfnby/cleanup-names

remove names present in ini files from names.txt
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.