diff --git a/README.md b/README.md
index 77ee91cde..882753143 100644
--- a/README.md
+++ b/README.md
@@ -107,11 +107,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*: 28th May, 2017
++ *Last Build*: 5th June, 2017
 + *Version*: 2.4.6
 + *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*: **106026**
++ *Line count*: **106028**
 + *File count*: **643**
 + *Folder count*: **115**
 
diff --git a/admin/README.txt b/admin/README.txt
index 77ee91cde..882753143 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -107,11 +107,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*: 28th May, 2017
++ *Last Build*: 5th June, 2017
 + *Version*: 2.4.6
 + *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*: **106026**
++ *Line count*: **106028**
 + *File count*: **643**
 + *Folder count*: **115**
 
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index 3a2c9a441..cb263aac3 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css
diff --git a/admin/assets/css/compiler.css b/admin/assets/css/compiler.css
index 893518a2b..2cecb2232 100644
--- a/admin/assets/css/compiler.css
+++ b/admin/assets/css/compiler.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			25th April, 2017
+	@version		@update number 49 of this MVC
+	@build			31st May, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.css
diff --git a/admin/assets/css/custom_code.css b/admin/assets/css/custom_code.css
index 08c4057fa..99894a6e6 100644
--- a/admin/assets/css/custom_code.css
+++ b/admin/assets/css/custom_code.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.css
diff --git a/admin/assets/css/custom_codes.css b/admin/assets/css/custom_codes.css
index cc1b0ae53..f6ada00b7 100644
--- a/admin/assets/css/custom_codes.css
+++ b/admin/assets/css/custom_codes.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index f57eeaaf3..6476bee51 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 982d7a0cd..a1d7c013c 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_document.css
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index 03e4a4295..300e648f9 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_documents.css
diff --git a/admin/assets/css/joomla_component.css b/admin/assets/css/joomla_component.css
index a5982faa8..2773b041a 100644
--- a/admin/assets/css/joomla_component.css
+++ b/admin/assets/css/joomla_component.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.css
diff --git a/admin/assets/css/joomla_components.css b/admin/assets/css/joomla_components.css
index 99c4b3f7a..ba8249a48 100644
--- a/admin/assets/css/joomla_components.css
+++ b/admin/assets/css/joomla_components.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.css
diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css
index e396730e5..b6b268eef 100644
--- a/admin/assets/css/layout.css
+++ b/admin/assets/css/layout.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.css
diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css
index 66561cb99..50c457c61 100644
--- a/admin/assets/css/layouts.css
+++ b/admin/assets/css/layouts.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.css
diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php
index beae06093..90e1b6001 100644
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@@ -706,7 +706,8 @@ abstract class ###Component###Helper
 				// If you don't need to handle multi-byte characters
 				// you can use preg_replace rather than mb_ereg_replace
 				// Thanks @Łukasz Rysiak!
-				$string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
 				// http://stackoverflow.com/a/2021729/1429677
 				return preg_replace('/\s+/', ' ', $string);
 			}
diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php
index 75a830633..32fd49186 100644
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@@ -698,7 +698,8 @@ abstract class ###Component###Helper
 				// If you don't need to handle multi-byte characters
 				// you can use preg_replace rather than mb_ereg_replace
 				// Thanks @Łukasz Rysiak!
-				$string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
 				// http://stackoverflow.com/a/2021729/1429677
 				return preg_replace('/\s+/', ' ', $string);
 			}
diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php
index eb1093533..e8197d4ca 100644
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controller.php b/admin/controller.php
index 343e1e8db..878f9cda7 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index b0e086856..3e8cb61c6 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php
index 27517651d..134692507 100644
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			25th April, 2017
+	@version		@update number 49 of this MVC
+	@build			31st May, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php
diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php
index 1b215da70..0d7d87e75 100644
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php
index a239ae7bc..c27d39429 100644
--- a/admin/controllers/custom_code.php
+++ b/admin/controllers/custom_code.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php
diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php
index e9ff5c583..01118f612 100644
--- a/admin/controllers/custom_codes.php
+++ b/admin/controllers/custom_codes.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index b17354436..9b9a14421 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index e7a5d3383..1389b5741 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_document.php
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index 892240596..7f4065f2c 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_documents.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index cb30e5386..cc0b5a062 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
diff --git a/admin/controllers/import_joomla_components.php b/admin/controllers/import_joomla_components.php
index 1fb68e618..ccad415fd 100644
--- a/admin/controllers/import_joomla_components.php
+++ b/admin/controllers/import_joomla_components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import_joomla_components.php
diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php
index 9275c3f8c..02637d68d 100644
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.php
diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php
index 20a4cdd92..670b7f312 100644
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.php
diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php
index d7041a243..f9c4e9840 100644
--- a/admin/controllers/layout.php
+++ b/admin/controllers/layout.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.php
diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php
index ac9089575..252029d17 100644
--- a/admin/controllers/layouts.php
+++ b/admin/controllers/layouts.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.php
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 7b9d3ef57..0afbba97c 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -4864,7 +4864,14 @@ class Interpretation extends Fields
 					}
 					elseif ($default == 0 || $default)
 					{
-						$default = $data['null_switch']." DEFAULT '".$default."'";
+						if (is_numeric($default))
+						{
+							$default = $data['null_switch']." DEFAULT ".$default;
+						}
+						else
+						{
+							$default = $data['null_switch']." DEFAULT '".$default."'";
+						}
 					}
 					elseif ($data['null_switch'] === 'NULL')
 					{
@@ -6814,8 +6821,8 @@ class Interpretation extends Fields
 	 * @param $parentKey
 	 * @param $parent_key
 	 * @param $globalKey
-     * @return string
-     */
+	 * @return string
+	 */
 	public function setListQueryLinked($viewName_single, $viewName_list, $functionName, $key, $_key, $parentKey, $parent_key, $globalKey)
 	{
 		// check if this view has category added
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index a093e575a..53008f508 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
@@ -2219,7 +2219,8 @@ abstract class ComponentbuilderHelper
 				// If you don't need to handle multi-byte characters
 				// you can use preg_replace rather than mb_ereg_replace
 				// Thanks @Łukasz Rysiak!
-				$string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				// $string = mb_ereg_replace("([^\w\s\d\-_\(\)])", '', $string);
+				$string = preg_replace("([^\w\s\d\-_\(\)])", '', $string);
 				// http://stackoverflow.com/a/2021729/1429677
 				return preg_replace('/\s+/', ' ', $string);
 			}
diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php
index 08b33256a..5fd758392 100644
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index 8eb1cc245..d9e827158 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php
index 4876ccadb..e61c52f86 100644
--- a/admin/helpers/indenter.php
+++ b/admin/helpers/indenter.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
diff --git a/admin/helpers/js.php b/admin/helpers/js.php
index 6c58c91c4..74d76b32e 100644
--- a/admin/helpers/js.php
+++ b/admin/helpers/js.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php
index 32e33bdde..a9fbb7fcd 100644
--- a/admin/helpers/minify.php
+++ b/admin/helpers/minify.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 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 20b80c085..13e7bcbf8 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -794,7 +794,7 @@ COM_COMPONENTBUILDER_CONFIG_CUSTOM_FOLDER_PATH_LABEL="Custom Folder Path"
 COM_COMPONENTBUILDER_CONFIG_DONT_LOAD="Not"
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_DESC="The encription key for the field encryption is set here."
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL="Encryption Settings"
-COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION="Enter link where you JCB package keys can be bought"
+COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_DESCRIPTION="Enter link where your JCB package key can be bought."
 COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_HINT="http://www.example.com/buy-keys"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_BUY_LINK_LABEL="Buy Link<br /><small>(to get key)</small>"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_COMPANY_DESCRIPTION="Enter Company Name Here"
@@ -2557,7 +2557,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPAND="Expand"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPAND_TWO="Expand 2"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPIRED="Expired"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK="Export Buy Link"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_DESCRIPTION="Enter link where you JCB package keys can be bought"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_DESCRIPTION="Enter link where your JCB package key can be bought."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT="http://www.example.com/buy-keys"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_LABEL="Buy Link<br /><small>(to get key)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_COMPONENTS_BUTTON_ACCESS="Joomla Component Export Components Button Access"
diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php
index a2d2f66cb..2ee824876 100644
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php
diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php
index ee0d1c1b4..c49d78106 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php
index 2d17a8f32..6509af6d8 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php
index aa020d5be..d6127a620 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_import_fullwidth.php
diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php
index da03ccaa4..ed4c8681d 100644
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php
index c382396f6..111f92701 100644
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php
diff --git a/admin/layouts/admin_view/linked_components_fullwidth.php b/admin/layouts/admin_view/linked_components_fullwidth.php
index eb2b255e0..d334f4d1a 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php
index 185385e02..6e51373c4 100644
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php
index 9df77d9ef..e7b0f321f 100644
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_left.php
diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php
index b18409301..d1be4d5a6 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/admin_view/settings_above.php b/admin/layouts/admin_view/settings_above.php
index 580deb345..6d831f83a 100644
--- a/admin/layouts/admin_view/settings_above.php
+++ b/admin/layouts/admin_view/settings_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_above.php
diff --git a/admin/layouts/admin_view/settings_left.php b/admin/layouts/admin_view/settings_left.php
index 64a9e4626..b5423ee33 100644
--- a/admin/layouts/admin_view/settings_left.php
+++ b/admin/layouts/admin_view/settings_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
diff --git a/admin/layouts/admin_view/settings_right.php b/admin/layouts/admin_view/settings_right.php
index 8308572c6..411b473b8 100644
--- a/admin/layouts/admin_view/settings_right.php
+++ b/admin/layouts/admin_view/settings_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
diff --git a/admin/layouts/admin_view/settings_under.php b/admin/layouts/admin_view/settings_under.php
index ae614f557..804cb05fd 100644
--- a/admin/layouts/admin_view/settings_under.php
+++ b/admin/layouts/admin_view/settings_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 70e31c890..ebac73d8e 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php
diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
index 5cfc829ff..b048183be 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php
index 2d17a8f32..6509af6d8 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
diff --git a/admin/layouts/custom_admin_view/custom_script_fullwidth.php b/admin/layouts/custom_admin_view/custom_script_fullwidth.php
index 9cdd699ac..78f2f41a5 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php
index a97393b92..255bbe47b 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php
index f88094fd2..d7b500ad5 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php
index 19150e2fa..65531621f 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php
index 28c77295d..3c20db50b 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php
index 706578982..cc773c79e 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php
index e205caab1..1d2ebc90f 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
index a1f75ad05..64a95c360 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php
index 7f0582fe4..ad7223470 100644
--- a/admin/layouts/custom_code/details_above.php
+++ b/admin/layouts/custom_code/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php
index f53dcd91c..7b1cf8c24 100644
--- a/admin/layouts/custom_code/details_fullwidth.php
+++ b/admin/layouts/custom_code/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php
index 52cc95f31..47688b212 100644
--- a/admin/layouts/custom_code/details_left.php
+++ b/admin/layouts/custom_code/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php
index 30bc56467..19ad2c7cc 100644
--- a/admin/layouts/custom_code/details_right.php
+++ b/admin/layouts/custom_code/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php
index e205caab1..1d2ebc90f 100644
--- a/admin/layouts/custom_code/details_under.php
+++ b/admin/layouts/custom_code/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/custom_code/publishing.php
+++ b/admin/layouts/custom_code/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/custom_code/publlshing.php
+++ b/admin/layouts/custom_code/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php
index 9915a27b5..df5aa0ea9 100644
--- a/admin/layouts/dynamic_get/abacus_fullwidth.php
+++ b/admin/layouts/dynamic_get/abacus_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_fullwidth.php
diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php
index eccd572f6..ac796875d 100644
--- a/admin/layouts/dynamic_get/abacus_left.php
+++ b/admin/layouts/dynamic_get/abacus_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		abacus_left.php
diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php
index 84a83f9bf..86ab808b0 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/dynamic_get/gettable_above.php b/admin/layouts/dynamic_get/gettable_above.php
index dcf79a9f1..741c8a3be 100644
--- a/admin/layouts/dynamic_get/gettable_above.php
+++ b/admin/layouts/dynamic_get/gettable_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_above.php
diff --git a/admin/layouts/dynamic_get/gettable_fullwidth.php b/admin/layouts/dynamic_get/gettable_fullwidth.php
index 38f7272ff..e6403afb0 100644
--- a/admin/layouts/dynamic_get/gettable_fullwidth.php
+++ b/admin/layouts/dynamic_get/gettable_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_fullwidth.php
diff --git a/admin/layouts/dynamic_get/gettable_left.php b/admin/layouts/dynamic_get/gettable_left.php
index 24e786ded..5e13039d0 100644
--- a/admin/layouts/dynamic_get/gettable_left.php
+++ b/admin/layouts/dynamic_get/gettable_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_left.php
diff --git a/admin/layouts/dynamic_get/gettable_right.php b/admin/layouts/dynamic_get/gettable_right.php
index 93f974258..37e60e402 100644
--- a/admin/layouts/dynamic_get/gettable_right.php
+++ b/admin/layouts/dynamic_get/gettable_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_right.php
diff --git a/admin/layouts/dynamic_get/gettable_under.php b/admin/layouts/dynamic_get/gettable_under.php
index 98187e0f3..84c2eb23e 100644
--- a/admin/layouts/dynamic_get/gettable_under.php
+++ b/admin/layouts/dynamic_get/gettable_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		gettable_under.php
diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/dynamic_get/publishing.php
+++ b/admin/layouts/dynamic_get/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/dynamic_get/publlshing.php
+++ b/admin/layouts/dynamic_get/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/field/details_fullwidth.php b/admin/layouts/field/details_fullwidth.php
index 197c57425..85bf18edd 100644
--- a/admin/layouts/field/details_fullwidth.php
+++ b/admin/layouts/field/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/field/details_left.php b/admin/layouts/field/details_left.php
index 959c385d5..aff6a16b8 100644
--- a/admin/layouts/field/details_left.php
+++ b/admin/layouts/field/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/field/details_right.php b/admin/layouts/field/details_right.php
index 05c6487ab..c257e1d1c 100644
--- a/admin/layouts/field/details_right.php
+++ b/admin/layouts/field/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/field/details_under.php b/admin/layouts/field/details_under.php
index e205caab1..1d2ebc90f 100644
--- a/admin/layouts/field/details_under.php
+++ b/admin/layouts/field/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/field/linked_admin_views_fullwidth.php b/admin/layouts/field/linked_admin_views_fullwidth.php
index a606a7784..25f8f2440 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_admin_views_fullwidth.php
diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/field/publishing.php
+++ b/admin/layouts/field/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/field/publlshing.php
+++ b/admin/layouts/field/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php
index e6ef81b58..168d719e2 100644
--- a/admin/layouts/field/scripts_left.php
+++ b/admin/layouts/field/scripts_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_left.php
diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php
index 0fa802b87..7976014cf 100644
--- a/admin/layouts/field/scripts_right.php
+++ b/admin/layouts/field/scripts_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_right.php
diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php
index a00767833..95094cdc5 100644
--- a/admin/layouts/fieldtype/details_left.php
+++ b/admin/layouts/fieldtype/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php
index 7dfc18475..7b0a55c7c 100644
--- a/admin/layouts/fieldtype/details_right.php
+++ b/admin/layouts/fieldtype/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 109ffbf8f..147a2347b 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields_fullwidth.php
diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/fieldtype/publishing.php
+++ b/admin/layouts/fieldtype/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/fieldtype/publlshing.php
+++ b/admin/layouts/fieldtype/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index a16c209a1..5b183cd05 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index ddfeb98ba..9dcf6d43d 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index d982d6a40..6cea67bb6 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index f2b8f4074..64ba04c01 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index e205caab1..1d2ebc90f 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index f32484ec4..590739ca4 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php
index 6f629227f..2372c28ba 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php
diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
index 9f8a13a71..81479b7ca 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views_fullwidth.php
diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php
index a97393b92..255bbe47b 100644
--- a/admin/layouts/joomla_component/details_above.php
+++ b/admin/layouts/joomla_component/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php
index 8cde08c40..3ed948c9d 100644
--- a/admin/layouts/joomla_component/details_left.php
+++ b/admin/layouts/joomla_component/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php
index 554909c2e..a1de30d67 100644
--- a/admin/layouts/joomla_component/details_right.php
+++ b/admin/layouts/joomla_component/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php
index e205caab1..1d2ebc90f 100644
--- a/admin/layouts/joomla_component/details_under.php
+++ b/admin/layouts/joomla_component/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
index 7349ef10c..2482e8d76 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_build_beta_fullwidth.php
diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
index 42f7b522c..bfd62ee4f 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_integration_fullwidth.php
diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
index 1e0e29b7e..c9dcfa906 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		libs_helpers_fullwidth.php
diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php
index d355b9e6d..43710db07 100644
--- a/admin/layouts/joomla_component/mysql_fullwidth.php
+++ b/admin/layouts/joomla_component/mysql_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		mysql_fullwidth.php
diff --git a/admin/layouts/joomla_component/php_fullwidth.php b/admin/layouts/joomla_component/php_fullwidth.php
index e9b593b06..d763994c1 100644
--- a/admin/layouts/joomla_component/php_fullwidth.php
+++ b/admin/layouts/joomla_component/php_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/joomla_component/publishing.php
+++ b/admin/layouts/joomla_component/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/joomla_component/publlshing.php b/admin/layouts/joomla_component/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/joomla_component/publlshing.php
+++ b/admin/layouts/joomla_component/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php
index 69629bdf0..a3f63b4fd 100644
--- a/admin/layouts/joomla_component/readme_left.php
+++ b/admin/layouts/joomla_component/readme_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php
diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php
index 9bd39d61b..3d0b6ed12 100644
--- a/admin/layouts/joomla_component/readme_right.php
+++ b/admin/layouts/joomla_component/readme_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php
diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php
index 11e70bed2..82916d297 100644
--- a/admin/layouts/joomla_component/settings_left.php
+++ b/admin/layouts/joomla_component/settings_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php
index 0207b1a6b..be946a905 100644
--- a/admin/layouts/joomla_component/settings_right.php
+++ b/admin/layouts/joomla_component/settings_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php
index cfb6a8553..abed723e0 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php
diff --git a/admin/layouts/joomla_component/translation_fullwidth.php b/admin/layouts/joomla_component/translation_fullwidth.php
index 498b65718..902c43ed1 100644
--- a/admin/layouts/joomla_component/translation_fullwidth.php
+++ b/admin/layouts/joomla_component/translation_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		translation_fullwidth.php
diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php
index 63002620a..6d2e81891 100644
--- a/admin/layouts/language/details_left.php
+++ b/admin/layouts/language/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php
index 5e66ef68b..b500520f2 100644
--- a/admin/layouts/language/details_right.php
+++ b/admin/layouts/language/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/language/publishing.php
+++ b/admin/layouts/language/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/language/publlshing.php
+++ b/admin/layouts/language/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/language_translation/details_above.php b/admin/layouts/language_translation/details_above.php
index c6857ef12..0a53b9f4a 100644
--- a/admin/layouts/language_translation/details_above.php
+++ b/admin/layouts/language_translation/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php
index 472954403..936606320 100644
--- a/admin/layouts/language_translation/details_fullwidth.php
+++ b/admin/layouts/language_translation/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/language_translation/publishing.php
+++ b/admin/layouts/language_translation/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/language_translation/publlshing.php
+++ b/admin/layouts/language_translation/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php
index 54ca62ac5..399c0d3d9 100644
--- a/admin/layouts/layout/custom_script_fullwidth.php
+++ b/admin/layouts/layout/custom_script_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php
index 1a6200f35..ea904d2f8 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php
index bdffb43f0..5be700e4e 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php
index bcc383c29..0f61f9055 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php
index f294e7c3a..e96cd69e6 100644
--- a/admin/layouts/layout/details_rightside.php
+++ b/admin/layouts/layout/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php
index e205caab1..1d2ebc90f 100644
--- a/admin/layouts/layout/details_under.php
+++ b/admin/layouts/layout/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/layout/publishing.php
+++ b/admin/layouts/layout/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/layout/publlshing.php
+++ b/admin/layouts/layout/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php
index 5cfc829ff..b048183be 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php
index 5c2de0e44..388ba72cb 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_left.php
diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php
index 91fc8a8b8..90a72d28b 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_right.php
diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php
index a97393b92..255bbe47b 100644
--- a/admin/layouts/site_view/details_above.php
+++ b/admin/layouts/site_view/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php
index f88094fd2..d7b500ad5 100644
--- a/admin/layouts/site_view/details_fullwidth.php
+++ b/admin/layouts/site_view/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php
index 19150e2fa..65531621f 100644
--- a/admin/layouts/site_view/details_left.php
+++ b/admin/layouts/site_view/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php
index bcc383c29..0f61f9055 100644
--- a/admin/layouts/site_view/details_right.php
+++ b/admin/layouts/site_view/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php
index 706578982..cc773c79e 100644
--- a/admin/layouts/site_view/details_rightside.php
+++ b/admin/layouts/site_view/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php
index e205caab1..1d2ebc90f 100644
--- a/admin/layouts/site_view/details_under.php
+++ b/admin/layouts/site_view/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php
index 803cc9325..6445f1dcc 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_css_fullwidth.php
diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php
index f89dee640..56590f6ec 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		linked_components_fullwidth.php
diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php
index 628d0a0f2..9a40a4df8 100644
--- a/admin/layouts/site_view/php_fullwidth.php
+++ b/admin/layouts/site_view/php_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		php_fullwidth.php
diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/site_view/publishing.php
+++ b/admin/layouts/site_view/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/site_view/publlshing.php
+++ b/admin/layouts/site_view/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php
index 9cb1c4353..b236f5215 100644
--- a/admin/layouts/snippet/details_above.php
+++ b/admin/layouts/snippet/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php
index 48e314c15..9b1c7eb84 100644
--- a/admin/layouts/snippet/details_left.php
+++ b/admin/layouts/snippet/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php
index bd1888342..bb36674b4 100644
--- a/admin/layouts/snippet/details_right.php
+++ b/admin/layouts/snippet/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/snippet/publishing.php
+++ b/admin/layouts/snippet/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/snippet/publlshing.php
+++ b/admin/layouts/snippet/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php
index 54ca62ac5..399c0d3d9 100644
--- a/admin/layouts/template/custom_script_fullwidth.php
+++ b/admin/layouts/template/custom_script_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_script_fullwidth.php
diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php
index 229118091..89eac3c81 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php
index bdffb43f0..5be700e4e 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php
index bcc383c29..0f61f9055 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php
index f294e7c3a..e96cd69e6 100644
--- a/admin/layouts/template/details_rightside.php
+++ b/admin/layouts/template/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php
index e205caab1..1d2ebc90f 100644
--- a/admin/layouts/template/details_under.php
+++ b/admin/layouts/template/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php
index e3af89f04..33267661b 100644
--- a/admin/layouts/template/publishing.php
+++ b/admin/layouts/template/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php
index ca0ce0c71..a6a5c131a 100644
--- a/admin/layouts/template/publlshing.php
+++ b/admin/layouts/template/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index 8e68ae694..c0e85b0b4 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.php
diff --git a/admin/models/compiler.php b/admin/models/compiler.php
index e7ce89eb8..3b0ae71e7 100644
--- a/admin/models/compiler.php
+++ b/admin/models/compiler.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			25th April, 2017
+	@version		@update number 49 of this MVC
+	@build			31st May, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		compiler.php
@@ -174,7 +174,8 @@ class ComponentbuilderModelCompiler extends JModelList
 		$set['debugLinenr']		= $debugLinenr;
 		// start up Compiler
 		$this->compiler			= new Compiler($set);
-		if($this->compiler){
+		if($this->compiler)
+		{
 			return true;
 		}
 		return false;
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index 1b52a3b53..3a093aef2 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index c02aa2347..ad0ce1b51 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php
diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php
index 885b1c384..68348eb61 100644
--- a/admin/models/custom_codes.php
+++ b/admin/models/custom_codes.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_codes.php
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
index d10b19d1d..68a985b4b 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		adminviewfolderlist.php
diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php
index a5c5733a7..70b6ff502 100644
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		adminviews.php
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index d6874ac31..af5e53fca 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		articles.php
diff --git a/admin/models/fields/component.php b/admin/models/fields/component.php
index 013814bd0..5aedabbaa 100644
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
diff --git a/admin/models/fields/components.php b/admin/models/fields/components.php
index 283ccafbb..765f3d278 100644
--- a/admin/models/fields/components.php
+++ b/admin/models/fields/components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php
diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php
index 0c456364c..b6aa6e2ec 100644
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customadminviews.php
diff --git a/admin/models/fields/customfilelist.php b/admin/models/fields/customfilelist.php
index 6fe56ddb0..709b568b9 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customfilelist.php
diff --git a/admin/models/fields/customfolderlist.php b/admin/models/fields/customfolderlist.php
index 6f2ab0834..b930854d5 100644
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customfolderlist.php
diff --git a/admin/models/fields/customgets.php b/admin/models/fields/customgets.php
index 0a0dcbc70..d53dccd31 100644
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customgets.php
diff --git a/admin/models/fields/dbtables.php b/admin/models/fields/dbtables.php
index 10b24355f..d6cc550d5 100644
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dbtables.php
diff --git a/admin/models/fields/dynamicget.php b/admin/models/fields/dynamicget.php
index 08270e6f8..e276ffd2c 100644
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamicget.php
diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php
index c5be9dc62..c8152025a 100644
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamicgets.php
diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php
index 295f13ba5..26d442f5b 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php
diff --git a/admin/models/fields/fieldsmulti.php b/admin/models/fields/fieldsmulti.php
index 4cf2cf5d3..cec93412f 100644
--- a/admin/models/fields/fieldsmulti.php
+++ b/admin/models/fields/fieldsmulti.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldsmulti.php
diff --git a/admin/models/fields/fieldtypes.php b/admin/models/fields/fieldtypes.php
index 1ece5e4ad..dbd2f17da 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
diff --git a/admin/models/fields/lang.php b/admin/models/fields/lang.php
index ef6605ecd..940638453 100644
--- a/admin/models/fields/lang.php
+++ b/admin/models/fields/lang.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		lang.php
diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php
index d6a8452bd..0c571fe80 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		maingets.php
diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
index 11376e84a..ac510fa46 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		siteviewfolderlist.php
diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php
index d973f7664..4ff4abdcd 100644
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		siteviews.php
diff --git a/admin/models/fields/snippets.php b/admin/models/fields/snippets.php
index 7da96580c..885dfbf44 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index 030e4f741..5fd55779f 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.js
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 97233d8b4..c21185390 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_document.js
diff --git a/admin/models/forms/joomla_component.js b/admin/models/forms/joomla_component.js
index 66f75276f..3a7ac21d3 100644
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.js
diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js
index 3ece76a66..ad31e531f 100644
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.js
diff --git a/admin/models/forms/layout.xml b/admin/models/forms/layout.xml
index 58ef4d7cb..d63e9ac32 100644
--- a/admin/models/forms/layout.xml
+++ b/admin/models/forms/layout.xml
@@ -155,37 +155,6 @@
 			required="false"
 			button="true"
 		/>
-		<!-- Php_view Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_view"
-			label="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL"
-			rows="17"
-			cols="5"
-			description="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT"
-			required="true"
-		/>
-		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
-		<!-- Layout Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="layout"
-			label="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL"
-			rows="20"
-			cols="15"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT"
-			required="true"
-		/>
-		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
-		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
 		<!-- Add_php_view Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -200,14 +169,45 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_LAYOUT_NO</option>
 		</field>
-		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
+		<!-- Layout Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="layout"
+			label="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL"
+			rows="20"
+			cols="15"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT"
+			required="true"
+		/>
+		<!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_snippet_usage" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_SNIPPET_USAGE_LABEL" heading="h4" class="snippet-usage note_snippet_usage" />
 		<!-- Not_required Field. Type: Hidden. (joomla) -->
 		<field
 			type="hidden"
 			name="not_required"
 			default="[]"
 		/>
+		<!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_uikit_snippet" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_UIKIT_SNIPPET_LABEL" heading="h4" class="snippet-code note_uikit_snippet" />
+		<!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="dynamic_values" label="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_DESCRIPTION" heading="h4" class="dynamic_values" />
+		<!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_add_language_string" label="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION" heading="h4" class="note_add_language_string" />
+		<!-- Php_view Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_view"
+			label="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_LABEL"
+			rows="17"
+			cols="5"
+			description="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_LAYOUT_PHP_VIEW_HINT"
+			required="true"
+		/>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index dae6e4e85..9d8d15a94 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_document.php
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index 76cc18fdd..535c913a4 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_documents.php
diff --git a/admin/models/import.php b/admin/models/import.php
index 5f5a7d460..23f129dad 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
diff --git a/admin/models/import_joomla_components.php b/admin/models/import_joomla_components.php
index b96275795..9a5f96263 100644
--- a/admin/models/import_joomla_components.php
+++ b/admin/models/import_joomla_components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 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 92aa75525..aca7f31b7 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.php
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index 5235d4a04..6f31b1cbc 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_components.php
diff --git a/admin/models/layout.php b/admin/models/layout.php
index 15a19fcc8..300156117 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.php
@@ -95,16 +95,16 @@ class ComponentbuilderModelLayout extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_view))
-			{
-				// base64 Decode php_view.
-				$item->php_view = base64_decode($item->php_view);
-			}
-
 			if (!empty($item->layout))
 			{
 				// base64 Decode layout.
 				$item->layout = base64_decode($item->layout);
+			}
+
+			if (!empty($item->php_view))
+			{
+				// base64 Decode php_view.
+				$item->php_view = base64_decode($item->php_view);
 			}
 			
 			if (!empty($item->id))
