Merge pull request #17 from SunJieMing/master

optimized tablet media query for list view
fixed issues from rebase
Merge pull request #18 from BrandonMcNary/master

fixed issues from rebase
debug commits