tmp
Merge branch 'master' of https://github.com/Soft-Artel/bossnote.web.git

Conflicts:
	js/SyncManager.js
Merge branch 'master' of https://github.com/Soft-Artel/bossnote.web.git
tmp2