@@ -830,16 +830,16 @@ class ComponentbuilderModelLayout extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 
 
-		// Set the php_view string to base64 string.
-		if (isset($data['php_view']))
-		{
-			$data['php_view'] = base64_encode($data['php_view']);
-		}
-
 		// Set the layout string to base64 string.
 		if (isset($data['layout']))
 		{
 			$data['layout'] = base64_encode($data['layout']);
+		}
+
+		// Set the php_view string to base64 string.
+		if (isset($data['php_view']))
+		{
+			$data['php_view'] = base64_encode($data['php_view']);
 		}
         
 		// Set the Params Items to data
diff --git a/admin/models/layouts.php b/admin/models/layouts.php
index c62d68ab4..bfc764d97 100644
--- a/admin/models/layouts.php
+++ b/admin/models/layouts.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layouts.php
@@ -271,10 +271,10 @@ class ComponentbuilderModelLayouts extends JModelList
 							continue;
 						}
 
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
 						// decode layout
 						$item->layout = base64_decode($item->layout);
+						// decode php_view
+						$item->php_view = base64_decode($item->php_view);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 765b55457..501c37466 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -1,24 +1,24 @@
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_admin_event` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_css` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_email_helper` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_license` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_dashboard_methods` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_helper_admin` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_helper_both` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_helper_site` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_method_uninstall` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_postflight_install` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_postflight_update` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_preflight_install` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_preflight_update` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_placeholders` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_sales_server` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_site_event` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_sql` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_update_server` TINYINT(1) NOT NULL DEFAULT '0',
+	`add_admin_event` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_css` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_email_helper` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_license` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_dashboard_methods` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_helper_admin` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_helper_both` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_helper_site` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_method_uninstall` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_postflight_install` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_postflight_update` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_preflight_install` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_preflight_update` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_placeholders` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_sales_server` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_site_event` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_sql` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_update_server` TINYINT(1) NOT NULL DEFAULT 0,
 	`addadmin_views` TEXT NOT NULL,
 	`addconfig` TEXT NOT NULL,
 	`addcontributors` TEXT NOT NULL,
@@ -26,35 +26,35 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	`addcustommenus` TEXT NOT NULL,
 	`addfiles` TEXT NOT NULL,
 	`addfolders` TEXT NOT NULL,
-	`addfootable` TINYINT(1) NOT NULL DEFAULT '0',
-	`addreadme` TINYINT(1) NOT NULL DEFAULT '0',
+	`addfootable` TINYINT(1) NOT NULL DEFAULT 0,
+	`addreadme` TINYINT(1) NOT NULL DEFAULT 0,
 	`addsite_views` TEXT NOT NULL,
-	`adduikit` TINYINT(1) NOT NULL DEFAULT '0',
+	`adduikit` TINYINT(1) NOT NULL DEFAULT 0,
 	`author` VARCHAR(255) NOT NULL DEFAULT '',
 	`bom` CHAR(64) NOT NULL DEFAULT '',
-	`buildcomp` TINYINT(1) NOT NULL DEFAULT '0',
+	`buildcomp` TINYINT(1) NOT NULL DEFAULT 0,
 	`buildcompsql` MEDIUMTEXT NOT NULL,
 	`companyname` CHAR(64) NOT NULL DEFAULT '',
 	`component_version` CHAR(64) NOT NULL DEFAULT '',
 	`copyright` VARCHAR(255) NOT NULL DEFAULT '',
-	`creatuserhelper` TINYINT(1) NOT NULL DEFAULT '0',
+	`creatuserhelper` TINYINT(1) NOT NULL DEFAULT 0,
 	`css` TEXT NOT NULL,
 	`dashboard_tab` TEXT NOT NULL,
-	`debug_linenr` TINYINT(1) NOT NULL DEFAULT '0',
+	`debug_linenr` TINYINT(1) NOT NULL DEFAULT 0,
 	`description` TEXT NOT NULL,
 	`email` VARCHAR(255) NOT NULL DEFAULT '',
-	`emptycontributors` TINYINT(1) NOT NULL DEFAULT '0',
+	`emptycontributors` TINYINT(1) NOT NULL DEFAULT 0,
 	`export_buy_link` VARCHAR(255) NOT NULL DEFAULT '',
 	`export_key` TEXT NOT NULL,
 	`export_package_link` VARCHAR(255) NOT NULL DEFAULT '',
 	`image` CHAR(64) NOT NULL DEFAULT '',
 	`license` VARCHAR(255) NOT NULL DEFAULT '',
-	`license_type` TINYINT(1) NOT NULL DEFAULT '0',
-	`mvc_versiondate` TINYINT(1) NOT NULL DEFAULT '0',
+	`license_type` TINYINT(1) NOT NULL DEFAULT 0,
+	`mvc_versiondate` TINYINT(1) NOT NULL DEFAULT 0,
 	`name` CHAR(64) NOT NULL DEFAULT '',
 	`name_code` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
-	`number` INT(11) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
+	`number` INT(11) NOT NULL DEFAULT 0,
 	`php_admin_event` MEDIUMTEXT NOT NULL,
 	`php_dashboard_methods` MEDIUMTEXT NOT NULL,
 	`php_helper_admin` MEDIUMTEXT NOT NULL,
@@ -74,7 +74,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
 	`update_server` VARCHAR(255) NOT NULL DEFAULT '',
 	`update_server_ftp` TEXT NOT NULL,
-	`update_server_target` TINYINT(1) NOT NULL DEFAULT '0',
+	`update_server_target` TINYINT(1) NOT NULL DEFAULT 0,
 	`version_update` TEXT NOT NULL,
 	`website` CHAR(255) NOT NULL DEFAULT '',
 	`whmcs_key` VARCHAR(255) NOT NULL DEFAULT '',
@@ -131,31 +131,31 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_joomla_component` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_css_view` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_css_views` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_custom_button` INT(1) NOT NULL DEFAULT '0',
-	`add_custom_import` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_fadein` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_javascript_view_file` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_javascript_views_file` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_after_delete` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_after_publish` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_allowedit` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_batchcopy` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_batchmove` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_before_delete` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_before_publish` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_document` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_getitem` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_getitems` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_getitems_after_all` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_postsavehook` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_save` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_sql` TINYINT(1) NOT NULL DEFAULT '0',
+	`add_css_view` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_css_views` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_custom_button` INT(1) NOT NULL DEFAULT 0,
+	`add_custom_import` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_fadein` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_javascript_view_file` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_javascript_views_file` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_after_delete` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_after_publish` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_allowedit` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_batchcopy` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_batchmove` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_before_delete` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_before_publish` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_getitem` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_getitems` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_getitems_after_all` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_postsavehook` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_save` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_sql` TINYINT(1) NOT NULL DEFAULT 0,
 	`addconditions` TEXT NOT NULL,
 	`addfields` TEXT NOT NULL,
 	`addlinked_views` TEXT NOT NULL,
