Fixed lock/selectedfrom being the wrong way around
Merge branch 'master' of https://github.com/UniversityRadioYork/MyRadio