list_item.xml instead of programmatic view building
Merge remote-tracking branch 'origin/master'