Fixed resolution and scaling issues on tablets
Merge branch 'master' of https://github.com/dsesclei/Thesis