upd
Merge branch 'master' of https://github.com/TeamGLPacman/Pacman

Conflicts solved:
	Pacman/GraphicsCore.cpp