MapManager
Merge branch 'master' of https://github.com/CarlRapp/PacMANIACS

Conflicts:
	PacMANIACS/Camera.cpp
	PacMANIACS/Camera.h
	PacMANIACS/PacMANIACS.vcxproj
	PacMANIACS/PacMANIACS.vcxproj.filters
	PacMANIACS/Window.cpp
Merge branch 'master' of https://github.com/CarlRapp/PacMANIACS

Conflicts:
	PacMANIACS/PacMANIACS.vcxproj
	PacMANIACS/PacMANIACS.vcxproj.filters