Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php
===================================================================
diff -u -r7043 -r7083
--- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7043)
+++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php	(.../application.php)	(revision 7083)
@@ -1047,6 +1047,10 @@
 	{
 		if(!$t) $t = $this->GetVar('t'); // moved from kMainTagProcessor->T()
 
+		if ($this->isModuleEnabled('Proj-CMS')) {
+			$t = preg_replace('/^Content\//', '', $t);
+		}
+
 		/*if ($this->GetVar('skip_last_template')) {
 			$params['opener'] = 'p';
 			$this->SetVar('m_opener', 'p');
@@ -2120,15 +2124,15 @@
 			$current_prefix = $parent_prefix;
 			array_unshift($prefixes, $current_prefix);
 		}
-		
+
 		// 2. find what if parent is passed
 		$passed = explode(',', $this->GetVar('passed'));
 		foreach ($prefixes as $current_prefix) {
 			if (in_array($current_prefix, $passed)) {
 				break;
 			}
 		}
-		
+
 		return $current_prefix;
 	}
 
Index: branches/unlabeled/unlabeled-1.3.2/core/install/install_schema.sql
===================================================================
diff -u -r7023 -r7083
--- branches/unlabeled/unlabeled-1.3.2/core/install/install_schema.sql	(.../install_schema.sql)	(revision 7023)
+++ branches/unlabeled/unlabeled-1.3.2/core/install/install_schema.sql	(.../install_schema.sql)	(revision 7083)
@@ -372,6 +372,13 @@
   KEY l5_Description (l5_Description(5))
 );
 
+CREATE TABLE CategoryCustomData (
+  CustomDataId int(11) NOT NULL auto_increment,
+  ResourceId int(10) unsigned NOT NULL default '0',
+  KEY ResourceId (ResourceId),
+  PRIMARY KEY  (CustomDataId)
+);
+
 CREATE TABLE CategoryItems (
   `CategoryId` int(11) NOT NULL default '0',
   `ItemResourceId` int(11) NOT NULL default '0',
Index: branches/unlabeled/unlabeled-1.20.2/core/units/admin/admin_config.php
===================================================================
diff -u -r7051 -r7083
--- branches/unlabeled/unlabeled-1.20.2/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 7051)
+++ branches/unlabeled/unlabeled-1.20.2/core/units/admin/admin_config.php	(.../admin_config.php)	(revision 7083)
@@ -35,10 +35,10 @@
 																					'priority'		=>	0,
 																					'type'			=>	stTREE,
 																			),
-																			
+
 													'in-portal:service'	=>	Array(
 																						'parent'		=>	'in-portal:tools',
-																						'icon'			=>	'in-portal:conf_general',
+																						'icon'			=>	'conf_general',
 																						'label'			=>	'la_tab_Service',
 																						'url'			=>	Array('t' => 'tools/system_tools', 'pass' => 'm'),
 																						'permissions'	=>	Array('view'),