Updates to item highlighting in MainActivity
Merge remote-tracking branch 'Databox/master'