Extended desktop grid system to tablet view.
Merge pull request #1341 from pjackson28/master

Extended desktop grid system to tablet view