Merge branch 'master' of github.com:mobilis/xhunt-webclient

Conflicts:
	js/xhunt.js
Merge branch 'master' of github.com:mobilis/xhunt-webclient
fix