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

Conflicts:
	SherpaDesk/js/index.js
fix

fix