DHTMLX fix
DB fix
Controllers half-fix
Merged Controllers