@@ -177,7 +177,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`javascript_views_footer` TEXT NOT NULL,
 	`name_list` CHAR(64) NOT NULL DEFAULT '',
 	`name_single` CHAR(64) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`php_after_delete` MEDIUMTEXT NOT NULL,
 	`php_after_publish` MEDIUMTEXT NOT NULL,
 	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
@@ -203,10 +203,10 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`php_postsavehook` MEDIUMTEXT NOT NULL,
 	`php_save` MEDIUMTEXT NOT NULL,
 	`short_description` VARCHAR(255) NOT NULL DEFAULT '',
-	`source` TINYINT(1) NOT NULL DEFAULT '0',
+	`source` TINYINT(1) NOT NULL DEFAULT 0,
 	`sql` MEDIUMTEXT NOT NULL,
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`type` INT(11) NOT NULL DEFAULT '0',
+	`type` INT(11) NOT NULL DEFAULT 0,
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -259,14 +259,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_css` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_css_document` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_custom_button` INT(1) NOT NULL DEFAULT '0',
-	`add_js_document` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_document` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_jview` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_jview_display` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_view` TINYINT(1) NOT NULL DEFAULT '0',
+	`add_css` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_css_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_custom_button` INT(1) NOT NULL DEFAULT 0,
+	`add_js_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_jview` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
 	`codename` VARCHAR(255) NOT NULL DEFAULT '',
 	`css` TEXT NOT NULL,
 	`css_document` TEXT NOT NULL,
