diff --git a/README.md b/README.md
index 163d92dc3..bab80ba10 100644
--- a/README.md
+++ b/README.md
@@ -105,11 +105,11 @@ 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*: 6th April, 2017
++ *Last Build*: 7th April, 2017
 + *Version*: 2.4.2
 + *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*: **105804**
++ *Line count*: **105835**
 + *File count*: **639**
 + *Folder count*: **115**
 
diff --git a/admin/README.txt b/admin/README.txt
index 163d92dc3..bab80ba10 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -105,11 +105,11 @@ 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*: 6th April, 2017
++ *Last Build*: 7th April, 2017
 + *Version*: 2.4.2
 + *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*: **105804**
++ *Line count*: **105835**
 + *File count*: **639**
 + *Folder count*: **115**
 
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index b20c2bc7c..3e61aa8a0 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0bfad228c..d063c4100 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
diff --git a/admin/assets/css/language_translation.css b/admin/assets/css/language_translation.css
index 8810a3e85..648b200f9 100644
--- a/admin/assets/css/language_translation.css
+++ b/admin/assets/css/language_translation.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translation.css
diff --git a/admin/assets/css/language_translations.css b/admin/assets/css/language_translations.css
index 851949bcb..3c15591a5 100644
--- a/admin/assets/css/language_translations.css
+++ b/admin/assets/css/language_translations.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translations.css
diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php
index 6600da4f9..58373d3a2 100644
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controller.php b/admin/controller.php
index e9ffdd560..bc904878e 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 50c0da44b..2074aa716 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 53f5007ef..7bf9e18c4 100644
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index b33c360a5..82381c2eb 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index 70fbd9a38..0e3921cde 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 dd5d1d6c1..9f44af9d5 100644
--- a/admin/controllers/import_joomla_components.php
+++ b/admin/controllers/import_joomla_components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php
diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php
index f4b1c9e7e..2fecc62e7 100644
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translation.php
diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php
index af6d29edc..8cd70fa0c 100644
--- a/admin/controllers/language_translations.php
+++ b/admin/controllers/language_translations.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translations.php
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 2cc42e2b9..718b12508 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -2947,7 +2947,7 @@ class Get
 		}
 		else
 		{
-			if (!$keyPlaceholder = array_search($item['id'], $this->functionNameMemory))
+			if (($keyPlaceholder = array_search($item['id'], $this->functionNameMemory)) === false)
 			{
 				$keyPlaceholder = $item['id'];
 			}
@@ -3032,9 +3032,8 @@ class Get
 		$query->from($this->db->quoteName('#__componentbuilder_language_translation','a'));
 		if (ComponentbuilderHelper::checkArray($values))
 		{
-			$query->select($this->db->quoteName(array('a.id','a.translation','a.entranslation','a.components')));
+			$query->select($this->db->quoteName(array('a.id','a.translation','a.entranslation','a.components','a.published')));
 			$query->where($this->db->quoteName('a.entranslation') . ' IN (' . implode(',',array_map(function($a){ return $this->db->quote($a); }, $values)) . ')');
-			$query->where($this->db->quoteName('a.published') . ' >= 1');
 			$this->db->setQuery($query);
 			$this->db->execute();
 			if ($this->db->getNumRows())
@@ -3052,7 +3051,7 @@ class Get
 	 * @return  void
 	 * 
 	 */
-	public function setLangPlaceholders(&$strings)
+	public function setLangPlaceholders($strings)
 	{
 		$counterInsert = 0;
 		$counterUpdate = 0;
@@ -3111,9 +3110,14 @@ class Get
 						if (ComponentbuilderHelper::checkJson($this->multiLangString[$string]['components']))
 						{
 							$components = (array) json_decode($this->multiLangString[$string]['components'], true);
+							// check if we should add the component ID
 							if (in_array($this->componentID, $components))
 							{
-								continue;
+								// only skip the update if the string is published and has the component ID
+								if ($this->multiLangString[$string]['published'] == 1)
+								{
+									continue;
+								}
 							}
 							else
 							{
@@ -3125,12 +3129,7 @@ class Get
 							$components = array($this->componentID);
 						}
 						// start the bucket for this lang
-						$this->existingLangStrings[$counterUpdate]			= array();
-						$this->existingLangStrings[$counterUpdate]['id']		= (int) $id;
-						$this->existingLangStrings[$counterUpdate]['conditions']	= array();
-						$this->existingLangStrings[$counterUpdate]['conditions'][]	= $this->db->quoteName('id') . ' = ' . $this->db->quote($id);
-						$this->existingLangStrings[$counterUpdate]['fields']		= array();
-						$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('components') . ' = ' . $this->db->quote(json_encode($components));
+						$this->setUpdateExistingLangStrings($id, $components, 1, $today, $counterUpdate);
 
 						$counterUpdate++;
 
@@ -3238,6 +3237,129 @@ class Get
 			// clear the values array
 			$this->existingLangStrings = array();            
 		}
+	} 
+	
+	/**
+	 * Remove exiting language translation stings
+	 * 
+	 * @param   int      $id  To string ID to remove
+	 *
+	 * @return  void
+	 * 
+	 */
+	protected function removeExitingLangString($id)
+	{
+		// Create a new query object.
+		$query = $this->db->getQuery(true);
+ 
+		// delete all custom keys for user 1001.
+		$conditions = array(
+		    $this->db->quoteName('id') . ' = ' . (int) $id
+		);
+
+		$query->delete($this->db->quoteName('#__componentbuilder_language_translation'));
+		$query->where($conditions);
+
+		$this->db->setQuery($query);
+		$this->db->execute();
+	}
+	
+	/**
+	 * Function to purge the unused languge strings
+	 * 
+	 * @param   string    $values  the active strings
+	 *
+	 * @return  void
+	 * 
+	 */
+	public function purgeLanuageStrings($values)
+	{
+		// Create a new query object.
+		$query = $this->db->getQuery(true);
+		$query->from($this->db->quoteName('#__componentbuilder_language_translation','a'));
+		$query->select($this->db->quoteName(array('a.id','a.translation','a.components')));
+		// get all string that are not linked to this component
+		$query->where($this->db->quoteName('a.entranslation') . ' NOT IN (' . implode(',',array_map(function($a){ return $this->db->quote($a); }, $values)) . ')');
+		$query->where($this->db->quoteName('a.published') . ' = 1');
+		$this->db->setQuery($query);
+		$this->db->execute();
+		if ($this->db->getNumRows())
+		{
+			$counterUpdate = 0;
+			$otherStrings = $this->db->loadAssocList();
+			$today = JFactory::getDate()->toSql();
+			foreach ($otherStrings as $item)
+			{
+				if (ComponentbuilderHelper::checkJson($item['components']))
+				{
+					$components = (array) json_decode($item['components'], true);
+					// if component is not found ignore this string, and do nothing
+					if (($key = array_search($this->componentID, $components)) !== false)
+					{
+						// first remove the component from the string
+						unset($components[$key]);
+						// check if there are more components
+						if (ComponentbuilderHelper::checkArray($components))
+						{
+							// just update the string to unlink the current component
+							$this->setUpdateExistingLangStrings($item['id'], $components, 1, $today, $counterUpdate);
+
+							$counterUpdate++;
+
+							// load to db 
+							$this->setExistingLangStrings(50);
+						}
+						// check if this string has been worked on
+						elseif (ComponentbuilderHelper::checkJson($item['translation']))
+						{
+							$translation = json_decode($item['translation'], true);
+							if (ComponentbuilderHelper::checkArray($translation) && ComponentbuilderHelper::checkArray($translation['translation']))
+							{
+								// only archive the item and update the string to unlink the current component
+								$this->setUpdateExistingLangStrings($item['id'], $components, 2, $today, $counterUpdate);
+
+								$counterUpdate++;
+
+								// load to db 
+								$this->setExistingLangStrings(50);
+							}
+							else
+							{
+								// remove the string since no translation found and not linked to any other component
+								$this->removeExitingLangString($item['id']);
+							}
+						}
+						else
+						{
+							// remove the string since no translation found and not linked to any other component
+							$this->removeExitingLangString($item['id']);
+						}
+					}
+				}
+			}
+			// load to db 
+			$this->setExistingLangStrings();
+		}
+	}
+	
+	/**
+	 * just to add lang string to the existing Lang Strings array
+	 * 
+	 * @return  void
+	 * 
+	 */
+	protected function setUpdateExistingLangStrings($id, $components, $published, $today, $counterUpdate)
+	{
+		// start the bucket for this lang
+		$this->existingLangStrings[$counterUpdate]			= array();
+		$this->existingLangStrings[$counterUpdate]['id']		= (int) $id;
+		$this->existingLangStrings[$counterUpdate]['conditions']	= array();
+		$this->existingLangStrings[$counterUpdate]['conditions'][]	= $this->db->quoteName('id') . ' = ' . $this->db->quote($id);
+		$this->existingLangStrings[$counterUpdate]['fields']		= array();
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('components') . ' = ' . $this->db->quote(json_encode($components));
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('published') . ' = ' . $this->db->quote($published);
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('modified') . ' = ' . $this->db->quote($today);
+		$this->existingLangStrings[$counterUpdate]['fields'][]		= $this->db->quoteName('modified_by') . ' = ' . $this->db->quote((int) $this->user->id);
 	}
 	
 	/**
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 4fad6b74e..313a42f61 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -5127,7 +5127,7 @@ class Interpretation extends Fields
 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
 		{
-			foreach ($this->langContent[$this->lang] as $keylang => $langval)
+			foreach ($this->langContent['both'] as $keylang => $langval)
 			{
 				$this->langContent['site'][$keylang] = $langval;
 			}
@@ -5729,8 +5729,7 @@ class Interpretation extends Fields
 				$linkedViewId = '';
 				if (ComponentbuilderHelper::checkArray($linkedTab))
 				{
-					$linkedViewId = array_search($tabNr,$linkedTab);
-					if ($linkedViewId)
+					if (($linkedViewId = array_search($tabNr, $linkedTab)) !== false)
 					{
 						// don't build
 						$buildLayout = false;
@@ -5925,7 +5924,7 @@ class Interpretation extends Fields
 				if(isset($linkedViewIdentifier) && ComponentbuilderHelper::checkArray($linkedViewIdentifier) && in_array($tabCodeName,$linkedViewIdentifier))
 				{
 					// get view name
-					$linkedViewId = array_search($tabCodeName,$linkedViewIdentifier);
+					$linkedViewId = array_search($tabCodeName, $linkedViewIdentifier);
 					$linkedViewData = $this->getAdminViewData($linkedViewId);
 					$linkedCodeName = ComponentbuilderHelper::safeString($linkedViewData->name_single);
 					// setup correct core target
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index ec8c49554..61df2b470 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -1100,6 +1100,8 @@ class Infusion extends Interpretation
 		$this->multiLangString = $this->getMultiLangStrings($values);
 		// update insert the current lang in to DB
 		$this->setLangPlaceholders($values);
+		// remove old unused language strings
+		$this->purgeLanuageStrings($values);
 		// path to INI file
 		$getPAth = $this->templatePath . '/en-GB.com_admin.ini';
 		// now we insert the values into the files
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 924dbf430..8558908a4 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php
index f8517fff5..b1cb60d86 100644
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 03b237dcd..75a536076 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php
index a164d2241..6c39f1e54 100644
--- a/admin/helpers/indenter.php
+++ b/admin/helpers/indenter.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
diff --git a/admin/helpers/js.php b/admin/helpers/js.php
index 55e8c07d6..b9d5dd158 100644
--- a/admin/helpers/js.php
+++ b/admin/helpers/js.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php
index 0798db9ac..7aad7977a 100644
--- a/admin/helpers/minify.php
+++ b/admin/helpers/minify.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		minify.php
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 46274e908..ca08344b0 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -3952,6 +3952,7 @@ COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
 COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
 COM_COMPONENTBUILDER_TO_CHANGE_THE_PACKAGE_OWNER_DEFAULTS_OPEN_THE_BJCB_GLOBAL_OPTIONSB_GO_TO_THE_BCOMPANYB_TAB_AND_ADD_THE_CORRECT_COMPANY_DETAILS_THERE="To change the package owner defaults. Open the <b>JCB Global Options</b>, go to the <b>Company</b> tab and add the correct company details there."
 COM_COMPONENTBUILDER_TRANSLATION="Translation"
+COM_COMPONENTBUILDER_USED_IN="used in"
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
 COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."
 COM_COMPONENTBUILDER_USE_KEY="Use Key"
diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php
index b4ebdc91b..fd75b8d77 100644
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 f253beeaa..e0b43f9bc 100644
--- a/admin/layouts/admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9de95d142..661e4e06c 100644
--- a/admin/layouts/admin_view/custom_buttons_left.php
+++ b/admin/layouts/admin_view/custom_buttons_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e9b3ff196..7e0a5e7cd 100644
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 8de3171cc..3f9963916 100644
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 91d07f9bb..b2158f42f 100644
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 a751ee17f..1ebe6f0c4 100644
--- a/admin/layouts/admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/admin_view/linked_components_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 4cfc2861c..b81ad4ed4 100644
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc380e97b..bac9c4064 100644
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 c1ff6cb9e..e4638c4cf 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 828a1b076..e702f2f01 100644
--- a/admin/layouts/admin_view/settings_above.php
+++ b/admin/layouts/admin_view/settings_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1d71b17c7..913a1888c 100644
--- a/admin/layouts/admin_view/settings_left.php
+++ b/admin/layouts/admin_view/settings_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 77a1177ee..0febb646b 100644
--- a/admin/layouts/admin_view/settings_right.php
+++ b/admin/layouts/admin_view/settings_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 fe3e75b4e..ea2c2fc84 100644
--- a/admin/layouts/admin_view/settings_under.php
+++ b/admin/layouts/admin_view/settings_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 eff3fdddb..aff16e8fb 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 5d75a628d..92369b856 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9de95d142..661e4e06c 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_left.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 cebee10c4..fc4aea6a6 100644
--- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 3f064604e..0a86042af 100644
--- a/admin/layouts/custom_admin_view/details_above.php
+++ b/admin/layouts/custom_admin_view/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 c24c2ba43..947e46bb3 100644
--- a/admin/layouts/custom_admin_view/details_fullwidth.php
+++ b/admin/layouts/custom_admin_view/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1f5caf41d..4bbb11e72 100644
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 4de395545..bc6c1fcf4 100644
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 8c85ecf0f..a37f61fbc 100644
--- a/admin/layouts/custom_admin_view/details_rightside.php
+++ b/admin/layouts/custom_admin_view/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/custom_admin_view/details_under.php
+++ b/admin/layouts/custom_admin_view/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0b20b8ee1..cd3f7ea05 100644
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 5b62b76e5..18435f9ff 100644
--- a/admin/layouts/custom_code/details_above.php
+++ b/admin/layouts/custom_code/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bb5c2da75..a9ef5b1c5 100644
--- a/admin/layouts/custom_code/details_fullwidth.php
+++ b/admin/layouts/custom_code/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 77129a2f6..ab1c52042 100644
--- a/admin/layouts/custom_code/details_left.php
+++ b/admin/layouts/custom_code/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 7d9ef9c64..da33aae0c 100644
--- a/admin/layouts/custom_code/details_right.php
+++ b/admin/layouts/custom_code/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/custom_code/details_under.php
+++ b/admin/layouts/custom_code/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/custom_code/publishing.php
+++ b/admin/layouts/custom_code/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/custom_code/publlshing.php
+++ b/admin/layouts/custom_code/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9f0492d7e..df182f66a 100644
--- a/admin/layouts/dynamic_get/abacus_fullwidth.php
+++ b/admin/layouts/dynamic_get/abacus_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 169f0c05d..3a9a8e41f 100644
--- a/admin/layouts/dynamic_get/abacus_left.php
+++ b/admin/layouts/dynamic_get/abacus_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 625aac840..d83a3cca0 100644
--- a/admin/layouts/dynamic_get/custom_script_fullwidth.php
+++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 4d9449915..dde75a818 100644
--- a/admin/layouts/dynamic_get/gettable_above.php
+++ b/admin/layouts/dynamic_get/gettable_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 21eb17078..831355448 100644
--- a/admin/layouts/dynamic_get/gettable_fullwidth.php
+++ b/admin/layouts/dynamic_get/gettable_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9eba07e3e..7821e4535 100644
--- a/admin/layouts/dynamic_get/gettable_left.php
+++ b/admin/layouts/dynamic_get/gettable_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 27abac9f6..1fd808307 100644
--- a/admin/layouts/dynamic_get/gettable_right.php
+++ b/admin/layouts/dynamic_get/gettable_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 451da57a0..69b1192bb 100644
--- a/admin/layouts/dynamic_get/gettable_under.php
+++ b/admin/layouts/dynamic_get/gettable_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/dynamic_get/publishing.php
+++ b/admin/layouts/dynamic_get/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/dynamic_get/publlshing.php
+++ b/admin/layouts/dynamic_get/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 6967ef60c..f62c56ae0 100644
--- a/admin/layouts/field/details_fullwidth.php
+++ b/admin/layouts/field/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 7b7a1ec59..8806eba37 100644
--- a/admin/layouts/field/details_left.php
+++ b/admin/layouts/field/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 ea93a4174..6d9baf532 100644
--- a/admin/layouts/field/details_right.php
+++ b/admin/layouts/field/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/field/details_under.php
+++ b/admin/layouts/field/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 955df3af1..e18168f98 100644
--- a/admin/layouts/field/linked_admin_views_fullwidth.php
+++ b/admin/layouts/field/linked_admin_views_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/field/publishing.php
+++ b/admin/layouts/field/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/field/publlshing.php
+++ b/admin/layouts/field/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 4ea0e84f3..600779d2a 100644
--- a/admin/layouts/field/scripts_left.php
+++ b/admin/layouts/field/scripts_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 41a734d04..ea740a4b4 100644
--- a/admin/layouts/field/scripts_right.php
+++ b/admin/layouts/field/scripts_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 74eb83aaa..1bcdd08d4 100644
--- a/admin/layouts/fieldtype/details_left.php
+++ b/admin/layouts/fieldtype/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 4dd4c52d2..a1d35f35f 100644
--- a/admin/layouts/fieldtype/details_right.php
+++ b/admin/layouts/fieldtype/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 7c8045988..d9bf6822f 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/fieldtype/publishing.php
+++ b/admin/layouts/fieldtype/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/fieldtype/publlshing.php
+++ b/admin/layouts/fieldtype/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 5bbfb8ac2..25f107644 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc9c67e5e..45fa805fb 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e1441b6c6..7c6895d45 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 884f572fe..7fd757b04 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 363f91221..db23cbc58 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 5aa7e1a34..56b3e8c82 100644
--- a/admin/layouts/joomla_component/admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/admin_views_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 07b98c3df..4836e42f8 100644
--- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 3f064604e..0a86042af 100644
--- a/admin/layouts/joomla_component/details_above.php
+++ b/admin/layouts/joomla_component/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 69372c951..e2235ddda 100644
--- a/admin/layouts/joomla_component/details_left.php
+++ b/admin/layouts/joomla_component/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 ddf94a7eb..e564a8d0d 100644
--- a/admin/layouts/joomla_component/details_right.php
+++ b/admin/layouts/joomla_component/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/joomla_component/details_under.php
+++ b/admin/layouts/joomla_component/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 40effb193..8d149ae48 100644
--- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
+++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 439694f82..e88602921 100644
--- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
+++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 f753b20ef..b4cada7bc 100644
--- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php
+++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9059197ee..ab774df0b 100644
--- a/admin/layouts/joomla_component/mysql_fullwidth.php
+++ b/admin/layouts/joomla_component/mysql_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 a0b7178a2..ed74f21b8 100644
--- a/admin/layouts/joomla_component/php_fullwidth.php
+++ b/admin/layouts/joomla_component/php_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/joomla_component/publishing.php
+++ b/admin/layouts/joomla_component/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/joomla_component/publlshing.php
+++ b/admin/layouts/joomla_component/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 02c13d2b2..efaa0993e 100644
--- a/admin/layouts/joomla_component/readme_left.php
+++ b/admin/layouts/joomla_component/readme_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 83e1b1c6a..3327725aa 100644
--- a/admin/layouts/joomla_component/readme_right.php
+++ b/admin/layouts/joomla_component/readme_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e7eea69e5..1ba6d7755 100644
--- a/admin/layouts/joomla_component/settings_left.php
+++ b/admin/layouts/joomla_component/settings_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 27f0d077a..fb4fe409e 100644
--- a/admin/layouts/joomla_component/settings_right.php
+++ b/admin/layouts/joomla_component/settings_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 95aae39f2..e9336607a 100644
--- a/admin/layouts/joomla_component/site_views_fullwidth.php
+++ b/admin/layouts/joomla_component/site_views_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e32ab81a9..b639abb6f 100644
--- a/admin/layouts/joomla_component/translation_fullwidth.php
+++ b/admin/layouts/joomla_component/translation_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 601591612..7218388eb 100644
--- a/admin/layouts/language/details_left.php
+++ b/admin/layouts/language/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 c43a25a70..fd0e31b12 100644
--- a/admin/layouts/language/details_right.php
+++ b/admin/layouts/language/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/language/publishing.php
+++ b/admin/layouts/language/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/language/publlshing.php
+++ b/admin/layouts/language/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 f6933bef5..d4d659c94 100644
--- a/admin/layouts/language_translation/details_above.php
+++ b/admin/layouts/language_translation/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 8867469b5..abada3d6e 100644
--- a/admin/layouts/language_translation/details_fullwidth.php
+++ b/admin/layouts/language_translation/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/language_translation/publishing.php
+++ b/admin/layouts/language_translation/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/language_translation/publlshing.php
+++ b/admin/layouts/language_translation/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 cd7d9bdc0..206ded8f1 100644
--- a/admin/layouts/layout/custom_script_fullwidth.php
+++ b/admin/layouts/layout/custom_script_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 32b31ceda..db1e8036e 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 848b24273..69f71da0a 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0bc6bfafc..4a1460ee4 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 b5b9693ef..2b91fd8eb 100644
--- a/admin/layouts/layout/details_rightside.php
+++ b/admin/layouts/layout/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/layout/details_under.php
+++ b/admin/layouts/layout/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/layout/publishing.php
+++ b/admin/layouts/layout/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/layout/publlshing.php
+++ b/admin/layouts/layout/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 5d75a628d..92369b856 100644
--- a/admin/layouts/site_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/site_view/custom_buttons_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 8e87487b5..fec31842b 100644
--- a/admin/layouts/site_view/custom_buttons_left.php
+++ b/admin/layouts/site_view/custom_buttons_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 6840c94f8..bd2610c61 100644
--- a/admin/layouts/site_view/custom_buttons_right.php
+++ b/admin/layouts/site_view/custom_buttons_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 3f064604e..0a86042af 100644
--- a/admin/layouts/site_view/details_above.php
+++ b/admin/layouts/site_view/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 c24c2ba43..947e46bb3 100644
--- a/admin/layouts/site_view/details_fullwidth.php
+++ b/admin/layouts/site_view/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1f5caf41d..4bbb11e72 100644
--- a/admin/layouts/site_view/details_left.php
+++ b/admin/layouts/site_view/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0bc6bfafc..4a1460ee4 100644
--- a/admin/layouts/site_view/details_right.php
+++ b/admin/layouts/site_view/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 8c85ecf0f..a37f61fbc 100644
--- a/admin/layouts/site_view/details_rightside.php
+++ b/admin/layouts/site_view/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/site_view/details_under.php
+++ b/admin/layouts/site_view/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 b20cad96a..52935d013 100644
--- a/admin/layouts/site_view/javascript_css_fullwidth.php
+++ b/admin/layouts/site_view/javascript_css_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 16f350a20..d19d160ad 100644
--- a/admin/layouts/site_view/linked_components_fullwidth.php
+++ b/admin/layouts/site_view/linked_components_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 a286a4132..5f9598382 100644
--- a/admin/layouts/site_view/php_fullwidth.php
+++ b/admin/layouts/site_view/php_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/site_view/publishing.php
+++ b/admin/layouts/site_view/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/site_view/publlshing.php
+++ b/admin/layouts/site_view/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9b3e1ad1d..900a46589 100644
--- a/admin/layouts/snippet/details_above.php
+++ b/admin/layouts/snippet/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e56b32385..5349347a8 100644
--- a/admin/layouts/snippet/details_left.php
+++ b/admin/layouts/snippet/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 ffaf7eb37..094426da0 100644
--- a/admin/layouts/snippet/details_right.php
+++ b/admin/layouts/snippet/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/snippet/publishing.php
+++ b/admin/layouts/snippet/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/snippet/publlshing.php
+++ b/admin/layouts/snippet/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 cd7d9bdc0..206ded8f1 100644
--- a/admin/layouts/template/custom_script_fullwidth.php
+++ b/admin/layouts/template/custom_script_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9a23e1a00..c1241a02f 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 848b24273..69f71da0a 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0bc6bfafc..4a1460ee4 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 b5b9693ef..2b91fd8eb 100644
--- a/admin/layouts/template/details_rightside.php
+++ b/admin/layouts/template/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 96e3a455f..e6752d95e 100644
--- a/admin/layouts/template/details_under.php
+++ b/admin/layouts/template/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 1fe0300c0..cfb167b3d 100644
--- a/admin/layouts/template/publishing.php
+++ b/admin/layouts/template/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 bc1f6ea4c..06ffe1052 100644
--- a/admin/layouts/template/publlshing.php
+++ b/admin/layouts/template/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 7ee6c651a..de88414c9 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.php
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index c564cfa5b..97cd7146e 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 a65663056..3e9f0dba2 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0deee82d7..85501e82d 100644
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e1f3669ba..9e5bf423d 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 2131b605d..8827fb10c 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e9bd29291..11ab9cad7 100644
--- a/admin/models/fields/components.php
+++ b/admin/models/fields/components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 b776547fa..3b35bf206 100644
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 a04fb8e9c..d25d0a5c2 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 05430c01c..88654a53f 100644
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0c30ed4e7..118ebaddc 100644
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 d26f07485..086284f8d 100644
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 aece7f8a8..fd841ae86 100644
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9e75af87f..4dfaf68d4 100644
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 7b693d326..9ea8cb4e2 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 115f82171..6a363cadd 100644
--- a/admin/models/fields/fieldsmulti.php
+++ b/admin/models/fields/fieldsmulti.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 19c3749e8..f3c428407 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 b2011d5f0..b72701aa3 100644
--- a/admin/models/fields/lang.php
+++ b/admin/models/fields/lang.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 50d1bf4da..047d1df15 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 4247c9de1..68d8d306e 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 8896cc0c8..10dfd0b79 100644
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 0bfb3310b..b7c7c7c73 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
diff --git a/admin/models/forms/language_translation.js b/admin/models/forms/language_translation.js
index 72000456f..03a4aea69 100644
--- a/admin/models/forms/language_translation.js
+++ b/admin/models/forms/language_translation.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translation.js
diff --git a/admin/models/import.php b/admin/models/import.php
index 1147beccd..b102c78c5 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 95c82b3c6..fea42da72 100644
--- a/admin/models/import_joomla_components.php
+++ b/admin/models/import_joomla_components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index 7ff37279a..6cea5dfb6 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -618,14 +618,24 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 							}
 						}
 					}
+					// set how many component use this string
+					$componentCounter = '';
+					if (ComponentbuilderHelper::checkJson($item->components))
+					{
+						$item->components = json_decode($item->components, true);
+					}
+					if (ComponentbuilderHelper::checkArray($item->components))
+					{
+						$componentCounter = ' - <small>' . JText::_('COM_COMPONENTBUILDER_USED_IN') . ' ' . count($item->components) . '</small>';
+					}
 					// load the languages to the string
 					if (ComponentbuilderHelper::checkArray($langBucket))
 					{
-						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 					else
 					{
-						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 				}
 			}
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index 3f36ca357..1b98010e7 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translation.php
diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php
index 13a55e38b..4bbc63a46 100644
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translations.php
@@ -136,14 +136,24 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 							}
 						}
 					}
+					// set how many component use this string
+					$componentCounter = '';
+					if (ComponentbuilderHelper::checkJson($item->components))
+					{
+						$item->components = json_decode($item->components, true);
+					}
+					if (ComponentbuilderHelper::checkArray($item->components))
+					{
+						$componentCounter = ' - <small>' . JText::_('COM_COMPONENTBUILDER_USED_IN') . ' ' . count($item->components) . '</small>';
+					}
 					// load the languages to the string
 					if (ComponentbuilderHelper::checkArray($langBucket))
 					{
-						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 					else
 					{
-						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 				}
 			}
@@ -308,14 +318,24 @@ class ComponentbuilderModelLanguage_translations extends JModelList
 							}
 						}
 					}
+					// set how many component use this string
+					$componentCounter = '';
+					if (ComponentbuilderHelper::checkJson($item->components))
+					{
+						$item->components = json_decode($item->components, true);
+					}
+					if (ComponentbuilderHelper::checkArray($item->components))
+					{
+						$componentCounter = ' - <small>' . JText::_('COM_COMPONENTBUILDER_USED_IN') . ' ' . count($item->components) . '</small>';
+					}
 					// load the languages to the string
 					if (ComponentbuilderHelper::checkArray($langBucket))
 					{
-						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+						$item->entranslation = '<small><em>(' . implode(', ', $langBucket) . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 					else
 					{
-						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150);
+						$item->entranslation = '<small><em>(' . JText::_('COM_COMPONENTBUILDER_NOTRANSLATION') . ')</em></small> ' . ComponentbuilderHelper::htmlEscape($item->entranslation, 'UTF-8', true, 150) . $componentCounter;
 					}
 				}
 			}
diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php
index 8eda17ee4..42150b941 100644
--- a/admin/tables/language_translation.php
+++ b/admin/tables/language_translation.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		language_translation.php
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index e5e23aac7..f50763d32 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 46fc6f79a..a4a24917c 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
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 e419ae7e8..a6dd24318 100644
--- a/admin/views/componentbuilder/tmpl/default_main.php
+++ b/admin/views/componentbuilder/tmpl/default_main.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 f636d8f05..6f7f5b503 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
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 ff5116e40..c0a91abe9 100644
--- a/admin/views/componentbuilder/tmpl/default_readme_information.php
+++ b/admin/views/componentbuilder/tmpl/default_readme_information.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 4595feb1a..1aa809a88 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
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 9f2ff265f..19877c08f 100644
--- a/admin/views/componentbuilder/tmpl/default_vdm.php
+++ b/admin/views/componentbuilder/tmpl/default_vdm.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 2a81b1ad3..9094c3a16 100644
--- a/admin/views/componentbuilder/view.html.php
+++ b/admin/views/componentbuilder/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 c1abc58d1..3c115e2a7 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 a57e22402..adb279aa7 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 2809ea5fe..3fc9cb37b 100644
--- a/admin/views/import_joomla_components/tmpl/default.php
+++ b/admin/views/import_joomla_components/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 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 14b948d37..5c5a032f7 100644
--- a/admin/views/import_joomla_components/view.html.php
+++ b/admin/views/import_joomla_components/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/language_translation/submitbutton.js b/admin/views/language_translation/submitbutton.js
index 420fa1a6a..6cbefbba2 100644
--- a/admin/views/language_translation/submitbutton.js
+++ b/admin/views/language_translation/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php
index b7f996f2a..da9a00f5e 100644
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php
index b81265987..1213a7af1 100644
--- a/admin/views/language_translation/view.html.php
+++ b/admin/views/language_translation/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php
index 11654e1ee..26f0b35f9 100644
--- a/admin/views/language_translations/tmpl/default.php
+++ b/admin/views/language_translations/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/language_translations/tmpl/default_batch_body.php b/admin/views/language_translations/tmpl/default_batch_body.php
index 0ac8e9de9..639965584 100644
--- a/admin/views/language_translations/tmpl/default_batch_body.php
+++ b/admin/views/language_translations/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/language_translations/tmpl/default_batch_footer.php b/admin/views/language_translations/tmpl/default_batch_footer.php
index 66270d853..145e0c9e6 100644
--- a/admin/views/language_translations/tmpl/default_batch_footer.php
+++ b/admin/views/language_translations/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/language_translations/tmpl/default_body.php b/admin/views/language_translations/tmpl/default_body.php
index c5524c8ce..970235d23 100644
--- a/admin/views/language_translations/tmpl/default_body.php
+++ b/admin/views/language_translations/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/language_translations/tmpl/default_foot.php b/admin/views/language_translations/tmpl/default_foot.php
index 3dab182cd..657d5cc0d 100644
--- a/admin/views/language_translations/tmpl/default_foot.php
+++ b/admin/views/language_translations/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/language_translations/tmpl/default_head.php b/admin/views/language_translations/tmpl/default_head.php
index a93413dc1..3d2c18691 100644
--- a/admin/views/language_translations/tmpl/default_head.php
+++ b/admin/views/language_translations/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/language_translations/tmpl/default_toolbar.php b/admin/views/language_translations/tmpl/default_toolbar.php
index eadd766f8..b910f33e4 100644
--- a/admin/views/language_translations/tmpl/default_toolbar.php
+++ b/admin/views/language_translations/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php
index 4db81f07a..8ffd6ab77 100644
--- a/admin/views/language_translations/view.html.php
+++ b/admin/views/language_translations/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 37 of this MVC
-	@build			5th April, 2017
+	@version		@update number 39 of this MVC
+	@build			7th April, 2017
 	@created		3rd April, 2017
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 29d417bf5..426999b6a 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>6th April, 2017</creationDate>
+	<creationDate>7th April, 2017</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>http://vdm.bz/component-builder</authorUrl>
diff --git a/script.php b/script.php
index 8a48ef6b6..367be5bee 100644
--- a/script.php
+++ b/script.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.2
-	@build			6th April, 2017
+	@build			7th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		script.php