Merge origin/master

Conflicts:
	src/Resources/Levels/level1.txt
	src/pacman_infd/GameController.java
	src/pacman_infd/ResourceManager.java
	src/pacman_infd/SoundManager.java