small fixes
Merge branch 'master' of https://github.com/sherpadesk/mobile-v3

Conflicts:
	js/main.js