App now uses real CardViews
Merge remote-tracking branch 'origin/master'