Fixed datasource parser
Merge branch 'core-refactor' of https://github.com/UniversityRadioYork/MyRadio into core-refactor