Merge branch 'master' into DevCardUImerger

Conflicts:
	include/GameBoard.h
	src/GameBoard.cpp
	src/GameController.cpp
RESOLVED, but I may have broken UnitTest++

Author: PickledMonkey

Makefile

@@ -7,7 +7,7 @@ export EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
-export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -I/usr/include/SDL -Wall
+export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -I/usr/include/SDL2 -I/usr/local/include/SDL2 -Wall
 export LDFLAGS := -L/usr/local/lib -lSDL2 -lSDL2_ttf -lGL -lGLU -Wl,-R/usr/local/lib
 
 .PHONY: all

UnitTest++/Makefile

@@ -27,12 +27,7 @@ src = src/AssertException.cpp \
 	src/XmlTestReporter.cpp \
 	src/CurrentTest.cpp
 
-ifeq ($(MSYSTEM), MINGW32)
   src += src/Win32/TimeHelpers.cpp
-else
-  src += src/Posix/SignalTranslator.cpp \
-	src/Posix/TimeHelpers.cpp
-endif
 
 test_src = src/tests/Main.cpp \
 	src/tests/TestAssertHandler.cpp \