Merge pull request #1 from wolfie/master

Updates from upstream
Merge remote-tracking branch 'upstream/master'
Moved data from various places to app.js, simplified switchView, added init functions to views
Decoupled course view updating from players view updating
Merge pull request #12 from Peppe-/master

Merging from Peppe- <3