Failed loading medal image. Changed hiddenside pane left to house the Songresults window
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/hanon/app/controller/EvaluationController.java