@@ -274,19 +274,19 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 	`custom_get` TEXT NOT NULL,
 	`default` TEXT NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`dynamic_get` INT(11) NOT NULL DEFAULT '0',
+	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`icon` CHAR(64) NOT NULL DEFAULT '',
 	`js_document` TEXT NOT NULL,
-	`main_get` INT(11) NOT NULL DEFAULT '0',
+	`main_get` INT(11) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`php_controller` MEDIUMTEXT NOT NULL,
 	`php_document` MEDIUMTEXT NOT NULL,
 	`php_jview` MEDIUMTEXT NOT NULL,
 	`php_jview_display` MEDIUMTEXT NOT NULL,
 	`php_model` MEDIUMTEXT NOT NULL,
 	`php_view` MEDIUMTEXT NOT NULL,
-	`snippet` INT(11) NOT NULL DEFAULT '0',
+	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
@@ -323,17 +323,17 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_admin_view` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_css` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_css_document` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_custom_button` INT(1) NOT NULL DEFAULT '0',
-	`add_js_document` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_document` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_jview` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_jview_display` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_view` TINYINT(1) NOT NULL DEFAULT '0',
+	`add_css` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_css_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_custom_button` INT(1) NOT NULL DEFAULT 0,
+	`add_js_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_document` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_jview` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_jview_display` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
 	`ajax_input` TEXT NOT NULL,
-	`button_position` TINYINT(1) NOT NULL DEFAULT '1',
+	`button_position` TINYINT(1) NOT NULL DEFAULT 1,
 	`codename` VARCHAR(255) NOT NULL DEFAULT '',
 	`css` TEXT NOT NULL,
 	`css_document` TEXT NOT NULL,
@@ -341,11 +341,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`custom_get` TEXT NOT NULL,
 	`default` TEXT NOT NULL,
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`dynamic_get` INT(11) NOT NULL DEFAULT '0',
+	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`js_document` TEXT NOT NULL,
-	`main_get` INT(11) NOT NULL DEFAULT '0',
+	`main_get` INT(11) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
 	`php_controller` MEDIUMTEXT NOT NULL,
 	`php_document` MEDIUMTEXT NOT NULL,
@@ -353,7 +353,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 	`php_jview_display` MEDIUMTEXT NOT NULL,
 	`php_model` MEDIUMTEXT NOT NULL,
 	`php_view` MEDIUMTEXT NOT NULL,
-	`snippet` INT(11) NOT NULL DEFAULT '0',
+	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
@@ -392,14 +392,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_site_view` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_php_view` TINYINT(1) NOT NULL DEFAULT '0',
+	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
 	`alias` VARCHAR(255) NOT NULL DEFAULT '',
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`dynamic_get` INT(11) NOT NULL DEFAULT '0',
+	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`php_view` MEDIUMTEXT NOT NULL,
-	`snippet` INT(11) NOT NULL DEFAULT '0',
+	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`template` TEXT NOT NULL,
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
@@ -428,15 +428,15 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_template` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_php_view` TINYINT(1) NOT NULL DEFAULT '0',
+	`add_php_view` TINYINT(1) NOT NULL DEFAULT 0,
 	`alias` VARCHAR(255) NOT NULL DEFAULT '',
 	`description` VARCHAR(255) NOT NULL DEFAULT '',
-	`dynamic_get` INT(11) NOT NULL DEFAULT '0',
+	`dynamic_get` INT(11) NOT NULL DEFAULT 0,
 	`layout` TEXT NOT NULL,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`php_view` MEDIUMTEXT NOT NULL,
-	`snippet` INT(11) NOT NULL DEFAULT '0',
+	`snippet` INT(11) NOT NULL DEFAULT 0,
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -464,25 +464,25 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_layout` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_php_after_getitem` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_after_getitems` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_before_getitem` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_before_getitems` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT '0',
+	`add_php_after_getitem` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_after_getitems` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_before_getitem` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_before_getitems` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_getlistquery` TINYINT(1) NOT NULL DEFAULT 0,
 	`addcalculation` CHAR NOT NULL DEFAULT '',
 	`db_selection` TEXT NOT NULL,
 	`db_table_main` VARCHAR(255) NOT NULL DEFAULT '',
 	`filter` TEXT NOT NULL,
 	`getcustom` VARCHAR(255) NOT NULL DEFAULT '',
