Huge changes to card layout. almost complete for data
Merge branch 'master' of https://github.com/yhmahw/android