Custom list adapter with TWO text fields
Merge remote-tracking branch 'origin/master'