Signed-off-by: Marina Radchenko <mar_radch@mail.ru>

repairing of excel loading,
check login in admin
Merge branch 'master' of https://github.com/stemsc/status-m.git

Conflicts:
	application/modules/user/controllers/ListOrderController.php