Merge branch 'master' of https://github.com/bigWebApps/SherpaDeskMobile

Conflicts:
SherpaDesk/css/style.css