Merge branch 'master' of https://github.com/rheit/zdoom

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt
Merge branch 'master' of https://github.com/coelckers/gzdoom

Conflicts:
	CMakeLists.txt
	src/CMakeLists.txt