diff --git a/README.md b/README.md
index 4fc1a8de3..97f8e2104 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder (2.4.6)
+# Component Builder (2.4.7)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.4.6) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.4.7) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -107,12 +107,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th June, 2017
-+ *Version*: 2.4.6
++ *Last Build*: 18th June, 2017
++ *Version*: 2.4.7
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **106028**
-+ *File count*: **643**
++ *Line count*: **106046**
++ *File count*: **644**
 + *Folder count*: **115**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
diff --git a/admin/README.txt b/admin/README.txt
index 4fc1a8de3..97f8e2104 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -1,4 +1,4 @@
-# Component Builder (2.4.6)
+# Component Builder (2.4.7)
 
 This is a [Joomla 3.x](http://www.joomla.org/) component.
 
@@ -8,7 +8,7 @@ The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanc
 
 Whether you're a seasoned [Joomla](http://www.joomla.org/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.4.6) with **ALL** its features and **ALL** concepts totally open-source and free!
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.4.7) with **ALL** its features and **ALL** concepts totally open-source and free!
 
 Once installed upgrades are quick and easy via the default Joomla upgrade area.
 
@@ -107,12 +107,12 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Component Builder](http://vdm.bz/component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 16th June, 2017
-+ *Version*: 2.4.6
++ *Last Build*: 18th June, 2017
++ *Version*: 2.4.7
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **106028**
-+ *File count*: **643**
++ *Line count*: **106046**
++ *File count*: **644**
 + *Folder count*: **115**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index 2766b7a6a..e08851ad3 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index 431a6f638..3d69e6fb8 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php
index 519d96363..e32a1da17 100644
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controller.php b/admin/controller.php
index 11b569de9..fbfae9948 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index af39ab009..1ff0d5c9e 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php
index aecedec87..4117bb626 100644
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index f901815a7..675454edc 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index 1f598acce..57492bb75 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php
index f975d49a0..d7b342913 100644
--- a/admin/controllers/import_joomla_components.php
+++ b/admin/controllers/import_joomla_components.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 7f60a5991..1c931ea23 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -229,6 +229,13 @@ class Fields extends Structure
 	 */
 	public $jsonStringBuilder = array();
 	
+	/**
+	 * Json String Builder for return values to array
+	 * 
+	 * @var    array
+	 */
+	public $jsonItemBuilderArray = array();
+	
 	/**
 	 * Json Item Builder
 	 * 
@@ -761,8 +768,8 @@ class Fields extends Structure
 				}
 				elseif ($this->defaultField($typeName, 'special'))
 				{
-					// set the repeatable field
-					if ($typeName === 'repeatable')
+					// set the repeatable field or subform field
+					if ($typeName === 'repeatable' || $typeName === 'subform')
 					{
 						if ($build)
 						{
@@ -1026,6 +1033,93 @@ class Fields extends Structure
 				$fieldSet .= PHP_EOL."\t\t\t</fields>";
 				$fieldSet .= PHP_EOL."\t\t</field>";
 			}
+			// set the repeatable field
+			elseif ($typeName === 'subform')
+			{
+				// now add to the field set
+				$fieldSet .= PHP_EOL."\t\t<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$fieldSet .= PHP_EOL."\t\t<field";
+				$fieldsSet = array();
+				foreach ($fieldAttributes as $property => $value)
+				{
+					if ($property != 'fields')
+					{
+						$fieldSet .= PHP_EOL."\t\t\t" . $property . '="' . $value . '"';
+					}
+				}
+				$fieldSet .= ">";
+				$fieldSet .= PHP_EOL."\t\t\t" . '<form hidden="true" name="list_' . $fieldAttributes['name'] . '_modal" repeat="true">';
+				if (strpos($fieldAttributes['fields'], ',') !== false)
+				{
+					// mulitpal fields
+					$fieldsSets = (array) explode(',', $fieldAttributes['fields']);
+				}
+				elseif (is_numeric($fieldAttributes['fields']))
+				{
+					// single field
+					$fieldsSets[] = (int) $fieldAttributes['fields'];
+				}
+				// only continue if we have a field set
+				if (ComponentbuilderHelper::checkArray($fieldsSets))
+				{
+					foreach ($fieldsSets as $fieldId)
+					{
+						// get the field data
+                                                $fieldData = array();
+						$fieldData['settings'] = $this->getFieldData($fieldId, $viewName);
+						if (ComponentbuilderHelper::checkObject($fieldData['settings']))
+						{
+							$r_name = ComponentbuilderHelper::safeString($fieldData['settings']->name);
+							$r_typeName = ComponentbuilderHelper::safeString($fieldData['settings']->type_name);
+							$r_multiple = false;
+							$r_langLabel = '';
+							// add the tabs needed
+							$taber = "\t\t";
+							// get field values
+							$r_fieldValues = $this->setFieldAttributes($fieldData, $view, $r_name, $r_typeName, $r_multiple, $r_langLabel, $langView, $spacerCounter, $listViewName, $viewName, $placeholders, true);
+							// check if values were set
+							if (ComponentbuilderHelper::checkArray($r_fieldValues))
+							{
+								//reset options array
+								$r_optionArray = array();
+								if ($this->defaultField($r_typeName, 'option'))
+								{
+									// now add to the field set
+									$fieldSet .= $this->setField('option', $taber, $r_fieldValues, $r_name, $r_typeName, $langView, $viewName, $listViewName, $placeholders, $r_optionArray);
+								}
+								elseif ($this->defaultField($r_typeName, 'plain'))
+								{
+									// now add to the field set
+									$fieldSet .= $this->setField('plain', $taber, $r_fieldValues, $r_name, $r_typeName, $langView, $viewName, $listViewName, $placeholders, $r_optionArray);
+								}
+								elseif (ComponentbuilderHelper::checkArray($r_fieldValues['custom']))
+								{
+									// add to custom
+									$custom = $r_fieldValues['custom'];
+									unset($r_fieldValues['custom']);
+									// now add to the field set
+									$fieldSet .= $this->setField('custom', $taber, $r_fieldValues, $r_name, $r_typeName, $langView, $viewName, $listViewName, $placeholders, $r_optionArray);
+									// set lang (just incase)
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									// add to lang array
+									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									// if label was set use instead
+									if (ComponentbuilderHelper::checkString($r_langLabel))
+									{
+										$r_listLangName = $r_langLabel;
+									}
+									// set the custom array
+									$data = array('type' => $r_typeName, 'code' => $r_name, 'lang' => $r_listLangName, 'custom' => $custom);
+									// set the custom field file
+									$this->setCustomFieldTypeFile($data, $listViewName, $viewName);
+								}
+							}
+						}
+					}
+				}
+				$fieldSet .= PHP_EOL."\t\t\t</form>";
+				$fieldSet .= PHP_EOL."\t\t</field>";
+			}
 		}
 		elseif ($setType === 'custom')
 		{
@@ -1729,7 +1823,7 @@ class Fields extends Structure
 			}
 		}
 		// build the list values
-		if ($field['list'] == 1 && $typeName != 'repeatable')
+		if ($field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
 		{
 			// load to list builder
 			$this->listBuilder[$listViewName][] = array(
@@ -1765,7 +1859,7 @@ class Fields extends Structure
 			$this->intFieldsBuilder[$viewName] .= ',"' . $name . '"';
 		}
 		// set all dynamic field of this view
-		if ($typeName != 'category' && $typeName != 'repeatable' && !in_array($name, $this->defaultFields))
+		if ($typeName != 'category' && $typeName != 'repeatable' && $typeName != 'subform' && !in_array($name, $this->defaultFields))
 		{
 			if (!isset($this->dynamicfieldsBuilder[$viewName]))
 			{
@@ -1790,7 +1884,7 @@ class Fields extends Structure
 			}
 		}
 		// set the custom builder
-		if (ComponentbuilderHelper::checkArray($custom) && $typeName != 'category' && $typeName != 'repeatable')
+		if (ComponentbuilderHelper::checkArray($custom) && $typeName != 'category' && $typeName != 'repeatable' && $typeName != 'subform')
 		{
 			$this->customBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom, 'method' => $field['settings']->store);
 			// set the custom fields needed in content type data
@@ -1836,7 +1930,7 @@ class Fields extends Structure
 			$this->checkboxBuilder[$viewName][] = $name;
 		}
 		// setup checkboxes and other json items for this view
-		if (($typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && $typeName != 'tag')
+		if (($typeName === 'subform' || $typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && $typeName != 'tag')
 		{
 			switch ($field['settings']->store)
 			{
@@ -1878,7 +1972,7 @@ class Fields extends Structure
 			}
 
 			// load the json list display fix
-			if ($field['list'] == 1 && $typeName != 'repeatable')
+			if ($field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
 			{
 				if (ComponentbuilderHelper::checkArray($options))
 				{
@@ -1889,6 +1983,12 @@ class Fields extends Structure
 					$this->getItemsMethodListStringFixBuilder[$viewName][] = array('name' => $name, 'type' => $typeName, 'translation' => false, 'custom' => $custom, 'method' => $field['settings']->store);
 				}
 			}
+			
+			// if subform the values must revert to array
+			if ('subform' === $typeName)
+			{
+				$this->jsonItemBuilderArray[$viewName][] = $name;
+			}
 		}
 		// build the data for the export & import methods $typeName === 'repeatable' ||
 		if (($typeName === 'checkboxes' || $multiple || $field['settings']->store != 0) && !ComponentbuilderHelper::checkArray($options))
@@ -1899,12 +1999,12 @@ class Fields extends Structure
 		// check if field should be added to uikit
 		$this->buildSiteFieldData($viewName, $name, 'uikit', $typeName);
 		// load the selection translation fix
-		if (ComponentbuilderHelper::checkArray($options) && $field['list'] == 1 && $typeName != 'repeatable')
+		if (ComponentbuilderHelper::checkArray($options) && $field['list'] == 1 && $typeName != 'repeatable' && $typeName != 'subform')
 		{
 			$this->selectionTranslationFixBuilder[$listViewName][$name] = $options;
 		}
 		// build the sort values
-		if ($field['sort'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable'))
+		if ($field['sort'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
 		{
 			$this->sortBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'custom' => $custom, 'options' => $options);
 		}
@@ -1914,7 +2014,7 @@ class Fields extends Structure
 			$this->searchBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'custom' => $custom, 'list' => $field['list']);
 		}
 		// build the filter values
-		if ($field['filter'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable'))
+		if ($field['filter'] == 1 && $field['list'] == 1 && (!$multiple && $typeName != 'checkbox' && $typeName != 'checkboxes' && $typeName != 'repeatable' && $typeName != 'subform'))
 		{
 			$this->filterBuilder[$listViewName][] = array('type' => $typeName, 'code' => $name, 'lang' => $listLangName, 'database' => $viewName, 'function' => ComponentbuilderHelper::safeString($name, 'F'), 'custom' => $custom, 'options' => $options);
 		}
@@ -2071,7 +2171,7 @@ class Fields extends Structure
 			'chromestyle', 'contenttype', 'databaseconnection', 'editors', 'email', 'file',
 			'filelist', 'folderlist', 'groupedlist', 'hidden', 'file', 'headertag', 'helpsite',
 			'imagelist', 'integer', 'language', 'list', 'media', 'menu', 'note', 'number', 'password',
-			'plugins', 'radio', 'repeatable', 'range', 'rules', 'sessionhandler', 'spacer', 'sql', 'tag',
+			'plugins', 'radio', 'repeatable', 'range', 'rules', 'subform', 'sessionhandler', 'spacer', 'sql', 'tag',
 			'tel', 'menuitem', 'meter', 'modulelayout', 'moduleorder', 'moduleposition', 'moduletag',
 			'templatestyle', 'text', 'textarea', 'timezone', 'url', 'user', 'usergroup'
 		    ),
@@ -2092,7 +2192,7 @@ class Fields extends Structure
 		    ),
 		    'special' => array(
 			'contentlanguage', 'groupedlist', 'moduleposition', 'plugin',
-			'repeatable', 'templatestyle'
+			'repeatable', 'templatestyle', 'subform'
 		    )
 		);
 
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 238b03ff5..8dab29312 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -3582,10 +3582,16 @@ class Interpretation extends Fields
 			$makeArray = '';
 			foreach ($this->jsonStringBuilder[$view] as $jsonString)
 			{
-			$script .= PHP_EOL.PHP_EOL."\t\t\tif (!empty(\$item->".$jsonString."))";
+				$script .= PHP_EOL.PHP_EOL."\t\t\tif (!empty(\$item->".$jsonString."))";
 				$script .= PHP_EOL."\t\t\t{";
 				$script .= PHP_EOL."\t\t\t\t//".$this->setLine(__LINE__)." JSON Decode ".$jsonString.".";
-				if (strpos($jsonString, 'group') !== false)
+				if (isset($this->jsonItemBuilderArray[$view])
+					&& ComponentbuilderHelper::checkArray($this->jsonStringBuilderArray[$view])
+					&& in_array($jsonString, $this->jsonItemBuilderArray[$view]))
+				{
+					$makeArray = ',true';
+				}
+				elseif (strpos($jsonString, 'group') !== false)
 				{
 					$makeArray = ',true';
 				}
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 1ce15dbd8..0cfe69e2e 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php
index 613d42bc7..226fce1ad 100644
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index 9b6c5ecc5..378e3385c 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php
index 662af49ab..276f526e5 100644
--- a/admin/helpers/indenter.php
+++ b/admin/helpers/indenter.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
diff --git a/admin/helpers/js.php b/admin/helpers/js.php
index d4204888f..e1bdcda85 100644
--- a/admin/helpers/js.php
+++ b/admin/helpers/js.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php
index 74a473fe6..1f4604ae9 100644
--- a/admin/helpers/minify.php
+++ b/admin/helpers/minify.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php
diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php
index f5dfaf713..7843e2f58 100644
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php
diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php
index 1cf990ee3..c1ddd3a4f 100644
--- a/admin/layouts/admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php
index 2073ede20..843156749 100644
--- a/admin/layouts/admin_view/custom_buttons_left.php
+++ b/admin/layouts/admin_view/custom_buttons_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php
index acf579a5e..6d60dab83 100644
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php
index 68e3770e9..b3bf91e6e 100644
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php
index af1bd699f..786389df8 100644
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php
diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php
index 409f5df23..462305a6c 100644
--- a/admin/layouts/admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/admin_view/linked_components_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php
index d5d4ff3ae..7fe63bd15 100644
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php
index a026e32a2..f3d6c9984 100644
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php
diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php
index 036c3294f..b6dada4da 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php
index b0e717ea7..7b66efd61 100644
--- a/admin/layouts/admin_view/settings_above.php
+++ b/admin/layouts/admin_view/settings_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php
diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php
index a179e4b59..3396e2d1e 100644
--- a/admin/layouts/admin_view/settings_left.php
+++ b/admin/layouts/admin_view/settings_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php
index 3c902fac1..3feae03fa 100644
--- a/admin/layouts/admin_view/settings_right.php
+++ b/admin/layouts/admin_view/settings_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php
index 4fb97b1d0..9a954fb15 100644
--- a/admin/layouts/admin_view/settings_under.php
+++ b/admin/layouts/admin_view/settings_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index be3796102..65ed5763c 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php
diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
index 38ea3368e..e3940ea36 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php
index 2073ede20..843156749 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_left.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php
index ab7abf009..46f1047ed 100644
--- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php
index 1b535a5e8..e24d63889 100644
--- a/admin/layouts/custom_admin_view/details_above.php
+++ b/admin/layouts/custom_admin_view/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php
index 78a2d9593..78732ed18 100644
--- a/admin/layouts/custom_admin_view/details_fullwidth.php
+++ b/admin/layouts/custom_admin_view/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php
index d241dc379..f0dd880dc 100644
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php
index dfeba3670..26e881c3f 100644
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php
index daa7ee4e3..84b4f2b89 100644
--- a/admin/layouts/custom_admin_view/details_rightside.php
+++ b/admin/layouts/custom_admin_view/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/custom_admin_view/details_under.php
+++ b/admin/layouts/custom_admin_view/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
index bdbae6ea5..f2b46d8a7 100644
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php
index 8fcb2eb57..3ec234dff 100644
--- a/admin/layouts/custom_code/details_above.php
+++ b/admin/layouts/custom_code/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php
index cf572f8d7..20f518d65 100644
--- a/admin/layouts/custom_code/details_fullwidth.php
+++ b/admin/layouts/custom_code/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php
index 9821ac808..78bb0a7d1 100644
--- a/admin/layouts/custom_code/details_left.php
+++ b/admin/layouts/custom_code/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php
index 292645e11..597a743b2 100644
--- a/admin/layouts/custom_code/details_right.php
+++ b/admin/layouts/custom_code/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/custom_code/details_under.php
+++ b/admin/layouts/custom_code/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/custom_code/publishing.php
+++ b/admin/layouts/custom_code/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/custom_code/publlshing.php
+++ b/admin/layouts/custom_code/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php
index ca997b52d..668e22eb3 100644
--- a/admin/layouts/dynamic_get/abacus_fullwidth.php
+++ b/admin/layouts/dynamic_get/abacus_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_fullwidth.php
diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php
index f0a28e86e..2c8b3b833 100644
--- a/admin/layouts/dynamic_get/abacus_left.php
+++ b/admin/layouts/dynamic_get/abacus_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_left.php
diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php
index 0bf86b75d..b577768a4 100644
--- a/admin/layouts/dynamic_get/custom_script_fullwidth.php
+++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php
index 70ac50411..051f16ebe 100644
--- a/admin/layouts/dynamic_get/gettable_above.php
+++ b/admin/layouts/dynamic_get/gettable_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_above.php
diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php
index 9a22983c1..59ec55ac6 100644
--- a/admin/layouts/dynamic_get/gettable_fullwidth.php
+++ b/admin/layouts/dynamic_get/gettable_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_fullwidth.php
diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php
index 060025217..39d2c04ab 100644
--- a/admin/layouts/dynamic_get/gettable_left.php
+++ b/admin/layouts/dynamic_get/gettable_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_left.php
diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php
index a72cb606e..491dae644 100644
--- a/admin/layouts/dynamic_get/gettable_right.php
+++ b/admin/layouts/dynamic_get/gettable_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_right.php
diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php
index d474e87ba..938ccc370 100644
--- a/admin/layouts/dynamic_get/gettable_under.php
+++ b/admin/layouts/dynamic_get/gettable_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_under.php
diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/dynamic_get/publishing.php
+++ b/admin/layouts/dynamic_get/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/dynamic_get/publlshing.php
+++ b/admin/layouts/dynamic_get/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php
index 8c0e17870..c251c224c 100644
--- a/admin/layouts/field/details_fullwidth.php
+++ b/admin/layouts/field/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php
index 582841bb8..f194aa907 100644
--- a/admin/layouts/field/details_left.php
+++ b/admin/layouts/field/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php
index 723e38911..0b587fe80 100644
--- a/admin/layouts/field/details_right.php
+++ b/admin/layouts/field/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/field/details_under.php
+++ b/admin/layouts/field/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php
index bf4aa9d07..42dd62d8b 100644
--- a/admin/layouts/field/linked_admin_views_fullwidth.php
+++ b/admin/layouts/field/linked_admin_views_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_admin_views_fullwidth.php
diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/field/publishing.php
+++ b/admin/layouts/field/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/field/publlshing.php
+++ b/admin/layouts/field/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php
index a7dfc3bc8..d09138d25 100644
--- a/admin/layouts/field/scripts_left.php
+++ b/admin/layouts/field/scripts_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_left.php
diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php
index 361791366..b8ceb6a8e 100644
--- a/admin/layouts/field/scripts_right.php
+++ b/admin/layouts/field/scripts_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_right.php
diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php
index 646a2df10..07a9afdd6 100644
--- a/admin/layouts/fieldtype/details_left.php
+++ b/admin/layouts/fieldtype/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php
index 4cddb1076..a6e18fdcc 100644
--- a/admin/layouts/fieldtype/details_right.php
+++ b/admin/layouts/fieldtype/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index f3885bb43..6d9bbed79 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/fieldtype/publishing.php
+++ b/admin/layouts/fieldtype/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/fieldtype/publlshing.php
+++ b/admin/layouts/fieldtype/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 4cecf9a49..dd0f4b9d3 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index 53ef9e14f..a19163bd5 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index e6ca1d488..86b6dfb56 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index cc5fc3366..9533157a3 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index aa55a6f69..d8fcddcbb 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php
index 29e9df1e4..c1cc884b8 100644
--- a/admin/layouts/joomla_component/admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/admin_views_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php
diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
index bbe15d6da..5dc56a033 100644
--- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views_fullwidth.php
diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php
index 1b535a5e8..e24d63889 100644
--- a/admin/layouts/joomla_component/details_above.php
+++ b/admin/layouts/joomla_component/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php
index 9d810bede..fb55ed69b 100644
--- a/admin/layouts/joomla_component/details_left.php
+++ b/admin/layouts/joomla_component/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php
index 55c14a200..63a42e683 100644
--- a/admin/layouts/joomla_component/details_right.php
+++ b/admin/layouts/joomla_component/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/joomla_component/details_under.php
+++ b/admin/layouts/joomla_component/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
index 358087974..1a1f5ae2d 100644
--- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
+++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_build_beta_fullwidth.php
diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
index 1ab8aa084..4dacf69a2 100644
--- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
+++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_integration_fullwidth.php
diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
index e6ac6fc15..0df69b70e 100644
--- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php
+++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		libs_helpers_fullwidth.php
diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php
index c9aed53f1..7fa89d869 100644
--- a/admin/layouts/joomla_component/mysql_fullwidth.php
+++ b/admin/layouts/joomla_component/mysql_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php
index 469a2138c..ccd13da9a 100644
--- a/admin/layouts/joomla_component/php_fullwidth.php
+++ b/admin/layouts/joomla_component/php_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/joomla_component/publishing.php
+++ b/admin/layouts/joomla_component/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/joomla_component/publlshing.php b/admin/layouts/joomla_component/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/joomla_component/publlshing.php
+++ b/admin/layouts/joomla_component/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php
index 389e36bb0..0f6c87e32 100644
--- a/admin/layouts/joomla_component/readme_left.php
+++ b/admin/layouts/joomla_component/readme_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php
diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php
index 389f1166c..ec309c761 100644
--- a/admin/layouts/joomla_component/readme_right.php
+++ b/admin/layouts/joomla_component/readme_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php
diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php
index 3e6e7f671..ccdd01544 100644
--- a/admin/layouts/joomla_component/settings_left.php
+++ b/admin/layouts/joomla_component/settings_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php
index aacd74da9..4cabe699a 100644
--- a/admin/layouts/joomla_component/settings_right.php
+++ b/admin/layouts/joomla_component/settings_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php
index f15451cb8..72298ff0d 100644
--- a/admin/layouts/joomla_component/site_views_fullwidth.php
+++ b/admin/layouts/joomla_component/site_views_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php
diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php
index 2ffb5734b..0aa72cab9 100644
--- a/admin/layouts/joomla_component/translation_fullwidth.php
+++ b/admin/layouts/joomla_component/translation_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		translation_fullwidth.php
diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php
index fb1a33c18..d596f7392 100644
--- a/admin/layouts/language/details_left.php
+++ b/admin/layouts/language/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php
index 12b75d060..25cc30682 100644
--- a/admin/layouts/language/details_right.php
+++ b/admin/layouts/language/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/language/publishing.php
+++ b/admin/layouts/language/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/language/publlshing.php
+++ b/admin/layouts/language/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php
index d638f311e..312844c49 100644
--- a/admin/layouts/language_translation/details_above.php
+++ b/admin/layouts/language_translation/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php
index 8cb681679..c08650688 100644
--- a/admin/layouts/language_translation/details_fullwidth.php
+++ b/admin/layouts/language_translation/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/language_translation/publishing.php
+++ b/admin/layouts/language_translation/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/language_translation/publlshing.php
+++ b/admin/layouts/language_translation/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php
index 757c27723..4a1e06080 100644
--- a/admin/layouts/layout/custom_script_fullwidth.php
+++ b/admin/layouts/layout/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php
index a3bacc923..8bc3d5b86 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php
index 309b7e4ef..592198641 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php
index 4467dc34c..f8eb07ee2 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php
index 2d9b6453a..bec630854 100644
--- a/admin/layouts/layout/details_rightside.php
+++ b/admin/layouts/layout/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/layout/details_under.php
+++ b/admin/layouts/layout/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/layout/publishing.php
+++ b/admin/layouts/layout/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/layout/publlshing.php
+++ b/admin/layouts/layout/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php
index 38ea3368e..e3940ea36 100644
--- a/admin/layouts/site_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/site_view/custom_buttons_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php
index fa9bcdf28..51f244622 100644
--- a/admin/layouts/site_view/custom_buttons_left.php
+++ b/admin/layouts/site_view/custom_buttons_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php
index 89e0edd62..e48d7e53d 100644
--- a/admin/layouts/site_view/custom_buttons_right.php
+++ b/admin/layouts/site_view/custom_buttons_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_right.php
diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php
index 1b535a5e8..e24d63889 100644
--- a/admin/layouts/site_view/details_above.php
+++ b/admin/layouts/site_view/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php
index 78a2d9593..78732ed18 100644
--- a/admin/layouts/site_view/details_fullwidth.php
+++ b/admin/layouts/site_view/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php
index d241dc379..f0dd880dc 100644
--- a/admin/layouts/site_view/details_left.php
+++ b/admin/layouts/site_view/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php
index 4467dc34c..f8eb07ee2 100644
--- a/admin/layouts/site_view/details_right.php
+++ b/admin/layouts/site_view/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php
index daa7ee4e3..84b4f2b89 100644
--- a/admin/layouts/site_view/details_rightside.php
+++ b/admin/layouts/site_view/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/site_view/details_under.php
+++ b/admin/layouts/site_view/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php
index 74c5b0b4c..e6bcf75eb 100644
--- a/admin/layouts/site_view/javascript_css_fullwidth.php
+++ b/admin/layouts/site_view/javascript_css_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_css_fullwidth.php
diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php
index 45b0b307a..e4c5768aa 100644
--- a/admin/layouts/site_view/linked_components_fullwidth.php
+++ b/admin/layouts/site_view/linked_components_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php
index 15b83c9d5..2530105c9 100644
--- a/admin/layouts/site_view/php_fullwidth.php
+++ b/admin/layouts/site_view/php_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/site_view/publishing.php
+++ b/admin/layouts/site_view/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/site_view/publlshing.php
+++ b/admin/layouts/site_view/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php
index 5175f7b60..7b3a277ec 100644
--- a/admin/layouts/snippet/details_above.php
+++ b/admin/layouts/snippet/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php
index d5c3b4048..ba3f2ad2a 100644
--- a/admin/layouts/snippet/details_left.php
+++ b/admin/layouts/snippet/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php
index 2e80a5b7d..57d9cac7d 100644
--- a/admin/layouts/snippet/details_right.php
+++ b/admin/layouts/snippet/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/snippet/publishing.php
+++ b/admin/layouts/snippet/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/snippet/publlshing.php
+++ b/admin/layouts/snippet/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php
index 757c27723..4a1e06080 100644
--- a/admin/layouts/template/custom_script_fullwidth.php
+++ b/admin/layouts/template/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php
index 4e2e67868..568e79a22 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php
index 309b7e4ef..592198641 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php
index 4467dc34c..f8eb07ee2 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php
index 2d9b6453a..bec630854 100644
--- a/admin/layouts/template/details_rightside.php
+++ b/admin/layouts/template/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php
index 20b836704..69089472b 100644
--- a/admin/layouts/template/details_under.php
+++ b/admin/layouts/template/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php
index a2c529d30..7e3bddd12 100644
--- a/admin/layouts/template/publishing.php
+++ b/admin/layouts/template/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php
index 2dd03e688..a2305bf96 100644
--- a/admin/layouts/template/publlshing.php
+++ b/admin/layouts/template/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index e64ed7595..9f294f1d2 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.php
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index d5550be72..c826b43b3 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
index 99b793b24..01984db97 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		adminviewfolderlist.php
diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php
index b150476d9..045f202cd 100644
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		adminviews.php
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index 31348b4bd..5008818e9 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		articles.php
diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php
index ca14436ac..ce1d88187 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php
index 1dc5cbbf2..540fe2bf2 100644
--- a/admin/models/fields/components.php
+++ b/admin/models/fields/components.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php
diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php
index 9855b4d78..f369e4507 100644
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customadminviews.php
diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php
index 55baad22b..6780c6d0a 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customfilelist.php
diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php
index 39e7ca8a8..3e4c65b6f 100644
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customfolderlist.php
diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php
index 8dfc952ce..195650bdb 100644
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customgets.php
diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php
index ccdf26b6e..4bd626078 100644
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dbtables.php
diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php
index 632cd76bc..6331554bf 100644
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamicget.php
diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php
index 596258f17..fb5aa12c9 100644
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamicgets.php
diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php
index 4b6e59c43..5ca628bc1 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php
diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php
index 4ed454b76..42b876ed7 100644
--- a/admin/models/fields/fieldsmulti.php
+++ b/admin/models/fields/fieldsmulti.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldsmulti.php
diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php
index 190349413..d8794fc91 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php
index 409e34af5..eae2a529b 100644
--- a/admin/models/fields/lang.php
+++ b/admin/models/fields/lang.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		lang.php
diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php
index f184397e9..e67193499 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		maingets.php
diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
index e08530e13..2c5211387 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		siteviewfolderlist.php
diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php
index 52b4fa0be..ce4cf244d 100644
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		siteviews.php
diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php
index d86c59810..c6169ca1c 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
diff --git a/admin/models/import.php b/admin/models/import.php
index 87d56e85a..1d4abfeef 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php
index 64fcc3960..69c0b8b82 100644
--- a/admin/models/import_joomla_components.php
+++ b/admin/models/import_joomla_components.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php
diff --git a/admin/sql/updates/mysql/2.4.6.sql b/admin/sql/updates/mysql/2.4.6.sql
new file mode 100644
index 000000000..d3f5a12fa
--- /dev/null
+++ b/admin/sql/updates/mysql/2.4.6.sql
@@ -0,0 +1 @@
+
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index 228d8f88f..15a73a609 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php
index 29b2f27d4..16a660f86 100644
--- a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php
+++ b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_closed_issues_the_closed_issues_on_github.php
diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php
index edfb2aa0c..6a20a41fa 100644
--- a/admin/views/componentbuilder/tmpl/default_main.php
+++ b/admin/views/componentbuilder/tmpl/default_main.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_main.php
diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php
index 15bc664ba..0530fcc64 100644
--- a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php
+++ b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_open_issues_the_open_issues_on_github.php
diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php
index e12b8c088..36fe2760c 100644
--- a/admin/views/componentbuilder/tmpl/default_readme_information.php
+++ b/admin/views/componentbuilder/tmpl/default_readme_information.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_readme_information.php
diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
index 19d0953f1..0c8979887 100644
--- a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
+++ b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_vast_development_method_notice_board.php
diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php
index 4508a7a71..0be083790 100644
--- a/admin/views/componentbuilder/tmpl/default_vdm.php
+++ b/admin/views/componentbuilder/tmpl/default_vdm.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_vdm.php
diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php
index b22fa6af7..f4a01969f 100644
--- a/admin/views/componentbuilder/view.html.php
+++ b/admin/views/componentbuilder/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index 90e5cbfe3..2b120410e 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 3f36c07ba..a2278b6dc 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php
index d340c1bd9..76fa6337c 100644
--- a/admin/views/import_joomla_components/tmpl/default.php
+++ b/admin/views/import_joomla_components/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php
index 64f4df964..904b1d21a 100644
--- a/admin/views/import_joomla_components/view.html.php
+++ b/admin/views/import_joomla_components/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 4edb07759..da348973b 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>16th June, 2017</creationDate>
+	<creationDate>18th June, 2017</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>http://vdm.bz/component-builder</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.4.6</version>
+	<version>2.4.7</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.4.6)</h1>
+		<h1>Component Builder (v.2.4.7)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](http://www.joomla.org/) that is highly advanced, truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 5b21c45ec..30b8ab5b6 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -305,4 +305,21 @@
 		<maintainerurl>http://vdm.bz/component-builder</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.4.7</version>
+		<infourl title="Component Builder!">http://vdm.bz/component-builder</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.4.7/JCB_v2.4.7.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://vdm.bz/component-builder</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>
\ No newline at end of file
diff --git a/script.php b/script.php
index e91412f58..4ae7e5976 100644
--- a/script.php
+++ b/script.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.4.6
-	@build			16th June, 2017
+	@version		2.4.7
+	@build			18th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		script.php
@@ -2204,7 +2204,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://vdm.bz/component-builder" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/component-300.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.4.6 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.4.7 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }