diff --git a/.gitignore b/.gitignore
index 3b75b1f05a9f5314825b1151f1af128d924f7374..9997877afc7db41f08867f8be1e0a62a471085dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@ application/cache/
 application/logs/
 application/config/
 system/
+modules/kotwig/cache/
 *.*~
 /.project
diff --git a/application/bootstrap.php b/application/bootstrap.php
index fe6a10c92f9a5b4923bc5f44a5cf217447042c3a..e28950c5366681808e8611e14a468ef1f9db8ab2 100644
--- a/application/bootstrap.php
+++ b/application/bootstrap.php
@@ -242,17 +242,11 @@ Route::set('stdnt:profile', 'student/profile')
         
 /* --------------- Преподаватели ---------------- */
 
-Route::set('map:show', 'map/<id>', array('id' => '[0-9]+'))
+Route::set('map:edit', 'map/<id>', array('id' => '[0-9]+'))
         ->defaults(array(
             'directory' => 'teacher',
             'controller' => 'map',
-            'action' => 'show'
-        ));
-
-Route::set('map:act', 'map/<action>/<id>', array('action' => '(create|edit)', 'id' => '[0-9]+'))
-        ->defaults(array(
-            'directory' => 'teacher',
-            'controller' => 'map'
+			'action' => 'edit'
         ));
 
 Route::set('rating', 'rating/<id>', array('id' => '[0-9]+'))
