Merge pull request #39 from jatitoam/develop

Tablet viewport and images in toolbar