testlayout.xml updated to use cardview
Merge remote-tracking branch 'origin/master'