Fixed score and combo outputs
Mostly comments.. But some small fixes for showing combo etc.
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	BeatToTheBeat/src/gui/GamePanel.java