Initial branch commit
Updated scene
Merged 'scoreboard' branch into dev