cabinet controller and views update
Merge branch 'master' of https://github.com/SashaChilly/zhivojoffice