Delete fragment_whitecardlist_grid.xml.
Rename fragment_whitecardlist_list.xml to fragment_whitecardlist.xml.
Delete and ignore Thumbs.db files.
Merge remote-tracking branch 'origin/master'