Fix list view adapter bug
Merge remote-tracking branch 'whatsToDo/master'