Merge branch 'master' of https://github.com/ruskam

Conflicts:
	web/js/globalVar.js
test
Testing synchronization again.