diff --git a/application/classes/Controller/Authentication.php b/application/classes/Controller/Authentication.php
index 9fa5e5e845f54917fa0c77d69929324dd45e9d90..da763b16e986d121fd462fc23f08b3e5f5cb7b79 100644
--- a/application/classes/Controller/Authentication.php
+++ b/application/classes/Controller/Authentication.php
@@ -8,7 +8,7 @@ class Controller_Authentication extends Controller {
             {
                 if(Account::instance()->isSignedIn())
                 {
-                    $page = Request::factory(Account::instance()->offsetGet('AccountType').'/index')->execute();
+                    $page = Request::factory(Account::instance()->offsetGet('Type').'/index')->execute();
                     $this->response->body($page);
                 }
             }
diff --git a/application/classes/Controller/Handler.php b/application/classes/Controller/Handler.php
index f064c4ba352f5cb48d5172c6e607a5ca9a658d5d..ba07096b35de9fb15db5bd5bd14021edd3cccb8a 100644
--- a/application/classes/Controller/Handler.php
+++ b/application/classes/Controller/Handler.php
@@ -33,7 +33,7 @@ class Controller_Handler extends Controller {
         if(!$this->checkAccessLevel())
         {
             // Перенаправляем на ошибку доступа
-            throw HTTP_Exception::factory (403, $this->user['AccountType']);
+            throw HTTP_Exception::factory (403, $this->user['Type']);
         }
     }
     
@@ -51,15 +51,15 @@ class Controller_Handler extends Controller {
         switch($this->access)
         {
             case self::ACCESS_ADMIN:
-                return Account::instance()->isSignedIn() AND $this->user['AccountType'] == 'admin';
+                return Account::instance()->isSignedIn() AND $this->user['Type'] == 'admin';
             break;
             
             case self::ACCESS_TEACHER:
-                return Account::instance()->isSignedIn() AND $this->user['AccountType'] == 'teacher';            
+                return Account::instance()->isSignedIn() AND $this->user['Type'] == 'teacher';            
             break;
             
             case self::ACCESS_STUDENT:
-                return Account::instance()->isSignedIn() AND $this->user['AccountType'] == 'student';
+                return Account::instance()->isSignedIn() AND $this->user['Type'] == 'student';
             break;
             
             case self::ACCESS_USER:
diff --git a/application/classes/Controller/Handler/Map.php b/application/classes/Controller/Handler/Map.php
index 21acf0b0eca7ffb588a1685d875f52106e8d3bcc..8b7af4c5ba41f6e0bd608afa7e16bc654854dff0 100644
--- a/application/classes/Controller/Handler/Map.php
+++ b/application/classes/Controller/Handler/Map.php
@@ -13,33 +13,34 @@ class Controller_Handler_Map extends Controller_Handler {
 			return $result[0]['Num'];
 		}
 		
-        public function action_AddMap() {
-			
-			$json = $this->post->offsetGet('data');
-			$json = json_decode($json, true);
-
-			for ($i = 0; $i < $json['modulesCount']; $i++) {
-				$query = $this->model->addModule(
-					$this->user['TeacherID'],
-					$json['DisciplineID'],
-					$i + 1,
-					$json[$i]['moduleName']
-				);
-				$ModuleID = $query[0]['Num'];
-				
-				for ($j = 0; $j < $json[$i]['subModules']['subModulesCount']; $j++) {
-					$this->model->addSubmodule(
-							$this->user['TeacherID'], 
-							$ModuleID,
-							$json[$i]['subModules'][$j]['maxRate'],
-							$j + 1,
-							$json[$i]['subModules'][$j]['subModuleName'],
-							'description',
-							$json[$i]['subModules'][$j]['typeControl']
+		// Изменения базовых параметров дисциплины
+		public function action_ChangeDiscipline() {
+			$data['success'] = false;
+            $this->post -> rule('DisciplineID', 'not_empty')
+                        -> rule('DisciplineID', 'digit')
+						-> rule('Grade', 'not_empty')
+                        -> rule('Grade', 'digit')
+						-> rule('SubjectID', 'not_empty')
+                        -> rule('SubjectID', 'digit')
+						-> rule('ExamType', 'not_empty')
+						-> rule('LectionCount', 'not_empty')
+                        -> rule('LectionCount', 'digit')
+						-> rule('PracticeCount', 'not_empty')
+                        -> rule('PracticeCount', 'digit');
+            if($this->post->check()) {
+					$result = $this->model->ChangeDiscipline(
+						$this->user['TeacherID'],
+						$this->post->offsetGet('DisciplineID'),
+						$this->post->offsetGet('ExamType'),
+						$this->post->offsetGet('LectionCount'),
+						$this->post->offsetGet('PracticeCount'),
+						$this->post->offsetGet('Grade'),
+						$this->post->offsetGet('SubjectID')
 					);
-				}
-			
+					if ($result[0]['Num'] == 0)
+						$data['success'] = true;
 			}
+			$this->response->body(json_encode($data));
 		}
 		
 		// Добавить модуль и к модулю 1 мероприятие
@@ -117,6 +118,23 @@ class Controller_Handler_Map extends Controller_Handler {
                 $this->response->body(json_encode('Error, ChangeModuleName'));
 		}
 		
+		// Поменять имя мероприятия
+		public function action_ChangeSubmoduleName() {
+            $this->post -> rule('SubmoduleID', 'not_empty')
+                        -> rule('SubmoduleID', 'digit')
+						-> rule('SubmoduleName', 'not_empty');
+            if($this->post->check()) {
+                $this->model->ChangeSubmoduleName($this->user['TeacherID'], $this->post->offsetGet('SubmoduleID'), $this->post->offsetGet('SubmoduleName'));
+				$this->response->body(json_encode('Ok, ChangeSubmoduleName!'));
+            }
+            else
+                $this->response->body(json_encode('Error, ChangeSubmoduleName'));
+		}
+		
+		public function action_ChangeSubmoduleOrder() {
+			
+		}
+		
 		// СВАП порядка двух модулей
 		public function action_SwapModuleOrder() {
 			$data['success'] = false;
@@ -149,7 +167,6 @@ class Controller_Handler_Map extends Controller_Handler {
 					$this->post->offsetGet('SubmoduleID1'),
 					$this->post->offsetGet('SubmoduleID2')
 				);
-				//var_dump($result);
 				if ($result[0]['Num'] == 0)
 					$data['success'] = true;
             }
@@ -177,22 +194,18 @@ class Controller_Handler_Map extends Controller_Handler {
             $this->response->body(json_encode($data));
         }
 		
-		// Поменять имя мероприятия
-		public function action_ChangeSubmoduleName() {
+		// Удалить мероприятие
+		public function action_DeleteSubmodule() {
+			$data['success'] = false;
             $this->post -> rule('SubmoduleID', 'not_empty')
-                        -> rule('SubmoduleID', 'digit')
-						-> rule('SubmoduleName', 'not_empty');
+                        -> rule('SubmoduleID', 'digit');
             if($this->post->check()) {
-                $this->model->ChangeSubmoduleName($this->user['TeacherID'], $this->post->offsetGet('SubmoduleID'), $this->post->offsetGet('SubmoduleName'));
-				$this->response->body(json_encode('Ok, ChangeSubmoduleName!'));
+                $result = $this->privateDeleteSubmodule($this->post->offsetGet('SubmoduleID'));
+				if ($result == 0)
+					$data['success'] = true;
             }
-            else
-                $this->response->body(json_encode('Error, ChangeSubmoduleName'));
-		}
-		
-		public function action_ChangeSubmoduleOrder() {
-			
-		}
+			$this->response->body(json_encode($data));
+        }
 		
 		//  Изменение макс. балла подмодуля
 		public function action_ChangeSubmoduleMaxRate() {
@@ -241,17 +254,4 @@ class Controller_Handler_Map extends Controller_Handler {
             else
                 $this->response->body(json_encode('Error, ChangeSubmoduleDescription'));
 		}
-		
-		// Удалить мероприятие
-		public function action_DeleteSubmodule() {
-			$data['success'] = false;
-            $this->post -> rule('SubmoduleID', 'not_empty')
-                        -> rule('SubmoduleID', 'digit');
-            if($this->post->check()) {
-                $result = $this->privateDeleteSubmodule($this->post->offsetGet('SubmoduleID'));
-				if ($result == 0)
-					$data['success'] = true;
-            }
-			$this->response->body(json_encode($data));
-        }
 }
diff --git a/application/classes/Controller/Handler/Sign.php b/application/classes/Controller/Handler/Sign.php
index 4b04c38111c198eec73c7a8e102977ef43e69aa5..703aa00a317a94bffb17e6cdf9dfde98c29e2ade 100644
--- a/application/classes/Controller/Handler/Sign.php
+++ b/application/classes/Controller/Handler/Sign.php
@@ -41,7 +41,7 @@ class Controller_Handler_Sign extends Controller_Handler {
                 ->rule('password', 'min_length', array(':value', $config['password']['length']))
                 ->rule('confirm_password', 'matches', array(':validation', 'confirm_password', 'password'))
                 ->rule('email', 'not_empty')
-                ->rule('email', 'email_domain')
+                ->rule('email', 'email')
                 ->rule('confirm_email', 'matches', array(':validation', 'confirm_email', 'email')); 
             if($this->post->check())
             {
diff --git a/application/classes/Controller/Teacher/Index.php b/application/classes/Controller/Teacher/Index.php
index aaf788af789b84504015735603237d2a5cf6a8fb..26eab296e640a8023990396aab768092cbd1aa93 100644
--- a/application/classes/Controller/Teacher/Index.php
+++ b/application/classes/Controller/Teacher/Index.php
@@ -6,16 +6,72 @@ class Controller_Teacher_Index extends Controller_UserEnvi {
     {
         $twig = Twig::factory('teacher/index');
         
-        // ???
+        $model = new Model_Teacher_Index;
+        $disciplines = $model->getDisciplinesForTeacher($this->UserInfo['TeacherID']);
+        $subjectsHandled = array(); $subjID = $discID = $i = $j = $k = 0;
         
+        foreach ($disciplines as $row) {
+            
+            if($subjID != $row['SubjectID'])
+            {
+                $i++; $j = $k = 0;
+                $subjID = $row['SubjectID'];
+            }
+            $subjectsHandled['Subjects'][$i]['Title'] = $row['SubjectName'];
+            
+            if($discID != $row['DisciplineID'])
+            {
+                $j++; $k = 0;
+                $discID = $row['DisciplineID'];
+            }
+            
+            $subjectsHandled['Subjects'][$i]['Disciplines'][$j]['ID'] = $row['DisciplineID'];
+            $subjectsHandled['Subjects'][$i]['Disciplines'][$j]['GradeNum'] = $row['StudyGroupGrade'];
+            $subjectsHandled['Subjects'][$i]['Disciplines'][$j]['ControlType'] = $this->getControlType($row['DisciplineType']);
+            $subjectsHandled['Subjects'][$i]['Disciplines'][$j]['Teachers'] = $this->getTeachersForDiscipline($discID);
+            
+            $k++;
+            $subjectsHandled['Subjects'][$i]['Disciplines'][$j]['Groups'][$k]['Count'] = 10;
+            $subjectsHandled['Subjects'][$i]['Disciplines'][$j]['Groups'][$k]['Num'] = $row['StudyGroupNum'];
+            $subjectsHandled['Subjects'][$i]['Disciplines'][$j]['Groups'][$k]['ID'] = $row['StudyGroupID'];
+        }
+        $twig->content = $subjectsHandled;
         $twig->User = $this->UserInfo;
         $this->response->body($twig);
     }
-	
+    
     public function action_settings() {
         $twig = Twig::factory('settings');
         $twig->User = $this->UserInfo;
         $this->response->body($twig);
     }
+    
+    protected function getControlType($type)
+    {
+        if($type == 'exam')
+        {
+            return 'Экзамен';
+        }
+        elseif($type == 'credit')
+        {
+            return 'Зачет';
+        }
+    }
+    
+    protected function getTeachersForDiscipline($id) {
+        $model = new Model_Teacher_Index;
+        $teachers = $model->getTeachersForDiscipline($id);
+        $teachersHandled = array(); $i = 0;
+        foreach ($teachers as $teacher)
+        {
+            $i++;
+            $teachersHandled[$i] = $teacher['LastName'].' '.UTF8::substr($teacher['FirstName'], 0, 1).'. ';
+            if(!empty($teacher['TeacherSecond']))
+            {
+                $teachersHandled[$i] .= UTF8::substr($teacher['SecondName'], 0, 1).'.';
+            }
+        }
+        return $teachersHandled;
+    }
 }
             
\ No newline at end of file
diff --git a/application/classes/Controller/Teacher/Map.php b/application/classes/Controller/Teacher/Map.php
index cf5d6437e0cd112608a7661ac807f6de9d699910..3fc87a5795191cdcebe7ef4d57fc352162943f13 100644
--- a/application/classes/Controller/Teacher/Map.php
+++ b/application/classes/Controller/Teacher/Map.php
@@ -20,29 +20,74 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
     
     public function action_create()
     {
-        $twig = Twig::factory('teacher/map/construct');
+        $twig = Twig::factory('teacher/map/add');
         $twig->User = $this->UserInfo;
-        $id = $this->request->param('id');
         
         $this->response->body($twig);
     }
     
     public function action_edit()
     {
-        $twig = Twig::factory('teacher/map/edit');
+		$twig = Twig::factory('teacher/map/edit');
         $id = $this->request->param('id');
         $db = new Model_Teacher_Map;
         $map = $db->getMapForDiscipline($this->UserInfo['TeacherID'], $id);
-        
-        if($map->count() == 0)
-            throw HTTP_Exception::factory(404, "Учебная карта дисциплины с ID $id не найдена!");
-        
-        $twig->User = $this->UserInfo;
-        $twig->Map = $this->getMapInfo($map);
-        $twig->Subject = $this->getSubjectInfo($db, $id);
-        $this->response->body($twig);
+		
+		$twig->User = $this->UserInfo;
+		$twig->Map = $this->getMapInfo($map);
+		$twig->Discipline = $this->getSubjectInfo($db, $id);
+		$twig->SubjectsList = array(
+			1 => array(
+				'ID' => '1',
+				'Title' =>'Математический анализ'
+			),
+			2 => array(
+				'ID' => '2',
+				'Title' =>'Дифференциальные уравнения'
+			),
+			3 => array(
+				'ID' => '3',
+				'Title' =>'Операционные системы'
+			),
+			4 => array(
+				'ID' => '4',
+				'Title' =>'Топология'
+			)
+		);
+		$twig->GradesList = array(
+			1 => array(
+				'ID' => '1',
+				'Title' =>'РљСѓСЂСЃ 1'
+			),
+			2 => array(
+				'ID' => '2',
+				'Title' =>'РљСѓСЂСЃ 2'
+			),
+			3 => array(
+				'ID' => '3',
+				'Title' =>'РљСѓСЂСЃ 3'
+			),
+			4 => array(
+				'ID' => '4',
+				'Title' =>'РљСѓСЂСЃ 4'
+			),
+			5 => array(
+				'ID' => '5',
+				'Title' =>'РљСѓСЂСЃ 6'
+			),
+			6 => array(
+				'ID' => '6',
+				'Title' =>'Магистратура 1'
+			),
+			7=> array(
+				'ID' => '7',
+				'Title' =>'Магистратура 2'
+			)
+		);
+			
+		$this->response->body($twig);
     }
-    
+	
     private function getMapInfo($map) {
         $mapHandled = array();
         
@@ -76,29 +121,38 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
 			if ($row['SubmoduleControl'] == 'LandmarkControl')
 				 $mapHandled[$i]['LandmarkControl'] += (int) $row['MaxRate'];
         }
-        $mapHandled['ModulesCount'] = $i;
-        $mapHandled['MaxRate'] = (int) $maxRate;  
-        
+		$mapHandled['ModulesCount'] = $i;
+		$mapHandled['MaxRate'] = (int) $maxRate; 
+
         return $mapHandled;
     }
     
     public function getSubjectInfo($db, $id)
     {
-        $info = $db->getDisciplineInfoByID($id)->offsetGet(0);
-        $teachers = $db->getTeachersForDiscipline($id);
+        $info = $db->getDisciplineInfoByID($id);
         
-        $subject['Title'] = $info['SubjectName'];
-        if($info['ExamType'] == 'exam')
-        {
-            $subject['Control'] = 'Экзамен';
-        }
-        elseif($info['ExamType'] == 'credit')
-        {
-            $subject['Control'] = 'Зачет';
-        }
+        if($info->count() == 0)
+           throw HTTP_Exception::factory(404, "Учебная карта дисциплины с ID $id не найдена!");
+		else
+			$info = $info->offsetGet(0);
+		
+		$teachers = $db->getTeachersForDiscipline($id);
+		
+        $subject['SubjectName'] = $info['SubjectName'];
+		$subject['SubjectID'] = $info['SubjectID'];
+        //if($info['ExamType'] == 'exam')
+        //{
+        //    $subject['Control'] = 'Экзамен';
+        //}
+        //elseif($info['ExamType'] == 'credit')
+        //{
+        //    $subject['Control'] = 'Зачет';
+        //}
+		$subject['ExamType'] = $info['ExamType'];
         
         $subject['LectureHours'] = $info['LectionCount'];
-        $subject['SeminarHours'] = $info['PracticeCount'];
+        $subject['PracticeHours'] = $info['PracticeCount'];
+		$subject['GradeID'] = $info['DisciplineGrade'];
         
         $teachersHandled = array(); $i = 0;
         
@@ -111,6 +165,8 @@ class Controller_Teacher_Map extends Controller_UserEnvi {
             $i++;
         }
         $subject['Teachers'] = implode(', ', $teachersHandled);
+		
+		return $subject;
     }
 }
             
\ No newline at end of file
diff --git a/application/classes/Controller/Teacher/Rating.php b/application/classes/Controller/Teacher/Rating.php
index 2d7fc729ebe7224dd9730b81f5f3a77e581326c7..1611f10769e3e14239d6ffbafc497b55b2b96335 100644
--- a/application/classes/Controller/Teacher/Rating.php
+++ b/application/classes/Controller/Teacher/Rating.php
@@ -49,14 +49,18 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
         // Студенты и баллы
         $students = $db->GetStudentsForDiscipline($this->UserInfo['TeacherID'], $id);
         $studentsHandled = array();
-        $i = 0;
+        $i = 0; $MigrantsCount = 0;
         
         foreach($students as $row) {
+			if ($row['isAttached'] == '0') {
+				// Не Мигранты
                 $i++;
                 $studentsHandled[$i]['StudentID'] = $row['StudentID'];
                 $studentsHandled[$i]['LastName'] = $row['LastName'];
                 $studentsHandled[$i]['FirstName'] = $row['FirstName'];
                 $studentsHandled[$i]['SecondName'] = $row['SecondName'];
+				$studentsHandled[$i]['Grade'] = $row['Grade'];
+				$studentsHandled[$i]['GroupNum'] = $row['GroupNum'];
                 $rate = $db->getMapForStudent($row['StudentID'], $id);
                 $j = 0;
                 foreach($rate as $r) {
@@ -65,13 +69,32 @@ class Controller_Teacher_Rating extends Controller_UserEnvi {
                         $studentsHandled[$i][$j]['Rate'] = $r['Rate'];
                 }
                 $studentsHandled[$i]['RateCount'] = $j;
+			}
+			else {
+				// Мигранты
+				$MigrantsCount++;
+				$MigrantsHandled[$MigrantsCount]['StudentID'] = $row['StudentID'];
+                $MigrantsHandled[$MigrantsCount]['StudentID'] = $row['StudentID'];
+                $MigrantsHandled[$MigrantsCount]['LastName'] = $row['LastName'];
+				$MigrantsHandled[$MigrantsCount]['FirstName'] = $row['FirstName'];
+				$MigrantsHandled[$MigrantsCount]['SecondName'] = $row['SecondName'];
+				$MigrantsHandled[$MigrantsCount]['Grade'] = $row['Grade'];
+				$MigrantsHandled[$MigrantsCount]['GroupNum'] = $row['GroupNum'];
+				$rate = $db->getMapForStudent($row['StudentID'], $id);
+                $j = 0;
+                foreach($rate as $r) {
+                        $j += 1;
+                        $MigrantsHandled[$MigrantsCount][$j]['SubmoduleID'] = $r['SubmoduleID'];
+                        $MigrantsHandled[$MigrantsCount][$j]['Rate'] = $r['Rate'];
+                }
+				$MigrantsHandled[$MigrantsCount]['RateCount'] = $j;
+			}
         }
         $twig->tableRate = $studentsHandled;
-
+		if (isset($MigrantsHandled))
+			$twig->migrantsRate = $MigrantsHandled;
+		
 		$this->response->body($twig);
-        
-        //$this->response->body(var_dump($disciplineHandled));
-        //$this->response->body(var_dump($studentsHandled));
     }
 }
             
\ No newline at end of file
diff --git a/application/classes/Controller/UserEnvi.php b/application/classes/Controller/UserEnvi.php
index 9fcbec5cc0e4f1e0111d3b4a50f3752acaea8d0c..41e4cb0a9343b056f5f9f50e9b2da9059d99b095 100644
--- a/application/classes/Controller/UserEnvi.php
+++ b/application/classes/Controller/UserEnvi.php
@@ -12,7 +12,7 @@ class Controller_UserEnvi extends Controller {
         else 
         {
             $this->UserInfo = Account::instance()->getInfoAsArray();
-            $type = Account::instance()->offsetGet('AccountType');
+            $type = Account::instance()->offsetGet('Type');
             $directory = $this->request->directory();
             if(!empty($directory) && UTF8::strcasecmp($this->request->directory(), $type))
             {
@@ -23,13 +23,13 @@ class Controller_UserEnvi extends Controller {
     
     public function action_index()
     {
-        $page = Request::factory($this->UserInfo['AccountType'].'/index')->execute();
+        $page = Request::factory($this->UserInfo['Type'].'/index')->execute();
         $this->response->body($page);
     }
     
     public function action_profile()
     {
-        $url = $this->UserInfo['AccountType']."/profile";
+        $url = $this->UserInfo['Type']."/profile";
         if(!empty($type))
             $url .= '/'.$type;
         if(!empty($id))
@@ -40,7 +40,7 @@ class Controller_UserEnvi extends Controller {
 	
     public function action_settings()
     {
-        $page = Request::factory($this->UserInfo['AccountType'].'/settings')->execute();
+        $page = Request::factory($this->UserInfo['Type'].'/settings')->execute();
         $this->response->body($page);
     }
 }
diff --git a/application/classes/Model/Account.php b/application/classes/Model/Account.php
index 74fe20d9c2d6100ade370093af2b183db4ce11a0..5d9bc658ce6baf6c178181a61f2238ac106dcab1 100644
--- a/application/classes/Model/Account.php
+++ b/application/classes/Model/Account.php
@@ -4,7 +4,7 @@ class Model_Account extends Model
 {
     public function setHashKey($key)
     {
-        $sql = "SELECT SetHashKey('$key') AS Key;";
+        $sql = "SELECT SetHashKey('$key') AS `Key`;";
         $key = DB::query(Database::SELECT, $sql)->execute();
         return $key->get('Key');
     }
@@ -52,7 +52,7 @@ class Model_Account extends Model
 
     public function changePassword($id, $password)
     {
-        $sql = "SELECT ChangePassword('$id', '$password') AS Num;";
+        $sql = "SELECT `ChangePassword`('$id', '$password') AS Num;";
         $query = DB::query(Database::SELECT, $sql)->execute();
         return $query;
     }
diff --git a/application/classes/Model/Teacher/Index.php b/application/classes/Model/Teacher/Index.php
new file mode 100644
index 0000000000000000000000000000000000000000..c2fed8723cd7324bd2aa589ad66f81e799754b55
--- /dev/null
+++ b/application/classes/Model/Teacher/Index.php
@@ -0,0 +1,16 @@
+<?php defined('SYSPATH') or die('No direct script access.');
+  
+class Model_Teacher_Index extends Model
+{
+    public function getDisciplinesForTeacher($teacherID)
+    {
+        $sql = "CALL `GetDisciplinesForTeacher`('$teacherID'); ";
+        return DB::query(Database::SELECT, $sql)->execute();
+    }
+    
+    public function getTeachersForDiscipline($disciplineID)
+    {
+        $sql = "CALL `GetTeachersForDiscipline`('$disciplineID'); ";
+        return DB::query(Database::SELECT, $sql)->execute();
+    }    
+}
diff --git a/application/classes/Model/Teacher/Map.php b/application/classes/Model/Teacher/Map.php
index 958ba4c808aeb522958ffae202f28264b561bf81..fdcc2d6d0c4ab8330fe2325d118da42416b17a0e 100644
--- a/application/classes/Model/Teacher/Map.php
+++ b/application/classes/Model/Teacher/Map.php
@@ -91,4 +91,16 @@ class Model_Teacher_Map extends Model
         $sql = "SELECT `ChangeSubmoduleControlType`('$teacherID', '$SubmoduleID', '$ControlType') AS `Num`;";
         return DB::query(Database::SELECT, $sql)->execute();
     }
+	
+    public function AddDiscipline($teacherID, $Grade, $SubjectID, $ExamType, $LectionCount, $PracticeCount)
+    {
+        $sql = "SELECT `AddDiscipline`('$teacherID', '$Grade', '$SubjectID', '$ExamType', '$LectionCount', '$PracticeCount') AS `Num`;";
+        return DB::query(Database::SELECT, $sql)->execute();
+    }
+	
+    public function ChangeDiscipline($teacherID, $DisciplineID, $ExamType, $LectionCount, $PracticeCount, $Grade, $SubjectID)
+    {
+        $sql = "SELECT `ChangeDiscipline`('$teacherID', '$DisciplineID', '$ExamType', '$LectionCount', '$PracticeCount', '$Grade', '$SubjectID') AS `Num`;";
+        return DB::query(Database::SELECT, $sql)->execute();
+    }
 }
diff --git a/application/views/admin/base.twig b/application/views/admin/base.twig
index cd66bb3a3a7794e152c258fb59554c2510a274a4..3de8c86b9588ac4820cde322521165c3590ab471 100644
--- a/application/views/admin/base.twig
+++ b/application/views/admin/base.twig
@@ -39,10 +39,10 @@
     <div class="layout_wrapper">
         <div class="layout">
             <div class="menu_wrapper">
-                {% include 'admin/menu.structure' %}                  
-                {% include 'admin/menu.process' %}                  
-                {% include 'admin/menu.accounts' %}                  
-                {% include 'admin/menu.system' %}                  
+                {% include 'admin/menu/structure' %}                  
+                {% include 'admin/menu/process' %}                  
+                {% include 'admin/menu/accounts' %}                  
+                {% include 'admin/menu/system' %}                  
             </div>
             <div class="main">
                 <div class="main_top">
diff --git a/application/views/admin/menu/menu.accounts.twig b/application/views/admin/menu/accounts.twig
similarity index 100%
rename from application/views/admin/menu/menu.accounts.twig
rename to application/views/admin/menu/accounts.twig
diff --git a/application/views/admin/menu/menu.process.twig b/application/views/admin/menu/process.twig
similarity index 100%
rename from application/views/admin/menu/menu.process.twig
rename to application/views/admin/menu/process.twig
diff --git a/application/views/admin/menu/menu.structure.twig b/application/views/admin/menu/structure.twig
similarity index 100%
rename from application/views/admin/menu/menu.structure.twig
rename to application/views/admin/menu/structure.twig
diff --git a/application/views/admin/menu/menu.system.twig b/application/views/admin/menu/system.twig
similarity index 100%
rename from application/views/admin/menu/menu.system.twig
rename to application/views/admin/menu/system.twig
diff --git a/application/views/settings.twig b/application/views/settings.twig
index 5c61e3774f5eff21bbadba394c2fc2104a0ed4fe..4e338e5f6d08dc1acb542c4d16ff57be45e1c6d8 100644
--- a/application/views/settings.twig
+++ b/application/views/settings.twig
@@ -10,7 +10,7 @@
 {% block main_content %}
 <div class="pageProfileSettings">
 	<div class="settingsSection">
-		<p>Логин может состоять из латинских букв, цифр и знаков: - и _</p>
+		<p>Логин может состоять из латинских букв, цифр и символа _</p>
 		<div class="itemBlock">
 			<div class="title">Логин:</div>
 			<div class="field"><input type="text" class="inputLogin inputText" value="{{ User.Login }}"></div>
diff --git a/application/views/teacher/index.twig b/application/views/teacher/index.twig
index 25cfb58549d6331d50f563df0ef9ad5ea93ddbde..ff434f32a3bd1491fcc99019184af8b523efb9c7 100644
--- a/application/views/teacher/index.twig
+++ b/application/views/teacher/index.twig
@@ -1,234 +1,73 @@
 {% extends 'base' %}
 
-{% block title %}РЈРљР”{% endblock %} {# head -> title #}
+{% block title %}Дисциплины{% endblock %} {# head -> title #}
 {% block media %} {# head -> css, js #}
-	{{ HTML.style('media/css/courses_teacher.css')|raw }}
+	{{ HTML.style('media/css/courses_teacher_var2.css')|raw }}
 {% endblock %}
 
-{% block main_top_title %}РЈРљР”{% endblock %}
-{% block main_content %}
-    <div class="user_courses">
-    	<div class="course_name_wrapper">
-    		<div class="course_img"></div>
-    		<div class="course_name">Операционные системы</div>
-    	</div>
-
-        <table cellspacing="0" border="0" width="100%" class="table">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td width="200px" class="table_head">Номер группы</td>
-				<td class="table_head">Число студентов</td>
-				<td class="table_head">Форма отчета</td>
-				<td>&nbsp;</td>
-			</tr>
-
-			<tr class="group_block">
-				<td class="course_number">1 РєСѓСЂСЃ</td>
-				<td>&nbsp;</td>
-				<td class="group_img_once"></td>
-				<td class="group_name_once" align="center"><a href="#1">2 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_once">32</td>
-				<td class="control_form_once">Экзамен</td>	
-				<td class="top_btn_border" rowspan="0"><button class="show_ukd_btn">РЈРљР”</button></td>		
-			</tr>	
-
-			<tr>
-				<td colspan="3" width="100px">&nbsp;</td>
-				<td>&nbsp;</td>
-				<td >&nbsp;</td>
-				<td >&nbsp;</td>
-				<td >&nbsp;</td>				
-			</tr>
-
-			<tr class="group_block">
-				<td class="course_number">2 РєСѓСЂСЃ</td>	
-				<td>&nbsp;</td>		
-				<td class="group_img_top"></td>
-				<td class="group_name_top" align="center"><a href="#1">1 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_top">22</td>
-				<td class="control_form_top">Экзамен</td>	
-				<td class="top_btn_border" rowspan="4"><button class="show_ukd_btn">РЈРљР”</button></td>		
-			</tr>
-
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img"></td>
-				<td class="group_name" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number">35</td>
-				<td class="control_form">Экзамен</td>			
-			</tr>
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img"></td>
-				<td class="group_name" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number">35</td>
-				<td class="control_form">Экзамен</td>			
-			</tr>
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img_bottom"></td>
-				<td class="group_name_bottom" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_bottom">35</td>
-				<td class="control_form_bottom">Экзамен</td>			
-			</tr>	
-		</table>
-
-    	<div class="course_name_wrapper">
-    		<div class="course_img"></div>
-    		<div class="course_name">Операционные системы</div>
-    	</div>
-
-        <table cellspacing="0" border="0" width="100%" class="table">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td width="200px" class="table_head">Номер группы</td>
-				<td class="table_head">Число студентов</td>
-				<td class="table_head">Форма отчета</td>
-				<td>&nbsp;</td>
-			</tr>
-
-			<tr class="group_block">
-				<td class="course_number">1 РєСѓСЂСЃ</td>
-				<td>&nbsp;</td>
-				<td class="group_img_once"></td>
-				<td class="group_name_once" align="center"><a href="#1">2 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_once">32</td>
-				<td class="control_form_once">Экзамен</td>	
-				<td class="top_btn_border" rowspan="0"><button class="show_ukd_btn">РЈРљР”</button></td>		
-			</tr>	
-
-			<tr>
-				<td colspan="3" width="100px">&nbsp;</td>
-				<td>&nbsp;</td>
-				<td >&nbsp;</td>
-				<td >&nbsp;</td>
-				<td >&nbsp;</td>				
-			</tr>
-
-			<tr class="group_block">
-				<td class="course_number">2 РєСѓСЂСЃ</td>	
-				<td>&nbsp;</td>		
-				<td class="group_img_top"></td>
-				<td class="group_name_top" align="center"><a href="#1">1 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_top">22</td>
-				<td class="control_form_top">Экзамен</td>	
-				<td class="top_btn_border" rowspan="4"><button class="show_ukd_btn">РЈРљР”</button></td>		
-			</tr>
+{% macro outputSubject(subject, HTML) %}
 
+<div class="discipline">
+    <div class="discipline_header">
+        <div class="discipline_title">{{ subject.Title }}</div>
+    </div>
+    <div class="discipline_groups">
+
+        <table cellspacing="0" border="0" width="100%">
+            <tr class="header_block">
+                <td class='info_cell'>Номер группы</td>
+                <td class='info_cell'>Число студентов</td>
+                <td class='common_cell'>Форма контроля</td>
+                <td class='common_cell'>Преподаватели</td>
+                <td class='common_cell'>Учебная карта</td>
+            </tr>
+        </table> 
+        {% for discipline in subject.Disciplines %}
+            <div class="grade_title">
+                {{ discipline.GradeNum }} РєСѓСЂСЃ
+            </div>
+            <div class="group_table">
+                
+                <table cellspacing="0" border="0" width="100%">
+                    {% for group in discipline.Groups %}
+                        {% if loop.index == 1 %}
+                            <tr class="group_block">
+                                <td class='info_cell td_group'>{{ HTML.anchor('rating/'~discipline.ID, group.Num~' группа', {'title': 'Перейти к оцениванию'})|raw }}</td>
+                                <td class='info_cell td_count'>{{ group.Count }}</td>
+                                <td rowspan='2' class='common_cell td_control'>{{ discipline.ControlType }}</td>
+                                <td rowspan='2' class='common_cell td_teachers'>
+                                    {% for teacher in discipline.Teachers %}
+                                        <div>{{ teacher }}</div>
+                                    {% endfor %}
+                                </td>
+                                <td rowspan='2' class='common_cell'>
+                                    {% set UKDcontent = "<div class='show_ukd_btn'>РЈРљР”</div>" %}
+                                    {{ HTML.anchor('map/'~discipline.ID, UKDcontent, {'title': 'Просмотр и редактирование учебной карты дисциплины'})|raw }}
+                                </td>
+                            </tr>
+                        {% else %}
+                            <tr class="group_block">
+                                <td class='info_cell td_group'>{{ HTML.anchor('rating/'~discipline.ID, group.Num~' группа', {'title': 'Перейти к оцениванию'})|raw }}</td>
+                                <td class='info_cell td_count'>{{ group.Count }}</td>
+                            </tr>
+                        {% endif %}
+                    {% endfor %}
+                </table>
+            </div>
+        {% endfor %}
+    </div>
+</div>
+{% endmacro %}
 
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img"></td>
-				<td class="group_name" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number">35</td>
-				<td class="control_form">Экзамен</td>			
-			</tr>
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img"></td>
-				<td class="group_name" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number">35</td>
-				<td class="control_form">Экзамен</td>			
-			</tr>
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img_bottom"></td>
-				<td class="group_name_bottom" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_bottom">35</td>
-				<td class="control_form_bottom">Экзамен</td>			
-			</tr>				
-		</table>
-
-    	<div class="course_name_wrapper">
-    		<div class="course_img"></div>
-    		<div class="course_name">Операционные системы</div>
-    	</div>
-
-        <table cellspacing="0" border="0" width="100%" class="table">
-			<tr>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td>&nbsp;</td>
-				<td width="200px" class="table_head">Номер группы</td>
-				<td class="table_head">Число студентов</td>
-				<td class="table_head">Форма отчета</td>
-				<td>&nbsp;</td>
-			</tr>
-
-			<tr class="group_block">
-				<td class="course_number">1 РєСѓСЂСЃ</td>
-				<td>&nbsp;</td>
-				<td class="group_img_once"></td>
-				<td class="group_name_once" align="center"><a href="#1">2 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_once">32</td>
-				<td class="control_form_once">Экзамен</td>	
-				<td class="top_btn_border" rowspan="0"><button class="show_ukd_btn">РЈРљР”</button></td>		
-			</tr>	
-
-			<tr>
-				<td colspan="3" width="100px">&nbsp;</td>
-				<td>&nbsp;</td>
-				<td >&nbsp;</td>
-				<td >&nbsp;</td>
-				<td >&nbsp;</td>				
-			</tr>
-
-			<tr class="group_block">
-				<td class="course_number">2 РєСѓСЂСЃ</td>	
-				<td>&nbsp;</td>		
-				<td class="group_img_top"></td>
-				<td class="group_name_top" align="center"><a href="#1">1 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_top">22</td>
-				<td class="control_form_top">Экзамен</td>	
-				<td class="top_btn_border" rowspan="4"><button class="show_ukd_btn">РЈРљР”</button></td>		
-			</tr>
-
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img"></td>
-				<td class="group_name" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number">35</td>
-				<td class="control_form">Экзамен</td>			
-			</tr>
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img"></td>
-				<td class="group_name" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number">35</td>
-				<td class="control_form">Экзамен</td>			
-			</tr>
-
-			<tr class="group_block">
-				<td >&nbsp;</td>
-				<td>&nbsp;</td>
-				<td class="group_img_bottom"></td>
-				<td class="group_name_bottom" align="center"><a href="#1">4 РіСЂСѓРїРїР°</a></td>	
-				<td class="stud_number_bottom">35</td>
-				<td class="control_form_bottom">Экзамен</td>			
-			</tr>	
-		</table>
+{% import 'teacher/index' as idx %}
 
-            {% for i in disciplines %}
-                {{ res.subject(i, HTML) }}    
-            {% endfor %}
+{% block main_top_title %}Дисциплины{% endblock %}
+{% block main_content %}
+    <div class="disciplines_wrapper">
+        {% for subject in content.Subjects %}
+            {{ idx.outputSubject(subject, HTML) }}
+        {% else %}
+            Похоже, что Вы не ведете ни одного предмета!
+        {% endfor %}
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/application/views/teacher/map/construct.twig b/application/views/teacher/map/construct.twig
deleted file mode 100644
index 3f33712ecbfa14c19bc520c37ffab34c0b949764..0000000000000000000000000000000000000000
--- a/application/views/teacher/map/construct.twig
+++ /dev/null
@@ -1,63 +0,0 @@
-{% extends 'base' %} 
-
-{% block title %}Конструктор УКД{% endblock %} {# head -> title #}
-{% block media %} {# head -> css, js #}
-	{{ HTML.style('media/css/construct.css')|raw }}
-	{{ HTML.script('media/js/construct.js')|raw }}
-{% endblock %}
-{% block main_top_title %}Конструктор УКД{% endblock %}
-{% block main_content %}
-	<div class="construct">
-		<div class="studyMap">
-			<div class="name">Виды контрольных мероприятий</div>
-			<div class="currentControl">Текущий контроль</div>
-			<div class="landmarkControl">Рубежный контроль</div>
-			<div class="actions">Действия</div>
-		</div>
-		<div class="moduleList">
-			<div class="moduleGroup">
-				<div class="moduleHead">
-					<div class="name">
-						<input type="text" class="inputName" value="Наименование модуля">
-					</div>
-					<div class="currentControl">10</div>
-					<div class="landmarkControl">5</div>
-					<div class="actions">
-						<div class="deleteModule delete"></div>
-						<div class="downModule down"></div>
-						<div class="upModule up"></div>
-						<div class="addSubModule add"></div>
-					</div>
-				</div>
-				<div class="subModules">
-					<div class="subModule">
-						<div class="name">
-							<input type="text" class="inputName" value="Название мероприятия">
-						</div>
-						<div class="currentControl"><input type="text" class="inputCredit inputCurrentControl" value="10"></div>
-						<div class="landmarkControl"><input type="text" class="inputCredit inputLandmarkControl" value=""></div>
-						<div class="actions">
-							<div class="deleteSubModule delete"></div>
-							<div class="downSubModule down"></div>
-							<div class="upSubModule up"></div>
-						</div>
-					</div>
-					<div class="subModule">
-						<div class="name">
-							<input type="text" class="inputName" value="Название мероприятия">
-						</div>
-						<div class="currentControl"><input type="text" class="inputCredit inputCurrentControl" value=""></div>
-						<div class="landmarkControl"><input type="text" class="inputCredit inputLandmarkControl" value="5"></div>
-						<div class="actions">
-							<div class="deleteSubModule delete"></div>
-							<div class="downSubModule down"></div>
-							<div class="upSubModule up"></div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="addModule">Добавить модуль</div>
-		<button class="createStudyMap">Сохранить</button>
-	</div>
-{% endblock %}
diff --git a/application/views/teacher/map/edit.twig b/application/views/teacher/map/edit.twig
index 616b6859e9f278a88eb7888a0ad702db23be7fd2..289215a2e27bae0a063b859144f9676488067255 100644
--- a/application/views/teacher/map/edit.twig
+++ b/application/views/teacher/map/edit.twig
@@ -3,10 +3,45 @@
 {% block title %}Конструктор УКД{% endblock %} {# head -> title #}
 {% block media %} {# head -> css, js #}
 	{{ HTML.style('media/css/construct.css')|raw }}
-	{{ HTML.script('media/js/construct.js')|raw }}
+	{{ HTML.script('media/js/construct/edit.js')|raw }}
 {% endblock %}
-{% block main_top_title %}Конструктор УКД - Редактирование{% endblock %}
+
+{% block main_top_title %}Редактирование УКД{% endblock %}
 {% block main_content %}
+	<div class="discipline">
+		<p class="top_center_info">Учебная карта дисциплины на 1 семестр 2014 года</p>
+		<div class="section">
+			<select class="SelectSubject">
+				<option value="0">Выберите предмет:</option>
+				{% for Subject in SubjectsList %}
+					<option value="{{ Subject.ID }}" {% if Discipline.SubjectID == Subject.ID %}selected{% endif %}>{{ Subject.Title }}</option>
+				{% endfor %}
+			</select>
+		</div>
+		<div class="section">
+			<select class="department">
+				<option value="0">Выберите кафедру:</option>
+			</select>
+			<select class="Grade">
+				<option value="0">Выберите курс:</option>
+				{% for Grade in GradesList %}
+					<option value="{{ Grade.ID }}" {% if Grade.ID == Discipline.GradeID %}selected{% endif %}>{{ Grade.Title }}</option>
+				{% endfor %}
+			</select>
+		</div>
+		<div class="section">
+			Контроль: 
+			<input name="ExamType" type="radio" value="exam" {% if Discipline.ExamType == 'exam' %}checked{% endif %}> Экзамен
+			<input name="ExamType" type="radio" value="credit" {% if Discipline.ExamType == 'credit' %}checked{% endif %}> Зачет
+		</div>
+		<div class="section">
+			<div class="item title">Лекционных часов:</div>
+			<div class="item"><input class="inputLectionCount" style="width: 50px;" value="{{ Discipline.LectureHours }}"></div>
+			<div class="item title">Практических часов:</div>
+			<div class="item"><input class="inputPracticeCount" style="width: 50px;" value="{{ Discipline.PracticeHours }}"></div>
+		</div>
+		<button class="ChangeDiscipline">Сохранить</button>
+	</div>
 	<div class="construct">
 		<div class="studyMap">
 			<div class="name">Виды контрольных мероприятий</div>
@@ -15,7 +50,7 @@
 			<div class="actions">Действия</div>
 		</div>
 		<div class="moduleList">
-		{% for i in 1..Map.ModulesCount %}
+		{% for i in range(1, Map.ModulesCount) if Map.ModulesCount > 0 %}
 			<div class="moduleGroup" id="{{ Map[i].ModuleID }}">
 				<div class="moduleHead">
 					<div class="name">
@@ -31,13 +66,13 @@
 					</div>
 				</div>
 				<div class="subModules">
-				{% for j in 1..Map[i].SubmodulesCount %}
+				{% for j in range(1, Map[i].SubmodulesCount) if Map[i].SubmodulesCount > 0 %}
 					<div class="subModule" id="{{ Map[i][j].SubmoduleID }}">
 						<div class="name">
 							<input type="text" class="inputName SubmoduleName" value="{{ Map[i][j].Title }}">
 						</div>
-						<div class="currentControl"><input type="text" class="inputCredit inputCurrentControl" value="{% if Map[i][j].SubmoduleControl == 'CurrentControl' %}{{ Map[i][j].MaxRate }}{% endif %}"></div>
-						<div class="landmarkControl"><input type="text" class="inputCredit inputLandmarkControl" value="{% if Map[i][j].SubmoduleControl == 'LandmarkControl' %}{{ Map[i][j].MaxRate }}{% endif %}"></div>
+						<div class="currentControl"><input type="text" class="inputCredit inputCurrentControl" value="{% if Map[i][j].SubmoduleControl == 'CurrentControl' %}{{ Map[i][j].MaxRate }}{% else %}0{% endif %}"></div>
+						<div class="landmarkControl"><input type="text" class="inputCredit inputLandmarkControl" value="{% if Map[i][j].SubmoduleControl == 'LandmarkControl' %}{{ Map[i][j].MaxRate }}{% else %}0{% endif %}"></div>
 						<div class="actions">
 							<div class="deleteSubModule delete"></div>
 							<div class="downSubModule down"></div>
@@ -47,9 +82,10 @@
 				{% endfor %}
 				</div>
 			</div>
+		{% else %}
+			<div class="empty">Пусто</div>
 		{% endfor %}
 		</div>
 		<div class="addModule">Добавить модуль</div>
-		<div class="change">Изменить</div>
 	</div>
 {% endblock %}
diff --git a/application/views/teacher/setRate.twig b/application/views/teacher/setRate.twig
index ae05f806d7756ca2fdc6869c03c63c7abed7e770..ffa83ca23ec3a17befd7bb3d2d30cab4f3a2ffe8 100644
--- a/application/views/teacher/setRate.twig
+++ b/application/views/teacher/setRate.twig
@@ -9,6 +9,7 @@
 {% block main_top_title %}Выставление баллов{% endblock %}
 {% block main_content %}
 	<h2 style="margin-left: 2.5%; font-weight: normal; color: #3399CC;">{{ headerRate.SubjectName }}</h2>
+	<p style="font-size: 15px; margin-left: 2.5%">Обратить внимание, что пустая клетка эквивалентна нулю</p>
 	<table class="studentsRate" border="0" cellspacing="0" cellpadding="0">
 		<tr>
 			<td class="title" width="150px">Модуль/номер</td>
@@ -23,19 +24,46 @@
 				{% set CellCount = CellCount + headerRate[i].SubmodulesCount %}
 				{% for j in 1..headerRate[i].SubmodulesCount %}
 					{% set col = col + 1 %}
-					<td class="subject col_{{ col }}" id="{{ headerRate[i][j].SubmoduleID }}">{{ headerRate[i][j].Title }}</td>
+					<td class="subject col_{{ col }}" id="{{ headerRate[i][j].SubmoduleID }}">{{ headerRate[i][j].Title }}<input type="hidden" class="MaxRate" value="{{ headerRate[i][j].MaxRate }}"></td>
 				{% endfor %}
 			{% endfor %}
 		</tr>
-		{% set row = 0 %}
+		{% set row = 0 %} {% set GroupNum = 0 %}
 		{% for student in tableRate %}
 			{% set row = row + 1 %}
-		<tr>
-			<td class="row_{{ row }} student" id="{{ student.StudentID }}">{{ student.LastName }} {{ student.FirstName }}</td>
-			{% for i in 1..CellCount %}
-				<td class="row_{{ row }} col_{{ i }} rateCell {% if student[i].Rate > 0 %}edit{% endif %}"><input value="{{ student[i].Rate }}"></td>
-			{% endfor %}
-		</tr>
+			{% if student.GroupNum != GroupNum %}	
+				{% set GroupNum = student.GroupNum %}
+				<tr>
+					<td class="group" colspan="{{ CellCount + 1 }}">{{ student.GroupNum }} РіСЂСѓРїРїР°</td>
+				</tr>
+			{% endif %}
+			<tr>
+				<td class="row_{{ row }} student" id="{{ student.StudentID }}">{{ student.LastName }} {{ student.FirstName }}</td>
+				{% for i in 1..CellCount %}
+					<td class="row_{{ row }} col_{{ i }} rateCell {% if student[i].Rate != null %}edit{% endif %}"><input value="{{ student[i].Rate }}"></td>
+				{% endfor %}
+			</tr>
+		{% endfor %}
+		{% set GroupNum = 0 %}
+		{% for student in migrantsRate %}
+			{% if  loop.first  == 1 %}
+				<tr>
+					<td class="group" colspan="{{ CellCount + 1 }}">Мигранты</td>
+				</tr>
+			{% endif %}
+			{% set row = row + 1 %}
+			{% if student.GroupNum != GroupNum %}	
+				{% set GroupNum = student.GroupNum %}
+				<tr>
+					<td class="group" colspan="{{ CellCount + 1 }}">{{ student.GroupNum }} РіСЂСѓРїРїР°</td>
+				</tr>
+			{% endif %}
+			<tr>
+				<td class="row_{{ row }} student" id="{{ student.StudentID }}">{{ student.LastName }} {{ student.FirstName }}</td>
+				{% for i in 1..CellCount %}
+					<td class="row_{{ row }} col_{{ i }} rateCell {% if student[i].Rate > 0 %}edit{% endif %}"><input value="{{ student[i].Rate }}"></td>
+				{% endfor %}
+			</tr>
 		{% endfor %}
 	</table>
 {% endblock %}
\ No newline at end of file
diff --git a/db/StoredProcedures.sql b/db/StoredProcedures.sql
index 7b830e17f011e5d82ca90f7627f6c5e34a2dcd96..5a414435b21a6500dec806e24dc3df6e39f6b563 100644
--- a/db/StoredProcedures.sql
+++ b/db/StoredProcedures.sql
@@ -86,7 +86,6 @@ BEGIN
 END //
 
 
--- Desc: * для аккаунта с данным логином и паролем
 DROP PROCEDURE IF EXISTS GetAccInfoByID; //
 CREATE PROCEDURE `GetAccInfoByID`(IN `UserID` VARCHAR(50) CHARSET utf8 )
     NO SQL
@@ -95,7 +94,9 @@ BEGIN
 			accounts.`Login`, 
 			accounts.`E-Mail`, 
 			accounts.Type, 
-			( accounts.ActivationCode IS NULL) AS 'isActivated'
+			accounts.isEnabled,
+			( accounts.ActivationCode IS NULL) AS 'isActivated',
+			accounts.UserAgent
 	FROM accounts
 	WHERE accounts.`ID` = UserID;
 END //
@@ -117,9 +118,7 @@ BEGIN
 	SELECT accounts.Type FROM accounts WHERE accounts.ID = UserID LIMIT 1 INTO varType;
 	IF varType = 1 THEN 
 		
-		SELECT 	UserID 					AS 'UserID', 
-				accounts.Type 			AS 'AccountType', 
-				students.ID 			AS 'StudentID', 
+		SELECT 	students.ID 			AS 'StudentID', 
 				students.LastName, 
 				students.FirstName, 
 				students.SecondName, 
@@ -132,35 +131,25 @@ BEGIN
 				specializations.Abbr 	AS 'SpecAbbr', 
 				faculties.ID 			AS 'FacultyID', 
 				faculties.Name 			AS 'FacultyName', 
-				faculties.Abbr 			AS 'FacultyAbbreviation',
-				accounts.isEnabled,
-				( accounts.ActivationCode IS NULL) AS 'isActivated',
-				accounts.UserAgent
-		FROM accounts
-		INNER JOIN students ON UserID = AccountID
+				faculties.Abbr 			AS 'FacultyAbbreviation'		
+		FROM `students`
 		INNER JOIN study_groups ON students.StudyGroupID = study_groups.ID
 		INNER JOIN faculties ON study_groups.FacultyID = faculties.ID
 		INNER JOIN specializations ON study_groups.SpecializationID = specializations.ID
-		WHERE accounts.ID = UserID;
+		WHERE students.AccountID = UserID;
 
 	ELSE
-		SELECT 	UserID 					AS 'UserID', 
-				accounts.Type 			AS 'AccountType', 
-				teachers.ID 			AS 'TeacherID', 
+		SELECT 	teachers.ID 			AS 'TeacherID', 
 				teachers.LastName, 
 				teachers.FirstName, 
 				teachers.SecondName, 
 				teachers.Degree, 
 				faculties.ID 			AS 'FacultyID', 
 				faculties.Name 			AS 'FacultyName', 
-				faculties.Abbr 			AS 'FacultyAbbreviation',
-				accounts.isEnabled,
-				( accounts.ActivationCode IS NULL) AS 'isActivated',
-				accounts.UserAgent
-		FROM `accounts`
-		INNER JOIN `teachers` ON UserID = teachers.AccountID
+				faculties.Abbr 			AS 'FacultyAbbreviation'
+		FROM `teachers`
 		INNER JOIN `faculties` ON teachers.FacultyID = faculties.ID
-		WHERE accounts.ID = UserID;
+		WHERE teachers.AccountID = UserID;
 
 	END IF;
 
@@ -591,9 +580,10 @@ BEGIN
     INNER JOIN `study_groups` 			ON study_groups.ID = attending_groups_bases.StudyGroupID
     WHERE 	disciplines_teachers.TeacherID = TeacherID AND 
     		disciplines.SemesterID = semID
-    ORDER BY 	disciplines.Grade 		ASC, 
-    			subjects.Name 			ASC,
-    			study_groups.GroupNum 	ASC;
+ORDER BY 	subjects.ID 		ASC, 
+                disciplines.ID 		ASC, 
+                study_groups.Grade 	ASC,
+                study_groups.GroupNum 	ASC;
 END //
 
 
diff --git a/media/css/base.css b/media/css/base.css
index e1557314b7a980f8437d42f82aa0045475c08f6c..f0b3653ccb39a38e8bf2fff28958d88729a1536a 100644
--- a/media/css/base.css
+++ b/media/css/base.css
@@ -89,6 +89,7 @@ a:hover {
 
 .main_content {
 	width: 100%;
+	position: relative;
 	padding-top: 25px;
 	padding-bottom: 20px;
 }
diff --git a/media/css/construct.css b/media/css/construct.css
index a2db5bef2d86f985cba5974b7e72305ed69a0347..dca75a90403f30d9735b925a675131973c11f1f0 100644
--- a/media/css/construct.css
+++ b/media/css/construct.css
@@ -1,6 +1,47 @@
+.TopRightMessage {
+	display: none;
+	position: absolute;
+	top: 0;
+	right: 0;
+	max-width: 500px;
+	padding: 7px 18px;
+	font-size: 15px;
+	color: #ffffff;
+	border-radius: 0 0 0 5px;
+}
+
+.discipline {	
+	margin: 0px 25px;
+}
+.discipline .top_center_info {
+	text-align: center;
+}
+.discipline .section {
+	margin: 10px 0px;
+}
+	.discipline .section .item{
+		display: inline;
+		float: left;
+		margin-right: 20px;
+	}
+		.discipline .section .item.title{
+		}
+	.discipline .section select {
+		padding: 5px;
+		border: 1px solid #d7d7d7;
+		background: #ffffff;
+		font-size: 0.8em;
+	}
+
+
+
 .construct { 
 	margin: 10px 25px;
 }
+	
+	.construct .empty {
+		display: block;
+	}
 
 /* Шапка "таблицы" учебной карты */
 .studyMap {
diff --git a/media/css/courses_teacher_var2.css b/media/css/courses_teacher_var2.css
new file mode 100644
index 0000000000000000000000000000000000000000..c6e9dbf41519f9e2dc69405c1728851f7a2e66ae
--- /dev/null
+++ b/media/css/courses_teacher_var2.css
@@ -0,0 +1,134 @@
+/* =========== [TABLE WIDTH] ============ */
+.info_cell, .common_cell
+{
+    width: 180px;
+    padding: 5px;
+    font-size: 11pt;
+}
+
+.group_block, .header_block
+{
+    text-align: center;
+}
+
+.disciplines_wrapper
+{
+    margin: 15px;
+}
+
+
+/* ============ Заголовок дисциплины ============== */
+
+.discipline_groups
+{
+    margin-left: 25px;
+}
+
+.discipline_header
+{}
+
+.discipline_header .discipline_title
+{
+    border-bottom: 1px solid #ccc;
+    padding: 3px;
+    font-weight: 700;
+}
+
+.discipline_groups .header_block td
+{
+    padding: 10px;
+    color: #4fbeec;
+}
+
+.discipline_groups .group_table
+{
+    margin-bottom: 10px;
+}
+
+/* ============ Настройки цвета ============== */
+
+.discipline_groups .group_block .td_group { color: #4fbeec; }
+.discipline_groups .group_block .td_count { color: #3A84A6; }
+.discipline_groups .group_block .td_control { color: #3A84A6; }
+.discipline_groups .group_block .td_teachers { color: #757575; }
+
+/* ============ РЈРљР” ========================== */
+
+.show_ukd_btn {
+
+	margin: 0 auto;
+	display: block;
+	border: 0;
+	padding: 6px 20px;
+        width: 60px;
+	background: #757575; /*#3A84A6;*/
+	font-weight: bold;
+	font-size: 13px;
+	color: #ffffff;
+	border-radius: 3px; 
+	moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	-khtml-border-radius: 3px;	
+}
+
+
+.show_ukd_btn:hover {
+	background: #3399CC;
+	cursor: pointer;
+}
+
+/* ============ Плашка курса ================= */
+
+.discipline_groups .grade_title
+{
+    border: 2px solid #2bbd19;
+    background: #2bbd19;
+    color: #fff;
+    width: 90px;
+    position: relative;
+    margin-bottom: -2px;
+    padding-bottom: 2px;
+    text-align: center;
+}
+
+/* =========== Внутренние границы ============= */
+
+.discipline_groups .group_block .info_cell
+{
+    /* border-bottom: 1px solid;
+    border-color: #ccc; */
+}
+
+/* ============ Внешние границы ============== */
+
+.discipline_groups .group_block .common_cell
+{
+    border-top: 2px solid;
+    border-bottom: 2px solid;
+    border-color: #ccc;
+}
+
+.discipline_groups .group_block .common_cell:last-child
+{
+    border-right: 2px solid;
+    border-color: #ccc;
+}
+
+.discipline_groups .group_block td:first-child
+{
+    border-left: 2px solid;
+    border-color: #ccc;
+}
+
+.discipline_groups .group_block:first-child .info_cell
+{
+    border-top: 2px solid;
+    border-color: #ccc;
+}
+
+.discipline_groups .group_block:last-child .info_cell
+{
+    border-bottom: 2px solid;
+    border-color: #ccc;
+}
+
diff --git a/media/css/setRate.css b/media/css/setRate.css
index 1a024d37dd8206d9a0e67f646b43fb4b3d660073..a7602be341c0260717adcd46e372437f1c7456e8 100644
--- a/media/css/setRate.css
+++ b/media/css/setRate.css
@@ -17,6 +17,9 @@
 	font-size: 13px;
 	color: #0183ce
 }
+.group {
+	text-align: center;
+} 
 table {
 	border-top: 1px solid #ccc;
 	border-right: 1px solid #ccc;
diff --git a/media/js/construct.js b/media/js/construct/edit.js
similarity index 71%
rename from media/js/construct.js
rename to media/js/construct/edit.js
index 886afac5b96a9b14dae00ee8c2163dd63e999593..4a4386447a1c15dae52935b4bc9769beb47b2027 100644
--- a/media/js/construct.js
+++ b/media/js/construct/edit.js
@@ -2,7 +2,7 @@ var $ = jQuery;
 $(function() {
 	var URL = (window.location.href).split('/');
 	var DisciplineID = URL[URL.length - 1]
-
+	
 	// Проверка на число, причем NaN не помеха
 	function isNum(v) {
 			return typeof v === 'number' && isFinite(v);
@@ -15,8 +15,8 @@ $(function() {
 			<div class="name">\
 				<input type="text" class="inputName SubmoduleName" value="Наименование мероприятия">\
 			</div>\
-			<div class="currentControl"><input type="text" class="inputCredit inputCurrentControl" value=""></div>\
-			<div class="landmarkControl"><input type="text" class="inputCredit inputLandmarkControl" value=""></div>\
+			<div class="currentControl"><input type="text" class="inputCredit inputCurrentControl" value="0"></div>\
+			<div class="landmarkControl"><input type="text" class="inputCredit inputLandmarkControl" value="0"></div>\
 			<div class="actions">\
 				<div class="deleteSubModule delete"></div>\
 				<div class="downSubModule down"></div>\
@@ -25,7 +25,7 @@ $(function() {
 		</div>\
 		';
 	}
-	
+
 	// Шаблон модуля
 	function GetModuleTmp() {
 		return '\
@@ -48,7 +48,7 @@ $(function() {
 			</div>\
 		</div>'
 	};
-	
+
 	// Подсчет текущего контроля
 	function CountCurrentControl(subModulesDiv){
 		var maxCredits = 0;
@@ -102,21 +102,62 @@ $(function() {
 		);
 	}
 	
-	// Переместить вверх МОДУЛЬ
-    $(".moduleList").on('click', '.upModule', function(){
-        var parentDIV = $(this).parent('div').parent('div').parent('div');
-        parentDIV.insertBefore(parentDIV.prev());
+	// Установить новый max балл
+	function SetNewRateAndControl(thisObj, OldMaxRate) {
+		// DIV с мероприятиями для данного модуля
+		var subModulesDiv = thisObj.parent().parent().parent();
+		// ID мероприятия
+		var ID = thisObj.parent('div').parent('div').attr('id');
+		var NewMaxRate = 0;
+		if (thisObj.val() != '')
+			NewMaxRate = thisObj.val();
 		
-		var ModuleID = parentDIV.attr('id');
+		// Меняем max балл
+		if (NewMaxRate != OldMaxRate)
+			ChangeSubmoduleMaxRate(ID, NewMaxRate);
 		
-		// Для того, который СТАЛ находится ниже
-		var nextModuleID = parentDIV.next('div').attr('id');
+		// Меняем тип
+		ControlType = 'CurrentControl'; // По-умолчанию 
+		if ((thisObj.parent().attr('class')).indexOf('landmarkControl') + 1 > 0)
+			ControlType = 'LandmarkControl';	
+		if (NewMaxRate > 0)
+			ChangeSubmoduleControlType(ID, ControlType);
 		
+		if (ControlType == 'CurrentControl')
+			thisObj.parent().parent().find('.landmarkControl').children('.inputLandmarkControl').val('0');
+			
+		if (ControlType == 'LandmarkControl')
+			thisObj.parent().parent().find('.currentControl').children('.inputCurrentControl').val('0');
+		
+		// Подсчет текущего и рубежного контроля после изменений
+		CountCurrentControl(subModulesDiv);
+		CountLandmarkControl(subModulesDiv);	
+	}
+	
+	// Поменять местами два модуля
+	function SwapModuleOrder(ModuleID1, ModuleID2) {
 		$.post(
 			'/~dev_rating/handler/map/SwapModuleOrder',
 			{
-				'ModuleID1': ModuleID,
-				'ModuleID2': nextModuleID
+				'ModuleID1': ModuleID1,
+				'ModuleID2': ModuleID2
+			},
+			function(data){
+				data = $.parseJSON(data);
+				if(data.success === true) {
+					alert('РћРє, SwapModuleOrder');
+				} else alert('Error, SwapModuleOrder');
+			}
+		);
+	}
+	
+	// Поменять местами два мероприятия
+	function SwapSubmoduleOrder(SubmoduleID1, SubmoduleID2) {
+		$.post(
+			'/~dev_rating/handler/map/SwapSubmoduleOrder',
+			{
+				'SubmoduleID1': SubmoduleID1,
+				'SubmoduleID2': SubmoduleID2
 			},
 			function(data){
 				data = $.parseJSON(data);
@@ -125,6 +166,46 @@ $(function() {
 				} else alert('Error, SwapModuleOrder');
 			}
 		);
+	}
+	
+//-------------------------------------------------------------------------------------------------------------------------------------------------
+	
+	// Изменения базовых параметров дисциплины
+    $(".ChangeDiscipline").click(function(){
+		//alert(DisciplineID);
+		//alert($('.Grade').val());
+		//alert($('input:radio[name=ExamType]:checked').val());
+		//alert($('.inputLectionCount').val());
+		//alert($('.inputPracticeCount').val());
+		$.post(
+			'/~dev_rating/handler/map/ChangeDiscipline',
+			{
+				'DisciplineID': DisciplineID,
+				'Grade': $('.Grade').val(),
+				'SubjectID': $('.SelectSubject').val(),
+				'ExamType': $('input:radio[name=ExamType]:checked').val(),
+				'LectionCount': $('.inputLectionCount').val(),
+				'PracticeCount': $('.inputPracticeCount').val()
+			},
+			function(data){
+				data = $.parseJSON(data);
+				if(data.success === true) {
+					alert('РћРє, ChangeDiscipline');
+				} else alert('Error, ChangeDiscipline');
+			}
+		);
+        return false
+    });
+	
+	// Переместить вверх МОДУЛЬ
+    $(".moduleList").on('click', '.upModule', function(){
+        var parentDIV = $(this).parent('div').parent('div').parent('div');
+        parentDIV.insertBefore(parentDIV.prev());
+		
+		var ModuleID = parentDIV.attr('id');
+		// Для того, который СТАЛ находится ниже
+		var nextModuleID = parentDIV.next('div').attr('id');
+		SwapModuleOrder(ModuleID, nextModuleID);
 		
         return false
     });
@@ -135,23 +216,9 @@ $(function() {
         parentDIV.insertAfter(parentDIV.next());
 		
 		var ModuleID = parentDIV.attr('id');
-		
 		// Для того, который СТАЛ находится выше
 		var prevModuleID = parentDIV.prev('div').attr('id');
-		
-		$.post(
-			'/~dev_rating/handler/map/SwapModuleOrder',
-			{
-				'ModuleID1': ModuleID,
-				'ModuleID2': prevModuleID
-			},
-			function(data){
-				data = $.parseJSON(data);
-				if(data.success === true) {
-					alert('РћРє, SwapModuleOrder');
-				} else alert('Error, SwapModuleOrder');
-			}
-		);
+		SwapModuleOrder(ModuleID, prevModuleID);
 		
         return false
     });
@@ -163,20 +230,7 @@ $(function() {
 		
 		var SubmoduleID = parentDIV.attr('id');
 		var nextSubmoduleID = parentDIV.next('div').attr('id');
-
-		$.post(
-			'/~dev_rating/handler/map/SwapSubmoduleOrder',
-			{
-				'SubmoduleID1': SubmoduleID,
-				'SubmoduleID2': nextSubmoduleID
-			},
-			function(data){
-				data = $.parseJSON(data);
-				if(data.success === true) {
-					alert('РћРє, SwapModuleOrder');
-				} else alert('Error, SwapModuleOrder');
-			}
-		);
+		SwapSubmoduleOrder(SubmoduleID, nextSubmoduleID);
 		
         return false
     });
@@ -188,20 +242,7 @@ $(function() {
 		
 		var SubmoduleID = parentDIV.attr('id');
 		var prevSubmoduleID = parentDIV.prev('div').attr('id');
-
-		$.post(
-			'/~dev_rating/handler/map/SwapSubmoduleOrder',
-			{
-				'SubmoduleID1': SubmoduleID,
-				'SubmoduleID2': prevSubmoduleID
-			},
-			function(data){
-				data = $.parseJSON(data);
-				if(data.success === true) {
-					alert('РћРє, SwapModuleOrder');
-				} else alert('Error, SwapModuleOrder');
-			}
-		);
+		SwapSubmoduleOrder(SubmoduleID, prevSubmoduleID);
 		
         return false
     });
@@ -229,6 +270,9 @@ $(function() {
 			}
 		);
 		
+		if ($('.empty').css('display') == 'block')
+			$('.empty').css('display', 'none');
+		
 	});
 	
 	// Добавить мероприятие
@@ -346,56 +390,24 @@ $(function() {
 	
 	// При записи в input текущий контроль
 	// При фокусе
-	var MaxRate = 0;
+	var OldMaxRate = 0;
 	$('.moduleList').on('focusin', '.inputCurrentControl', function(){
-		MaxRate = $(this).val();
+		OldMaxRate = $(this).val();
 	});
 	// При потери фокуса
 	$('.moduleList').on('focusout', '.inputCurrentControl', function(){
-		var subModulesDiv = $(this).parent().parent().parent();
-		CountCurrentControl(subModulesDiv);
-		var NewMaxRate = $(this).val();
-		var ID = $(this).parent('div').parent('div').attr('id');
-		if (parseInt(NewMaxRate) > 0) {
-			// Блокируем рубежный контроль
-			var inputLandmarkControl = $(this).parent().parent().children('.landmarkControl').children('.inputLandmarkControl');
-			inputLandmarkControl.attr('readonly', true);
-			// Меняем max балл
-			if (NewMaxRate != MaxRate)
-				ChangeSubmoduleMaxRate(ID, NewMaxRate);
-			// Меняем тип
-			if (parseInt(inputLandmarkControl.val()) <= 0)
-				ChangeSubmoduleControlType(ID, 'CurrentControl');
-		}
-		else 
-			$(this).parent().parent().children('.landmarkControl').children('.inputLandmarkControl').attr('readonly', false);
+		SetNewRateAndControl($(this), OldMaxRate);
 	});
 	
 	// При записи в input рубежный контроль
 	// При фокусе
-	var MaxRate = 0;
+	var OldMaxRate = 0;
 	$('.moduleList').on('focusin', '.inputLandmarkControl', function(){
-		MaxRate = $(this).val();
+		OldMaxRate = $(this).val();
 	});
 	// При потери фокуса
 	$('.moduleList').on('focusout', '.inputLandmarkControl', function(){
-		var subModulesDiv = $(this).parent().parent().parent();
-		CountLandmarkControl(subModulesDiv);
-		var NewMaxRate = $(this).val();
-		var ID = $(this).parent('div').parent('div').attr('id');
-		if (parseInt(NewMaxRate) > 0 ) {
-			// Блокируем рубежный контроль
-			var inputCurrentControl = $(this).parent().parent().children('.currentControl').children('.inputCurrentControl');
-			inputCurrentControl.attr('readonly', true);
-			// Меняем max балл
-			if (NewMaxRate != MaxRate)
-				ChangeSubmoduleMaxRate(ID, NewMaxRate);
-			// Меняем тип
-			if (parseInt(inputCurrentControl.val()) <= 0) 
-				ChangeSubmoduleControlType(ID, 'LandmarkControl');
-		}
-		else 
-			$(this).parent().parent().children('.currentControl').children('.inputCurrentControl').attr('readonly', false);
+		SetNewRateAndControl($(this), OldMaxRate);
 	});
 	
 	// В inputCredit (где баллы вводить) разрешаем вводить только цифры
@@ -417,47 +429,4 @@ $(function() {
         }
     });
 	
-	// При нажатие кнопки 'сохранить' генерация JSON
-	$('.createStudyMap').click(function(){
-		var modulesCount = 0;
-		// jsonModules - JSON данные, для отправки на сервер
-		var jsonModules = '{"DisciplineID" : "'+DisciplineID+'", ';
-		var amountModulesHead = $('.moduleGroup').size();
-		$('.moduleGroup').each(function(i){
-			modulesCount++;
-			var subModulesCount = 0;
-			jsonModules += '"'+i+'"'+':{';
-			var jsonModule = '"moduleName":"'+$(this).children('.moduleHead').children('.name').children('.inputName').val()+'",';
-			// jsonSubModules - мероприятия в JSON представление
-			var jsonSubModules = '"subModules":{';
-			var amountSubModules = $('.subModule', this).size();
-			$('.subModule', this).each(function(i){
-				subModulesCount++;
-				var subModuleName = $(this).children('.name').children('.inputName').val();
-				
-				var rateControl; // Тип контроля
-				if (parseInt($(this).children('.currentControl').children('.inputCurrentControl').val()) > 0)
-					rateControl = '"maxRate" : "'+parseInt($(this).children('.currentControl').children('.inputCurrentControl').val())+'", "typeControl" : "CurrentControl"';
-				if (parseInt($(this).children('.landmarkControl').children('.inputLandmarkControl').val()) > 0)
-					rateControl = '"maxRate" : "'+parseInt($(this).children('.landmarkControl').children('.inputLandmarkControl').val())+'", "typeControl" : "LandmarkControl"';
-				
-				jsonSubModules += '"'+i+'":{"subModuleName":"'+subModuleName+'", '+rateControl+'}';
-				jsonSubModules += (i + 1 == amountSubModules) ? '' : ',';
-			});
-			jsonSubModules += ', "subModulesCount" : "'+subModulesCount+'"}';
-			jsonModules += jsonModule+jsonSubModules;
-			jsonModules += (i + 1 == amountModulesHead) ? '}' : '},';
-		});
-		jsonModules += ', "modulesCount" : "'+modulesCount+'" }';
-		console.log(JSON.stringify(jsonModules));
-		
-		$.post(
-			'/~dev_rating/handler/map/AddMap',
-			{"data" : jsonModules},
-			function(data){
-				alert(data);
-			},
-			'json'
-		);
-	});
 });
diff --git a/media/js/event_inspector.js b/media/js/event_inspector.js
new file mode 100644
index 0000000000000000000000000000000000000000..77db70482742dfc71e9a969dcba7d232c5f8e742
--- /dev/null
+++ b/media/js/event_inspector.js
@@ -0,0 +1,18 @@
+function event_inspector_showMessage($text, $success){
+	$('.TopRightMessage').text($text);
+	
+	$('.TopRightMessage').show();
+	
+	if ($success == true)
+		$('.TopRightMessage').css('background', '#2bbd19');
+		
+	if ($success == false)
+		$('.TopRightMessage').css('background', '#FF6666');
+
+	if ($('.TopRightMessage').css('display') == 'block')
+		setInterval(
+			function(){
+				$('.TopRightMessage').hide("slow")
+			}, 5000
+		);
+}
diff --git a/media/js/setRate.js b/media/js/setRate.js
index 6b58deaefbcf4010e78fcc503de2caf287de3bee..20bb2de12a8afe80712abd14d179890207f133f0 100644
--- a/media/js/setRate.js
+++ b/media/js/setRate.js
@@ -31,32 +31,41 @@ $(function() {
 		// Получаем подмодуль
 		var reg = /col_\d+/;
 		var col = ''+reg.exec(thisObj.attr('class'));
-		col = $('.'+col+':first').attr('id');
+		SubmoduleID = $('.'+col+':first').attr('id');
 		
 		// Получаем студента
 		var reg = /row_\d+/;
 		var row = ''+reg.exec(thisObj.attr('class'));
-		row = $('.'+row+':first').attr('id');
+		StudentID = $('.'+row+':first').attr('id');
 		
 		var edit = false; // Типа говорим, что балл нужно добавить, а не изменить
 		if (-1 < thisObj.attr('class').indexOf('edit'))
 			edit = true; // Типа изменить балл
+		
+		if (thisObj.children('input').val() != '')
+			var NewRate = thisObj.children('input').val();
+		else var NewRate = 0;
+		var MaxRate = $('.'+col+':first').children('input').val();
 
-		if (oldRateCell != thisObj.children('input').val())
+		if (parseInt(NewRate) <= parseInt(MaxRate)) 
+		{
 			if (edit) {
-				$.post('/~dev_rating/handler/rating/changeRate', {'student': row, 'submodule': col, 'rate': thisObj.children('input').val() },
+				$.post('/~dev_rating/handler/rating/changeRate', {'student': StudentID, 'submodule': SubmoduleID, 'rate': NewRate },
 					function(data){
 						alert(data);
 					}
 				);
 			}
 			else {
-				$.post('/~dev_rating/handler/rating/setRate', {'student': row, 'submodule': col, 'rate': thisObj.children('input').val() },
+				$.post('/~dev_rating/handler/rating/setRate', {'student': StudentID, 'submodule': SubmoduleID, 'rate': NewRate },
 					function(data){
 						alert(data);
 					}
 				);
 			}
+		} 
+		else 
+			alert('Текущий балл превышает максимальный для данного модуля.');
 	}
 	
 	$('.rateCell').mouseenter(function(){
@@ -69,19 +78,27 @@ $(function() {
 			tdUnFocus($(this));
 	});
 	
+	var OldRate = 0;
 	$('.rateCell').focusin(function(){
 		isFocusCell = true;
 		tdFocus($(this), $(this).attr('class'));
+		if ($(this).children('input').val() != '')
+			OldRate = $(this).children('input').val();
+		else OldRate = 0;
 	});
 	
 	$('.rateCell').focusout(function(){
 		isFocusCell = false;
-		Rating($(this));
+		if ($(this).children('input').val() != '')
+			var NewRate = $(this).children('input').val();
+		else var NewRate = 0;
+		if (NewRate != OldRate)
+			Rating($(this));
 		tdUnFocus($(this));
 	});
 	
-	// В inputCredit (где баллы вводить) разрешаем вводить только цифры
-	$('.rateCell').children('input').keydown(function(event) {
+	// Разрешаем вводить только цифры
+	function KeyDownOnlyNumber(event) {
         // Разрешаем: backspace, delete, tab и escape
         if ( event.keyCode == 46 || event.keyCode == 8 || event.keyCode == 9 || event.keyCode == 27 || 
              // Разрешаем: Ctrl+A
@@ -97,6 +114,11 @@ $(function() {
                 event.preventDefault(); 
             }   
         }
+	}
+	
+	// В inputCredit (где баллы вводить) разрешаем вводить только цифры
+	$('.rateCell').children('input').keydown(function(event) {
+		KeyDownOnlyNumber(event);
     });
 	
 });
diff --git a/modules/account/classes/Kohana/Account.php b/modules/account/classes/Kohana/Account.php
index 26a2fb94de2ee205160815b953316aff8e5da92f..6860e175003e13f19fc8994dbaf59d7e02044b72 100644
--- a/modules/account/classes/Kohana/Account.php
+++ b/modules/account/classes/Kohana/Account.php
@@ -120,7 +120,7 @@ class Kohana_Account implements ArrayAccess {
         {
             if(!$this->checkHash())
             {
-                $this->signOut();
+                $this->completeSignOut();
                 return false;
             }
         }
@@ -145,13 +145,18 @@ class Kohana_Account implements ArrayAccess {
     {
         if($this->isSignedIn())
         {
-            $this->_session->set('ID', FALSE)->set('LoggedIn', FALSE)->set('UserHash', FALSE);
-            Cookie::delete('userhash');
-            unset($this->_userInfo);
-            $this->_session->restart();
+            return $this->completeSignOut();
         }
     }
     
+    protected function completeSignOut()
+    {
+        $this->_session->set('ID', FALSE)->set('LoggedIn', FALSE)->set('UserHash', FALSE);
+        Cookie::delete('userhash');
+        unset($this->_userInfo);
+        $this->_session->restart();
+        return TRUE;
+    }
 
     /**
      * Проверяет корректность данного пароля для текущего пользователя.
@@ -168,8 +173,8 @@ class Kohana_Account implements ArrayAccess {
     
     public function changePassword($old, $new)
     {
-        if(!$this->isSignedIn() || !$this->checkPassword($old))
-            return FALSE;
+        /* if(!$this->isSignedIn() || !$this->checkPassword($old))
+            return FALSE; */
         $this->_model->changePassword($this->offsetGet('UserID'), sha1($new));
         $passhash = $this->hash($this->hash($new).$this->_config['hash_key']);
         Cookie::set('userhash', $passhash);
@@ -227,8 +232,6 @@ class Kohana_Account implements ArrayAccess {
         $info += $this->_model->getAccountInfoByID($id)->offsetGet(0);
         $info['EMail'] = $info['E-Mail'];
         unset($info['E-Mail']);
-        unset($info['ID']);
-        unset($info['Type']);
         return $info;
     }
 
diff --git a/modules/kotwig/cache/02/d8/c3410b37b216eed146df92439e469b0a2c5f167e97fc567c2bb774c7af8f.php b/modules/kotwig/cache/02/d8/c3410b37b216eed146df92439e469b0a2c5f167e97fc567c2bb774c7af8f.php
deleted file mode 100644
index 45be0f72aaafa637599d1001862e4109acf5ccac..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/02/d8/c3410b37b216eed146df92439e469b0a2c5f167e97fc567c2bb774c7af8f.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/* sign/remindpass */
-class __TwigTemplate_02d8c3410b37b216eed146df92439e469b0a2c5f167e97fc567c2bb774c7af8f extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("sign");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'forms' => array($this, 'block_forms'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "sign";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Восстановление доступа";
-    }
-
-    // line 4
-    public function block_forms($context, array $blocks = array())
-    {
-        // line 5
-        echo "    <div class='tips'>
-        Случилось так, что Вы забыли пароль?<br>
-        Введите свой E-Mail адрес, и мы пришлем данные для восстановления доступа.
-        <br>
-        <b>Обратите внимание!</b> Если Вы - преподаватель, то
-        восстановление доступа к аккаунту возможно только через&nbsp;деканат.
-    </div>
-    ";
-        // line 12
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "email", 1 => "text", 2 => ""), "method"), "html", null, true);
-        echo "
-    ";
-        // line 13
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "email", 1 => "button", 2 => "Восстановить"), "method"), "html", null, true);
-        echo "
-    <div class='actiongrid'>
-        ";
-        // line 15
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "sign/in", 1 => "Я вспомнил! Просто дайте мне войти."), "method");
-        echo "
-    </div>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "sign/remindpass";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  56 => 15,  51 => 13,  47 => 12,  38 => 5,  35 => 4,  29 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/08/58/825d0ef2efbb836fba58853bd3e92b27fb6abfb63f374349d7ef990a2200.php b/modules/kotwig/cache/08/58/825d0ef2efbb836fba58853bd3e92b27fb6abfb63f374349d7ef990a2200.php
deleted file mode 100644
index b99ba58de14bf2edd8791d9a12b810df2fb99b78..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/08/58/825d0ef2efbb836fba58853bd3e92b27fb6abfb63f374349d7ef990a2200.php
+++ /dev/null
@@ -1,394 +0,0 @@
-<?php
-
-/* teacher/index */
-class __TwigTemplate_0858825d0ef2efbb836fba58853bd3e92b27fb6abfb63f374349d7ef990a2200 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "РЈРљР”";
-    }
-
-    // line 4
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 5
-        echo "\t";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/courses_teacher.css"), "method");
-        echo "
-";
-    }
-
-    // line 8
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "РЈРљР”";
-    }
-
-    // line 9
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 10
-        echo "    <div class=\"user_courses\">
-<!--
-\t    <div class=\"course_main_wrapper\">
-\t\t    <div class=\"course_img\"></div>
-\t\t    <div class=\"course_name_wrapper\">
-\t\t    \t<div class=\"course_name\"><a href=\"#\">Операционные системы</a></div>
-\t\t    </div>
-
-\t\t    <div class=\"group_main_wrapper\">
-\t\t\t    <div class=\"group_img\"></div>
-\t\t\t    <div class=\"group_name_wrapper\">
-\t\t\t    \t<div class=\"group_name\"><a href=\"#1\">2 РіСЂСѓРїРїР°</a></div>
-\t\t\t    \t<div class=\"student_value\">24 студента</div>
-\t\t\t    \t<div class=\"control_form\">Зачет</div>
-\t\t\t    </div>
-\t\t\t</div>
-
-\t\t    <div class=\"group_main_wrapper\">
-\t\t\t    <div class=\"group_img\"></div>
-\t\t\t    <div class=\"group_name_wrapper\">
-\t\t\t    \t<div class=\"group_name\"><a href=\"#1\">3 РіСЂСѓРїРїР°</a></div>
-\t\t\t    \t<div class=\"student_value\">32 студента</div>
-\t\t\t    \t<div class=\"control_form\">Зачет</div>\t\t\t    \t
-\t\t\t    </div>
-\t\t\t</div>
-\t\t</div>
-
-\t    <div class=\"course_main_wrapper\">
-\t\t    <div class=\"course_img\"></div>
-\t\t    <div class=\"course_name_wrapper\">
-\t\t    \t<div class=\"course_name\"><a href=\"#\">Математический анализ</a></div>
-\t\t    </div>
-
-\t\t    <div class=\"group_main_wrapper\">
-\t\t\t    <div class=\"group_img\"></div>
-\t\t\t    <div class=\"group_name_wrapper\">
-\t\t\t    \t<div class=\"group_name\"><a href=\"#1\">2 РіСЂСѓРїРїР°</a></div>
-\t\t\t    \t<div class=\"student_value\">32 студента</div>
-\t\t\t    \t<div class=\"control_form\">Зачет</div>\t\t\t    \t
-\t\t\t    </div>
-\t\t\t</div>
-\t\t</div>  -->
-
-
-
-        <table cellspacing=\"0\" border=\"0\" width=\"100%\" class=\"table\">
-\t\t\t<tr class=\"course_content\">
-\t\t\t\t<td class = \"course_img\"></td>
-\t\t\t\t<td class = \"course_name\" colspan=\"4\">Операционные системы</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"4\">&nbsp;</td>
-\t\t\t\t<td width=\"200px\" class=\"table_head\">Номер группы</td>
-\t\t\t\t<td class=\"table_head\">Число студентов</td>
-\t\t\t\t<td class=\"table_head\">Форма отчета</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"2\" width=\"100px\"></td>
-\t\t\t\t<td class=\"course_number\">1 РєСѓСЂСЃ</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_once\"></td>
-\t\t\t\t<td class=\"group_name_once\" align=\"center\"><a href=\"#1\">2 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_once\">32</td>
-\t\t\t\t<td class=\"control_form_once\">Экзамен</td>\t
-\t\t\t\t<td class=\"top_btn_border\" rowspan=\"0\"><button class=\"show_ukd_btn\">РЈРљР”</button></td>\t\t
-\t\t\t</tr>\t
-\t\t\t
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td >&nbsp;</td>
-\t\t\t\t<td class=\"\" align=\"center\"><a href=\"#1\">&nbsp;</a></td>\t
-\t\t\t\t<td class=\"\">&nbsp;</td>
-\t\t\t\t<td class=\"\">&nbsp;</td>\t\t\t\t
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_top\"></td>
-\t\t\t\t<td class=\"group_name_top\" align=\"center\"><a href=\"#1\">1 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_top\">22</td>
-\t\t\t\t<td class=\"control_form_top\">Экзамен</td>\t
-\t\t\t\t<td class=\"top_btn_border\" rowspan=\"2\"><button class=\"show_ukd_btn\">РЈРљР”</button></td>\t\t
-\t\t\t</tr>\t
-\t\t\t
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_bottom\"></td>
-\t\t\t\t<td class=\"group_name_bottom\" align=\"center\"><a href=\"#1\">4 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_bottom\">35</td>
-\t\t\t\t<td class=\"control_form_bottom\">Экзамен</td>\t\t\t
-\t\t\t</tr>\t\t\t\t
-
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td >&nbsp;</td>
-\t\t\t\t<td class=\"\" align=\"center\"><a href=\"#1\">&nbsp;</a></td>\t
-\t\t\t\t<td class=\"\">&nbsp;</td>
-\t\t\t\t<td class=\"\">&nbsp;</td>\t\t\t\t
-\t\t\t</tr>
-
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"2\" width=\"100px\"></td>
-\t\t\t\t<td class=\"course_number\">2 РєСѓСЂСЃ</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_top\"></td>
-\t\t\t\t<td class=\"group_name_top\" align=\"center\"><a href=\"#1\">2 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_top\">32</td>
-\t\t\t\t<td class=\"control_form_top\">Экзамен</td>\t
-\t\t\t\t<td class=\"top_btn_border\" rowspan=\"2\"><button class=\"show_ukd_btn\">РЈРљР”</button></td>\t\t
-\t\t\t</tr>\t
-\t\t\t
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_bottom\"></td>
-\t\t\t\t<td class=\"group_name_bottom\" align=\"center\"><a href=\"#1\">3 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_bottom\">43</td>
-\t\t\t\t<td class=\"control_form_bottom\">Экзамен</td>\t\t\t
-\t\t\t</tr>\t
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td >&nbsp;</td>
-\t\t\t\t<td class=\"\" align=\"center\"><a href=\"#1\">&nbsp;</a></td>\t
-\t\t\t\t<td class=\"\">&nbsp;</td>
-\t\t\t\t<td class=\"\">&nbsp;</td>\t\t\t\t
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_top\"></td>
-\t\t\t\t<td class=\"group_name_top\" align=\"center\"><a href=\"#1\">1 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_top\">22</td>
-\t\t\t\t<td class=\"control_form_top\">Экзамен</td>\t
-\t\t\t\t<td class=\"top_btn_border\" rowspan=\"2\"><button class=\"show_ukd_btn\">РЈРљР”</button></td>\t\t
-\t\t\t</tr>\t
-\t\t\t
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_bottom\"></td>
-\t\t\t\t<td class=\"group_name_bottom\" align=\"center\"><a href=\"#1\">4 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_bottom\">35</td>
-\t\t\t\t<td class=\"control_form_bottom\">Экзамен</td>\t\t\t
-\t\t\t</tr>\t
-
-
-
-\t\t\t<tr class=\"course_content\">
-\t\t\t\t<td class = \"course_img\"></td>
-\t\t\t\t<td class = \"course_name\" colspan=\"4\">Математический анализ</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"4\">&nbsp;</td>
-\t\t\t\t<td width=\"200px\" class=\"table_head\">Номер группы</td>
-\t\t\t\t<td class=\"table_head\">Число студентов</td>
-\t\t\t\t<td class=\"table_head\">Форма отчета</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"2\" width=\"100px\"></td>
-\t\t\t\t<td class=\"course_number\">1 РєСѓСЂСЃ</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_top\"></td>
-\t\t\t\t<td class=\"group_name_top\" align=\"center\"><a href=\"#1\">2 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_top\">32</td>
-\t\t\t\t<td class=\"control_form_top\">Экзамен</td>\t
-\t\t\t\t<td class=\"top_btn_border\" rowspan=\"2\"><button class=\"show_ukd_btn\">РЈРљР”</button></td>\t\t
-\t\t\t</tr>\t
-\t\t\t
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img_bottom\"></td>
-\t\t\t\t<td class=\"group_name_bottom\" align=\"center\"><a href=\"#1\">3 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number_bottom\">43</td>
-\t\t\t\t<td class=\"control_form_bottom\">Экзамен</td>\t\t\t
-\t\t\t</tr>
-
-
-
-<!--
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img\"></td>
-\t\t\t\t<td class=\"group_name\"><a href=\"#1\">3 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number\">38</td>
-\t\t\t\t<td class=\"control_form\">Зачет</td>
-\t\t\t\t\t\t\t
-\t\t\t</tr>\t
-
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"2\" width=\"100px\"></td>
-\t\t\t\t<td class=\"course_number\">3 РєСѓСЂСЃ</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img\"></td>
-\t\t\t\t<td class=\"group_name\"><a href=\"#1\">2 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number\">32</td>
-\t\t\t\t<td class=\"control_form\">Экзамен</td>
-\t\t\t\t\t\t\t
-\t\t\t</tr>\t
-
-
-\t\t\t<tr class=\"course_content\">
-\t\t\t\t<td class = \"course_img\"></td>
-\t\t\t\t<td class = \"course_name\" colspan=\"4\"><a href=\"#\">Математический анализ</a></td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"7\">&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"2\" width=\"100px\"></td>
-\t\t\t\t<td class=\"course_number\">1 РєСѓСЂСЃ</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img\"></td>
-\t\t\t\t<td class=\"group_name\"><a href=\"#1\">2 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number\">32</td>
-\t\t\t\t<td class=\"control_form\">Экзамен</td>
-\t\t\t\t\t\t\t
-\t\t\t</tr>
-
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img\"></td>
-\t\t\t\t<td class=\"group_name\"><a href=\"#1\">3 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number\">38</td>
-\t\t\t\t<td class=\"control_form\">Зачет</td>\t\t
-\t\t\t</tr>\t
-
-
-\t\t\t<tr>
-\t\t\t\t<td colspan=\"2\" width=\"100px\"></td>
-\t\t\t\t<td class=\"course_number\">3 РєСѓСЂСЃ</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t\t<td>&nbsp;</td>
-\t\t\t</tr>\t\t\t\t\t\t\t
-\t\t\t<tr class=\"group_block\">
-\t\t\t\t<td colspan=\"3\" width=\"100px\">&nbsp;</td>
-\t\t\t\t<td class=\"group_img\"></td>
-\t\t\t\t<td class=\"group_name\"><a href=\"#1\">3 РіСЂСѓРїРїР°</a></td>\t
-\t\t\t\t<td class=\"stud_number\">38</td>
-\t\t\t\t<td class=\"control_form\">Зачет</td>\t\t
-\t\t\t</tr>\t\t
-         \t-->
-            ";
-        // line 314
-        $context['_parent'] = (array) $context;
-        $context['_seq'] = twig_ensure_traversable((isset($context["disciplines"]) ? $context["disciplines"] : null));
-        foreach ($context['_seq'] as $context["_key"] => $context["i"]) {
-            // line 315
-            echo "                ";
-            echo twig_escape_filter($this->env, $this->getAttribute((isset($context["res"]) ? $context["res"] : null), "subject", array(0 => (isset($context["i"]) ? $context["i"] : null), 1 => (isset($context["HTML"]) ? $context["HTML"] : null)), "method"), "html", null, true);
-            echo "    
-            ";
-        }
-        $_parent = $context['_parent'];
-        unset($context['_seq'], $context['_iterated'], $context['_key'], $context['i'], $context['_parent'], $context['loop']);
-        $context = array_intersect_key($context, $_parent) + $_parent;
-        // line 317
-        echo "    </div>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "teacher/index";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  376 => 317,  367 => 315,  363 => 314,  57 => 10,  54 => 9,  48 => 8,  41 => 5,  37 => 4,  31 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/0a/64/0b7bbebea0ec2645cb9e8449e2acae24ed7dec3e2221c16e589a504a0e85.php b/modules/kotwig/cache/0a/64/0b7bbebea0ec2645cb9e8449e2acae24ed7dec3e2221c16e589a504a0e85.php
deleted file mode 100644
index 31bc6326a9183a7f38151d8290f44368313c3d74..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/0a/64/0b7bbebea0ec2645cb9e8449e2acae24ed7dec3e2221c16e589a504a0e85.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/* errors/404 */
-class __TwigTemplate_0a640b7bbebea0ec2645cb9e8449e2acae24ed7dec3e2221c16e589a504a0e85 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-            'pagename' => array($this, 'block_pagename'),
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<!DOCTYPE html>
-<html>
-    <head>
-        <title>";
-        // line 4
-        $this->displayBlock('pagename', $context, $blocks);
-        echo "</title>
-        ";
-        // line 5
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/error.css"), "method");
-        echo "
-        <meta charset=\"UTF-8\">
-        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
-    </head>
-    <body>
-        <div class='page_layout'>
-            <div class='content_box'>
-                <div class='error'>404</div>
-                <div class='message'>";
-        // line 13
-        echo twig_escape_filter($this->env, (isset($context["message"]) ? $context["message"] : null), "html", null, true);
-        echo "</div>
-            </div>
-            <div class='footer'>
-               Создано отборными рабами<br>Южного Федерального Университета &copy; 2014
-            </div>
-        </div>
-    </body>
-</html>
-";
-    }
-
-    // line 4
-    public function block_pagename($context, array $blocks = array())
-    {
-        echo "Ошибочка вышла!";
-    }
-
-    public function getTemplateName()
-    {
-        return "errors/404";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  53 => 4,  40 => 13,  29 => 5,  25 => 4,  20 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/0b/6f/395ca14ac202374d5cff678b71157d0bef7e00c3045e9b80aab4ffb85276.php b/modules/kotwig/cache/0b/6f/395ca14ac202374d5cff678b71157d0bef7e00c3045e9b80aab4ffb85276.php
deleted file mode 100644
index 17d37128334452b69cf00ef13a91679c92fd8b40..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/0b/6f/395ca14ac202374d5cff678b71157d0bef7e00c3045e9b80aab4ffb85276.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-/* sign */
-class __TwigTemplate_0b6f395ca14ac202374d5cff678b71157d0bef7e00c3045e9b80aab4ffb85276 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-            'pagename' => array($this, 'block_pagename'),
-            'title' => array($this, 'block_title'),
-            'forms' => array($this, 'block_forms'),
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 10
-        echo "  
-";
-        // line 11
-        $context["sign"] = $this->env->loadTemplate("sign");
-        // line 12
-        echo "<!DOCTYPE html> 
-<html>
-    <head>
-        <title>";
-        // line 15
-        $this->displayBlock('pagename', $context, $blocks);
-        echo " | ";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "</title>
-        ";
-        // line 16
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/sign.css"), "method");
-        echo "
-        ";
-        // line 17
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/forms.css"), "method");
-        echo "
-        ";
-        // line 18
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/jquery-2.1.0.min.js"), "method");
-        echo "
-        ";
-        // line 19
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/sign.js"), "method");
-        echo "
-        <meta charset=\"UTF-8\">
-        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
-    </head>
-    <body>
-        <div class=\"header_wrapper\">
-            <div class=\"header\">
-                <div class=\"top_logo\">
-                        ";
-        // line 27
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "
-                </div>
-                <div class=\"top_name_faculty\">
-                        ";
-        // line 30
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FacultyName"), "html", null, true);
-        echo "
-                </div>
-                <div class=\"top_user\">
-                        Аутентификация
-                </div>
-            </div>
-        </div>        
-        <div class='auth_layout'>            
-            <div class=\"sign_form\">
-                <div class=\"main\">
-                    <div class=\"top\">
-                            <div class=\"top_title\">";
-        // line 41
-        $this->displayBlock('title', $context, $blocks);
-        echo "</div>
-                    </div>
-
-                    <div class=\"content_wrapper\">
-                        <div class=\"content\">
-                            ";
-        // line 46
-        $this->displayBlock('forms', $context, $blocks);
-        // line 47
-        echo "                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class='footer'>
-                <a href='http://vk.com/itlab_mmcs'>IT-лаборатория мехмата ЮФУ &copy; 2014</a>
-            </div>
-        </div>
-    </body>
-</html>
-";
-    }
-
-    // line 15
-    public function block_pagename($context, array $blocks = array())
-    {
-        echo "Вход в систему";
-    }
-
-    // line 41
-    public function block_title($context, array $blocks = array())
-    {
-        echo " ";
-    }
-
-    // line 46
-    public function block_forms($context, array $blocks = array())
-    {
-        echo " ";
-    }
-
-    // line 1
-    public function getinput($_name = null, $_type = null, $_value = null, $_placeholder = null)
-    {
-        $context = $this->env->mergeGlobals(array(
-            "name" => $_name,
-            "type" => $_type,
-            "value" => $_value,
-            "placeholder" => $_placeholder,
-        ));
-
-        $blocks = array();
-
-        ob_start();
-        try {
-            // line 2
-            echo "    <div class='standartform'>
-        ";
-            // line 3
-            if (((isset($context["type"]) ? $context["type"] : null) != "button")) {
-                // line 4
-                echo "            <input id='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' placeholder='";
-                echo twig_escape_filter($this->env, (isset($context["placeholder"]) ? $context["placeholder"] : null), "html", null, true);
-                echo "' type='";
-                echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-                echo "' name='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' value='";
-                echo twig_escape_filter($this->env, (isset($context["value"]) ? $context["value"] : null), "html", null, true);
-                echo "'>
-        ";
-            } else {
-                // line 6
-                echo "            <input id='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' type='";
-                echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-                echo "' name='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' value='";
-                echo twig_escape_filter($this->env, (isset($context["value"]) ? $context["value"] : null), "html", null, true);
-                echo "'>
-        ";
-            }
-            // line 8
-            echo "    </div>
-";
-        } catch (Exception $e) {
-            ob_end_clean();
-
-            throw $e;
-        }
-
-        return ('' === $tmp = ob_get_clean()) ? '' : new Twig_Markup($tmp, $this->env->getCharset());
-    }
-
-    public function getTemplateName()
-    {
-        return "sign";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  168 => 8,  156 => 6,  142 => 4,  140 => 3,  137 => 2,  123 => 1,  117 => 46,  111 => 41,  105 => 15,  91 => 47,  89 => 46,  81 => 41,  67 => 30,  61 => 27,  50 => 19,  46 => 18,  42 => 17,  32 => 15,  27 => 12,  25 => 11,  22 => 10,  64 => 15,  60 => 14,  54 => 11,  49 => 9,  45 => 8,  38 => 16,  35 => 4,  29 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/0d/c5/44d9cd70d91d166812e5cc2900310187856b4410f4362ee86e83ebbecf18.php b/modules/kotwig/cache/0d/c5/44d9cd70d91d166812e5cc2900310187856b4410f4362ee86e83ebbecf18.php
deleted file mode 100644
index b3fbd12e12d6a86d9f5a1e3c26a7510dc5eb68e0..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/0d/c5/44d9cd70d91d166812e5cc2900310187856b4410f4362ee86e83ebbecf18.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/* admin/menu.process */
-class __TwigTemplate_0dc544d9cd70d91d166812e5cc2900310187856b4410f4362ee86e83ebbecf18 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<div class=\"menu\">
-    <div class=\"menu_top\">
-            <div class=\"menu_top_title\">Учебный процесс</div>
-    </div>
-    <div class=\"menu_content\">
-            <ul>
-                ";
-        // line 7
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/semester", 1 => "<li>Управление семестром</li>"), "method");
-        echo "
-                ";
-        // line 8
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/disciplines", 1 => "<li>Управление дисциплинами</li>"), "method");
-        echo "
-                ";
-        // line 9
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/teachers", 1 => "<li>Управление преподавателями</li>"), "method");
-        echo "
-                ";
-        // line 10
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/students", 1 => "<li>Управление студентами</li>"), "method");
-        echo "
-            </ul>
-    </div>
-</div>";
-    }
-
-    public function getTemplateName()
-    {
-        return "admin/menu.process";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  39 => 10,  35 => 9,  31 => 8,  27 => 7,  19 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/14/5d/4fd58e8cd9b304b0d2039ca0fd101aa0da5f5ef473d252a19a948ba1ec1f.php b/modules/kotwig/cache/14/5d/4fd58e8cd9b304b0d2039ca0fd101aa0da5f5ef473d252a19a948ba1ec1f.php
deleted file mode 100644
index 27f5c6e23011672de5c2e8fd8eb3a191a53b44b1..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/14/5d/4fd58e8cd9b304b0d2039ca0fd101aa0da5f5ef473d252a19a948ba1ec1f.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/* errors/http */
-class __TwigTemplate_145d4fd58e8cd9b304b0d2039ca0fd101aa0da5f5ef473d252a19a948ba1ec1f extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-            'pagename' => array($this, 'block_pagename'),
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<!DOCTYPE html> 
-<html>
-    <head>
-        <title>";
-        // line 4
-        $this->displayBlock('pagename', $context, $blocks);
-        echo " | ";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "</title>
-        ";
-        // line 5
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/sign.css"), "method");
-        echo "
-        <meta charset=\"UTF-8\">
-        <meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\">
-    </head>
-    <body>
-        <div class=\"header_wrapper\">
-            <div class=\"header\">
-                <div class=\"top_logo\">
-                        ";
-        // line 13
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "
-                </div>
-                <div class=\"top_name_faculty\">
-                        ";
-        // line 16
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FacultyName"), "html", null, true);
-        echo "
-                </div>
-                <div class=\"top_user\">
-                        Ошибка
-                </div>
-            </div>
-        </div>        
-        <div class='auth_layout'>            
-            <div class=\"sign_form\">
-                <div class=\"main\">
-                    <div class=\"top\">
-                            <div class=\"top_title\">Ошибка</div>
-                    </div>
-
-                    <div class=\"content_wrapper\">
-                        <div class=\"content\" style=\"text-align: center;\">
-                            <div style=\"font-size: 100px;\">";
-        // line 32
-        echo twig_escape_filter($this->env, (isset($context["code"]) ? $context["code"] : null), "html", null, true);
-        echo "</div>
-                            <div style=\"color: #999; font-size: 12px;\">";
-        // line 33
-        echo twig_escape_filter($this->env, (isset($context["message"]) ? $context["message"] : null), "html", null, true);
-        echo "</div>
-                            <div><a href=\"";
-        // line 34
-        echo twig_escape_filter($this->env, (isset($context["link"]) ? $context["link"] : null), "html", null, true);
-        echo "\" style='font-size: 12px; color: #0183ce; text-decoration: none;'>Вернуться на главную страницу</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class='footer'>
-                <a href='http://vk.com/itlab_mmcs'>IT-лаборатория мехмата ЮФУ &copy; 2014</a>
-            </div>
-        </div>
-    </body>
-</html>";
-    }
-
-    // line 4
-    public function block_pagename($context, array $blocks = array())
-    {
-        echo "Ошибка";
-    }
-
-    public function getTemplateName()
-    {
-        return "errors/http";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  90 => 4,  75 => 34,  71 => 33,  67 => 32,  48 => 16,  42 => 13,  31 => 5,  25 => 4,  20 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/27/4e/a2840eb20600668663fbfa00dcb3c2e0c0ae4256f3e51368274dd267063c.php b/modules/kotwig/cache/27/4e/a2840eb20600668663fbfa00dcb3c2e0c0ae4256f3e51368274dd267063c.php
deleted file mode 100644
index 2e18d0c0042133132a40a8bc469bf4cb6d0be4e3..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/27/4e/a2840eb20600668663fbfa00dcb3c2e0c0ae4256f3e51368274dd267063c.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/* teacher/construct */
-class __TwigTemplate_274ea2840eb20600668663fbfa00dcb3c2e0c0ae4256f3e51368274dd267063c extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Конструктор УКД";
-    }
-
-    // line 4
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 5
-        echo "\t";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/construct.css"), "method");
-        echo "
-\t";
-        // line 6
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/construct.js"), "method");
-        echo "
-";
-    }
-
-    // line 8
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Конструктор УКД";
-    }
-
-    // line 9
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 10
-        echo "\t<div class=\"construct\">
-\t\t<div class=\"studyMap\">
-\t\t\t<div class=\"name\">Виды контрольных мероприятий</div>
-\t\t\t<div class=\"currentControl\">Текущий контроль</div>
-\t\t\t<div class=\"landmarkControl\">Рубежный контроль</div>
-\t\t\t<div class=\"actions\">Действия</div>
-\t\t</div>
-\t\t<div class=\"moduleList\">
-\t\t\t<div class=\"moduleGroup\">
-\t\t\t\t<div class=\"moduleHead\">
-\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Модуль 1. Наименование модуля\">
-\t\t\t\t\t</div>
-\t\t\t\t\t<div class=\"currentControl\">15</div>
-\t\t\t\t\t<div class=\"landmarkControl\">5</div>
-\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t<div class=\"deleteModule delete\"></div>
-\t\t\t\t\t\t<div class=\"downModule down\"></div>
-\t\t\t\t\t\t<div class=\"upModule up\"></div>
-\t\t\t\t\t\t<div class=\"addSubModule add\"></div>
-\t\t\t\t\t</div>
-\t\t\t\t</div>
-\t\t\t\t<div class=\"subModules\">
-\t\t\t\t\t<div class=\"subModule\">
-\t\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Контрольная работа\">
-\t\t\t\t\t\t</div>
-\t\t\t\t\t\t<div class=\"currentControl\"><input type=\"text\" class=\"inputCredit inputCurrentControl\" value=\"10\"></div>
-\t\t\t\t\t\t<div class=\"landmarkControl\"><input type=\"text\" class=\"inputCredit inputLandmarkControl\" value=\"\"></div>
-\t\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t\t<div class=\"deleteSubModule delete\"></div>
-\t\t\t\t\t\t\t<div class=\"downSubModule down\"></div>
-\t\t\t\t\t\t\t<div class=\"upSubModule up\"></div>
-\t\t\t\t\t\t</div>
-\t\t\t\t\t</div>
-\t\t\t\t\t<div class=\"subModule\">
-\t\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Тест\">
-\t\t\t\t\t\t</div>
-\t\t\t\t\t\t<div class=\"currentControl\"><input type=\"text\" class=\"inputCredit inputCurrentControl\" value=\"5\"></div>
-\t\t\t\t\t\t<div class=\"landmarkControl\"><input type=\"text\" class=\"inputCredit inputLandmarkControl\" value=\"\"></div>
-\t\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t\t<div class=\"deleteSubModule delete\"></div>
-\t\t\t\t\t\t\t<div class=\"downSubModule down\"></div>
-\t\t\t\t\t\t\t<div class=\"upSubModule up\"></div>
-\t\t\t\t\t\t</div>
-\t\t\t\t\t</div>
-\t\t\t\t\t<div class=\"subModule\">
-\t\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Домашнее задание\">
-\t\t\t\t\t\t</div>
-\t\t\t\t\t\t<div class=\"currentControl\"><input type=\"text\" class=\"inputCredit inputCurrentControl\" value=\"\"></div>
-\t\t\t\t\t\t<div class=\"landmarkControl\"><input type=\"text\" class=\"inputCredit inputLandmarkControl\" value=\"5\"></div>
-\t\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t\t<div class=\"deleteSubModule delete\"></div>
-\t\t\t\t\t\t\t<div class=\"downSubModule down\"></div>
-\t\t\t\t\t\t\t<div class=\"upSubModule up\"></div>
-\t\t\t\t\t\t</div>
-\t\t\t\t\t</div>
-\t\t\t\t</div>
-\t\t\t</div>
-\t\t</div>
-\t\t<div class=\"addModule\">Добавить модуль</div>
-\t\t<button class=\"saveStudyMap\">Сохранить</button>
-\t</div>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "teacher/construct";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  61 => 10,  58 => 9,  52 => 8,  46 => 6,  41 => 5,  37 => 4,  31 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/2f/50/7d281d9f8d5c49b8f1accf258c16429394965f3f55df9f1ba11cad9f60a1.php b/modules/kotwig/cache/2f/50/7d281d9f8d5c49b8f1accf258c16429394965f3f55df9f1ba11cad9f60a1.php
deleted file mode 100644
index 218d8de42bda43a9b16bc131846382600d692f51..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/2f/50/7d281d9f8d5c49b8f1accf258c16429394965f3f55df9f1ba11cad9f60a1.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-
-/* student/subject */
-class __TwigTemplate_2f507d281d9f8d5c49b8f1accf258c16429394965f3f55df9f1ba11cad9f60a1 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'media' => array($this, 'block_media'),
-            'title' => array($this, 'block_title'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 23
-        $context["mod"] = $this->env->loadTemplate("student/subject");
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 4
-        echo "    ";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/modules.css"), "method");
-        echo "
-";
-    }
-
-    // line 24
-    public function block_title($context, array $blocks = array())
-    {
-        echo twig_escape_filter($this->env, (($this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "Title", array(), "any", true, true)) ? (_twig_default_filter($this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "Title"), "Предмет")) : ("Предмет")), "html", null, true);
-    }
-
-    // line 25
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo " ";
-        echo twig_escape_filter($this->env, (($this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "Title", array(), "any", true, true)) ? (_twig_default_filter($this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "Title"), "Предмет")) : ("Предмет")), "html", null, true);
-        echo " ";
-    }
-
-    // line 27
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 28
-        echo "
-<div class='main_teachers'>
-    <div class=\"main_teachers_content\">
-        <div class=\"teachers_part_color\"><div class=\"teachers_tittle\">Преподаватели:</div> <div class=\"teachers_info\">";
-        // line 31
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "Teachers"), "html", null, true);
-        echo "</div> </div>
-        <div class=\"teachers_part_color\"><div class=\"teachers_tittle\">Форма промежуточной аттестации:</div>  <div class=\"teachers_info\">";
-        // line 32
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "Control"), "html", null, true);
-        echo " </div></div>
-        <div class=\"teachers_part_color\"><div class=\"teachers_tittle\">Часов: </div>  <div class=\"teachers_info\"> ";
-        // line 33
-        echo twig_escape_filter($this->env, ($this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "LectureHours") + $this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "SeminarHours")), "html", null, true);
-        echo " (</div><div class=\"teachers_tittle\"> Лекций:</div> <div class=\"teachers_info\">";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "LectureHours"), "html", null, true);
-        echo "</div> <div class=\"teachers_tittle\"> Практики:</div> <div class=\"teachers_info\">";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["Subject"]) ? $context["Subject"] : null), "SeminarHours"), "html", null, true);
-        echo ")</div> </div>
-    </div>
-</div>
-
-<div class=\"main_modules\">
-\t";
-        // line 38
-        $context['_parent'] = (array) $context;
-        $context['_seq'] = twig_ensure_traversable(range(1, $this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), "ModulesCount")));
-        foreach ($context['_seq'] as $context["_key"] => $context["i"]) {
-            // line 39
-            echo "            <table border=\"0\" cellspacing=\"0\" class=\"module_table\">
-                <tr class=\"table_module\">
-                    <td colspan=\"3\">";
-            // line 41
-            echo twig_escape_filter($this->env, $this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "ModuleTitle"), "html", null, true);
-            echo "</td>
-                </tr>
-                <tr class=\"table_top\">
-                    <td width=\"500px\">Мероприятие</td>
-                    <td>Дата</td>
-                    <td>Балл</td>
-                </tr>\t\t\t
-                ";
-            // line 48
-            $context['_parent'] = (array) $context;
-            $context['_seq'] = twig_ensure_traversable(range(1, $this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "SubmodulesCount")));
-            foreach ($context['_seq'] as $context["_key"] => $context["j"]) {
-                echo "\t
-                    ";
-                // line 49
-                echo $context["mod"]->getevent($this->getAttribute($this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), (isset($context["j"]) ? $context["j"] : null), array(), "array"), "Title"), $this->getAttribute($this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), (isset($context["j"]) ? $context["j"] : null), array(), "array"), "Date"), $this->getAttribute($this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), (isset($context["j"]) ? $context["j"] : null), array(), "array"), "Rate"), $this->getAttribute($this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), (isset($context["j"]) ? $context["j"] : null), array(), "array"), "MaxRate"));
-                echo "
-                ";
-            }
-            $_parent = $context['_parent'];
-            unset($context['_seq'], $context['_iterated'], $context['_key'], $context['j'], $context['_parent'], $context['loop']);
-            $context = array_intersect_key($context, $_parent) + $_parent;
-            // line 50
-            echo "\t\t\t
-            </table>
-            ";
-            // line 52
-            echo $context["mod"]->getmodule_result($this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "Rate"), $this->getAttribute($this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "MaxRate"));
-            echo "\t
-\t";
-        }
-        $_parent = $context['_parent'];
-        unset($context['_seq'], $context['_iterated'], $context['_key'], $context['i'], $context['_parent'], $context['loop']);
-        $context = array_intersect_key($context, $_parent) + $_parent;
-        // line 54
-        echo "\t<div class=\"result_division\"></div>
-\t<div class=\"main_result\">
-            <div class=\"main_result_text\">Суммарный балл:</div>
-            <div class=\"main_result_value\">";
-        // line 57
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), "Rate"), "html", null, true);
-        echo "/</div>
-            <div class=\"main_result_max_value\">";
-        // line 58
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["discipline"]) ? $context["discipline"] : null), "MaxRate"), "html", null, true);
-        echo "</div>
-\t</div>
-</div>
-";
-    }
-
-    // line 7
-    public function getevent($_event_name = null, $_event_date = null, $_event_ball = null, $_event_max_ball = null)
-    {
-        $context = $this->env->mergeGlobals(array(
-            "event_name" => $_event_name,
-            "event_date" => $_event_date,
-            "event_ball" => $_event_ball,
-            "event_max_ball" => $_event_max_ball,
-        ));
-
-        $blocks = array();
-
-        ob_start();
-        try {
-            // line 8
-            echo "    <tr class=\"table_content\">
-        <td>";
-            // line 9
-            echo twig_escape_filter($this->env, (isset($context["event_name"]) ? $context["event_name"] : null), "html", null, true);
-            echo "</td>
-        <td>";
-            // line 10
-            echo twig_escape_filter($this->env, (isset($context["event_date"]) ? $context["event_date"] : null), "html", null, true);
-            echo "</td>
-        <td>";
-            // line 11
-            echo twig_escape_filter($this->env, (isset($context["event_ball"]) ? $context["event_ball"] : null), "html", null, true);
-            echo " / ";
-            echo twig_escape_filter($this->env, (isset($context["event_max_ball"]) ? $context["event_max_ball"] : null), "html", null, true);
-            echo "</td>
-    </tr>\t\t\t\t\t\t\t\t\t\t\t
-";
-        } catch (Exception $e) {
-            ob_end_clean();
-
-            throw $e;
-        }
-
-        return ('' === $tmp = ob_get_clean()) ? '' : new Twig_Markup($tmp, $this->env->getCharset());
-    }
-
-    // line 15
-    public function getmodule_result($_sum_ball = null, $_max_ball = null)
-    {
-        $context = $this->env->mergeGlobals(array(
-            "sum_ball" => $_sum_ball,
-            "max_ball" => $_max_ball,
-        ));
-
-        $blocks = array();
-
-        ob_start();
-        try {
-            // line 16
-            echo "    <div class=\"module_result\">
-        <div class=\"module_result_text\">Итог модуля:</div>\t\t
-        <div class=\"module_result_value\">";
-            // line 18
-            echo twig_escape_filter($this->env, (isset($context["sum_ball"]) ? $context["sum_ball"] : null), "html", null, true);
-            echo "/</div>
-        <div class=\"module_result_max_value\">";
-            // line 19
-            echo twig_escape_filter($this->env, (isset($context["max_ball"]) ? $context["max_ball"] : null), "html", null, true);
-            echo "</div>
-    </div>\t
-";
-        } catch (Exception $e) {
-            ob_end_clean();
-
-            throw $e;
-        }
-
-        return ('' === $tmp = ob_get_clean()) ? '' : new Twig_Markup($tmp, $this->env->getCharset());
-    }
-
-    public function getTemplateName()
-    {
-        return "student/subject";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  208 => 19,  204 => 18,  200 => 16,  188 => 15,  172 => 11,  168 => 10,  164 => 9,  161 => 8,  147 => 7,  139 => 58,  135 => 57,  130 => 54,  122 => 52,  118 => 50,  110 => 49,  104 => 48,  94 => 41,  90 => 39,  86 => 38,  74 => 33,  70 => 32,  66 => 31,  61 => 28,  58 => 27,  50 => 25,  44 => 24,  37 => 4,  33 => 3,  28 => 23,);
-    }
-}
diff --git a/modules/kotwig/cache/40/67/9a49b190d8131c4d6cabe13d088792c01ff6de8a4d07c9e8d85d75e843f4.php b/modules/kotwig/cache/40/67/9a49b190d8131c4d6cabe13d088792c01ff6de8a4d07c9e8d85d75e843f4.php
deleted file mode 100644
index 95d8b970a7efbe76e497323b1694f54fdc76ef8d..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/40/67/9a49b190d8131c4d6cabe13d088792c01ff6de8a4d07c9e8d85d75e843f4.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/* sign/up */
-class __TwigTemplate_40679a49b190d8131c4d6cabe13d088792c01ff6de8a4d07c9e8d85d75e843f4 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("sign");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'forms' => array($this, 'block_forms'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "sign";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Активация аккаунта";
-    }
-
-    // line 4
-    public function block_forms($context, array $blocks = array())
-    {
-        // line 5
-        echo "    <form action=\"";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["URL"]) ? $context["URL"] : null), "base", array(), "method"), "html", null, true);
-        echo "\" method='POST' id='signup_f'>
-    <div id='errors'></div>
-    <div>
-        ";
-        // line 8
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "activation_code", 1 => "text", 2 => "", 3 => "Код активации"), "method"), "html", null, true);
-        echo "
-        ";
-        // line 9
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "login", 1 => "text", 2 => "", 3 => "Имя пользователя"), "method"), "html", null, true);
-        echo "
-        ";
-        // line 10
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "password", 1 => "password", 2 => "", 3 => "Пароль"), "method"), "html", null, true);
-        echo "
-        ";
-        // line 11
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "confirm_password", 1 => "password", 2 => "", 3 => "Подтверждение пароля"), "method"), "html", null, true);
-        echo "
-        ";
-        // line 12
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "email", 1 => "text", 2 => "", 3 => "E-Mail адрес"), "method"), "html", null, true);
-        echo "
-        ";
-        // line 13
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "confirm_email", 1 => "text", 2 => "", 3 => "Подтверждение E-Mail адреса"), "method"), "html", null, true);
-        echo "
-    </div>
-    ";
-        // line 15
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "signup_b", 1 => "button", 2 => "Активировать"), "method"), "html", null, true);
-        echo "
-    </form>
-    <div class='actiongrid'>
-        ";
-        // line 18
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "sign/in", 1 => "Войти в существующий аккаунт"), "method");
-        echo "
-    </div>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "sign/up";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  76 => 18,  70 => 15,  65 => 13,  61 => 12,  57 => 11,  53 => 10,  49 => 9,  45 => 8,  38 => 5,  35 => 4,  29 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/4a/45/06183f4520d2231ae685fd792f5ccf433982c45edb89e7b3b7c8f335f27f.php b/modules/kotwig/cache/4a/45/06183f4520d2231ae685fd792f5ccf433982c45edb89e7b3b7c8f335f27f.php
deleted file mode 100644
index a07d5c54ca76fc38b771c33df7e92c9d4a73311b..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/4a/45/06183f4520d2231ae685fd792f5ccf433982c45edb89e7b3b7c8f335f27f.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/* sign/contentblock */
-class __TwigTemplate_4a4506183f4520d2231ae685fd792f5ccf433982c45edb89e7b3b7c8f335f27f extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<div class=\"contentblock\">
-    <h2>Добро пожаловать в ";
-        // line 2
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "!</h2>
-    
-</div>";
-    }
-
-    public function getTemplateName()
-    {
-        return "sign/contentblock";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  22 => 2,  19 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/61/67/626074b88cd457ab432ee91e3ba39c30208c58bcc4425893ac08c82c2988.php b/modules/kotwig/cache/61/67/626074b88cd457ab432ee91e3ba39c30208c58bcc4425893ac08c82c2988.php
deleted file mode 100644
index b0990d258745e23dc77ac5a74e16044c5b18a645..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/61/67/626074b88cd457ab432ee91e3ba39c30208c58bcc4425893ac08c82c2988.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/* admin/menu.accounts */
-class __TwigTemplate_6167626074b88cd457ab432ee91e3ba39c30208c58bcc4425893ac08c82c2988 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<div class=\"menu\">
-    <div class=\"menu_top\">
-            <div class=\"menu_top_title\">Учетные записи</div>
-    </div>
-    <div class=\"menu_content\">
-            <ul>
-                ";
-        // line 7
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/users", 1 => "<li>Управление пользователями</li>"), "method");
-        echo "
-                ";
-        // line 8
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/requests/remark", 1 => "<li>Запросы на исправление <b>(1)</b></li>"), "method");
-        echo "
-                ";
-        // line 9
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/requests/restore", 1 => "<li>Восстановление доступа <b>(1)</b></li>"), "method");
-        echo "
-            </ul>
-    </div>
-</div>";
-    }
-
-    public function getTemplateName()
-    {
-        return "admin/menu.accounts";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  39 => 10,  35 => 9,  31 => 8,  27 => 7,  19 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/65/6d/ddc46a18f732a607cf69ad7a10b97d86ab5d0c66e08ddb1eed298690595a.php b/modules/kotwig/cache/65/6d/ddc46a18f732a607cf69ad7a10b97d86ab5d0c66e08ddb1eed298690595a.php
deleted file mode 100644
index b5cb0bcaa6d56c4ad614badbd5c7a57ef436076f..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/65/6d/ddc46a18f732a607cf69ad7a10b97d86ab5d0c66e08ddb1eed298690595a.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/* new_sign */
-class __TwigTemplate_656dddc46a18f732a607cf69ad7a10b97d86ab5d0c66e08ddb1eed298690595a extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 10
-        echo "
-";
-        // line 11
-        $context["sign"] = $this->env->loadTemplate("new_sign");
-        // line 12
-        echo "
-<html>
-<head>
-\t<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-\t<title>";
-        // line 16
-        $this->displayBlock('title', $context, $blocks);
-        echo "</title>
-\t";
-        // line 17
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/new_sign.css"), "method");
-        echo "
-\t";
-        // line 18
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/forms.css"), "method");
-        echo "
-\t";
-        // line 19
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/jquery-1.11.1.min.js"), "method");
-        echo "
-\t";
-        // line 20
-        $this->displayBlock('media', $context, $blocks);
-        // line 21
-        echo "</head>
-<body>
-<div id=\"wrap\">
-
-\t<div class=\"header_wrapper\">
-            <div class=\"header\">
-                <div class=\"top_logo\">
-                        ";
-        // line 28
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "
-                </div>
-                <div class=\"top_name_faculty\">
-                        Южный Федеральный Университет
-                </div>
-                <div class=\"top_user\">
-                        Аутентификация
-                </div>
-            </div>
-\t</div>
-        <div class=\"auth_wrapper\">                
-            ";
-        // line 39
-        $this->env->loadTemplate("sign/contentblock")->display($context);
-        echo "              
-            ";
-        // line 40
-        $this->env->loadTemplate("sign/sideblock")->display($context);
-        // line 41
-        echo "        </div>
-\t<div id=\"footer_fixBug\"></div>
-\t<div class=\"footer\">
-            <a href='http://vk.com/itlab_mmcs'>IT-лаборатория мехмата ЮФУ &copy; 2014</a>
-\t</div>
-</div>
-</body>
-</html>";
-    }
-
-    // line 16
-    public function block_title($context, array $blocks = array())
-    {
-    }
-
-    // line 20
-    public function block_media($context, array $blocks = array())
-    {
-    }
-
-    // line 1
-    public function getinput($_name = null, $_type = null, $_value = null, $_placeholder = null)
-    {
-        $context = $this->env->mergeGlobals(array(
-            "name" => $_name,
-            "type" => $_type,
-            "value" => $_value,
-            "placeholder" => $_placeholder,
-        ));
-
-        $blocks = array();
-
-        ob_start();
-        try {
-            // line 2
-            echo "    <div class='standartform'>
-        ";
-            // line 3
-            if (((isset($context["type"]) ? $context["type"] : null) != "button")) {
-                // line 4
-                echo "            <input id='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' placeholder='";
-                echo twig_escape_filter($this->env, (isset($context["placeholder"]) ? $context["placeholder"] : null), "html", null, true);
-                echo "' type='";
-                echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-                echo "' name='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' value='";
-                echo twig_escape_filter($this->env, (isset($context["value"]) ? $context["value"] : null), "html", null, true);
-                echo "'>
-        ";
-            } else {
-                // line 6
-                echo "            <input id='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' type='";
-                echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-                echo "' name='";
-                echo twig_escape_filter($this->env, (isset($context["name"]) ? $context["name"] : null), "html", null, true);
-                echo "' value='";
-                echo twig_escape_filter($this->env, (isset($context["value"]) ? $context["value"] : null), "html", null, true);
-                echo "'>
-        ";
-            }
-            // line 8
-            echo "    </div>
-";
-        } catch (Exception $e) {
-            ob_end_clean();
-
-            throw $e;
-        }
-
-        return ('' === $tmp = ob_get_clean()) ? '' : new Twig_Markup($tmp, $this->env->getCharset());
-    }
-
-    public function getTemplateName()
-    {
-        return "new_sign";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  145 => 8,  133 => 6,  119 => 4,  117 => 3,  114 => 2,  100 => 1,  95 => 20,  90 => 16,  79 => 41,  77 => 40,  73 => 39,  59 => 28,  50 => 21,  48 => 20,  44 => 19,  40 => 18,  36 => 17,  32 => 16,  26 => 12,  24 => 11,  21 => 10,);
-    }
-}
diff --git a/modules/kotwig/cache/7b/ce/c0e397310cace16df759510b383bcb1320396f1144310fc5219cec3c495d.php b/modules/kotwig/cache/7b/ce/c0e397310cace16df759510b383bcb1320396f1144310fc5219cec3c495d.php
deleted file mode 100644
index 8cca3bf01ec6f8cfca1d510901b26915f83c37d8..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/7b/ce/c0e397310cace16df759510b383bcb1320396f1144310fc5219cec3c495d.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/* teacher/map/construct */
-class __TwigTemplate_7bcec0e397310cace16df759510b383bcb1320396f1144310fc5219cec3c495d extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Конструктор УКД";
-    }
-
-    // line 4
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 5
-        echo "\t";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/construct.css"), "method");
-        echo "
-\t";
-        // line 6
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/construct.js"), "method");
-        echo "
-";
-    }
-
-    // line 8
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Конструктор УКД";
-    }
-
-    // line 9
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 10
-        echo "\t<div class=\"construct\">
-\t\t<div class=\"studyMap\">
-\t\t\t<div class=\"name\">Виды контрольных мероприятий</div>
-\t\t\t<div class=\"currentControl\">Текущий контроль</div>
-\t\t\t<div class=\"landmarkControl\">Рубежный контроль</div>
-\t\t\t<div class=\"actions\">Действия</div>
-\t\t</div>
-\t\t<div class=\"moduleList\">
-\t\t\t<div class=\"moduleGroup\">
-\t\t\t\t<div class=\"moduleHead\">
-\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Модуль 1. Наименование модуля\">
-\t\t\t\t\t</div>
-\t\t\t\t\t<div class=\"currentControl\">15</div>
-\t\t\t\t\t<div class=\"landmarkControl\">5</div>
-\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t<div class=\"deleteModule delete\"></div>
-\t\t\t\t\t\t<div class=\"downModule down\"></div>
-\t\t\t\t\t\t<div class=\"upModule up\"></div>
-\t\t\t\t\t\t<div class=\"addSubModule add\"></div>
-\t\t\t\t\t</div>
-\t\t\t\t</div>
-\t\t\t\t<div class=\"subModules\">
-\t\t\t\t\t<div class=\"subModule\">
-\t\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Контрольная работа\">
-\t\t\t\t\t\t</div>
-\t\t\t\t\t\t<div class=\"currentControl\"><input type=\"text\" class=\"inputCredit inputCurrentControl\" value=\"10\"></div>
-\t\t\t\t\t\t<div class=\"landmarkControl\"><input type=\"text\" class=\"inputCredit inputLandmarkControl\" value=\"\"></div>
-\t\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t\t<div class=\"deleteSubModule delete\"></div>
-\t\t\t\t\t\t\t<div class=\"downSubModule down\"></div>
-\t\t\t\t\t\t\t<div class=\"upSubModule up\"></div>
-\t\t\t\t\t\t</div>
-\t\t\t\t\t</div>
-\t\t\t\t\t<div class=\"subModule\">
-\t\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Тест\">
-\t\t\t\t\t\t</div>
-\t\t\t\t\t\t<div class=\"currentControl\"><input type=\"text\" class=\"inputCredit inputCurrentControl\" value=\"5\"></div>
-\t\t\t\t\t\t<div class=\"landmarkControl\"><input type=\"text\" class=\"inputCredit inputLandmarkControl\" value=\"\"></div>
-\t\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t\t<div class=\"deleteSubModule delete\"></div>
-\t\t\t\t\t\t\t<div class=\"downSubModule down\"></div>
-\t\t\t\t\t\t\t<div class=\"upSubModule up\"></div>
-\t\t\t\t\t\t</div>
-\t\t\t\t\t</div>
-\t\t\t\t\t<div class=\"subModule\">
-\t\t\t\t\t\t<div class=\"name\">
-\t\t\t\t\t\t\t<input type=\"text\" class=\"inputName\" value=\"Домашнее задание\">
-\t\t\t\t\t\t</div>
-\t\t\t\t\t\t<div class=\"currentControl\"><input type=\"text\" class=\"inputCredit inputCurrentControl\" value=\"\"></div>
-\t\t\t\t\t\t<div class=\"landmarkControl\"><input type=\"text\" class=\"inputCredit inputLandmarkControl\" value=\"5\"></div>
-\t\t\t\t\t\t<div class=\"actions\">
-\t\t\t\t\t\t\t<div class=\"deleteSubModule delete\"></div>
-\t\t\t\t\t\t\t<div class=\"downSubModule down\"></div>
-\t\t\t\t\t\t\t<div class=\"upSubModule up\"></div>
-\t\t\t\t\t\t</div>
-\t\t\t\t\t</div>
-\t\t\t\t</div>
-\t\t\t</div>
-\t\t</div>
-\t\t<div class=\"addModule\">Добавить модуль</div>
-\t\t<button class=\"saveStudyMap\">Сохранить</button>
-\t</div>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "teacher/map/construct";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  61 => 10,  58 => 9,  52 => 8,  46 => 6,  41 => 5,  37 => 4,  31 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/7e/93/cea0c1d8b73ca61ac9cdb44647afc0581ff1b0425303c688941a5d9fe391.php b/modules/kotwig/cache/7e/93/cea0c1d8b73ca61ac9cdb44647afc0581ff1b0425303c688941a5d9fe391.php
deleted file mode 100644
index 77d867ec852d254856dfc0510f1e01e1dbe159f3..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/7e/93/cea0c1d8b73ca61ac9cdb44647afc0581ff1b0425303c688941a5d9fe391.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-/* teacher/setRate */
-class __TwigTemplate_7e93cea0c1d8b73ca61ac9cdb44647afc0581ff1b0425303c688941a5d9fe391 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Выставление баллов";
-    }
-
-    // line 4
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 5
-        echo "\t";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/setRate.css"), "method");
-        echo "
-\t";
-        // line 6
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/setRate.js"), "method");
-        echo "
-";
-    }
-
-    // line 9
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Выставление баллов";
-    }
-
-    // line 10
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 11
-        echo "\t<h2 style=\"margin-left: 2.5%; font-weight: normal; color: #3399CC;\">";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), "SubjectName"), "html", null, true);
-        echo "</h2>
-\t<table class=\"studentsRate\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">
-\t\t<tr>
-\t\t\t<td class=\"title\" width=\"150px\">Модуль/номер</td>
-\t\t\t";
-        // line 15
-        $context['_parent'] = (array) $context;
-        $context['_seq'] = twig_ensure_traversable(range(1, $this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), "ModulesCount")));
-        foreach ($context['_seq'] as $context["_key"] => $context["i"]) {
-            // line 16
-            echo "\t\t\t\t<td class=\"subject\" colspan=\"";
-            echo twig_escape_filter($this->env, $this->getAttribute($this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "SubmodulesCount"), "html", null, true);
-            echo "\">";
-            echo twig_escape_filter($this->env, $this->getAttribute($this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "ModuleTitle"), "html", null, true);
-            echo "</td>
-\t\t\t";
-        }
-        $_parent = $context['_parent'];
-        unset($context['_seq'], $context['_iterated'], $context['_key'], $context['i'], $context['_parent'], $context['loop']);
-        $context = array_intersect_key($context, $_parent) + $_parent;
-        // line 18
-        echo "\t\t</tr>
-\t\t<tr>
-\t\t\t";
-        // line 20
-        $context["CellCount"] = 0;
-        echo " ";
-        $context["col"] = 0;
-        // line 21
-        echo "\t\t\t<td class=\"title\">Мероприятие</td>
-\t\t\t";
-        // line 22
-        $context['_parent'] = (array) $context;
-        $context['_seq'] = twig_ensure_traversable(range(1, $this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), "ModulesCount")));
-        foreach ($context['_seq'] as $context["_key"] => $context["i"]) {
-            // line 23
-            echo "\t\t\t\t";
-            $context["CellCount"] = ((isset($context["CellCount"]) ? $context["CellCount"] : null) + $this->getAttribute($this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "SubmodulesCount"));
-            // line 24
-            echo "\t\t\t\t";
-            $context['_parent'] = (array) $context;
-            $context['_seq'] = twig_ensure_traversable(range(1, $this->getAttribute($this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "SubmodulesCount")));
-            foreach ($context['_seq'] as $context["_key"] => $context["j"]) {
-                // line 25
-                echo "\t\t\t\t\t";
-                $context["col"] = ((isset($context["col"]) ? $context["col"] : null) + 1);
-                // line 26
-                echo "\t\t\t\t\t<td class=\"subject col_";
-                echo twig_escape_filter($this->env, (isset($context["col"]) ? $context["col"] : null), "html", null, true);
-                echo "\" id=\"";
-                echo twig_escape_filter($this->env, $this->getAttribute($this->getAttribute($this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), (isset($context["j"]) ? $context["j"] : null), array(), "array"), "SubmoduleID"), "html", null, true);
-                echo "\">";
-                echo twig_escape_filter($this->env, $this->getAttribute($this->getAttribute($this->getAttribute((isset($context["headerRate"]) ? $context["headerRate"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), (isset($context["j"]) ? $context["j"] : null), array(), "array"), "Title"), "html", null, true);
-                echo "</td>
-\t\t\t\t";
-            }
-            $_parent = $context['_parent'];
-            unset($context['_seq'], $context['_iterated'], $context['_key'], $context['j'], $context['_parent'], $context['loop']);
-            $context = array_intersect_key($context, $_parent) + $_parent;
-            // line 28
-            echo "\t\t\t";
-        }
-        $_parent = $context['_parent'];
-        unset($context['_seq'], $context['_iterated'], $context['_key'], $context['i'], $context['_parent'], $context['loop']);
-        $context = array_intersect_key($context, $_parent) + $_parent;
-        // line 29
-        echo "\t\t</tr>
-\t\t";
-        // line 30
-        $context["row"] = 0;
-        // line 31
-        echo "\t\t";
-        $context['_parent'] = (array) $context;
-        $context['_seq'] = twig_ensure_traversable((isset($context["tableRate"]) ? $context["tableRate"] : null));
-        foreach ($context['_seq'] as $context["_key"] => $context["student"]) {
-            // line 32
-            echo "\t\t\t";
-            $context["row"] = ((isset($context["row"]) ? $context["row"] : null) + 1);
-            // line 33
-            echo "\t\t<tr>
-\t\t\t<td class=\"row_";
-            // line 34
-            echo twig_escape_filter($this->env, (isset($context["row"]) ? $context["row"] : null), "html", null, true);
-            echo " student\" id=\"";
-            echo twig_escape_filter($this->env, $this->getAttribute((isset($context["student"]) ? $context["student"] : null), "StudentID"), "html", null, true);
-            echo "\">";
-            echo twig_escape_filter($this->env, $this->getAttribute((isset($context["student"]) ? $context["student"] : null), "LastName"), "html", null, true);
-            echo " ";
-            echo twig_escape_filter($this->env, $this->getAttribute((isset($context["student"]) ? $context["student"] : null), "FirstName"), "html", null, true);
-            echo "</td>
-\t\t\t";
-            // line 35
-            $context['_parent'] = (array) $context;
-            $context['_seq'] = twig_ensure_traversable(range(1, (isset($context["CellCount"]) ? $context["CellCount"] : null)));
-            foreach ($context['_seq'] as $context["_key"] => $context["i"]) {
-                // line 36
-                echo "\t\t\t\t<td class=\"row_";
-                echo twig_escape_filter($this->env, (isset($context["row"]) ? $context["row"] : null), "html", null, true);
-                echo " col_";
-                echo twig_escape_filter($this->env, (isset($context["i"]) ? $context["i"] : null), "html", null, true);
-                echo " rateCell ";
-                if (($this->getAttribute($this->getAttribute((isset($context["student"]) ? $context["student"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "Rate") > 0)) {
-                    echo "edit";
-                }
-                echo "\"><input value=\"";
-                echo twig_escape_filter($this->env, $this->getAttribute($this->getAttribute((isset($context["student"]) ? $context["student"] : null), (isset($context["i"]) ? $context["i"] : null), array(), "array"), "Rate"), "html", null, true);
-                echo "\"></td>
-\t\t\t";
-            }
-            $_parent = $context['_parent'];
-            unset($context['_seq'], $context['_iterated'], $context['_key'], $context['i'], $context['_parent'], $context['loop']);
-            $context = array_intersect_key($context, $_parent) + $_parent;
-            // line 38
-            echo "\t\t</tr>
-\t\t";
-        }
-        $_parent = $context['_parent'];
-        unset($context['_seq'], $context['_iterated'], $context['_key'], $context['student'], $context['_parent'], $context['loop']);
-        $context = array_intersect_key($context, $_parent) + $_parent;
-        // line 40
-        echo "\t</table>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "teacher/setRate";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  183 => 40,  176 => 38,  159 => 36,  155 => 35,  145 => 34,  142 => 33,  139 => 32,  134 => 31,  132 => 30,  129 => 29,  123 => 28,  110 => 26,  107 => 25,  102 => 24,  99 => 23,  95 => 22,  92 => 21,  88 => 20,  84 => 18,  73 => 16,  69 => 15,  61 => 11,  58 => 10,  52 => 9,  46 => 6,  41 => 5,  37 => 4,  31 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/89/e2/be0c560db224f719d8999820e6cc8399a22afc94e257eec3fa4dfdd8352a.php b/modules/kotwig/cache/89/e2/be0c560db224f719d8999820e6cc8399a22afc94e257eec3fa4dfdd8352a.php
deleted file mode 100644
index ffbddc366630ed0c32febb4866079a19883f38bb..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/89/e2/be0c560db224f719d8999820e6cc8399a22afc94e257eec3fa4dfdd8352a.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/* sign/sideblock */
-class __TwigTemplate_89e2be0c560db224f719d8999820e6cc8399a22afc94e257eec3fa4dfdd8352a extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<div class=\"sideblock\">
-    <div class=\"sign_form\">
-        <div class=\"main\">
-            <div class=\"top\">
-                    <div class=\"top_title\">Авторизация</div>
-            </div>
-
-            <div class=\"content\">
-                <form action=\"";
-        // line 9
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["URL"]) ? $context["URL"] : null), "base", array(), "method"), "html", null, true);
-        echo "\" method='POST' id='signin_f'>
-                <div id='errors' style='text-align: center;'>Неправильный логин/E-Mail или пароль</div>
-                <div id='inputs'>
-                    ";
-        // line 12
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "login", 1 => "text", 2 => "", 3 => "Имя пользователя или E-Mail"), "method"), "html", null, true);
-        echo "
-                    ";
-        // line 13
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "password", 1 => "password", 2 => "", 3 => "Пароль"), "method"), "html", null, true);
-        echo "
-                </div>
-                ";
-        // line 15
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "signin_b", 1 => "button", 2 => "Войти"), "method"), "html", null, true);
-        echo "
-                </form>
-            </div>
-        </div>
-    </div>
-
-    <div class=\"sign_form\">
-        <div class=\"main\">
-            <div class=\"top\">
-                    <div class=\"top_title\">Активация аккаунта</div>
-            </div>
-
-            <div class=\"content\">
-                <form action=\"";
-        // line 28
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["URL"]) ? $context["URL"] : null), "base", array(), "method"), "html", null, true);
-        echo "\" method='POST' id='signup_f'>
-                <div id='errors'></div>
-                <div>
-                    ";
-        // line 31
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "activation_code", 1 => "text", 2 => "", 3 => "Код активации"), "method"), "html", null, true);
-        echo "
-                    ";
-        // line 32
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "login", 1 => "text", 2 => "", 3 => "Имя пользователя"), "method"), "html", null, true);
-        echo "
-                    ";
-        // line 33
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "password", 1 => "password", 2 => "", 3 => "Пароль"), "method"), "html", null, true);
-        echo "
-                    ";
-        // line 34
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "email", 1 => "text", 2 => "", 3 => "E-Mail адрес"), "method"), "html", null, true);
-        echo "
-                </div>
-                ";
-        // line 36
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "signup_b", 1 => "button", 2 => "Активировать"), "method"), "html", null, true);
-        echo "
-                </form>
-            </div>
-        </div>    
-    </div>
-</div>";
-    }
-
-    public function getTemplateName()
-    {
-        return "sign/sideblock";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  83 => 36,  78 => 34,  74 => 33,  70 => 32,  66 => 31,  60 => 28,  44 => 15,  39 => 13,  35 => 12,  29 => 9,  19 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/92/64/c8350d7a356ad2a5c333ec51be2cf1565f0848a619185d48431507b2e975.php b/modules/kotwig/cache/92/64/c8350d7a356ad2a5c333ec51be2cf1565f0848a619185d48431507b2e975.php
deleted file mode 100644
index 9fadb77e2417d01cc6ea858a2004b4eeb69add0d..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/92/64/c8350d7a356ad2a5c333ec51be2cf1565f0848a619185d48431507b2e975.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/* student/results */
-class __TwigTemplate_9264c8350d7a356ad2a5c333ec51be2cf1565f0848a619185d48431507b2e975 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 32
-        $context["res"] = $this->env->loadTemplate("student/results");
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 34
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Мои баллы";
-    }
-
-    // line 35
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 36
-        echo "\t";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/results.css"), "method");
-        echo "
-";
-    }
-
-    // line 39
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Мои баллы";
-    }
-
-    // line 40
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 41
-        echo "    <div class=\"user_courses\">
-        ";
-        // line 42
-        if ((twig_length_filter($this->env, (isset($context["disciplines"]) ? $context["disciplines"] : null)) > 0)) {
-            // line 43
-            echo "        <table cellspacing=\"0\" border=\"0\" width=\"100%\" class=\"table\">
-            <tr class=\"course_table_top\">
-                <td>&nbsp;</td>
-                <td>Предмет</td>
-                <td>Преподаватель</td>
-                <td>Форма контроля</td>
-                <td>Текущий балл</td>
-                <td>Успеваемость</td>
-            </tr>
-
-            ";
-            // line 53
-            $context['_parent'] = (array) $context;
-            $context['_seq'] = twig_ensure_traversable((isset($context["disciplines"]) ? $context["disciplines"] : null));
-            foreach ($context['_seq'] as $context["_key"] => $context["i"]) {
-                // line 54
-                echo "                ";
-                if (($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Type") == "exam")) {
-                    // line 55
-                    echo "                    ";
-                    $context["control"] = "Экзамен";
-                    // line 56
-                    echo "                ";
-                } elseif (($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Type") == "credit")) {
-                    // line 57
-                    echo "                    ";
-                    $context["control"] = "Зачет";
-                    // line 58
-                    echo "                ";
-                }
-                // line 59
-                echo "
-                ";
-                // line 60
-                $context["teacher"] = ((((($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "TeacherLast") . " ") . twig_first($this->env, $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "TeacherFirst"))) . ". ") . twig_first($this->env, $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "TeacherSecond"))) . ".");
-                // line 61
-                echo "
-                ";
-                // line 62
-                echo $context["res"]->getsubject($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "SubjectID"), $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "SubjectName"), (isset($context["teacher"]) ? $context["teacher"] : null), (isset($context["control"]) ? $context["control"] : null), $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Rate"), $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "MaxRate"), (isset($context["HTML"]) ? $context["HTML"] : null));
-                echo "    
-            ";
-            }
-            $_parent = $context['_parent'];
-            unset($context['_seq'], $context['_iterated'], $context['_key'], $context['i'], $context['_parent'], $context['loop']);
-            $context = array_intersect_key($context, $_parent) + $_parent;
-            // line 64
-            echo "        </table>
-        ";
-        } else {
-            // line 66
-            echo "            По какой-то неведомой причине Вы не подписаны ни на один курс. Возможно, Вы уже отчислены?
-        ";
-        }
-        // line 68
-        echo "    </div>
-";
-    }
-
-    // line 3
-    public function getsubject($_subj_id = null, $_subj_name = null, $_teacher_name = null, $_form_control = null, $_rating_value = null, $_rating_cur_max = null, $_HTML = null)
-    {
-        $context = $this->env->mergeGlobals(array(
-            "subj_id" => $_subj_id,
-            "subj_name" => $_subj_name,
-            "teacher_name" => $_teacher_name,
-            "form_control" => $_form_control,
-            "rating_value" => $_rating_value,
-            "rating_cur_max" => $_rating_cur_max,
-            "HTML" => $_HTML,
-        ));
-
-        $blocks = array();
-
-        ob_start();
-        try {
-            // line 4
-            echo "\t<tr class=\"course_content\">
-\t\t<td class = \"course_img\"></td>
-
-\t\t<td class = \"course_name\">
-                        ";
-            // line 8
-            echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => ("student/rating/show/" . (isset($context["subj_id"]) ? $context["subj_id"] : null)), 1 => (isset($context["subj_name"]) ? $context["subj_name"] : null)), "method");
-            echo "
-\t\t</td>
-
-\t\t<td class=\"course_teacher\">
-\t\t\t";
-            // line 12
-            echo twig_escape_filter($this->env, (isset($context["teacher_name"]) ? $context["teacher_name"] : null), "html", null, true);
-            echo "
-\t\t</td>
-
-\t\t<td  class=\"course_form_control\">
-\t\t\t";
-            // line 16
-            echo twig_escape_filter($this->env, (isset($context["form_control"]) ? $context["form_control"] : null), "html", null, true);
-            echo "
-\t\t</td>\t
-
-\t\t<td class=\"course_rating_value\">
-\t\t\t";
-            // line 20
-            echo twig_escape_filter($this->env, ((array_key_exists("rating_value", $context)) ? (_twig_default_filter((isset($context["rating_value"]) ? $context["rating_value"] : null), "0")) : ("0")), "html", null, true);
-            echo " / ";
-            echo twig_escape_filter($this->env, ((array_key_exists("rating_cur_max", $context)) ? (_twig_default_filter((isset($context["rating_cur_max"]) ? $context["rating_cur_max"] : null), "0")) : ("0")), "html", null, true);
-            echo "
-\t\t</td>
-
-\t\t<td class=\"course_rating_percent\">
-                    ";
-            // line 24
-            if (((isset($context["rating_cur_max"]) ? $context["rating_cur_max"] : null) != 0)) {
-                // line 25
-                echo "\t\t\t";
-                echo twig_escape_filter($this->env, intval(floor(((100 * (isset($context["rating_value"]) ? $context["rating_value"] : null)) / (isset($context["rating_cur_max"]) ? $context["rating_cur_max"] : null)))), "html", null, true);
-                echo " %
-                    ";
-            } else {
-                // line 27
-                echo "                        ---
-                    ";
-            }
-            // line 29
-            echo "\t\t</td>
-\t</tr>\t
-";
-        } catch (Exception $e) {
-            ob_end_clean();
-
-            throw $e;
-        }
-
-        return ('' === $tmp = ob_get_clean()) ? '' : new Twig_Markup($tmp, $this->env->getCharset());
-    }
-
-    public function getTemplateName()
-    {
-        return "student/results";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  189 => 29,  185 => 27,  179 => 25,  177 => 24,  168 => 20,  161 => 16,  154 => 12,  147 => 8,  141 => 4,  124 => 3,  119 => 68,  115 => 66,  111 => 64,  103 => 62,  100 => 61,  98 => 60,  95 => 59,  92 => 58,  89 => 57,  86 => 56,  83 => 55,  80 => 54,  76 => 53,  64 => 43,  62 => 42,  59 => 41,  56 => 40,  50 => 39,  43 => 36,  39 => 35,  33 => 34,  28 => 32,);
-    }
-}
diff --git a/modules/kotwig/cache/a2/ce/13368f3a3598b3e61164e44d82b0afc552a5ca6b1ee57ed2767d2633f895.php b/modules/kotwig/cache/a2/ce/13368f3a3598b3e61164e44d82b0afc552a5ca6b1ee57ed2767d2633f895.php
deleted file mode 100644
index 3fec6eff528cac5acba4e83a11f773457de4df2e..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/a2/ce/13368f3a3598b3e61164e44d82b0afc552a5ca6b1ee57ed2767d2633f895.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-
-/* admin/base */
-class __TwigTemplate_a2ce13368f3a3598b3e61164e44d82b0afc552a5ca6b1ee57ed2767d2633f895 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 11
-        echo "
-";
-        // line 12
-        $context["admin"] = $this->env->loadTemplate("admin/base");
-        // line 13
-        echo "<html>
-<head>
-\t<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-\t<title>";
-        // line 16
-        $this->displayBlock('title', $context, $blocks);
-        echo " | ";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "</title>
-\t";
-        // line 17
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/admin/base.css"), "method");
-        echo "
-\t";
-        // line 18
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/admin/macro.css"), "method");
-        echo "
-\t";
-        // line 19
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/jquery-1.11.1.min.js"), "method");
-        echo "
-\t";
-        // line 20
-        $this->displayBlock('media', $context, $blocks);
-        // line 21
-        echo "</head> 
-<body>
-<div id=\"wrap\">
-    <div class=\"header_wrapper\">
-            <div class=\"header\">
-                    <div class=\"top_logo\">
-                            ";
-        // line 27
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "/", 1 => $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), 2 => array("title" => "Перейти на главную")), "method");
-        echo "
-                    </div>
-                    <div class=\"top_name_faculty\">
-                            Панель администратора
-                    </div>
-                    <div class=\"top_user\">
-                            ";
-        // line 33
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FirstName"), "html", null, true);
-        echo " ";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "LastName"), "html", null, true);
-        echo "
-                            ";
-        // line 34
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/logout", 1 => "Выход из панели администратора", 2 => array("title" => "Вернуться на сайт")), "method");
-        echo "
-                    </div>
-            </div>
-    </div>
-    
-    <div class=\"layout_wrapper\">
-        <div class=\"layout\">
-            <div class=\"menu_wrapper\">
-                ";
-        // line 42
-        $this->env->loadTemplate("admin/menu.structure")->display($context);
-        echo "                  
-                ";
-        // line 43
-        $this->env->loadTemplate("admin/menu.process")->display($context);
-        echo "                  
-                ";
-        // line 44
-        $this->env->loadTemplate("admin/menu.accounts")->display($context);
-        echo "                  
-                ";
-        // line 45
-        $this->env->loadTemplate("admin/menu.system")->display($context);
-        echo "                  
-            </div>
-            <div class=\"main\">
-                <div class=\"main_top\">
-                        <div class=\"main_top_tittle\">";
-        // line 49
-        $this->displayBlock('main_top_title', $context, $blocks);
-        echo "</div>
-                </div>
-
-                <div class=\"main_content\">
-                ";
-        // line 53
-        $this->displayBlock('main_content', $context, $blocks);
-        // line 60
-        echo "                </div>
-            </div>
-        </div>
-    </div>
-    
-    <div id=\"footer_fixBug\"></div>
-    <div class=\"footer\">
-        <a href='http://vk.com/itlab_mmcs'>IT-лаборатория мехмата ЮФУ &copy; 2014</a>
-    </div>
-</div>
-</body>
-</html>
-";
-    }
-
-    // line 16
-    public function block_title($context, array $blocks = array())
-    {
-    }
-
-    // line 20
-    public function block_media($context, array $blocks = array())
-    {
-    }
-
-    // line 49
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Добро пожаловать в панель администратора!";
-    }
-
-    // line 53
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 54
-        echo "                    ";
-        echo $context["admin"]->getmessage("error", "Внутренняя ошибка сервера", "Я - сообщение");
-        echo "
-                    ";
-        // line 55
-        echo $context["admin"]->getmessage("tips", "Внутренняя подсказка сервера", "Я - сообщение");
-        echo "
-                    ";
-        // line 56
-        echo $context["admin"]->getmessage("warning", "Внутреннее предупреждение сервера", "Я - сообщение");
-        echo "
-                    ";
-        // line 57
-        echo $context["admin"]->getmessage("success", "Внутренний успех сервера", "Я - сообщение");
-        echo "
-
-                ";
-    }
-
-    // line 1
-    public function getmessage($_type = null, $_title = null, $_message = null)
-    {
-        $context = $this->env->mergeGlobals(array(
-            "type" => $_type,
-            "title" => $_title,
-            "message" => $_message,
-        ));
-
-        $blocks = array();
-
-        ob_start();
-        try {
-            // line 2
-            echo "<div class=\"";
-            echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-            echo "\">
-    <div class=\"";
-            // line 3
-            echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-            echo "_top\">
-        <div class=\"";
-            // line 4
-            echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-            echo "_top_title\">";
-            echo twig_escape_filter($this->env, (isset($context["title"]) ? $context["title"] : null), "html", null, true);
-            echo "</div>
-    </div>
-    <div class=\"";
-            // line 6
-            echo twig_escape_filter($this->env, (isset($context["type"]) ? $context["type"] : null), "html", null, true);
-            echo "_content\">
-        ";
-            // line 7
-            echo twig_escape_filter($this->env, (isset($context["message"]) ? $context["message"] : null), "html", null, true);
-            echo "
-    </div>
-</div>
-";
-        } catch (Exception $e) {
-            ob_end_clean();
-
-            throw $e;
-        }
-
-        return ('' === $tmp = ob_get_clean()) ? '' : new Twig_Markup($tmp, $this->env->getCharset());
-    }
-
-    public function getTemplateName()
-    {
-        return "admin/base";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  203 => 7,  199 => 6,  192 => 4,  188 => 3,  183 => 2,  170 => 1,  163 => 57,  159 => 56,  155 => 55,  150 => 54,  147 => 53,  141 => 49,  136 => 20,  131 => 16,  115 => 60,  113 => 53,  106 => 49,  99 => 45,  95 => 44,  91 => 43,  87 => 42,  76 => 34,  70 => 33,  61 => 27,  53 => 21,  51 => 20,  47 => 19,  43 => 18,  39 => 17,  33 => 16,  28 => 13,  26 => 12,  23 => 11,);
-    }
-}
diff --git a/modules/kotwig/cache/b2/9e/59ebc2122a3e19e3697e62947de1c54ef8ee6af81f274a65c0fa9a3453cb.php b/modules/kotwig/cache/b2/9e/59ebc2122a3e19e3697e62947de1c54ef8ee6af81f274a65c0fa9a3453cb.php
deleted file mode 100644
index 3ef1bd4aeba662847b6d966678fa46e1d5bb7ae7..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/b2/9e/59ebc2122a3e19e3697e62947de1c54ef8ee6af81f274a65c0fa9a3453cb.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/* sign/in */
-class __TwigTemplate_b29e59ebc2122a3e19e3697e62947de1c54ef8ee6af81f274a65c0fa9a3453cb extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("sign");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'forms' => array($this, 'block_forms'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "sign";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Авторизация";
-    }
-
-    // line 4
-    public function block_forms($context, array $blocks = array())
-    {
-        // line 5
-        echo "    <form action=\"";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["URL"]) ? $context["URL"] : null), "base", array(), "method"), "html", null, true);
-        echo "\" method='POST' id='signin_f'>
-    <div id='errors' style='text-align: center;'>Неправильный логин/E-Mail или пароль</div>
-    <div id='inputs'>
-        ";
-        // line 8
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "login", 1 => "text", 2 => "", 3 => "Имя пользователя или E-Mail"), "method"), "html", null, true);
-        echo "
-        ";
-        // line 9
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "password", 1 => "password", 2 => "", 3 => "Пароль"), "method"), "html", null, true);
-        echo "
-    </div>
-    ";
-        // line 11
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["sign"]) ? $context["sign"] : null), "input", array(0 => "signin_b", 1 => "button", 2 => "Войти"), "method"), "html", null, true);
-        echo "
-    </form>
-    <div class='actiongrid'>
-        ";
-        // line 14
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "remind", 1 => "Забыли пароль?"), "method");
-        echo " | 
-        ";
-        // line 15
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "sign/up", 1 => "Активировать аккаунт"), "method");
-        echo "
-    </div>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "sign/in";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  64 => 15,  60 => 14,  54 => 11,  49 => 9,  45 => 8,  38 => 5,  35 => 4,  29 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/c3/74/8dceb748d20f1b263f37500d0b4c8e2153d045cbb6ac4d678bd2634a4ba8.php b/modules/kotwig/cache/c3/74/8dceb748d20f1b263f37500d0b4c8e2153d045cbb6ac4d678bd2634a4ba8.php
deleted file mode 100644
index 9212bd1760f70a9f90fc1303d76834c7c156f66d..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/c3/74/8dceb748d20f1b263f37500d0b4c8e2153d045cbb6ac4d678bd2634a4ba8.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/* student/profile */
-class __TwigTemplate_c3748dceb748d20f1b263f37500d0b4c8e2153d045cbb6ac4d678bd2634a4ba8 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Профиль студента";
-    }
-
-    // line 4
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 5
-        echo "\t";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/profile.css"), "method");
-        echo "
-\t";
-        // line 6
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/profile.js"), "method");
-        echo "
-";
-    }
-
-    // line 9
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Профиль студента";
-    }
-
-    // line 10
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 11
-        echo "<div class=\"profile_settings_wrapper\">
-\t<div class=\"profileName\">
-\t\t";
-        // line 13
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "LastName"), "html", null, true);
-        echo "
-\t\t";
-        // line 14
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FirstName"), "html", null, true);
-        echo "
-\t\t";
-        // line 15
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "SecondName"), "html", null, true);
-        echo "
-\t</div>
-
-
-
-\t<div class=\"information_wrapper\">
-\t\t<div class=\"base_information\">
-\t\t\t<form>
-\t\t\t   <fieldset>
-\t\t\t     \t<legend class=\"base_form_title\" align=\"center\">Общая информация</legend>
-\t\t
-\t\t\t\t    <table border=\"0\" cellspacing=\"0\" class=\"module_table\">\t\t
-\t\t\t\t\t    <tr class=\"table_content\">
-\t\t\t\t\t        <td class=\"td_border top_border data_tittle\">Факультет:</td>
-\t\t\t\t\t        <td class=\"top_border data_info\">";
-        // line 29
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FacultyName"), "html", null, true);
-        echo " (";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FacultyAbbreviation"), "html", null, true);
-        echo ")</td>
-\t\t\t\t\t    </tr>
-\t\t\t\t\t    <tr class=\"table_content\">
-\t\t\t\t\t\t    <td class=\"td_border data_tittle\">Направление: </td>
-\t\t\t\t\t\t    <td class=\"data_info\">";
-        // line 33
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "SpecName"), "html", null, true);
-        echo " (";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "SpecAbbr"), "html", null, true);
-        echo ")</td>
-\t\t\t\t\t\t</tr>
-\t\t\t\t\t    <tr class=\"table_content\">
-\t\t\t\t\t\t    <td class=\"td_border data_tittle\">РљСѓСЂСЃ: </td>
-\t\t\t\t\t\t    <td class=\"data_info\">";
-        // line 37
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "Grade"), "html", null, true);
-        echo "</td>
-\t\t\t\t\t\t</tr>
-
-\t\t\t\t\t    <tr class=\"table_content\">
-\t\t\t\t\t\t\t    <td class=\"td_border data_tittle\">Группа: </td>
-\t\t\t\t\t\t\t    <td class=\"data_info\">";
-        // line 42
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "Group"), "html", null, true);
-        echo "</td>
-\t\t\t\t\t\t\t</tr>
-\t\t\t\t\t    </table>
-
-\t\t\t   </fieldset>
-\t\t\t</form>
-\t\t</div>
-
-\t\t<div class=\"personal_information\">
-\t\t\t<form>
-\t\t\t   <fieldset>
-\t\t\t     \t<legend class=\"personal_form_title\" align=\"center\">Персональная информация</legend>
-
-\t\t\t\t    <table border=\"0\" cellspacing=\"0\" class=\"module_table\">\t\t
-\t\t\t\t\t    <tr class=\"table_content\">
-\t\t\t\t\t        <td class=\"td_border top_border data_tittle\">Логин:</td>
-\t\t\t\t\t        <td class=\"top_border data_info\">login</td>
-\t\t\t\t\t    </tr>
-\t\t\t\t\t    <tr class=\"table_content\">
-\t\t\t\t\t\t    <td class=\"td_border data_tittle\">E-mail: </td>
-\t\t\t\t\t\t    <td class=\"data_info\">example_mail@mail.ru</td>
-\t\t\t\t\t\t</tr>
-\t\t\t\t\t    <tr class=\"table_content\">
-\t\t\t\t\t\t    <td class=\"td_border data_tittle\">Пароль: </td>
-\t\t\t\t\t\t    <td class=\"data_info\"> <button>Сменить</button></td>
-\t\t\t\t\t\t</tr>
-\t\t\t\t\t</table>\t\t\t\t
-\t\t\t   </fieldset>
-\t\t\t</form>
-\t\t</div>
-\t</div>
-</div>
-
-<div id=\"slideout\">
-\t<img src=\"media/css/icons/feedback.png\" alt=\"Отправить отзыв\" />
-\t<div id=\"slideout_inner\">
-\t\t<form>
-\t\t\t<div class=\"err_alt\">Если вы нашли ошибку в своих личных данных, сообщите об этом.</div>
-\t\t\t<textarea></textarea>
-\t\t\t<input type=\"submit\" value=\"Сообщить\"></input>
-\t\t</form>
-\t</div>
-</div>
-
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "student/profile";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  116 => 42,  108 => 37,  99 => 33,  90 => 29,  73 => 15,  69 => 14,  65 => 13,  61 => 11,  58 => 10,  52 => 9,  46 => 6,  41 => 5,  37 => 4,  31 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/ca/e6/62172fd450bb0cd710a769079c05bfc5d8e35efa6576edc7d0377afdd4a2.php b/modules/kotwig/cache/ca/e6/62172fd450bb0cd710a769079c05bfc5d8e35efa6576edc7d0377afdd4a2.php
deleted file mode 100644
index 4b27a27d8e47a16ba367c5318c4cfb94eedd92fe..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/ca/e6/62172fd450bb0cd710a769079c05bfc5d8e35efa6576edc7d0377afdd4a2.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/* base */
-class __TwigTemplate_cae662172fd450bb0cd710a769079c05bfc5d8e35efa6576edc7d0377afdd4a2 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<html>
-<head>
-\t<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\"/>
-\t<title>";
-        // line 4
-        $this->displayBlock('title', $context, $blocks);
-        echo " | ";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), "html", null, true);
-        echo "</title>
-\t";
-        // line 5
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/base.css"), "method");
-        echo "
-\t";
-        // line 6
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/jquery-1.11.1.min.js"), "method");
-        echo "
-\t";
-        // line 7
-        $this->displayBlock('media', $context, $blocks);
-        // line 8
-        echo "</head> 
-<body>
-<div id=\"wrap\">
-
-\t<div class=\"header_wrapper\">
-\t\t<div class=\"header\">
-\t\t\t<div class=\"top_logo\">
-\t\t\t\t";
-        // line 15
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "/", 1 => $this->getAttribute((isset($context["System"]) ? $context["System"] : null), "Title"), 2 => array("title" => "Перейти на главную")), "method");
-        echo "
-\t\t\t</div>
-\t\t\t<div class=\"top_name_faculty\">
-\t\t\t\t";
-        // line 18
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FacultyName"), "html", null, true);
-        echo "
-\t\t\t</div>
-\t\t\t<div class=\"top_user\">
-\t\t\t\t";
-        // line 21
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "FirstName"), "html", null, true);
-        echo " ";
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "LastName"), "html", null, true);
-        echo "
-\t\t\t\t";
-        // line 22
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "settings", 1 => "Настройки", 2 => array("title" => "Настройки аккаунта")), "method");
-        echo "
-\t\t\t\t";
-        // line 23
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "sign/out", 1 => "Выход", 2 => array("title" => "Выход из системы")), "method");
-        echo "
-\t\t\t</div>
-\t\t</div>
-\t</div>
-\t<div class=\"main\">
-\t\t<div class=\"main_top\">
-\t\t\t<div class=\"main_top_tittle\">";
-        // line 29
-        $this->displayBlock('main_top_title', $context, $blocks);
-        echo "</div>
-\t\t</div>
-
-\t\t<div class=\"main_content\">
-\t\t";
-        // line 33
-        $this->displayBlock('main_content', $context, $blocks);
-        // line 35
-        echo "\t\t</div>
-\t</div>
-\t<div id=\"footer_fixBug\"></div>
-\t<div class=\"footer\">
-            <a href='http://vk.com/itlab_mmcs'>IT-лаборатория мехмата ЮФУ &copy; 2014</a>
-\t</div>
-</div>
-</body>
-</html>
-";
-    }
-
-    // line 4
-    public function block_title($context, array $blocks = array())
-    {
-    }
-
-    // line 7
-    public function block_media($context, array $blocks = array())
-    {
-    }
-
-    // line 29
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Привет!";
-    }
-
-    // line 33
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 34
-        echo "\t\t";
-    }
-
-    public function getTemplateName()
-    {
-        return "base";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  125 => 34,  122 => 33,  116 => 29,  111 => 7,  106 => 4,  93 => 35,  91 => 33,  84 => 29,  75 => 23,  71 => 22,  65 => 21,  59 => 18,  53 => 15,  44 => 8,  42 => 7,  38 => 6,  34 => 5,  28 => 4,  23 => 1,  376 => 317,  367 => 315,  363 => 314,  57 => 10,  54 => 9,  48 => 8,  41 => 5,  37 => 4,  31 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/cd/e0/fb0dec1400c54a0f7e7eafa73624c53e4da258bbd34b3380a0defeba95c1.php b/modules/kotwig/cache/cd/e0/fb0dec1400c54a0f7e7eafa73624c53e4da258bbd34b3380a0defeba95c1.php
deleted file mode 100644
index cd73152825a78cca122801f4d4c490d29e1baefc..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/cd/e0/fb0dec1400c54a0f7e7eafa73624c53e4da258bbd34b3380a0defeba95c1.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/* settings */
-class __TwigTemplate_cde0fb0dec1400c54a0f7e7eafa73624c53e4da258bbd34b3380a0defeba95c1 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'media' => array($this, 'block_media'),
-            'title' => array($this, 'block_title'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 3
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 4
-        echo "\t<title>";
-        $this->displayBlock('title', $context, $blocks);
-        echo "</title>
-\t";
-        // line 5
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/settings.css"), "method");
-        echo "
-\t";
-        // line 6
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "script", array(0 => "media/js/settings.js"), "method");
-        echo "
-";
-    }
-
-    // line 4
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Настройки";
-    }
-
-    // line 9
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo " Настройки ";
-    }
-
-    // line 10
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 11
-        echo "<div class=\"pageProfileSettings\">
-\t<div class=\"settingsSection\">
-\t\t<p>Логин может состоять из латинских букв, цифр и знаков: - и _</p>
-\t\t<div class=\"itemBlock\">
-\t\t\t<div class=\"title\">Логин:</div>
-\t\t\t<div class=\"field\"><input type=\"text\" class=\"inputLogin inputText\" value=\"";
-        // line 16
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "Login"), "html", null, true);
-        echo "\"></div>
-\t\t</div>
-\t\t<button class=\"changeLogin saveSettings\">Изменить логин</button>
-\t</div>
-\t
-\t<div class=\"settingsSection\">
-\t\t<div class=\"itemBlock\">
-\t\t\t<div class=\"title\">Текущей адрес:</div>
-\t\t\t<div class=\"field\"><input type=\"text\" class=\"inputText\" value=\"";
-        // line 24
-        echo twig_escape_filter($this->env, $this->getAttribute((isset($context["User"]) ? $context["User"] : null), "EMail"), "html", null, true);
-        echo "\" readonly></div>
-\t\t</div>
-\t\t<div class=\"itemBlock\">
-\t\t\t<div class=\"title\">Новый адрес:</div>
-\t\t\t<div class=\"field\"><input type=\"text\" class=\"inputNewEmail inputText\" value=\"\"></div>
-\t\t</div>
-\t\t<button class=\"changeEmail saveSettings\">Сохранить адрес not work now</button>
-\t</div>
-\t
-\t<div class=\"settingsSection\">
-\t\t<div class=\"itemBlock\">
-\t\t\t<div class=\"title\">Старый пароль:</div>
-\t\t\t<div class=\"field\"><input type=\"text\" class=\"inputCurrentPass inputText\" value=\"\"></div>
-\t\t</div>
-\t\t<p>Пароль должен состоять из 5 и более символов</p>
-\t\t<div class=\"itemBlock\">
-\t\t\t<div class=\"title\">Новый пароль:</div>
-\t\t\t<div class=\"field\"><input type=\"text\" class=\"inputNewPass inputText\" value=\"\"></div>
-\t\t</div>
-\t\t<div class=\"itemBlock\">
-\t\t\t<div class=\"title\">Повторите пароль:</div>
-\t\t\t<div class=\"field\"><input type=\"text\" class=\"inputРЎonfirmPass inputText\" value=\"\"></div>
-\t\t</div>
-\t\t<button class=\"changePass saveSettings\">Изменить пароль</button>
-\t</div>\t
-</div>
-";
-    }
-
-    public function getTemplateName()
-    {
-        return "settings";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  83 => 24,  72 => 16,  65 => 11,  62 => 10,  56 => 9,  50 => 4,  44 => 6,  40 => 5,  35 => 4,  31 => 3,);
-    }
-}
diff --git a/modules/kotwig/cache/d5/30/b7b8c231f0b46437525e62b5b0760ca8e6b3a743a7a17aa5902c50d02c5e.php b/modules/kotwig/cache/d5/30/b7b8c231f0b46437525e62b5b0760ca8e6b3a743a7a17aa5902c50d02c5e.php
deleted file mode 100644
index 04adf66797d969379286c11f15656720add0d877..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/d5/30/b7b8c231f0b46437525e62b5b0760ca8e6b3a743a7a17aa5902c50d02c5e.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/* admin/menu.structure */
-class __TwigTemplate_d530b7b8c231f0b46437525e62b5b0760ca8e6b3a743a7a17aa5902c50d02c5e extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<div class=\"menu\">
-    <div class=\"menu_top\">
-            <div class=\"menu_top_title\">Структура ЮФУ</div>
-    </div>
-    <div class=\"menu_content\">
-            <ul>
-                ";
-        // line 7
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/structure", 1 => "<li>Подразделения ЮФУ</li>"), "method");
-        echo "
-                ";
-        // line 8
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/specializations", 1 => "<li>Направления подготовки</li>"), "method");
-        echo "
-            </ul>
-    </div>
-</div>";
-    }
-
-    public function getTemplateName()
-    {
-        return "admin/menu.structure";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  31 => 8,  27 => 7,  19 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/d7/ac/f29cda33ddb134132f6e9ccb59a25598c68dd31364bfa3bd4f3b3cd1e6f0.php b/modules/kotwig/cache/d7/ac/f29cda33ddb134132f6e9ccb59a25598c68dd31364bfa3bd4f3b3cd1e6f0.php
deleted file mode 100644
index 56355d4e8e4166b5b35f9aadd59911eea661befb..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/d7/ac/f29cda33ddb134132f6e9ccb59a25598c68dd31364bfa3bd4f3b3cd1e6f0.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/* admin/menu.system */
-class __TwigTemplate_d7acf29cda33ddb134132f6e9ccb59a25598c68dd31364bfa3bd4f3b3cd1e6f0 extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = false;
-
-        $this->blocks = array(
-        );
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<div class=\"menu\">
-    <div class=\"menu_top\">
-            <div class=\"menu_top_title\">Система</div>
-    </div>
-    <div class=\"menu_content\">
-            <ul>
-                ";
-        // line 7
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/log/user", 1 => "<li>История действий</li>"), "method");
-        echo "
-                ";
-        // line 8
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/log/kohana", 1 => "<li>Log-файлы Kohana</li>"), "method");
-        echo "
-                ";
-        // line 9
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/requests/errors", 1 => "<li>Сообщения об ошибках <b>(100500)</b></li>"), "method");
-        echo "
-                ";
-        // line 10
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/stats", 1 => "<li>Статистика использования</li>"), "method");
-        echo "
-                ";
-        // line 11
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => "admin/sysinfo", 1 => "<li>Информация о системе</li>"), "method");
-        echo "
-            </ul>
-    </div>
-</div>   ";
-    }
-
-    public function getTemplateName()
-    {
-        return "admin/menu.system";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  43 => 11,  39 => 10,  35 => 9,  31 => 8,  27 => 7,  19 => 1,);
-    }
-}
diff --git a/modules/kotwig/cache/fd/67/269c91f130d878a1f191c35c894f2bd0a2c42fa3f379feaeac597f85eefd.php b/modules/kotwig/cache/fd/67/269c91f130d878a1f191c35c894f2bd0a2c42fa3f379feaeac597f85eefd.php
deleted file mode 100644
index 9a01f417a45697aab972b1d2290749f85f9ab578..0000000000000000000000000000000000000000
--- a/modules/kotwig/cache/fd/67/269c91f130d878a1f191c35c894f2bd0a2c42fa3f379feaeac597f85eefd.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/* student/index */
-class __TwigTemplate_fd67269c91f130d878a1f191c35c894f2bd0a2c42fa3f379feaeac597f85eefd extends Twig_Template
-{
-    public function __construct(Twig_Environment $env)
-    {
-        parent::__construct($env);
-
-        $this->parent = $this->env->loadTemplate("base");
-
-        $this->blocks = array(
-            'title' => array($this, 'block_title'),
-            'media' => array($this, 'block_media'),
-            'main_top_title' => array($this, 'block_main_top_title'),
-            'main_content' => array($this, 'block_main_content'),
-        );
-    }
-
-    protected function doGetParent(array $context)
-    {
-        return "base";
-    }
-
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 32
-        $context["res"] = $this->env->loadTemplate("student/index");
-        $this->parent->display($context, array_merge($this->blocks, $blocks));
-    }
-
-    // line 34
-    public function block_title($context, array $blocks = array())
-    {
-        echo "Мои баллы";
-    }
-
-    // line 35
-    public function block_media($context, array $blocks = array())
-    {
-        echo " ";
-        // line 36
-        echo "\t";
-        echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "style", array(0 => "media/css/results.css"), "method");
-        echo "
-";
-    }
-
-    // line 39
-    public function block_main_top_title($context, array $blocks = array())
-    {
-        echo "Мои баллы";
-    }
-
-    // line 40
-    public function block_main_content($context, array $blocks = array())
-    {
-        // line 41
-        echo "    <div class=\"user_courses\">
-        ";
-        // line 42
-        if ((twig_length_filter($this->env, (isset($context["disciplines"]) ? $context["disciplines"] : null)) > 0)) {
-            // line 43
-            echo "        <table cellspacing=\"0\" border=\"0\" width=\"100%\" class=\"table\">
-            <tr class=\"course_table_top\">
-                <td>&nbsp;</td>
-                <td>Предмет</td>
-                <td>Преподаватель</td>
-                <td>Форма контроля</td>
-                <td>Текущий балл</td>
-                <td>Успеваемость</td>
-            </tr>
-
-            ";
-            // line 53
-            $context['_parent'] = (array) $context;
-            $context['_seq'] = twig_ensure_traversable((isset($context["disciplines"]) ? $context["disciplines"] : null));
-            foreach ($context['_seq'] as $context["_key"] => $context["i"]) {
-                // line 54
-                echo "                ";
-                echo $context["res"]->getsubject((isset($context["i"]) ? $context["i"] : null), (isset($context["HTML"]) ? $context["HTML"] : null));
-                echo "    
-            ";
-            }
-            $_parent = $context['_parent'];
-            unset($context['_seq'], $context['_iterated'], $context['_key'], $context['i'], $context['_parent'], $context['loop']);
-            $context = array_intersect_key($context, $_parent) + $_parent;
-            // line 56
-            echo "        </table>
-        ";
-        } else {
-            // line 58
-            echo "            По какой-то неведомой причине Вы не подписаны ни на один курс. Возможно, Вы уже отчислены?
-        ";
-        }
-        // line 60
-        echo "    </div>
-";
-    }
-
-    // line 3
-    public function getsubject($_i = null, $_HTML = null)
-    {
-        $context = $this->env->mergeGlobals(array(
-            "i" => $_i,
-            "HTML" => $_HTML,
-        ));
-
-        $blocks = array();
-
-        ob_start();
-        try {
-            // line 4
-            echo "\t<tr class=\"course_content\">
-\t\t<td class = \"course_img\"></td>
-
-\t\t<td class = \"course_name\">
-                        ";
-            // line 8
-            echo $this->getAttribute((isset($context["HTML"]) ? $context["HTML"] : null), "anchor", array(0 => ("subject/" . $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "ID")), 1 => $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Title")), "method");
-            echo "
-\t\t</td>
-
-\t\t<td class=\"course_teacher\">
-\t\t\t";
-            // line 12
-            echo twig_escape_filter($this->env, $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Teacher"), "html", null, true);
-            echo "
-\t\t</td>
-
-\t\t<td  class=\"course_form_control\">
-\t\t\t";
-            // line 16
-            echo twig_escape_filter($this->env, $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Control"), "html", null, true);
-            echo "
-\t\t</td>\t
-
-\t\t<td class=\"course_rating_value\">
-\t\t\t";
-            // line 20
-            echo twig_escape_filter($this->env, (($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Rate", array(), "any", true, true)) ? (_twig_default_filter($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Rate"), "0")) : ("0")), "html", null, true);
-            echo " / ";
-            echo twig_escape_filter($this->env, (($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "MaxRate", array(), "any", true, true)) ? (_twig_default_filter($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "MaxRate"), "0")) : ("0")), "html", null, true);
-            echo "
-\t\t</td>
-
-\t\t<td class=\"course_rating_percent\">
-                    ";
-            // line 24
-            if (($this->getAttribute((isset($context["i"]) ? $context["i"] : null), "MaxRate") != 0)) {
-                // line 25
-                echo "\t\t\t";
-                echo twig_escape_filter($this->env, intval(floor(((100 * $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "Rate")) / $this->getAttribute((isset($context["i"]) ? $context["i"] : null), "MaxRate")))), "html", null, true);
-                echo " %
-                    ";
-            } else {
-                // line 27
-                echo "                        ---
-                    ";
-            }
-            // line 29
-            echo "\t\t</td>
-\t</tr>\t
-";
-        } catch (Exception $e) {
-            ob_end_clean();
-
-            throw $e;
-        }
-
-        return ('' === $tmp = ob_get_clean()) ? '' : new Twig_Markup($tmp, $this->env->getCharset());
-    }
-
-    public function getTemplateName()
-    {
-        return "student/index";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  162 => 29,  158 => 27,  152 => 25,  150 => 24,  141 => 20,  134 => 16,  127 => 12,  120 => 8,  114 => 4,  102 => 3,  97 => 60,  93 => 58,  89 => 56,  80 => 54,  76 => 53,  64 => 43,  62 => 42,  59 => 41,  56 => 40,  50 => 39,  43 => 36,  39 => 35,  33 => 34,  28 => 32,);
-    }
-}