Minor refactoring
Merge branch 'master' of github.com:oheidemann/extreme-play
Better Player => JSON handling