commit

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
merge conflict

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
composer.json correct and add holidays

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
conflict merge

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
i'm very stuped

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
vova derzhis

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
sorry fix bug
corrected userStatus and User.php

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
corrected redirect

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
corrected getUserInfo and delete getInfo and corrected Department getStatus

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
complete correct

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
i know how =)

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
check isset user status

Signed-off-by: dmitry konurov <dmtiry.konurov@opensoftdev.ru>
Merge pull request #200 from dkonurov/master

composer.json and holidays add + sql fixed