-	`gettype` TINYINT(1) NOT NULL DEFAULT '0',
+	`gettype` TINYINT(1) NOT NULL DEFAULT 0,
 	`global` TEXT NOT NULL,
 	`join_db_table` TEXT NOT NULL,
 	`join_view_table` TEXT NOT NULL,
-	`main_source` TINYINT(1) NOT NULL DEFAULT '0',
+	`main_source` TINYINT(1) NOT NULL DEFAULT 0,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`order` TEXT NOT NULL,
-	`pagination` TINYINT(1) NOT NULL DEFAULT '1',
+	`pagination` TINYINT(1) NOT NULL DEFAULT 1,
 	`php_after_getitem` MEDIUMTEXT NOT NULL,
 	`php_after_getitems` MEDIUMTEXT NOT NULL,
 	`php_before_getitem` MEDIUMTEXT NOT NULL,
@@ -491,7 +491,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_dynamic_get` (
 	`php_custom_get` MEDIUMTEXT NOT NULL,
 	`php_getlistquery` MEDIUMTEXT NOT NULL,
 	`view_selection` TEXT NOT NULL,
-	`view_table_main` INT(11) NOT NULL DEFAULT '0',
+	`view_table_main` INT(11) NOT NULL DEFAULT 0,
 	`where` TEXT NOT NULL,
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
@@ -527,18 +527,18 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_custom_code` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`code` MEDIUMTEXT NOT NULL,
-	`comment_type` TINYINT(1) NOT NULL DEFAULT '1',
-	`component` INT(11) NOT NULL DEFAULT '0',
+	`comment_type` TINYINT(1) NOT NULL DEFAULT 1,
+	`component` INT(11) NOT NULL DEFAULT 0,
 	`from_line` VARCHAR(100) NOT NULL DEFAULT '',
 	`function_name` VARCHAR(255) NOT NULL DEFAULT '',
 	`hashendtarget` VARCHAR(64) NOT NULL DEFAULT '',
 	`hashtarget` VARCHAR(64) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`path` TEXT NOT NULL,
 	`system_name` VARCHAR(255) NOT NULL DEFAULT '',
-	`target` TINYINT(1) NOT NULL DEFAULT '0',
+	`target` TINYINT(1) NOT NULL DEFAULT 0,
 	`to_line` VARCHAR(100) NOT NULL DEFAULT '',
-	`type` TINYINT(1) NOT NULL DEFAULT '0',
+	`type` TINYINT(1) NOT NULL DEFAULT 0,
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
 	`created_by` INT(10) unsigned NOT NULL DEFAULT 0,
@@ -572,7 +572,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` (
 	`heading` VARCHAR(255) NOT NULL DEFAULT '',
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`snippet` TEXT NOT NULL,
-	`type` INT(11) NOT NULL DEFAULT '0',
+	`type` INT(11) NOT NULL DEFAULT 0,
 	`url` VARCHAR(255) NOT NULL DEFAULT '',
 	`usage` TEXT NOT NULL,
 	`params` text NOT NULL DEFAULT '',
@@ -600,11 +600,11 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_snippet` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`add_css_view` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_css_views` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT '0',
-	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT '0',
-	`catid` INT(11) NOT NULL DEFAULT '0',
+	`add_css_view` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_css_views` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_javascript_view_footer` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_javascript_views_footer` TINYINT(1) NOT NULL DEFAULT 0,
+	`catid` INT(11) NOT NULL DEFAULT 0,
 	`css_view` TEXT NOT NULL,
 	`css_views` TEXT NOT NULL,
 	`datadefault` CHAR(64) NOT NULL DEFAULT '',
@@ -612,14 +612,14 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 	`datalenght` CHAR(64) NOT NULL DEFAULT '',
 	`datalenght_other` CHAR(64) NOT NULL DEFAULT '',
 	`datatype` CHAR(64) NOT NULL DEFAULT '',
-	`fieldtype` INT(11) NOT NULL DEFAULT '0',
+	`fieldtype` INT(11) NOT NULL DEFAULT 0,
 	`indexes` CHAR(64) NOT NULL DEFAULT '',
 	`javascript_view_footer` TEXT NOT NULL,
 	`javascript_views_footer` TEXT NOT NULL,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`null_switch` CHAR(64) NOT NULL DEFAULT '',
-	`store` INT(11) NOT NULL DEFAULT '0',
+	`store` INT(11) NOT NULL DEFAULT 0,
 	`xml` TEXT NOT NULL,
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
@@ -658,7 +658,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_field` (
 CREATE TABLE IF NOT EXISTS `#__componentbuilder_fieldtype` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
-	`catid` INT(11) NOT NULL DEFAULT '0',
+	`catid` INT(11) NOT NULL DEFAULT 0,
 	`description` TEXT NOT NULL,
 	`name` VARCHAR(255) NOT NULL DEFAULT '',
 	`properties` TEXT NOT NULL,
