merge
Merge branch 'master' of https://github.com/vlastachu/n1bounce

Conflicts:
	src/Engine.h
	src/EventManager.h
	src/GameCore.cpp