ResolveEvent is startint to look like something

;)
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefense/AudioManager.h