modified
Merge branch 'Sofia' of https://github.com/gKSD/Last-fm-android-app into Sofia