Minor syntactical changes
Merge branch 'master' into no-soundtrack

Conflicts:
	src/model/AudioManager.java