Testing area written (crashes at start game)
Merge branch 'master' of https://github.com/fomartin/TheResistance

Conflicts:
	TheResistance/TheResistance.pro
	build-TheResistance-Desktop_Qt_5_3_0_MinGW_32bit-Debug/Makefile
	build-TheResistance-Desktop_Qt_5_3_0_MinGW_32bit-Debug/Makefile.Debug
	build-TheResistance-Desktop_Qt_5_3_0_MinGW_32bit-Debug/Makefile.Release
	build-TheResistance-Desktop_Qt_5_3_0_MinGW_32bit-Debug/ui_startwindow.h