-
Merge branch 'dev-SOA-2' of
https://github.com/Soft-Artel/bossnote.web.git into dev-SOA-2

Conflicts:
	v2/js/view/notepadCtrl.js