Merge branch 'master' into jens
Fixed loading of PongApp. Adjust PongApp is next
Merge branch 'jens'