changes
Merge branch 'master' of https://github.com/jonwa/nuke_of_the_patriots_v2

Conflicts:
	Nukes of the patriots/Capitalist.cpp
	Nukes of the patriots/Communist.cpp
	Nukes of the patriots/Communist.h
	Nukes of the patriots/GUIEditField.cpp
	Nukes of the patriots/GUIEditField.h
	Nukes of the patriots/Menu.cpp
	Nukes of the patriots/XML/CapitalistButtonPos.xml
	Nukes of the patriots/XML/MenuWindow.xml