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

Conflicts:
	index.php
	js/app.js
	js/sm.js