@@ -742,15 +742,15 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_help_document` (
 	`asset_id` INT(10) unsigned NOT NULL DEFAULT 0 COMMENT 'FK to the #__assets table.',
 	`admin_view` CHAR(255) NOT NULL DEFAULT '',
 	`alias` CHAR(64) NOT NULL DEFAULT '',
-	`article` TINYINT(1) NOT NULL DEFAULT '0',
+	`article` TINYINT(1) NOT NULL DEFAULT 0,
 	`content` TEXT NOT NULL,
 	`groups` TEXT NOT NULL,
-	`location` TINYINT(1) NOT NULL DEFAULT '0',
-	`not_required` INT(1) NOT NULL DEFAULT '0',
+	`location` TINYINT(1) NOT NULL DEFAULT 0,
+	`not_required` INT(1) NOT NULL DEFAULT 0,
 	`site_view` CHAR(255) NOT NULL DEFAULT '',
-	`target` TINYINT(1) NOT NULL DEFAULT '0',
+	`target` TINYINT(1) NOT NULL DEFAULT 0,
 	`title` CHAR(64) NOT NULL DEFAULT '',
-	`type` TINYINT(1) NOT NULL DEFAULT '0',
+	`type` TINYINT(1) NOT NULL DEFAULT 0,
 	`url` VARCHAR(255) NOT NULL DEFAULT '',
 	`params` text NOT NULL DEFAULT '',
 	`published` TINYINT(3) NOT NULL DEFAULT 1,
diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php
index 83df387b6..9e66383d1 100644
--- a/admin/tables/custom_code.php
+++ b/admin/tables/custom_code.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		custom_code.php
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 45217b177..5c4b29858 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		help_document.php
diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php
index 5532a9a80..99e80e968 100644
--- a/admin/tables/joomla_component.php
+++ b/admin/tables/joomla_component.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		joomla_component.php
diff --git a/admin/tables/layout.php b/admin/tables/layout.php
index 665bfc735..4b455e58c 100644
--- a/admin/tables/layout.php
+++ b/admin/tables/layout.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		layout.php
diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php
index ec7016f5a..b9c2211d8 100644
--- a/admin/views/compiler/tmpl/default.php
+++ b/admin/views/compiler/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			25th April, 2017
+	@version		@update number 49 of this MVC
+	@build			31st May, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		default.php
@@ -50,7 +50,7 @@ Joomla.submitbutton = function(task)
 		var component = jQuery('#component').val();
 		var isValid = true;
 		
-		if(component == "" && task == 'compiler.compiler'){
+		if(component == '' && task == 'compiler.compiler'){
 			isValid = false;
 		}
 		if (isValid){
diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php
index 901ea2b50..941b7ec39 100644
--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 48 of this MVC
-	@build			25th April, 2017
+	@version		@update number 49 of this MVC
+	@build			31st May, 2017
 	@created		1st February, 2017
 	@package		Component Builder
 	@subpackage		view.html.php
@@ -252,9 +252,9 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 			// to check is READ/NEW
 			function getIS(type,notice){
 				if (type == 1) {
-					var getUrl = \"index.php?option=com_componentbuilder&task=ajax.isNew&format=json\";
+					var getUrl = JRouter(\"index.php?option=com_componentbuilder&task=ajax.isNew&format=json\");
 				} else if (type == 2) {
-					var getUrl = \"index.php?option=com_componentbuilder&task=ajax.isRead&format=json\";
+					var getUrl = JRouter(\"index.php?option=com_componentbuilder&task=ajax.isRead&format=json\");
 				}	
 				if(token.length > 0 && notice.length){
 					var request = \"token=\"+token+\"&notice=\"+notice;
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index 7a44b3268..8d3fdf515 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_closed_issues_the_closed_issues_on_github.php
index 050f9a812..8947417a1 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_closed_issues_the_closed_issues_on_github.php
diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php
index 6a6efab64..c2631f8d3 100644
--- a/admin/views/componentbuilder/tmpl/default_main.php
+++ b/admin/views/componentbuilder/tmpl/default_main.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_main.php
diff --git a/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php b/admin/views/componentbuilder/tmpl/default_open_issues_the_open_issues_on_github.php
index d9458b895..ab9a9ce33 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_open_issues_the_open_issues_on_github.php
diff --git a/admin/views/componentbuilder/tmpl/default_readme_information.php b/admin/views/componentbuilder/tmpl/default_readme_information.php
index 67b740f50..dc8ad7776 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_readme_information.php
diff --git a/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php b/admin/views/componentbuilder/tmpl/default_vast_development_method_notice_board.php
index 117dc0321..78be4e2c8 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_vast_development_method_notice_board.php
diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php
index d4d8358fe..25dc090b5 100644
--- a/admin/views/componentbuilder/tmpl/default_vdm.php
+++ b/admin/views/componentbuilder/tmpl/default_vdm.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_vdm.php
diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php
index 70fd352a4..4cda33f31 100644
--- a/admin/views/componentbuilder/view.html.php
+++ b/admin/views/componentbuilder/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/custom_code/submitbutton.js b/admin/views/custom_code/submitbutton.js
index 1701b3736..7bcfb5169 100644
--- a/admin/views/custom_code/submitbutton.js
+++ b/admin/views/custom_code/submitbutton.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php
index 91dbfb6f8..21a3adea2 100644
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php
index 7b618da88..a0c06bbc2 100644
--- a/admin/views/custom_code/view.html.php
+++ b/admin/views/custom_code/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/custom_codes/tmpl/default.php b/admin/views/custom_codes/tmpl/default.php
index 97ed6689a..588c45170 100644
--- a/admin/views/custom_codes/tmpl/default.php
+++ b/admin/views/custom_codes/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/custom_codes/tmpl/default_batch_body.php b/admin/views/custom_codes/tmpl/default_batch_body.php
index 7ce9ee0fb..da5e0064a 100644
--- a/admin/views/custom_codes/tmpl/default_batch_body.php
+++ b/admin/views/custom_codes/tmpl/default_batch_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/custom_codes/tmpl/default_batch_footer.php b/admin/views/custom_codes/tmpl/default_batch_footer.php
index 6804bc15e..5ead4a660 100644
--- a/admin/views/custom_codes/tmpl/default_batch_footer.php
+++ b/admin/views/custom_codes/tmpl/default_batch_footer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/custom_codes/tmpl/default_body.php b/admin/views/custom_codes/tmpl/default_body.php
index 4dad8cc79..8c03c8ef7 100644
--- a/admin/views/custom_codes/tmpl/default_body.php
+++ b/admin/views/custom_codes/tmpl/default_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/custom_codes/tmpl/default_foot.php b/admin/views/custom_codes/tmpl/default_foot.php
index 107c52be9..375e5ef9c 100644
--- a/admin/views/custom_codes/tmpl/default_foot.php
+++ b/admin/views/custom_codes/tmpl/default_foot.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/custom_codes/tmpl/default_head.php b/admin/views/custom_codes/tmpl/default_head.php
index 33283916c..b11b00ac2 100644
--- a/admin/views/custom_codes/tmpl/default_head.php
+++ b/admin/views/custom_codes/tmpl/default_head.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/custom_codes/tmpl/default_toolbar.php b/admin/views/custom_codes/tmpl/default_toolbar.php
index 0d6876997..15f47fd1c 100644
--- a/admin/views/custom_codes/tmpl/default_toolbar.php
+++ b/admin/views/custom_codes/tmpl/default_toolbar.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php
index b0e353887..46ab067eb 100644
--- a/admin/views/custom_codes/view.html.php
+++ b/admin/views/custom_codes/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 82 of this MVC
-	@build			25th April, 2017
+	@build			26th April, 2017
 	@created		11th October, 2016
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js
index b8f8f0aac..43fc878f4 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 008332890..623e00438 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index 950cf867f..914ed2364 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index bd97385a4..c475a4f25 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php
index 1b6e9f603..6ae140a23 100644
--- a/admin/views/help_documents/tmpl/default_batch_body.php
+++ b/admin/views/help_documents/tmpl/default_batch_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php
index 2d658233d..b17000070 100644
--- a/admin/views/help_documents/tmpl/default_batch_footer.php
+++ b/admin/views/help_documents/tmpl/default_batch_footer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php
index dd59f6adb..17d8d6021 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php
index a034d0cc4..6930ef269 100644
--- a/admin/views/help_documents/tmpl/default_foot.php
+++ b/admin/views/help_documents/tmpl/default_foot.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php
index 5b22f3a96..307cb65f0 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php
index 9223cd26b..8aa3d9a9a 100644
--- a/admin/views/help_documents/tmpl/default_toolbar.php
+++ b/admin/views/help_documents/tmpl/default_toolbar.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index c719328be..786c28036 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 6 of this MVC
-	@build			17th October, 2016
+	@build			18th October, 2016
 	@created		4th March, 2016
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index 3194d6819..704947160 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 0d5a19b00..abe951546 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/import_joomla_components/tmpl/default.php b/admin/views/import_joomla_components/tmpl/default.php
index c33db681f..54c5072e0 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php
index 705922f36..589cf62ba 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.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js
index dff667f55..5cf8b5e85 100644
--- a/admin/views/joomla_component/submitbutton.js
+++ b/admin/views/joomla_component/submitbutton.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php
index 8225e3972..5a25da765 100644
--- a/admin/views/joomla_component/tmpl/edit.php
+++ b/admin/views/joomla_component/tmpl/edit.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php
index adce000d3..38569035a 100644
--- a/admin/views/joomla_component/view.html.php
+++ b/admin/views/joomla_component/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php
index a93917307..95382d6d3 100644
--- a/admin/views/joomla_components/tmpl/default.php
+++ b/admin/views/joomla_components/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/joomla_components/tmpl/default_batch_body.php b/admin/views/joomla_components/tmpl/default_batch_body.php
index 11a09b47b..06e9d584c 100644
--- a/admin/views/joomla_components/tmpl/default_batch_body.php
+++ b/admin/views/joomla_components/tmpl/default_batch_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/joomla_components/tmpl/default_batch_footer.php b/admin/views/joomla_components/tmpl/default_batch_footer.php
index 0a0362e4e..34161ec54 100644
--- a/admin/views/joomla_components/tmpl/default_batch_footer.php
+++ b/admin/views/joomla_components/tmpl/default_batch_footer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/joomla_components/tmpl/default_body.php b/admin/views/joomla_components/tmpl/default_body.php
index 80616827c..36db30163 100644
--- a/admin/views/joomla_components/tmpl/default_body.php
+++ b/admin/views/joomla_components/tmpl/default_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/joomla_components/tmpl/default_foot.php b/admin/views/joomla_components/tmpl/default_foot.php
index 5b9f0c56f..f0d48a41d 100644
--- a/admin/views/joomla_components/tmpl/default_foot.php
+++ b/admin/views/joomla_components/tmpl/default_foot.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/joomla_components/tmpl/default_head.php b/admin/views/joomla_components/tmpl/default_head.php
index de52af8a0..db25a066f 100644
--- a/admin/views/joomla_components/tmpl/default_head.php
+++ b/admin/views/joomla_components/tmpl/default_head.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/joomla_components/tmpl/default_toolbar.php b/admin/views/joomla_components/tmpl/default_toolbar.php
index 3ecd33f75..3c822791d 100644
--- a/admin/views/joomla_components/tmpl/default_toolbar.php
+++ b/admin/views/joomla_components/tmpl/default_toolbar.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index b643e073d..7ce15c7c2 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		@update number 338 of this MVC
-	@build			20th May, 2017
+	@build			29th May, 2017
 	@created		6th May, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/layout/submitbutton.js b/admin/views/layout/submitbutton.js
index c4b7df6e1..b77c97157 100644
--- a/admin/views/layout/submitbutton.js
+++ b/admin/views/layout/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php
index dc4fca982..873b1a893 100644
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php
index b26332ca3..c0465a16a 100644
--- a/admin/views/layout/view.html.php
+++ b/admin/views/layout/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/layouts/tmpl/default.php b/admin/views/layouts/tmpl/default.php
index 0c912e398..152507bbd 100644
--- a/admin/views/layouts/tmpl/default.php
+++ b/admin/views/layouts/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/layouts/tmpl/default_batch_body.php b/admin/views/layouts/tmpl/default_batch_body.php
index 16d0f75e6..186ac4919 100644
--- a/admin/views/layouts/tmpl/default_batch_body.php
+++ b/admin/views/layouts/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/layouts/tmpl/default_batch_footer.php b/admin/views/layouts/tmpl/default_batch_footer.php
index 849d4afeb..9f86d0a30 100644
--- a/admin/views/layouts/tmpl/default_batch_footer.php
+++ b/admin/views/layouts/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/layouts/tmpl/default_body.php b/admin/views/layouts/tmpl/default_body.php
index 3151f540e..4bb78c31b 100644
--- a/admin/views/layouts/tmpl/default_body.php
+++ b/admin/views/layouts/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/layouts/tmpl/default_foot.php b/admin/views/layouts/tmpl/default_foot.php
index f994a1057..66153c338 100644
--- a/admin/views/layouts/tmpl/default_foot.php
+++ b/admin/views/layouts/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/layouts/tmpl/default_head.php b/admin/views/layouts/tmpl/default_head.php
index 77b33b936..ab9f18dc1 100644
--- a/admin/views/layouts/tmpl/default_head.php
+++ b/admin/views/layouts/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/layouts/tmpl/default_toolbar.php b/admin/views/layouts/tmpl/default_toolbar.php
index 0f363e8e2..3137e9f02 100644
--- a/admin/views/layouts/tmpl/default_toolbar.php
+++ b/admin/views/layouts/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php
index 5c5c246ea..8ea9e0c40 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 67 of this MVC
-	@build			1st April, 2017
+	@version		@update number 77 of this MVC
+	@build			30th May, 2017
 	@created		18th May, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/componentbuilder.xml b/componentbuilder.xml
index b51f14b09..4356d3968 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>28th May, 2017</creationDate>
+	<creationDate>5th June, 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 c927d5387..13082114b 100644
--- a/script.php
+++ b/script.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		2.4.6
-	@build			28th May, 2017
+	@build			5th June, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		script.php
@@ -1581,7 +1581,7 @@ class com_componentbuilderInstallerScript
 			$layout->type_title = 'Componentbuilder Layout';
 			$layout->type_alias = 'com_componentbuilder.layout';
 			$layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","layout":"layout","add_php_view":"add_php_view","not_required":"not_required"}}';
+			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","add_php_view":"add_php_view","layout":"layout","not_required":"not_required","php_view":"php_view"}}';
 			$layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute';
 			$layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","dynamic_get","snippet","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"}]}';
 
@@ -1886,7 +1886,7 @@ class com_componentbuilderInstallerScript
 			$layout->type_title = 'Componentbuilder Layout';
 			$layout->type_alias = 'com_componentbuilder.layout';
 			$layout->table = '{"special": {"dbtable": "#__componentbuilder_layout","key": "id","type": "Layout","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","php_view":"php_view","layout":"layout","add_php_view":"add_php_view","not_required":"not_required"}}';
+			$layout->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "name","core_state": "published","core_alias": "alias","core_created_time": "created","core_modified_time": "modified","core_body": "null","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"name":"name","alias":"alias","description":"description","dynamic_get":"dynamic_get","snippet":"snippet","add_php_view":"add_php_view","layout":"layout","not_required":"not_required","php_view":"php_view"}}';
 			$layout->router = 'ComponentbuilderHelperRoute::getLayoutRoute';
 			$layout->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/layout.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","dynamic_get","snippet","add_php_view","not_required"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "dynamic_get","targetTable": "#__componentbuilder_dynamic_get","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "snippet","targetTable": "#__componentbuilder_snippet","targetColumn": "id","displayColumn": "name"}]}';