refactor
Merge branch 'develop' of github.com:marc68128/GrooveSharkWindowsPhone into develop