Added handling of the listView
Merge branch 'master' of https://github.com/akarapetyan/RocknRoll