Merge branch '2.4' of https://github.com/MISP/MISP into 2.4

app/Model/Server.php

@@ -507,6 +507,14 @@ class Server extends AppModel {
 							'test' => 'testForCustomImage',
 							'type' => 'string',
 					),
+					'title_text' => array(
+						'level' => 2,
+						'description' => 'Used in the page title, after the name of the page',
+						'value' => 'MISP',
+						'errorMessage' => '',
+						'test' => 'testForEmpty',
+						'type' => 'string',
+					),
 					'take_ownership_xml_import' => array(
 							'level' => 2,
 							'description' => 'Allows users to take ownership of an event uploaded via the "Add MISP XML" button. This allows spoofing the creator of a manually imported event, also breaking possibly breaking the original intended releasability. Synchronising with an instance that has a different creator for the same event can lead to unwanted consequences.',

app/View/Layouts/default.ctp

@@ -4,7 +4,7 @@
 	<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 	<?php echo $this->Html->charset(); ?>
 	<title>
-		<?php echo $title_for_layout, ' - MISP '. h(Configure::read('MISP.welcome_text_top')); ?>
+		<?php echo $title_for_layout, ' - '. h(Configure::read('MISP.title_text') ? Configure::read('MISP.title_text') : 'MISP'); ?>
 	</title>
 	<?php
 		if (!isset($debugMode)) {

app/files/misp-galaxy

@@ -1 +1 @@
-Subproject commit 5f34b618f8a912f6023a2b442b64b35ed1014e3e
+Subproject commit 36a27a959e6697b5efe39994c2bc48e0921a34a3

app/files/misp-objects

@@ -1 +1 @@
-Subproject commit cf7aa00f98e658aee04c233ca547e1881df0a5fb
+Subproject commit 285635c04cf10c08978c6c21478eaf260ccc4bf5