Update config folder for 3.1.
Set default rules back to the old 2.3 balance in regards to the HQ for 3.1.
Remove semperfi-js AI from 3.1
Change version in configure.ac to 3.1git.
Merge branch 'bugfixes' into 3.1
Update the docs for the xcode builds.
Merge branch 'bugfixes' into 3.1
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update translations.
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update ChangeLog.
  Polish translation update by Emdek.
  Update custom translations.
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update team colours to correspond to their names better.
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Add ChangeLog date.
Activate the low qual vids for the xcode beta builds.
Fix the releaseBranch script.
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Update ChangeLog.
  Make pathfinding find straighter paths on average.
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Fix cross-compilation.
  Add assert for droids added to wrong group.
  qtscript: Try harder not to crash if we fail to load our script context.
  Fix ticket:3094 unit designs in factory menu not appearing when saving and loading.
  Better repo detection for autorevision.sh.
  Revert "Remove hg stuff from autorevision.sh."
  Remove hg stuff from autorevision.sh.
  Remove redundant dependency for version.o.
  Move WZ_WRITEDIR to frame.h and use it for the crashdumps as well.
  Disentangle some Mac includes.
  Actually initialize SDL paste system somewhere.
  Fix crash in semperfi-js

Conflicts:
	src/main.cpp
Fix breakage in the mac builds due to changes in 395cb1b and 5506dae.
Add the error tag back.

This way message will actually show up in xcode builds if reached.
Update Zlib to 1.2.6 and Png to 1.5.8.
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Fix the help bundle.
  Bring back the WarzoneHelp info.plist which was lost in the shuffle.
  Get all of the scripts that are likely to change with any regularity out of the xcode project.
  OS X: Fetching new build dependency versions is not an error.
  Don't assume Xcode's build products are in the source tree.
  Add OS X help menu items for the man page and scripting docs.
  Simplify dependencies in the xcode build.

Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
Merge branch 'bugfixes' into 3.1

* bugfixes:
  Check if we actually need to hide widgets before hiding them
  Fix player counts for both AI & humans & 'closed' slots in MP games
  Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104
  Fix calling batch file for autorevision.sh script refs: 17596232cc207da5007d2120aec849b8db5ea943
  Don't go past the map's player limits when allocating players. fixes ticket:3089
  Fix issues that were overlooked from the revert(s) in ac550acd58b9f65bf0a4f68b02131b0f108d1021
  qtscript: Add a note about local variables to the documentation.
  Splice in the Changelog from 2.3.
  Set radarOnScreen to true by default.
  Add general rules script for the campaign.
  Run eventStartLevel always, not only for skirmish.