Merge branch 'master' into ESR31

Conflicts:
	build/premake/premake4.lua
	source/ps/GameSetup/GameSetup.cpp
	source/ps/Replay.cpp
	source/scriptinterface/ScriptInterface.cpp
	source/scriptinterface/ScriptInterface.h
	source/simulation2/serialization/BinarySerializer.cpp
	source/simulation2/serialization/SerializedScriptTypes.h
	source/simulation2/serialization/StdDeserializer.cpp
	source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp