From 5d19f4607097042e805c9dfeb90c71d700bbbcaf Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Thu, 2 Jun 2016 17:18:49 +0100
Subject: [PATCH] Added the option to overwrite the default-fields, so you can
 add them to the list view in admin area and change their layout position in
 the edit view. Also fixed some minor bugs.

---
 README.md                                     |  10 +-
 admin/assets/css/admin.css                    |   4 +-
 admin/assets/css/admin_view.css               |   4 +-
 admin/assets/css/admin_views.css              |   4 +-
 admin/assets/css/component.css                |   4 +-
 admin/assets/css/components.css               |   4 +-
 admin/assets/css/custom_admin_view.css        |   4 +-
 admin/assets/css/custom_admin_views.css       |   4 +-
 admin/assets/css/dashboard.css                |   4 +-
 admin/assets/css/dynamic_get.css              |   4 +-
 admin/assets/css/dynamic_gets.css             |   4 +-
 admin/assets/css/field.css                    |   4 +-
 admin/assets/css/fields.css                   |   4 +-
 admin/assets/css/fieldtype.css                |   4 +-
 admin/assets/css/fieldtypes.css               |   4 +-
 admin/assets/css/help_document.css            |   4 +-
 admin/assets/css/help_documents.css           |   4 +-
 admin/assets/css/layout.css                   |   4 +-
 admin/assets/css/layouts.css                  |   4 +-
 admin/assets/css/site_view.css                |   4 +-
 admin/assets/css/site_views.css               |   4 +-
 admin/assets/css/snippet.css                  |   4 +-
 admin/assets/css/snippets.css                 |   4 +-
 admin/assets/css/template.css                 |   4 +-
 admin/assets/css/templates.css                |   4 +-
 .../compiler/joomla_3/install.mysql.utf8.sql  |   7 +-
 admin/componentbuilder.php                    |   4 +-
 admin/controller.php                          |   4 +-
 admin/controllers/admin_view.php              |   4 +-
 admin/controllers/admin_views.php             |   4 +-
 admin/controllers/ajax.json.php               |   4 +-
 admin/controllers/compiler.php                |   4 +-
 admin/controllers/component.php               |   4 +-
 admin/controllers/componentbuilder.php        |   4 +-
 admin/controllers/components.php              |   4 +-
 admin/controllers/custom_admin_view.php       |   4 +-
 admin/controllers/custom_admin_views.php      |   4 +-
 admin/controllers/dynamic_get.php             |   4 +-
 admin/controllers/dynamic_gets.php            |   4 +-
 admin/controllers/field.php                   |   4 +-
 admin/controllers/fields.php                  |   4 +-
 admin/controllers/fieldtype.php               |   4 +-
 admin/controllers/fieldtypes.php              |   4 +-
 admin/controllers/help.php                    |   4 +-
 admin/controllers/help_document.php           |   4 +-
 admin/controllers/help_documents.php          |   4 +-
 admin/controllers/import.php                  |   4 +-
 admin/controllers/layout.php                  |   4 +-
 admin/controllers/layouts.php                 |   4 +-
 admin/controllers/site_view.php               |   4 +-
 admin/controllers/site_views.php              |   4 +-
 admin/controllers/snippet.php                 |   4 +-
 admin/controllers/snippets.php                |   4 +-
 admin/controllers/template.php                |   4 +-
 admin/controllers/templates.php               |   4 +-
 admin/helpers/compiler/c_Fields.php           | 437 ++++++++++------
 admin/helpers/compiler/e_Interpretation.php   | 474 ++++++++++++------
 admin/helpers/componentbuilder.php            |   4 +-
 admin/helpers/html/batch_.php                 |   4 +-
 admin/helpers/indenter.php                    |   4 +-
 admin/helpers/js.php                          |   4 +-
 admin/helpers/minify.php                      |   4 +-
 .../en-GB/en-GB.com_componentbuilder.ini      | 132 +++--
 admin/layouts/admin_view/css_fullwidth.php    |   4 +-
 .../admin_view/custom_import_fullwidth.php    |   4 +-
 admin/layouts/admin_view/fields_fullwidth.php |   4 +-
 .../admin_view/javascript_fullwidth.php       |   4 +-
 admin/layouts/admin_view/mysql_fullwidth.php  |   4 +-
 admin/layouts/admin_view/mysql_left.php       |   4 +-
 admin/layouts/admin_view/php_fullwidth.php    |   4 +-
 admin/layouts/admin_view/publishing.php       |   4 +-
 admin/layouts/admin_view/publlshing.php       |   4 +-
 admin/layouts/admin_view/settings_above.php   |   4 +-
 admin/layouts/admin_view/settings_left.php    |   4 +-
 admin/layouts/admin_view/settings_right.php   |   4 +-
 admin/layouts/admin_view/settings_under.php   |   4 +-
 admin/layouts/batchselection.php              |   4 +-
 .../component/admin_views_fullwidth.php       |   4 +-
 admin/layouts/component/details_above.php     |   4 +-
 admin/layouts/component/details_left.php      |   4 +-
 admin/layouts/component/details_right.php     |   4 +-
 admin/layouts/component/details_under.php     |   4 +-
 .../component/ftp_servers_fullwidth.php       |   4 +-
 admin/layouts/component/publishing.php        |   4 +-
 admin/layouts/component/publlshing.php        |   4 +-
 admin/layouts/component/readme_left.php       |   4 +-
 admin/layouts/component/readme_right.php      |   4 +-
 admin/layouts/component/scripts_fullwidth.php |   4 +-
 admin/layouts/component/settings_left.php     |   4 +-
 admin/layouts/component/settings_right.php    |   4 +-
 .../component/site_views_fullwidth.php        |   4 +-
 .../custom_buttons_fullwidth.php              |   4 +-
 .../custom_admin_view/custom_buttons_left.php |   4 +-
 .../custom_script_fullwidth.php               |   4 +-
 .../custom_admin_view/details_above.php       |   4 +-
 .../custom_admin_view/details_fullwidth.php   |   4 +-
 .../custom_admin_view/details_left.php        |   4 +-
 .../custom_admin_view/details_right.php       |   4 +-
 .../custom_admin_view/details_rightside.php   |   4 +-
 .../custom_admin_view/details_under.php       |   4 +-
 .../layouts/custom_admin_view/publishing.php  |   4 +-
 .../layouts/custom_admin_view/publlshing.php  |   4 +-
 .../layouts/dynamic_get/abacus_fullwidth.php  |   4 +-
 admin/layouts/dynamic_get/abacus_left.php     |   4 +-
 .../dynamic_get/custom_script_fullwidth.php   |   4 +-
 admin/layouts/dynamic_get/gettable_above.php  |   4 +-
 .../dynamic_get/gettable_fullwidth.php        |   4 +-
 admin/layouts/dynamic_get/gettable_left.php   |   4 +-
 admin/layouts/dynamic_get/gettable_right.php  |   4 +-
 admin/layouts/dynamic_get/gettable_under.php  |   4 +-
 admin/layouts/dynamic_get/publishing.php      |   4 +-
 admin/layouts/dynamic_get/publlshing.php      |   4 +-
 admin/layouts/field/details_fullwidth.php     |   4 +-
 admin/layouts/field/details_left.php          |   4 +-
 admin/layouts/field/details_right.php         |   4 +-
 admin/layouts/field/details_under.php         |   4 +-
 admin/layouts/field/publishing.php            |   4 +-
 admin/layouts/field/publlshing.php            |   4 +-
 admin/layouts/field/scripts_left.php          |   4 +-
 admin/layouts/field/scripts_right.php         |   4 +-
 admin/layouts/fieldtype/details_left.php      |   4 +-
 admin/layouts/fieldtype/details_right.php     |   4 +-
 admin/layouts/fieldtype/fields_fullwidth.php  |   4 +-
 admin/layouts/fieldtype/publishing.php        |   4 +-
 admin/layouts/fieldtype/publlshing.php        |   4 +-
 admin/layouts/help_document/details_above.php |   4 +-
 .../help_document/details_fullwidth.php       |   4 +-
 admin/layouts/help_document/details_left.php  |   4 +-
 admin/layouts/help_document/details_right.php |   4 +-
 admin/layouts/help_document/details_under.php |   4 +-
 admin/layouts/help_document/publishing.php    |   4 +-
 admin/layouts/help_document/publlshing.php    |   4 +-
 .../layout/custom_script_fullwidth.php        |   4 +-
 admin/layouts/layout/details_fullwidth.php    |   4 +-
 admin/layouts/layout/details_left.php         |   4 +-
 admin/layouts/layout/details_right.php        |   4 +-
 admin/layouts/layout/details_rightside.php    |   4 +-
 admin/layouts/layout/details_under.php        |   4 +-
 admin/layouts/layout/publishing.php           |   4 +-
 admin/layouts/layout/publlshing.php           |   4 +-
 .../site_view/custom_buttons_fullwidth.php    |   4 +-
 admin/layouts/site_view/details_above.php     |   4 +-
 admin/layouts/site_view/details_fullwidth.php |   4 +-
 admin/layouts/site_view/details_left.php      |   4 +-
 admin/layouts/site_view/details_right.php     |   4 +-
 admin/layouts/site_view/details_rightside.php |   4 +-
 admin/layouts/site_view/details_under.php     |   4 +-
 .../site_view/javascript_css_fullwidth.php    |   4 +-
 admin/layouts/site_view/php_fullwidth.php     |   4 +-
 admin/layouts/site_view/publishing.php        |   4 +-
 admin/layouts/site_view/publlshing.php        |   4 +-
 admin/layouts/snippet/details_above.php       |   4 +-
 admin/layouts/snippet/details_left.php        |   4 +-
 admin/layouts/snippet/details_right.php       |   4 +-
 admin/layouts/snippet/publishing.php          |   4 +-
 admin/layouts/snippet/publlshing.php          |   4 +-
 .../template/custom_script_fullwidth.php      |   4 +-
 admin/layouts/template/details_fullwidth.php  |   4 +-
 admin/layouts/template/details_left.php       |   4 +-
 admin/layouts/template/details_right.php      |   4 +-
 admin/layouts/template/details_rightside.php  |   4 +-
 admin/layouts/template/details_under.php      |   4 +-
 admin/layouts/template/publishing.php         |   4 +-
 admin/layouts/template/publlshing.php         |   4 +-
 admin/models/admin_view.php                   |   4 +-
 admin/models/admin_views.php                  |   4 +-
 admin/models/ajax.php                         |   4 +-
 admin/models/compiler.php                     |   4 +-
 admin/models/component.php                    |   4 +-
 admin/models/componentbuilder.php             |   4 +-
 admin/models/components.php                   |   4 +-
 admin/models/custom_admin_view.php            |   4 +-
 admin/models/custom_admin_views.php           |   4 +-
 admin/models/dynamic_get.php                  |   4 +-
 admin/models/dynamic_gets.php                 |   4 +-
 admin/models/field.php                        |   4 +-
 admin/models/fields.php                       |   4 +-
 admin/models/fields/adminviews.php            |   4 +-
 admin/models/fields/articles.php              |   4 +-
 admin/models/fields/customadminviews.php      |   4 +-
 admin/models/fields/customfilelist.php        |   4 +-
 admin/models/fields/customfolderlist.php      |   4 +-
 admin/models/fields/customgets.php            |   4 +-
 admin/models/fields/dbtables.php              |   4 +-
 admin/models/fields/dynamicgets.php           |   4 +-
 admin/models/fields/fields.php                |   4 +-
 admin/models/fields/fieldsmulti.php           |   4 +-
 admin/models/fields/fieldtypes.php            |   4 +-
 admin/models/fields/maingets.php              |   4 +-
 admin/models/fields/siteviews.php             |   4 +-
 admin/models/fields/snippets.php              |   4 +-
 admin/models/fieldtype.php                    |   4 +-
 admin/models/fieldtypes.php                   |   4 +-
 admin/models/forms/admin_view.js              |   4 +-
 admin/models/forms/admin_view.xml             |  10 +-
 admin/models/forms/component.js               |   4 +-
 admin/models/forms/component.xml              |  10 +-
 admin/models/forms/custom_admin_view.js       |   4 +-
 admin/models/forms/custom_admin_view.xml      |  10 +-
 admin/models/forms/dynamic_get.js             |   4 +-
 admin/models/forms/dynamic_get.xml            |  10 +-
 admin/models/forms/field.js                   |   4 +-
 admin/models/forms/field.xml                  |  10 +-
 admin/models/forms/fieldtype.js               |   4 +-
 admin/models/forms/fieldtype.xml              |  10 +-
 admin/models/forms/help_document.js           |   4 +-
 admin/models/forms/help_document.xml          |   9 +-
 admin/models/forms/layout.js                  |   4 +-
 admin/models/forms/layout.xml                 |  10 +-
 admin/models/forms/site_view.js               |   4 +-
 admin/models/forms/site_view.xml              |  10 +-
 admin/models/forms/snippet.js                 |   4 +-
 admin/models/forms/snippet.xml                |  10 +-
 admin/models/forms/template.js                |   4 +-
 admin/models/forms/template.xml               |  10 +-
 admin/models/help_document.php                |   4 +-
 admin/models/help_documents.php               |   4 +-
 admin/models/import.php                       |   4 +-
 admin/models/layout.php                       |   4 +-
 admin/models/layouts.php                      |   4 +-
 admin/models/site_view.php                    |   4 +-
 admin/models/site_views.php                   |   4 +-
 admin/models/snippet.php                      |   4 +-
 admin/models/snippets.php                     |   4 +-
 admin/models/template.php                     |   4 +-
 admin/models/templates.php                    |   4 +-
 admin/sql/install.mysql.utf8.sql              |   7 +-
 admin/sql/updates/mysql/2.1.10.sql            |   1 +
 admin/tables/admin_view.php                   |   4 +-
 admin/tables/component.php                    |   4 +-
 admin/tables/custom_admin_view.php            |   4 +-
 admin/tables/dynamic_get.php                  |   4 +-
 admin/tables/field.php                        |   4 +-
 admin/tables/fieldtype.php                    |   4 +-
 admin/tables/help_document.php                |   4 +-
 admin/tables/layout.php                       |   4 +-
 admin/tables/site_view.php                    |   4 +-
 admin/tables/snippet.php                      |   4 +-
 admin/tables/template.php                     |   4 +-
 admin/views/admin_view/submitbutton.js        |   4 +-
 admin/views/admin_view/tmpl/edit.php          |   4 +-
 admin/views/admin_view/view.html.php          |   4 +-
 admin/views/admin_views/tmpl/default.php      |   4 +-
 .../admin_views/tmpl/default_batch_body.php   |   4 +-
 .../admin_views/tmpl/default_batch_footer.php |   4 +-
 admin/views/admin_views/tmpl/default_body.php |   4 +-
 admin/views/admin_views/tmpl/default_foot.php |   4 +-
 admin/views/admin_views/tmpl/default_head.php |   4 +-
 .../admin_views/tmpl/default_toolbar.php      |   4 +-
 admin/views/admin_views/view.html.php         |   4 +-
 admin/views/compiler/tmpl/default.php         |   4 +-
 admin/views/compiler/view.html.php            |   4 +-
 admin/views/component/submitbutton.js         |   4 +-
 admin/views/component/tmpl/edit.php           |   4 +-
 admin/views/component/view.html.php           |   4 +-
 admin/views/componentbuilder/tmpl/default.php |   4 +-
 .../componentbuilder/tmpl/default_main.php    |   4 +-
 .../componentbuilder/tmpl/default_vdm.php     |   4 +-
 admin/views/componentbuilder/view.html.php    |   4 +-
 admin/views/components/tmpl/default.php       |   4 +-
 .../components/tmpl/default_batch_body.php    |   4 +-
 .../components/tmpl/default_batch_footer.php  |   4 +-
 admin/views/components/tmpl/default_body.php  |   4 +-
 admin/views/components/tmpl/default_foot.php  |   4 +-
 admin/views/components/tmpl/default_head.php  |   4 +-
 .../views/components/tmpl/default_toolbar.php |   4 +-
 admin/views/components/view.html.php          |   4 +-
 admin/views/custom_admin_view/submitbutton.js |   4 +-
 admin/views/custom_admin_view/tmpl/edit.php   |   4 +-
 admin/views/custom_admin_view/view.html.php   |   4 +-
 .../views/custom_admin_views/tmpl/default.php |   4 +-
 .../tmpl/default_batch_body.php               |   4 +-
 .../tmpl/default_batch_footer.php             |   4 +-
 .../custom_admin_views/tmpl/default_body.php  |   4 +-
 .../custom_admin_views/tmpl/default_foot.php  |   4 +-
 .../custom_admin_views/tmpl/default_head.php  |   4 +-
 .../tmpl/default_toolbar.php                  |   4 +-
 admin/views/custom_admin_views/view.html.php  |   4 +-
 admin/views/dynamic_get/submitbutton.js       |   4 +-
 admin/views/dynamic_get/tmpl/edit.php         |   4 +-
 admin/views/dynamic_get/view.html.php         |   4 +-
 admin/views/dynamic_gets/tmpl/default.php     |   4 +-
 .../dynamic_gets/tmpl/default_batch_body.php  |   4 +-
 .../tmpl/default_batch_footer.php             |   4 +-
 .../views/dynamic_gets/tmpl/default_body.php  |   4 +-
 .../views/dynamic_gets/tmpl/default_foot.php  |   4 +-
 .../views/dynamic_gets/tmpl/default_head.php  |   4 +-
 .../dynamic_gets/tmpl/default_toolbar.php     |   4 +-
 admin/views/dynamic_gets/view.html.php        |   4 +-
 admin/views/field/submitbutton.js             |   4 +-
 admin/views/field/tmpl/edit.php               |   4 +-
 admin/views/field/view.html.php               |   4 +-
 admin/views/fields/tmpl/default.php           |   4 +-
 .../views/fields/tmpl/default_batch_body.php  |   4 +-
 .../fields/tmpl/default_batch_footer.php      |   4 +-
 admin/views/fields/tmpl/default_body.php      |   4 +-
 admin/views/fields/tmpl/default_foot.php      |   4 +-
 admin/views/fields/tmpl/default_head.php      |   4 +-
 admin/views/fields/tmpl/default_toolbar.php   |   4 +-
 admin/views/fields/view.html.php              |   4 +-
 admin/views/fieldtype/submitbutton.js         |   4 +-
 admin/views/fieldtype/tmpl/edit.php           |   4 +-
 admin/views/fieldtype/view.html.php           |   4 +-
 admin/views/fieldtypes/tmpl/default.php       |   4 +-
 .../fieldtypes/tmpl/default_batch_body.php    |   4 +-
 .../fieldtypes/tmpl/default_batch_footer.php  |   4 +-
 admin/views/fieldtypes/tmpl/default_body.php  |   4 +-
 admin/views/fieldtypes/tmpl/default_foot.php  |   4 +-
 admin/views/fieldtypes/tmpl/default_head.php  |   4 +-
 .../views/fieldtypes/tmpl/default_toolbar.php |   4 +-
 admin/views/fieldtypes/view.html.php          |   4 +-
 admin/views/help_document/submitbutton.js     |   4 +-
 admin/views/help_document/tmpl/edit.php       |   4 +-
 admin/views/help_document/view.html.php       |   4 +-
 admin/views/help_documents/tmpl/default.php   |   4 +-
 .../tmpl/default_batch_body.php               |   4 +-
 .../tmpl/default_batch_footer.php             |   4 +-
 .../help_documents/tmpl/default_body.php      |   4 +-
 .../help_documents/tmpl/default_foot.php      |   4 +-
 .../help_documents/tmpl/default_head.php      |   4 +-
 .../help_documents/tmpl/default_toolbar.php   |   4 +-
 admin/views/help_documents/view.html.php      |   4 +-
 admin/views/import/tmpl/default.php           |   4 +-
 admin/views/import/view.html.php              |   4 +-
 admin/views/layout/submitbutton.js            |   4 +-
 admin/views/layout/tmpl/edit.php              |   4 +-
 admin/views/layout/view.html.php              |   4 +-
 admin/views/layouts/tmpl/default.php          |   4 +-
 .../views/layouts/tmpl/default_batch_body.php |   4 +-
 .../layouts/tmpl/default_batch_footer.php     |   4 +-
 admin/views/layouts/tmpl/default_body.php     |   4 +-
 admin/views/layouts/tmpl/default_foot.php     |   4 +-
 admin/views/layouts/tmpl/default_head.php     |   4 +-
 admin/views/layouts/tmpl/default_toolbar.php  |   4 +-
 admin/views/layouts/view.html.php             |   4 +-
 admin/views/site_view/submitbutton.js         |   4 +-
 admin/views/site_view/tmpl/edit.php           |   4 +-
 admin/views/site_view/view.html.php           |   4 +-
 admin/views/site_views/tmpl/default.php       |   4 +-
 .../site_views/tmpl/default_batch_body.php    |   4 +-
 .../site_views/tmpl/default_batch_footer.php  |   4 +-
 admin/views/site_views/tmpl/default_body.php  |   4 +-
 admin/views/site_views/tmpl/default_foot.php  |   4 +-
 admin/views/site_views/tmpl/default_head.php  |   4 +-
 .../views/site_views/tmpl/default_toolbar.php |   4 +-
 admin/views/site_views/view.html.php          |   4 +-
 admin/views/snippet/submitbutton.js           |   4 +-
 admin/views/snippet/tmpl/edit.php             |   4 +-
 admin/views/snippet/view.html.php             |   4 +-
 admin/views/snippets/tmpl/default.php         |   4 +-
 .../snippets/tmpl/default_batch_body.php      |   4 +-
 .../snippets/tmpl/default_batch_footer.php    |   4 +-
 admin/views/snippets/tmpl/default_body.php    |   4 +-
 admin/views/snippets/tmpl/default_foot.php    |   4 +-
 admin/views/snippets/tmpl/default_head.php    |   4 +-
 admin/views/snippets/tmpl/default_toolbar.php |   4 +-
 admin/views/snippets/view.html.php            |   4 +-
 admin/views/template/submitbutton.js          |   4 +-
 admin/views/template/tmpl/edit.php            |   4 +-
 admin/views/template/view.html.php            |   4 +-
 admin/views/templates/tmpl/default.php        |   4 +-
 .../templates/tmpl/default_batch_body.php     |   4 +-
 .../templates/tmpl/default_batch_footer.php   |   4 +-
 admin/views/templates/tmpl/default_body.php   |   4 +-
 admin/views/templates/tmpl/default_foot.php   |   4 +-
 admin/views/templates/tmpl/default_head.php   |   4 +-
 .../views/templates/tmpl/default_toolbar.php  |   4 +-
 admin/views/templates/view.html.php           |   4 +-
 componentbuilder.xml                          |   6 +-
 script.php                                    |   6 +-
 site/assets/css/site.css                      |   4 +-
 site/componentbuilder.php                     |   4 +-
 site/controller.php                           |   4 +-
 site/controllers/help.php                     |   4 +-
 site/helpers/componentbuilder.php             |   4 +-
 site/helpers/headercheck.php                  |   4 +-
 site/helpers/route.php                        |   4 +-
 site/router.php                               |   4 +-
 378 files changed, 1531 insertions(+), 1090 deletions(-)
 create mode 100644 admin/sql/updates/mysql/2.1.10.sql

diff --git a/README.md b/README.md
index 73502fc18..99e76aea1 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder (2.1.10)
+# Component Builder (2.1.11)
 
 This is a [Joomla 3.x] (http://www.joomla.org/) component.
 
@@ -32,12 +32,12 @@ Would you require more help please open and issue here on [gitHub today](https:/
 + *Author*: [Llewellyn van der Merwe] (mailto:info@vdm.io)
 + *Name*: [Component Builder] (https://www.vdm.io/joomla-component-builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 31st May, 2016
-+ *Version*: 2.1.10
++ *Last Build*: 2nd June, 2016
++ *Version*: 2.1.11
 + *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*: **82957**
-+ *File count*: **503**
++ *Line count*: **83090**
++ *File count*: **504**
 + *Folder count*: **99**
 
 > This **component** was build with a Joomla [Automated Component Builder] (https://www.vdm.io/joomla-component-builder).
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index 876a309da..bf8ce8f53 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin.css
diff --git a/admin/assets/css/admin_view.css b/admin/assets/css/admin_view.css
index 3d9795bce..f079c040c 100644
--- a/admin/assets/css/admin_view.css
+++ b/admin/assets/css/admin_view.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.css
diff --git a/admin/assets/css/admin_views.css b/admin/assets/css/admin_views.css
index 37ae21180..e3524a4fd 100644
--- a/admin/assets/css/admin_views.css
+++ b/admin/assets/css/admin_views.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.css
diff --git a/admin/assets/css/component.css b/admin/assets/css/component.css
index 1e7bceacd..44d13572b 100644
--- a/admin/assets/css/component.css
+++ b/admin/assets/css/component.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.css
diff --git a/admin/assets/css/components.css b/admin/assets/css/components.css
index 92991c949..ae7734287 100644
--- a/admin/assets/css/components.css
+++ b/admin/assets/css/components.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.css
diff --git a/admin/assets/css/custom_admin_view.css b/admin/assets/css/custom_admin_view.css
index 658db7ad0..bc7c4e362 100644
--- a/admin/assets/css/custom_admin_view.css
+++ b/admin/assets/css/custom_admin_view.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.css
diff --git a/admin/assets/css/custom_admin_views.css b/admin/assets/css/custom_admin_views.css
index 7e64771de..641266e8b 100644
--- a/admin/assets/css/custom_admin_views.css
+++ b/admin/assets/css/custom_admin_views.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index 6a0330435..04560a397 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dashboard.css
diff --git a/admin/assets/css/dynamic_get.css b/admin/assets/css/dynamic_get.css
index 14aa7ff47..a72e95589 100644
--- a/admin/assets/css/dynamic_get.css
+++ b/admin/assets/css/dynamic_get.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.css
diff --git a/admin/assets/css/dynamic_gets.css b/admin/assets/css/dynamic_gets.css
index 006f03ec1..974c98f9a 100644
--- a/admin/assets/css/dynamic_gets.css
+++ b/admin/assets/css/dynamic_gets.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.css
diff --git a/admin/assets/css/field.css b/admin/assets/css/field.css
index 08fc0354d..89a8f9f5f 100644
--- a/admin/assets/css/field.css
+++ b/admin/assets/css/field.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.css
diff --git a/admin/assets/css/fields.css b/admin/assets/css/fields.css
index 42a24ae65..4bcd65f21 100644
--- a/admin/assets/css/fields.css
+++ b/admin/assets/css/fields.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.css
diff --git a/admin/assets/css/fieldtype.css b/admin/assets/css/fieldtype.css
index 5f880b7b6..6abe0132f 100644
--- a/admin/assets/css/fieldtype.css
+++ b/admin/assets/css/fieldtype.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.css
diff --git a/admin/assets/css/fieldtypes.css b/admin/assets/css/fieldtypes.css
index 3d96b6b81..60a66c43f 100644
--- a/admin/assets/css/fieldtypes.css
+++ b/admin/assets/css/fieldtypes.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.css
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 971d2d279..cf87646c1 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.css
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index 379bfeb24..89cfb649e 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.css
diff --git a/admin/assets/css/layout.css b/admin/assets/css/layout.css
index 58c3f8c2e..9006ee2c9 100644
--- a/admin/assets/css/layout.css
+++ b/admin/assets/css/layout.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.css
diff --git a/admin/assets/css/layouts.css b/admin/assets/css/layouts.css
index 9b59e954f..e2f31469f 100644
--- a/admin/assets/css/layouts.css
+++ b/admin/assets/css/layouts.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.css
diff --git a/admin/assets/css/site_view.css b/admin/assets/css/site_view.css
index f95bf7071..b34012925 100644
--- a/admin/assets/css/site_view.css
+++ b/admin/assets/css/site_view.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.css
diff --git a/admin/assets/css/site_views.css b/admin/assets/css/site_views.css
index 14a4db535..f0d500bdb 100644
--- a/admin/assets/css/site_views.css
+++ b/admin/assets/css/site_views.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.css
diff --git a/admin/assets/css/snippet.css b/admin/assets/css/snippet.css
index cca73862c..953a8e245 100644
--- a/admin/assets/css/snippet.css
+++ b/admin/assets/css/snippet.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.css
diff --git a/admin/assets/css/snippets.css b/admin/assets/css/snippets.css
index 0383ec5e6..ce8772e69 100644
--- a/admin/assets/css/snippets.css
+++ b/admin/assets/css/snippets.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.css
diff --git a/admin/assets/css/template.css b/admin/assets/css/template.css
index 1cefc92a1..1b0924abf 100644
--- a/admin/assets/css/template.css
+++ b/admin/assets/css/template.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.css
diff --git a/admin/assets/css/templates.css b/admin/assets/css/templates.css
index 842677681..64424aab2 100644
--- a/admin/assets/css/templates.css
+++ b/admin/assets/css/templates.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.css
diff --git a/admin/compiler/joomla_3/install.mysql.utf8.sql b/admin/compiler/joomla_3/install.mysql.utf8.sql
index 273e93820..16c3c66b0 100644
--- a/admin/compiler/joomla_3/install.mysql.utf8.sql
+++ b/admin/compiler/joomla_3/install.mysql.utf8.sql
@@ -1 +1,6 @@
-###INSTALL###
\ No newline at end of file
+###INSTALL###
+
+--
+-- Always insure this column is large enough for all the access control values.
+--
+ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';
diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php
index 2761e58ca..b8a1f5a31 100644
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controller.php b/admin/controller.php
index 8836d92ac..12c524293 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php
index 3a33ed36b..d13754355 100644
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php
index bd44bfab3..c0b3305ec 100644
--- a/admin/controllers/admin_views.php
+++ b/admin/controllers/admin_views.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index e6f5a2393..bd76798fa 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.json.php
diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php
index 7acb0e3fb..0eddd93ac 100644
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
diff --git a/admin/controllers/component.php b/admin/controllers/component.php
index 86386f5e8..739bea4d8 100644
--- a/admin/controllers/component.php
+++ b/admin/controllers/component.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php
index c0a5e4447..48106a38d 100644
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/controllers/components.php b/admin/controllers/components.php
index 0197f0906..f8a8761a2 100644
--- a/admin/controllers/components.php
+++ b/admin/controllers/components.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php
diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php
index bf6bdc798..49415e587 100644
--- a/admin/controllers/custom_admin_view.php
+++ b/admin/controllers/custom_admin_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php
index eab24a389..eb220d582 100644
--- a/admin/controllers/custom_admin_views.php
+++ b/admin/controllers/custom_admin_views.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php
diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php
index 28c00b312..0a82afd15 100644
--- a/admin/controllers/dynamic_get.php
+++ b/admin/controllers/dynamic_get.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php
diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php
index 7f91f7d92..fcbc9284b 100644
--- a/admin/controllers/dynamic_gets.php
+++ b/admin/controllers/dynamic_gets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php
diff --git a/admin/controllers/field.php b/admin/controllers/field.php
index 77ad0c4e3..e98a39de1 100644
--- a/admin/controllers/field.php
+++ b/admin/controllers/field.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php
diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php
index 07f9011b2..ed9319ca9 100644
--- a/admin/controllers/fields.php
+++ b/admin/controllers/fields.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php
diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php
index b8e9dfb47..e350d3350 100644
--- a/admin/controllers/fieldtype.php
+++ b/admin/controllers/fieldtype.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php
diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php
index 8343a5cde..24ff93f48 100644
--- a/admin/controllers/fieldtypes.php
+++ b/admin/controllers/fieldtypes.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index c28e28104..05ea4bda1 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 078de9163..a45a49538 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index cd2b9e91a..2dda21df4 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index ec96ba472..75695db25 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php
index 70c2c0a37..f56ab06f2 100644
--- a/admin/controllers/layout.php
+++ b/admin/controllers/layout.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php
diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php
index d52bc1f37..742b7239e 100644
--- a/admin/controllers/layouts.php
+++ b/admin/controllers/layouts.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php
diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php
index 13fea9e90..67139d41c 100644
--- a/admin/controllers/site_view.php
+++ b/admin/controllers/site_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php
index f2e626d3d..012b3d60f 100644
--- a/admin/controllers/site_views.php
+++ b/admin/controllers/site_views.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php
diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php
index b9b9dd3a5..f9d6d9dc2 100644
--- a/admin/controllers/snippet.php
+++ b/admin/controllers/snippet.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php
diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php
index 3954bd48e..c1ed97995 100644
--- a/admin/controllers/snippets.php
+++ b/admin/controllers/snippets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
diff --git a/admin/controllers/template.php b/admin/controllers/template.php
index 618317520..1d1605b6a 100644
--- a/admin/controllers/template.php
+++ b/admin/controllers/template.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php
diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php
index e7f77f0c6..a552d6223 100644
--- a/admin/controllers/templates.php
+++ b/admin/controllers/templates.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index 11656a75a..d13a8a47a 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -306,6 +306,34 @@ class Fields extends Structure
 	 * @var    array
 	 */
 	public $setGroupControl = array();
+	
+	/**
+	 * Set Field Names
+	 * 
+	 * @var    array
+	 */
+	public $fieldsNames = array();
+	
+	/**
+	 * Default Fields
+	 * 
+	 * @var    array
+	 */
+	public $defaultFields = array('created', 'created_by', 'modified', 'modified_by', 'published', 'ordering', 'access', 'version', 'hits', 'id');
+	
+	/**
+	 * Default Fields set to publishing
+	 * 
+	 * @var    array
+	 */
+	public $newPublishingFields = array();
+	
+	/**
+	 * Default Fields set to publishing
+	 * 
+	 * @var    array
+	 */
+	public $movedPublishingFields = array();
 
 	/**
 	 * set the Field set of a view
@@ -338,7 +366,7 @@ class Fields extends Structure
 			$readOnly = "";
 			if ($view['settings']->type == 2)
 			{
-				$readOnly = "\n\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
+				$readOnly = "\t\t\t" . 'readonly="true"' . "\n\t\t\t" . 'disabled="true"';
 			}
 			// main lang prefix
 			$langView = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U');
@@ -370,129 +398,22 @@ class Fields extends Structure
 			$this->langContent[$this->lang][$langViews . '_BATCH_TIP'] = "All changes will be applied to all selected " . $view['settings']->name_list;
 			// set some basic defaults
 			$this->langContent[$this->lang][$langView . '_ERROR_UNIQUE_ALIAS'] = "Another " . $view['settings']->name_single . " has the same alias.";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created date";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date " . $view['settings']->name_single . " was created.";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created by";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created the " . $view['settings']->name_single . ".";
+			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created Date";
+			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was created.";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_LABEL'] = "Modified Date";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was modified.";
+			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created By";
+			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created this " . $view['settings']->name_single . ".";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_LABEL'] = "Modified By";
+			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_DESC'] = "The last user that modified this " . $view['settings']->name_single . ".";
 			$this->langContent[$this->lang][$langView . '_ORDERING_LABEL'] = "Ordering";
 			$this->langContent[$this->lang][$langView . '_VERSION_LABEL'] = "Revision";
 			$this->langContent[$this->lang][$langView . '_VERSION_DESC'] = "A count of the number of times this " . $view['settings']->name_single . " has been revised.";
 			$this->langContent[$this->lang][$langView . '_SAVE_WARNING'] = "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.";
-			// set the defautl fields
-			$fieldSet = '<fieldset name="details">';
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Default Fields. -->";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Id Field. Type: Text (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"id"';
-			$fieldSet .= "\n\t\t\t" . 'type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"created"';
-			$fieldSet .= "\n\t\t\ttype=" . '"calendar"';
-			$fieldSet .= "\n\t\t\tlabel=" . '"' . $langView . '_CREATED_DATE_LABEL"';
-			$fieldSet .= "\n\t\t\tdescription=" . '"' . $langView . '_CREATED_DATE_DESC"';
-			$fieldSet .= "\n\t\t\tsize=" . '"22"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tformat=" . '"%Y-%m-%d %H:%M:%S"';
-			$fieldSet .= "\n\t\t\tfilter=" . '"user_utc"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " User Created Field. Type: User (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\tname=" . '"created_by"';
-			$fieldSet .= "\n\t\t\ttype=" . '"user"';
-			$fieldSet .= "\n\t\t\tlabel=" . '"' . $langView . '_CREATED_BY_LABEL"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tdescription=" . '"' . $langView . '_CREATED_BY_DESC"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Published Field. Type: List (joomla) -->";
-			$fieldSet .= "\n\t\t<field name=" . '"published" type="list" label="JSTATUS"';
-			$fieldSet .= "\n\t\t\tdescription=" . '"JFIELD_PUBLISHED_DESC" class="chzn-color-state"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\tfilter=" . '"intval" size="1" default="1" >';
-
-			$fieldSet .= "\n\t\t\t<option value=" . '"1">';
-			$fieldSet .= "\n\t\t\t\tJPUBLISHED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"0">';
-			$fieldSet .= "\n\t\t\t\tJUNPUBLISHED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"2">';
-			$fieldSet .= "\n\t\t\t\tJARCHIVED</option>";
-			$fieldSet .= "\n\t\t\t<option value=" . '"-2">';
-			$fieldSet .= "\n\t\t\t\tJTRASHED</option>";
-			$fieldSet .= "\n\t\t</field>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla) -->";
-			$fieldSet .= "\n\t\t" . '<field name="modified" type="calendar" class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"';
-			$fieldSet .= "\n\t\t\t" . 'size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />';
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla) -->";
-			$fieldSet .= "\n\t\t" . '<field name="modified_by" type="user"';
-			$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t\t" . 'filter="unset"';
-			$fieldSet .= "\n\t\t/>";
-			// check if view has access
-			if (isset($this->accessBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName]))
-			{
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla) -->";
-				$fieldSet .= "\n\t\t" . '<field name="access"';
-				$fieldSet .= "\n\t\t\t" . 'type="accesslevel"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_ACCESS_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_ACCESS_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'default="1"';
-				$fieldSet .= $readOnly;
-				$fieldSet .= "\n\t\t\t" . 'required="false"';
-				$fieldSet .= "\n\t\t/>";
-			}
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\t" . 'name="ordering"';
-			$fieldSet .= "\n\t\t\t" . 'type="number"';
-			$fieldSet .= "\n\t\t\t" . 'class="inputbox validate-ordering"';
-			$fieldSet .= "\n\t\t\t" . 'label="' . $langView . '_ORDERING_LABEL' . '"';
-			$fieldSet .= "\n\t\t\t" . 'description=""';
-			$fieldSet .= "\n\t\t\t" . 'default="0"';
-			$fieldSet .= "\n\t\t\t" . 'size="6"';
-			$fieldSet .= $readOnly;
-			$fieldSet .= "\n\t\t\t" . 'required="false"';
-			$fieldSet .= "\n\t\t/>";
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Version Field. Type: Text (joomla) -->";
-			$fieldSet .= "\n\t\t<field";
-			$fieldSet .= "\n\t\t\t" . 'name="version"';
-			$fieldSet .= "\n\t\t\t" . 'type="text"';
-			$fieldSet .= "\n\t\t\t" . 'class="readonly"';
-			$fieldSet .= "\n\t\t\t" . 'label="' . $langView . '_VERSION_LABEL"';
-			$fieldSet .= "\n\t\t\t" . 'description="' . $langView . '_VERSION_DESC"';
-			$fieldSet .= "\n\t\t\t" . 'size="6"';
-			$fieldSet .= "\n\t\t\t" . 'readonly="true"';
-			$fieldSet .= "\n\t\t\t" . 'filter="unset"';
-			$fieldSet .= "\n\t\t/>";
-			// check if metadata is added to this view
-			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
-			{
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
-				$fieldSet .= "\n\t\t\t" . 'name="metakey"';
-				$fieldSet .= "\n\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_META_KEYWORDS_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_META_KEYWORDS_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t/>";
-				$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t<field";
-				$fieldSet .= "\n\t\t\t" . 'name="metadesc"';
-				$fieldSet .= "\n\t\t\t" . 'type="textarea"';
-				$fieldSet .= "\n\t\t\t" . 'label="JFIELD_META_DESCRIPTION_LABEL"';
-				$fieldSet .= "\n\t\t\t" . 'description="JFIELD_META_DESCRIPTION_DESC"';
-				$fieldSet .= "\n\t\t\t" . 'rows="3"';
-				$fieldSet .= "\n\t\t\t" . 'cols="30"';
-				$fieldSet .= "\n\t\t/>";
-			}
-			$fieldSet .= "\n\t\t<!--" . $this->setLine(__LINE__) . " Dynamic Fields. -->";
+			
 			// start adding dynamc fields
+			$dynamcfields = '';
+			// place holders
 			$placeholders = array(
 			    '###component###' => $component,
 			    '###view###' => $viewName,
@@ -503,47 +424,217 @@ class Fields extends Structure
 			// TODO we should add the global and local view switch if field for front end
 			foreach ($view['settings']->fields as $field)
 			{
-				$fieldSet .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true);
+				$dynamcfields .= $this->setDynamicField($field, $view, $view['settings']->type, $langView, $viewName, $listViewName, $spacerCounter, $placeholders, $dbkey, true);
+			}
+			
+			// set the defautl fields
+			$fieldSet = array();
+			$fieldSet[] = '<fieldset name="details">';
+			$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Default Fields. -->";
+			$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Id Field. Type: Text (joomla) -->";
+			// if id is not set
+			if (!isset($this->fieldsNames[$viewName]['id']))
+			{
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"id"';
+				$fieldSet[] = "\t\t\t" . 'type="text" class="readonly" label="JGLOBAL_FIELD_ID_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description ="JGLOBAL_FIELD_ID_DESC" size="10" default="0"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if created is not set
+			if (!isset($this->fieldsNames[$viewName]['created']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Date Created Field. Type: Calendar (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"created"';
+				$fieldSet[] = "\t\t\ttype=" . '"calendar"';
+				$fieldSet[] = "\t\t\tlabel=" . '"' . $langView . '_CREATED_DATE_LABEL"';
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_CREATED_DATE_DESC"';
+				$fieldSet[] = "\t\t\tsize=" . '"22"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tformat=" . '"%Y-%m-%d %H:%M:%S"';
+				$fieldSet[] = "\t\t\tfilter=" . '"user_utc"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if created_by is not set
+			if (!isset($this->fieldsNames[$viewName]['created_by']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " User Created Field. Type: User (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\tname=" . '"created_by"';
+				$fieldSet[] = "\t\t\ttype=" . '"user"';
+				$fieldSet[] = "\t\t\tlabel=" . '"' . $langView . '_CREATED_BY_LABEL"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_CREATED_BY_DESC"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if published is not set
+			if (!isset($this->fieldsNames[$viewName]['published']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Published Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t<field name=" . '"published" type="list" label="JSTATUS"';
+				$fieldSet[] = "\t\t\tdescription=" . '"JFIELD_PUBLISHED_DESC" class="chzn-color-state"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\tfilter=" . '"intval" size="1" default="1" >';
+				$fieldSet[] = "\t\t\t<option value=" . '"1">';
+				$fieldSet[] = "\t\t\t\tJPUBLISHED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"0">';
+				$fieldSet[] = "\t\t\t\tJUNPUBLISHED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"2">';
+				$fieldSet[] = "\t\t\t\tJARCHIVED</option>";
+				$fieldSet[] = "\t\t\t<option value=" . '"-2">';
+				$fieldSet[] = "\t\t\t\tJTRASHED</option>";
+				$fieldSet[] = "\t\t</field>";
+			}
+			// if modified is not set
+			if (!isset($this->fieldsNames[$viewName]['modified']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Date Modified Field. Type: Calendar (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="modified" type="calendar" class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_MODIFIED_DATE_LABEL" description="' . $langView . '_MODIFIED_DATE_DESC"';
+				$fieldSet[] = "\t\t\t" . 'size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />';
+			}
+			// if modified_by is not set
+			if (!isset($this->fieldsNames[$viewName]['modified_by']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " User Modified Field. Type: User (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="modified_by" type="user"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_MODIFIED_BY_LABEL"';
+				$fieldSet[] = "\t\t\tdescription=" . '"' . $langView . '_MODIFIED_BY_DESC"';
+				$fieldSet[] = "\t\t\t" . 'class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t\t" . 'filter="unset"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// check if view has access
+			if (isset($this->accessBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName]) && !isset($this->fieldsNames[$viewName]['access']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Access Field. Type: Accesslevel (joomla) -->";
+				$fieldSet[] = "\t\t" . '<field name="access"';
+				$fieldSet[] = "\t\t\t" . 'type="accesslevel"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_ACCESS_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_ACCESS_DESC"';
+				$fieldSet[] = "\t\t\t" . 'default="1"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\t" . 'required="false"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if ordering is not set
+			if (!isset($this->fieldsNames[$viewName]['ordering']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Ordering Field. Type: Numbers (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="ordering"';
+				$fieldSet[] = "\t\t\t" . 'type="number"';
+				$fieldSet[] = "\t\t\t" . 'class="inputbox validate-ordering"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_ORDERING_LABEL' . '"';
+				$fieldSet[] = "\t\t\t" . 'description=""';
+				$fieldSet[] = "\t\t\t" . 'default="0"';
+				$fieldSet[] = "\t\t\t" . 'size="6"';
+				$fieldSet[] = $readOnly;
+				$fieldSet[] = "\t\t\t" . 'required="false"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// if version is not set
+			if (!isset($this->fieldsNames[$viewName]['version']))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Version Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="version"';
+				$fieldSet[] = "\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t" . 'class="readonly"';
+				$fieldSet[] = "\t\t\t" . 'label="' . $langView . '_VERSION_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="' . $langView . '_VERSION_DESC"';
+				$fieldSet[] = "\t\t\t" . 'size="6"';
+				$fieldSet[] = "\t\t\t" . 'readonly="true"';
+				$fieldSet[] = "\t\t\t" . 'filter="unset"';
+				$fieldSet[] = "\t\t/>";
 			}
-
-			$fieldSet .= "\n\t</fieldset>";
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
 			{
-				$fieldSet .= "\n\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
-				$fieldSet .= "\n\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-				$fieldSet .= "\n\t\t" . '<fieldset name="vdmmetadata"';
-				$fieldSet .= "\n\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="robots"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="list"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
-				$fieldSet .= "\n\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
-				$fieldSet .= "\n\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
-				$fieldSet .= "\n\t\t\t" . '</field>';
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="author"';
-				$fieldSet .= "\n\t\t\t\t" . 'type="text"';
-				$fieldSet .= "\n\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
-				$fieldSet .= "\n\t\t\t\t" . 'size="20"';
-				$fieldSet .= "\n\t\t\t/>";
-				$fieldSet .= "\n\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
-				$fieldSet .= "\n\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
-				$fieldSet .= "\n\t\t\t\t" . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
-				$fieldSet .= "\n\t\t\t\t" . 'cols="30" rows="2"';
-				$fieldSet .= "\n\t\t\t/>";
-				$fieldSet .= "\n\t\t</fieldset>";
-				$fieldSet .= "\n\t</fields>";
+				// metakey
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metakey Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="metakey"';
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_KEYWORDS_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_KEYWORDS_DESC"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
+				$fieldSet[] = "\t\t/>";
+				// metadesc
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Metadesc Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t<field";
+				$fieldSet[] = "\t\t\t" . 'name="metadesc"';
+				$fieldSet[] = "\t\t\t" . 'type="textarea"';
+				$fieldSet[] = "\t\t\t" . 'label="JFIELD_META_DESCRIPTION_LABEL"';
+				$fieldSet[] = "\t\t\t" . 'description="JFIELD_META_DESCRIPTION_DESC"';
+				$fieldSet[] = "\t\t\t" . 'rows="3"';
+				$fieldSet[] = "\t\t\t" . 'cols="30"';
+				$fieldSet[] = "\t\t/>";
+			}
+			// load the dynamic fields now
+			if (ComponentbuilderHelper::checkString($dynamcfields))
+			{
+				$fieldSet[] = "\t\t<!--" . $this->setLine(__LINE__) . " Dynamic Fields. -->" . $dynamcfields;
+			}
+			// close fieldset
+			$fieldSet[] = "\t</fieldset>";
+			// check if metadata is added to this view
+			if (isset($this->metadataBuilder[$viewName]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName]))
+			{
+				$fieldSet[] = "\n\t<!--" . $this->setLine(__LINE__) . " Metadata Fields. -->";
+				$fieldSet[] = "\t<fields" . ' name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				$fieldSet[] = "\t\t" . '<fieldset name="vdmmetadata"';
+				$fieldSet[] = "\t\t\t" . 'label="JGLOBAL_FIELDSET_METADATA_OPTIONS">';
+				// robots
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Robots Field. Type: List (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="robots"';
+				$fieldSet[] = "\t\t\t\t" . 'type="list"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JFIELD_METADATA_ROBOTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_METADATA_ROBOTS_DESC" >';
+				$fieldSet[] = "\t\t\t\t" . '<option value="">JGLOBAL_USE_GLOBAL</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t\t" . '<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>';
+				$fieldSet[] = "\t\t\t" . '</field>';
+				// author
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Author Field. Type: Text (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="author"';
+				$fieldSet[] = "\t\t\t\t" . 'type="text"';
+				$fieldSet[] = "\t\t\t\t" . 'label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"';
+				$fieldSet[] = "\t\t\t\t" . 'size="20"';
+				$fieldSet[] = "\t\t\t/>";
+				// rights
+				$fieldSet[] = "\t\t\t<!--" . $this->setLine(__LINE__) . " Rights Field. Type: Textarea (joomla) -->";
+				$fieldSet[] = "\t\t\t" . '<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"';
+				$fieldSet[] = "\t\t\t\t" . 'description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"';
+				$fieldSet[] = "\t\t\t\t" . 'cols="30" rows="2"';
+				$fieldSet[] = "\t\t\t/>";
+				$fieldSet[] = "\t\t</fieldset>";
+				$fieldSet[] = "\t</fields>";
 			}
 			// retunr the set
-			return $fieldSet;
+			return implode("\n", $fieldSet);
 		}
 		return '';
 	}
+		
+	/**
+	 * set Field Names
+	 * 
+	 * @param   string   $view    View the field belongs to
+	 * @param   string    $name    The name of the field
+	 *
+	 * 
+	 */
+	public function setFieldsNames(&$view, &$name)
+	{
+		$this->fieldsNames[$view][$name] = $name;
+	}
 
 	/**
 	 * set Dynamic field
@@ -575,6 +666,9 @@ class Fields extends Structure
 		// check if values were set
 		if (ComponentbuilderHelper::checkArray($fieldAttributes))
 		{
+			// set the array of field names
+			$this->setFieldsNames($viewName,$fieldAttributes['name']);
+			
 			if ($this->defaultField($typeName, 'option'))
 			{
 				//reset options array
@@ -607,6 +701,11 @@ class Fields extends Structure
 					{
 						$tabName = $view['settings']->tabs[(int) $field['tab']];
 					}
+					elseif ((int) $field['tab'] == 15)
+					{
+						// set to publishing tab
+						$tabName = 'publishing';
+					}
 					$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 				}
 				// now add to the field set
@@ -908,7 +1007,7 @@ class Fields extends Structure
 	 */
 	public function setLayoutBuilder(&$viewName,&$tabName,&$name,&$field)
 	{
-		if (ComponentbuilderHelper::checkString($tabName))
+		if (ComponentbuilderHelper::checkString($tabName) && $tabName != 'publishing')
 		{
 			$this->tabCounter[$viewName][(int) $field['tab']] = $tabName;
 			if (isset($this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']]))
@@ -920,6 +1019,27 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName][$tabName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
+		}
+		elseif ($tabName == 'publishing')
+		{
+			if (!in_array($name, $this->defaultFields))
+			{
+				if (isset($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]))
+				{
+					$size = count($this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']]) + 1;
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][$size] = $name;
+				}
+				else
+				{
+					$this->newPublishingFields[$viewName][(int) $field['alignment']][(int) $field['order_edit']] = $name;
+				}
+			}
 		}
 		else
 		{
@@ -933,6 +1053,12 @@ class Fields extends Structure
 			{
 				$this->layoutBuilder[$viewName]['Details'][(int) $field['alignment']][(int) $field['order_edit']] = $name;
 			}
+			// check if publishing fields were over written
+			if (in_array($name, $this->defaultFields))
+			{
+				// just to eliminate
+				$this->movedPublishingFields[$viewName][$name] = $name;
+			}
 		}
 	}
 
@@ -1438,7 +1564,7 @@ class Fields extends Structure
 			$this->intFieldsBuilder[$viewName] .= ',"' . $name . '"';
 		}
 		// set all dynamic field of this view
-		if ($typeName != 'category' && $typeName != 'repeatable')
+		if ($typeName != 'category' && $typeName != 'repeatable' && !in_array($name, $this->defaultFields))
 		{
 			if (!isset($this->dynamicfieldsBuilder[$viewName]))
 			{
@@ -1594,6 +1720,11 @@ class Fields extends Structure
 		{
 			$tabName = $view['settings']->tabs[(int) $field['tab']];
 		}
+		elseif ((int) $field['tab'] == 15)
+		{
+			// set to publishing tab
+			$tabName = 'publishing';
+		}
 		$this->setLayoutBuilder($viewName, $tabName, $name, $field);
 	}
 	
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index bb9e246d7..341a5d1a3 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -4627,7 +4627,11 @@ class Interpretation extends Fields
 
 				// setup the tables
 				$db .= "CREATE TABLE IF NOT EXISTS `#__".$component."_".$view."` (";
-				$db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['id']))
+				{
+					$db .= "\n\t`id` int(11) NOT NULL AUTO_INCREMENT,";
+				}
 				$db .= "\n\t`asset_id` INT(255) UNSIGNED NOT NULL DEFAULT '0',";
 				ksort($fields);
 				foreach ($fields as $field => $data)
@@ -4667,22 +4671,66 @@ class Interpretation extends Fields
 					// set the field to db
 					$db .= "\n\t`".$field."` ".$data['type'].$lenght." ".$default.",";
 				}
-				$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
-				$db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',";
-				$db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',";
-				$db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',";
-				$db .= "\n\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
-				$db .= "\n\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
-				$db .= "\n\t`checked_out` int(11) NOT NULL,";
-				$db .= "\n\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
-				$db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',";
-				$db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['params']))
+				{
+					$db .= "\n\t`params` TEXT NOT NULL DEFAULT '',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['published']))
+				{
+					$db .= "\n\t`published` tinyint(1) NOT NULL DEFAULT '1',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
+					$db .= "\n\t`created_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
+					$db .= "\n\t`modified_by` int(11) NOT NULL DEFAULT '0',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created']))
+				{
+					$db .= "\n\t`created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified']))
+				{
+					$db .= "\n\t`modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out']))
+				{
+					$db .= "\n\t`checked_out` int(11) NOT NULL,";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out_time']))
+				{
+					$db .= "\n\t`checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['version']))
+				{
+					$db .= "\n\t`version` int(11) NOT NULL DEFAULT '1',";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['hits']))
+				{
+					$db .= "\n\t`hits` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if view has access
 				if (isset($this->accessBuilder[$view]) && ComponentbuilderHelper::checkString($this->accessBuilder[$view]))
 				{
 					$db .= "\n\t`access` int(11) DEFAULT NULL,";
 				}
-				$db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['ordering']))
+				{
+					$db .= "\n\t`ordering` int(11) NOT NULL DEFAULT '0',";
+				}
 				// check if metadata is added to this view
 				if (isset($this->metadataBuilder[$view]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$view]))
 				{
@@ -4703,10 +4751,26 @@ class Interpretation extends Fields
 				{
 					$db .= ",\n\tKEY `idx_access` (`access`)";
 				}
-				$db .= ",\n\tKEY `idx_checkout` (`checked_out`)";
-				$db .= ",\n\tKEY `idx_createdby` (`created_by`)";
-				$db .= ",\n\tKEY `idx_modifiedby` (`modified_by`)";
-				$db .= ",\n\tKEY `idx_state` (`published`)";
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['checked_out']))
+				{
+					$db .= ",\n\tKEY `idx_checkout` (`checked_out`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['created_by']))
+				{
+					$db .= ",\n\tKEY `idx_createdby` (`created_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['modified_by']))
+				{
+					$db .= ",\n\tKEY `idx_modifiedby` (`modified_by`)";
+				}
+				// check if default field was over written
+				if (!isset($this->fieldsNames[$view]['published']))
+				{
+					$db .= ",\n\tKEY `idx_state` (`published`)";
+				}
 				if (isset($this->dbKeys[$view]) && ComponentbuilderHelper::checkArray($this->dbKeys[$view]))
 				{
 					foreach ($this->dbKeys[$view] as $nr => $key)
@@ -5011,37 +5075,41 @@ class Interpretation extends Fields
 			$body .= "\n\t\t\$canDo = ".$Helper."::getActions('".$viewName_single."',\$item,'".$viewName_list."');";
 			$body .= "\n\t?>";
 			$body .= "\n\t".'<tr class="row<?php echo $i % 2; ?>">';
-			$body .= "\n\t\t".'<td class="order nowrap center hidden-phone">';
-			// check if the item has permissions.
-			if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+			// only load if not over written
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')): ?>";
+				$body .= "\n\t\t".'<td class="order nowrap center hidden-phone">';
+				// check if the item has permissions.
+				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')): ?>";
+				}
+				else
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')): ?>";
+				}
+				$body .= "\n\t\t\t<?php";
+				$body .= "\n\t\t\t\tif (\$this->saveOrder)";
+				$body .= "\n\t\t\t\t{";
+				$body .= "\n\t\t\t\t\t\$iconClass = ' inactive';";
+				$body .= "\n\t\t\t\t}";
+				$body .= "\n\t\t\t\telse";
+				$body .= "\n\t\t\t\t{";
+				$body .= "\n\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');";
+				$body .= "\n\t\t\t\t}";
+				$body .= "\n\t\t\t?>";
+				$body .= "\n\t\t\t".'<span class="sortable-handler<?php echo $iconClass; ?>">';
+				$body .= "\n\t\t\t\t".'<i class="icon-menu"></i>';
+				$body .= "\n\t\t\t</span>";
+				$body .= "\n\t\t\t<?php if (\$this->saveOrder) : ?>";
+				$body .= "\n\t\t\t\t".'<input type="text" style="display:none" name="order[]" size="5"';
+				$body .= "\n\t\t\t\t".'value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />';
+				$body .= "\n\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t<?php else: ?>";
+				$body .= "\n\t\t\t&#8942;";
+				$body .= "\n\t\t<?php endif; ?>";
+				$body .= "\n\t\t</td>";
 			}
-			else
-			{
-				$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')): ?>";
-			}
-			$body .= "\n\t\t\t<?php";
-			$body .= "\n\t\t\t\tif (\$this->saveOrder)";
-			$body .= "\n\t\t\t\t{";
-			$body .= "\n\t\t\t\t\t\$iconClass = ' inactive';";
-			$body .= "\n\t\t\t\t}";
-			$body .= "\n\t\t\t\telse";
-			$body .= "\n\t\t\t\t{";
-			$body .= "\n\t\t\t\t\t\$iconClass = ' inactive tip-top".'" hasTooltip" title="'."' . JHtml::tooltipText('JORDERINGDISABLED');";
-			$body .= "\n\t\t\t\t}";
-			$body .= "\n\t\t\t?>";
-			$body .= "\n\t\t\t".'<span class="sortable-handler<?php echo $iconClass; ?>">';
-			$body .= "\n\t\t\t\t".'<i class="icon-menu"></i>';
-			$body .= "\n\t\t\t</span>";
-			$body .= "\n\t\t\t<?php if (\$this->saveOrder) : ?>";
-			$body .= "\n\t\t\t\t".'<input type="text" style="display:none" name="order[]" size="5"';
-			$body .= "\n\t\t\t\t".'value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />';
-			$body .= "\n\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t<?php else: ?>";
-			$body .= "\n\t\t\t&#8942;";
-			$body .= "\n\t\t<?php endif; ?>";
-			$body .= "\n\t\t</td>";
 			$body .= "\n\t\t".'<td class="nowrap center">';
 			// check if the item has permissions.
 			if ($coreLoad && isset($core['core.edit']) && isset($this->permissionBuilder['global'][$core['core.edit']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit']]))
@@ -5128,12 +5196,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$this->user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@@ -5253,6 +5321,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@@ -5263,32 +5339,38 @@ class Interpretation extends Fields
 				}
 			}
 			// add the defaults
-			$body .= "\n\t\t".'<td class="center">';
-			// check if the item has permissions.
-			if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')) : ?>";
-			}
-			else
+				$body .= "\n\t\t".'<td class="center">';
+				// check if the item has permissions.
+				if ($coreLoad && isset($core['core.edit.state']) && isset($this->permissionBuilder['global'][$core['core.edit.state']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.edit.state']]) && in_array($viewName_single,$this->permissionBuilder['global'][$core['core.edit.state']]))
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('".$core['core.edit.state']."')) : ?>";
+				}
+				else
+				{
+					$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')) : ?>";
+				}
+				$body .= "\n\t\t\t\t<?php if (\$item->checked_out) : ?>";
+				$body .= "\n\t\t\t\t\t<?php if (\$canCheckin) : ?>";
+				$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
+				$body .= "\n\t\t\t\t\t<?php else: ?>";
+				$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
+				$body .= "\n\t\t\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t\t\t<?php else: ?>";
+				$body .= "\n\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
+				$body .= "\n\t\t\t\t<?php endif; ?>";
+				$body .= "\n\t\t<?php else: ?>";
+				$body .= "\n\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
+				$body .= "\n\t\t<?php endif; ?>";
+				$body .= "\n\t\t</td>";
+			}	
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
 			{
-				$body .= "\n\t\t<?php if (\$canDo->get('core.edit.state')) : ?>";
+				$body .= "\n\t\t".'<td class="nowrap center hidden-phone">';
+				$body .= "\n\t\t\t<?php echo \$item->id; ?>";
+				$body .= "\n\t\t</td>";
 			}
-			$body .= "\n\t\t\t\t<?php if (\$item->checked_out) : ?>";
-			$body .= "\n\t\t\t\t\t<?php if (\$canCheckin) : ?>";
-			$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
-			$body .= "\n\t\t\t\t\t<?php else: ?>";
-			$body .= "\n\t\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
-			$body .= "\n\t\t\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t\t\t<?php else: ?>";
-			$body .= "\n\t\t\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', true, 'cb'); ?>";
-			$body .= "\n\t\t\t\t<?php endif; ?>";
-			$body .= "\n\t\t<?php else: ?>";
-			$body .= "\n\t\t\t<?php echo JHtml::_('jgrid.published', \$item->published, \$i, '".$viewName_list.".', false, 'cb'); ?>";
-			$body .= "\n\t\t<?php endif; ?>";
-			$body .= "\n\t\t</td>";
-			$body .= "\n\t\t".'<td class="nowrap center hidden-phone">';
-			$body .= "\n\t\t\t<?php echo \$item->id; ?>";
-			$body .= "\n\t\t</td>";
 			$body .= "\n\t</tr>";
 			$body .= "\n<?php endforeach; ?>";
 			// return the build
@@ -5320,9 +5402,12 @@ class Interpretation extends Fields
 			// set default
 			$head = '<tr>';
 			$head .= "\n\t<?php if (\$this->canEdit&& \$this->canState): ?>";
-			$head .= "\n\t\t".'<th width="1%" class="nowrap center hidden-phone">';
-			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".'<i class="icon-menu-2"></i>'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>";
-			$head .= "\n\t\t</th>";
+			if (!isset($this->fieldsNames[$viewName_single]['ordering']))
+			{
+				$head .= "\n\t\t".'<th width="1%" class="nowrap center hidden-phone">';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".'<i class="icon-menu-2"></i>'."', 'ordering', \$this->listDirn, \$this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>";
+				$head .= "\n\t\t</th>";
+			}
 			$head .= "\n\t\t".'<th width="20" class="nowrap center">';
 			$head .= "\n\t\t\t<?php echo JHtml::_('grid.checkall'); ?>";
 			$head .= "\n\t\t</th>";
@@ -5359,18 +5444,24 @@ class Interpretation extends Fields
 				$this->listColnrBuilder[$viewName_list]++;
 			}
 			// set default
-			$head .= "\n\t<?php if (\$this->canState): ?>";
- 			$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
-   			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$statusLangName."', 'published', \$this->listDirn, \$this->listOrder); ?>";
- 			$head .= "\n\t\t</th>";
-			$head .= "\n\t<?php else: ?>";
- 			$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
-   			$head .= "\n\t\t\t<?php echo JText::_('".$statusLangName."'); ?>";
- 			$head .= "\n\t\t</th>";
-			$head .= "\n\t<?php endif; ?>";
- 			$head .= "\n\t".'<th width="5" class="nowrap center hidden-phone" >';
- 			$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$idLangName."', 'id', \$this->listDirn, \$this->listOrder); ?>";
- 			$head .= "\n\t</th>";
+			if (!isset($this->fieldsNames[$viewName_single]['published']))
+			{
+				$head .= "\n\t<?php if (\$this->canState): ?>";
+				$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$statusLangName."', 'published', \$this->listDirn, \$this->listOrder); ?>";
+				$head .= "\n\t\t</th>";
+				$head .= "\n\t<?php else: ?>";
+				$head .= "\n\t\t".'<th width="10" class="nowrap center" >';
+				$head .= "\n\t\t\t<?php echo JText::_('".$statusLangName."'); ?>";
+				$head .= "\n\t\t</th>";
+				$head .= "\n\t<?php endif; ?>";
+			}
+			if (!isset($this->fieldsNames[$viewName_single]['id']))
+			{
+				$head .= "\n\t".'<th width="5" class="nowrap center hidden-phone" >';
+				$head .= "\n\t\t\t<?php echo JHtml::_('grid.sort', '".$idLangName."', 'id', \$this->listDirn, \$this->listOrder); ?>";
+				$head .= "\n\t</th>";
+			}
  			$head .= "\n</tr>";
 
 			return $head;
@@ -5711,14 +5802,23 @@ class Interpretation extends Fields
 			{
 				$this->langContent[$this->lang][$tabLangName] = 'Publishing';
 			}
-			// check if access is added to this view
-			if (isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
+			// TODO add new publishing fields <-- nice to have, but no time now to do this
+			// $this->newPublishingFields[$viewName_single]
+			// the default publishing items
+			$items = array();
+			foreach ($this->defaultFields as $defaultField)
 			{
-				$addAccess = ",\n\t'access'";
-			}
-			else
-			{
-				$addAccess = "";
+				if (!isset($this->movedPublishingFields[$viewName_single][$defaultField]))
+				{
+					if ($defaultField != 'access')
+					{
+						$items[] = $defaultField;
+					}
+					elseif ($defaultField == 'access' && isset($this->accessBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->accessBuilder[$viewName_single]))
+					{
+						$items[] = $defaultField;
+					}
+				}
 			}
 			// check if metadata is added to this view
 			if (isset($this->metadataBuilder[$viewName_single]) && ComponentbuilderHelper::checkString($this->metadataBuilder[$viewName_single]))
@@ -5727,10 +5827,21 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'metadata';
 				// the default publishing tiems
-				$items = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by',\n\t'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
-				// set the publishing layout
-				$this->setLayout($viewName_single, $tabCodeNameLeft, $items, 'layoutpublished');
-				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');
+				if (ComponentbuilderHelper::checkArray($items))
+				{
+					// load all items
+					$items_one = "'". implode("',\n\t'", $items)."'";
+					// set the publishing layout
+					$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+					$items_one = true;
+				}
+				else
+				{
+					$items_one = false;				
+				}
+				// set the metadata layout
+				$this->setLayout($viewName_single, $tabCodeNameRight, false, 'layoutmetadata');	
+				$items_two = true;
 			}
 			else
 			{
@@ -5738,41 +5849,98 @@ class Interpretation extends Fields
 				$tabCodeNameLeft = 'publishing';
 				$tabCodeNameRight = 'publlshing';
 				// the default publishing tiems
-				$items_one = "'created',\n\t'created_by',\n\t'modified',\n\t'modified_by'";
-				$items_two = "'published',\n\t'ordering'".$addAccess.",\n\t'version',\n\t'hits',\n\t'id'";
-				// set the publishing layout
-				$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
-				$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
-			}
-			// check if the item has permissions.
-			$publishingPer = array();
-			$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
-			foreach ($allToBeChekced as $core_permission)
-			{
-				if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single,$this->permissionBuilder['global'][$core[$core_permission]]))
+				if (ComponentbuilderHelper::checkArray($items))
 				{
-					// set permissions.
-					$publishingPer[] = "\$this->canDo->get('".$core[$core_permission]."')";
+					
+					$items_one = array('created', 'created_by', 'modified', 'modified_by');
+					$items_two = array('published', 'ordering', 'access', 'version', 'hits', 'id');
+					// check all items
+					foreach ($items_one as $key_one => $item_one)
+					{
+						if (!in_array($item_one, $items))
+						{
+							unset($items_one[$key_one]);
+						}
+					}
+					foreach ($items_two as $key_two => $item_two)
+					{
+						if (!in_array($item_two, $items))
+						{
+							unset($items_two[$key_two]);
+						}
+					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_one))
+					{
+						// load all items
+						$items_one = "'". implode("',\n\t'", $items_one)."'";
+						// set the publishing layout
+						$this->setLayout($viewName_single, $tabCodeNameLeft, $items_one, 'layoutpublished');
+						$items_one = true;
+					}
+					// load all items that remain
+					if (ComponentbuilderHelper::checkArray($items_two))
+					{
+						// load all items
+						$items_two = "'". implode("',\n\t'", $items_two)."'";
+						// set the publishing layout
+						$this->setLayout($viewName_single, $tabCodeNameRight, $items_two, 'layoutpublished');
+						$items_two = true;
+					}
 				}
 				else
 				{
-					// set permissions.
-					$publishingPer[] = "\$this->canDo->get('".$core_permission."')";
+					$items_one = false;
+					$items_two = false;					
 				}
 			}
-			$body .= "\n\n\t<?php if (".implode(' || ', $publishingPer).") : ?>";
-			// set the default publishing tab
-			$body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
-			$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
-			$body .= "\n\t\t\t".'<div class="span6">';
-			$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
-			$body .= "\n\t\t\t</div>";
-			$body .= "\n\t\t\t".'<div class="span6">';
-			$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameRight."', \$this); ?>";
-			$body .= "\n\t\t\t</div>";
-			$body .= "\n\t\t</div>";
-			$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
-			$body .= "\n\t<?php endif; ?>";
+			if ($items_one && $items_two)
+			{
+				$classs = "span6";
+			}
+			elseif ($items_one || $items_two)
+			{
+				$classs = "span12";
+			}
+			// only load this if needed
+			if ($items_one || $items_two)
+			{
+				// check if the item has permissions.
+				$publishingPer = array();
+				$allToBeChekced = array('core.delete','core.edit.created_by','core.edit.state','core.edit.created');
+				foreach ($allToBeChekced as $core_permission)
+				{
+					if ($coreLoad && isset($core[$core_permission]) && isset($this->permissionBuilder['global'][$core[$core_permission]]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core[$core_permission]]) && in_array($viewName_single,$this->permissionBuilder['global'][$core[$core_permission]]))
+					{
+						// set permissions.
+						$publishingPer[] = "\$this->canDo->get('".$core[$core_permission]."')";
+					}
+					else
+					{
+						// set permissions.
+						$publishingPer[] = "\$this->canDo->get('".$core_permission."')";
+					}
+				}
+				$body .= "\n\n\t<?php if (".implode(' || ', $publishingPer).") : ?>";
+				// set the default publishing tab
+				$body .= "\n\t<?php echo JHtml::_('bootstrap.addTab', '".$viewName_single."Tab', '".$tabCodeNameLeft."', JText::_('".$tabLangName."', true)); ?>";
+				$body .= "\n\t\t".'<div class="row-fluid form-horizontal-desktop">';
+				if ($items_one)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
+					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameLeft."', \$this); ?>";
+					$body .= "\n\t\t\t</div>";
+				}
+				if ($items_two)
+				{
+					$body .= "\n\t\t\t".'<div class="'.$classs.'">';
+					$body .= "\n\t\t\t\t<?php echo JLayoutHelper::render('".$viewName_single.".".$tabCodeNameRight."', \$this); ?>";
+					$body .= "\n\t\t\t</div>";
+				}
+				$body .= "\n\t\t</div>";
+				$body .= "\n\t<?php echo JHtml::_('bootstrap.endTab'); ?>";
+				$body .= "\n\t<?php endif; ?>";
+			}
 			// make sure we dont load it to a view with the name component
 			if ($viewName_single != 'component')
 			{
@@ -6030,7 +6198,7 @@ class Interpretation extends Fields
 	 * @param $viewName_list
 	 * @param $refview
 	 * @return string
-     */
+	*/
 	public function setListBodyLinked($viewName_single, $viewName_list, $refview)
 	{
 		if (isset($this->listBuilder[$viewName_list]) && ComponentbuilderHelper::checkArray($this->listBuilder[$viewName_list]))
@@ -6121,12 +6289,12 @@ class Interpretation extends Fields
 					elseif ($item['type'] == 'user' && !$item['title'])
 					{
 						// user and linked
-						$body .= "\n\t\t<?php \$itemUser = JFactory::getUser(\$item->user); ?>";
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
 						$body .= "\n\t\t".'<td class="nowrap">';
 						$body .= "\n\t\t\t<?php if (\$user->authorise('core.edit', 'com_users')): ?>";
-						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->user ?>"><?php echo $itemUser->name; ?></a>';
+						$body .= "\n\t\t\t\t".'<a href="index.php?option=com_users&task=user.edit&id=<?php echo (int) $item->'.$item['code'].' ?>"><?php echo $'.$item['code'].'User->name; ?></a>';
 						$body .= "\n\t\t\t<?php else: ?>";
-						$body .= "\n\t\t\t\t<?php echo \$itemUser->name; ?>";
+						$body .= "\n\t\t\t\t<?php echo \$".$item['code']."User->name; ?>";
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
@@ -6257,6 +6425,14 @@ class Interpretation extends Fields
 						$body .= "\n\t\t\t<?php endif; ?>";
 						$body .= "\n\t\t</td>";
 					}
+					elseif ($item['type'] == 'user')
+					{
+						// user name only
+						$body .= "\n\t\t<?php \$".$item['code']."User = JFactory::getUser(\$item->".$item['code']."); ?>";
+						$body .= "\n\t\t".'<td class="nowrap">';
+						$body .= "\n\t\t\t<?php echo \$".$item['code']."User->name; ?>";
+						$body .= "\n\t\t</td>";
+					}
 					else
 					{
 						// normal not linked
@@ -8627,6 +8803,11 @@ class Interpretation extends Fields
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
 						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JText::_(\$text));";
 					}
+					elseif ($filter['type'] == 'user')
+					{
+						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
+						$function[] = "\t\t\t\t\$filter[] = JHtml::_('select.option', \$".$filter['code'].", JFactory::getUser(\$".$filter['code'].")->name);";
+					}
 					else
 					{
 						$function[] = "\t\t\t\t//".$this->setLine(__LINE__)." Now add the ".$filter['code']." and its text to the options array";
@@ -10106,6 +10287,8 @@ class Interpretation extends Fields
 
 	public function setSortFields($view)
 	{
+		// keep track of all fields already added
+		$donelist = array('sorting','published');
 		// set the default first
 		$fields = "return array(";
 		$fields .= "\n\t\t\t'a.sorting' => JText::_('JGRID_HEADING_ORDERING')";
@@ -10116,17 +10299,20 @@ class Interpretation extends Fields
 		{
 			foreach ($this->sortBuilder[$view] as $filter)
 			{
-				if ($filter['type'] == 'category')
+				if (!in_array($filter['code'], $donelist))
 				{
-					$fields .= ",\n\t\t\t'c.category_title' => JText::_('".$filter['lang']."')";
-				}
-				elseif (ComponentbuilderHelper::checkArray($filter['custom']))
-				{
-					$fields .= ",\n\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')";
-				}
-				else
-				{
-					$fields .= ",\n\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')";
+					if ($filter['type'] == 'category')
+					{
+						$fields .= ",\n\t\t\t'c.category_title' => JText::_('".$filter['lang']."')";
+					}
+					elseif (ComponentbuilderHelper::checkArray($filter['custom']))
+					{
+						$fields .= ",\n\t\t\t'".$filter['custom']['db'].".".$filter['custom']['text']."' => JText::_('".$filter['lang']."')";
+					}
+					else
+					{
+						$fields .= ",\n\t\t\t'a.".$filter['code']."' => JText::_('".$filter['lang']."')";
+					}
 				}
 			}
 		}
@@ -12507,8 +12693,12 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 										$view['settings']->permissions = array();
 										$view['settings']->permissions[] = $fieldView;
 									}
-									// load to global field permission set
-									$this->permissionFields[$nameView][$fieldName] = $fieldType;
+									// insure that no default field get loaded
+									if (!in_array($fieldName, $this->defaultFields))
+									{
+										// load to global field permission set
+										$this->permissionFields[$nameView][$fieldName] = $fieldType;
+									}
 								}
 							}
 						}
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 1931becb8..500f1c7cd 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index b1c4fd7b4..8e96f2fbf 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batch_.php
diff --git a/admin/helpers/indenter.php b/admin/helpers/indenter.php
index 6ff0cd0b3..05d04771c 100644
--- a/admin/helpers/indenter.php
+++ b/admin/helpers/indenter.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		indenter.php
diff --git a/admin/helpers/js.php b/admin/helpers/js.php
index 6b1c0ee50..206959a0a 100644
--- a/admin/helpers/js.php
+++ b/admin/helpers/js.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		js.php
diff --git a/admin/helpers/minify.php b/admin/helpers/minify.php
index a4989814a..1be200885 100644
--- a/admin/helpers/minify.php
+++ b/admin/helpers/minify.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 6fde457bf..34db1da4b 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -137,10 +137,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED="core.edit.created"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITCREATED_BY="core.edit.created_by"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITOWN="core.edit.own"
 COM_COMPONENTBUILDER_ADMIN_VIEW_COREEDITSTATE="core.edit.state"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created the Admin View."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date Admin View was created."
-COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Admin View."
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC="The date this Admin View was created."
+COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS="CSS"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_ADMIN_VIEW_CSS_VIEWS="Css Views"
@@ -238,6 +238,10 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_DESCRIPTION="Enter method name."
 COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_HINT="Method Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_METHOD_NAME_LABEL="Method Name"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_DESC="The last user that modified this Admin View."
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Admin View was modified."
+COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_ADMIN_VIEW_MYSQL="MySQL"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT="Name Here"
@@ -583,10 +587,10 @@ COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT="Copyright"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_DESCRIPTION="Add Copyright Here"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_HINT="Add Copyright Here"
 COM_COMPONENTBUILDER_COMPONENT_COPYRIGHT_LABEL="Copyright"
-COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_DESC="The user that created the Component."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date Component was created."
-COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_DESC="The user that created this Component."
+COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC="The date this Component was created."
+COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_COMPONENT_CREATUSERHELPER="Creatuserhelper"
 COM_COMPONENTBUILDER_COMPONENT_CREATUSERHELPER_LABEL="Add Create User Helper Method"
 COM_COMPONENTBUILDER_COMPONENT_CREDIT="Credit"
@@ -739,6 +743,10 @@ COM_COMPONENTBUILDER_COMPONENT_METADATA_LABEL="Has Metadata"
 COM_COMPONENTBUILDER_COMPONENT_MINUS="Minus"
 COM_COMPONENTBUILDER_COMPONENT_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_COMPONENT_MOBILE="Mobile"
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_DESC="The last user that modified this Component."
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_DESC="The date this Component was modified."
+COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_COMPONENT_MOVE="Move"
 COM_COMPONENTBUILDER_COMPONENT_MUSIC="Music"
 COM_COMPONENTBUILDER_COMPONENT_MYSQL_DESCRIPTION="Update Dump"
@@ -1227,10 +1235,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMMENTS_TWO="Comments 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_COMPASS="Compass"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT="Contract"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CONTRACT_TWO="Contract 2"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC="The user that created the Custom Admin View."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_DESC="The date Custom Admin View was created."
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC="The user that created this Custom Admin View."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_DESC="The date this Custom Admin View was created."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CSS="Css"
@@ -1341,6 +1349,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_LABEL="Target Controller Method"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS="Minus"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOBILE="Mobile"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_DESC="The last user that modified this Custom Admin View."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_DESC="The date this Custom Admin View was modified."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOVE="Move"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MUSIC="Music"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NAME="Name"
@@ -1582,10 +1594,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_BB="bb"
 COM_COMPONENTBUILDER_DYNAMIC_GET_C="c"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CATEGORIES="Categories"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CC="cc"
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_DESC="The user that created the Dynamic Get."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_DESC="The date Dynamic Get was created."
-COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_DESC="The user that created this Dynamic Get."
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_DESC="The date this Dynamic Get was created."
+COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CUSTOM="Custom"
 COM_COMPONENTBUILDER_DYNAMIC_GET_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_DYNAMIC_GET_D="d"
@@ -1672,6 +1684,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE="Main Source"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_DESCRIPTION="Select the main source of this dynamic get method."
 COM_COMPONENTBUILDER_DYNAMIC_GET_MAIN_SOURCE_LABEL="Main Source"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MM="mm"
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_DESC="The last user that modified this Dynamic Get."
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_DESC="The date this Dynamic Get was modified."
+COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE="Multiple"
 COM_COMPONENTBUILDER_DYNAMIC_GET_N="n"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NAME="Name"
@@ -1904,10 +1920,10 @@ COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_DESCRIPTION="Select if the value is ad
 COM_COMPONENTBUILDER_FIELDTYPE_ADJUSTABLE_LABEL="Adjustable"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELDTYPE_CATID_LABEL="Category"
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC="The user that created the Fieldtype."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date Fieldtype was created."
-COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC="The user that created this Fieldtype."
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC="The date this Fieldtype was created."
+COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_FIELDTYPE_DESCRIPTION_HINT="Add Description Here"
@@ -1922,6 +1938,10 @@ COM_COMPONENTBUILDER_FIELDTYPE_FIELDTYPE_CATEGORY="Fieldtype Category"
 COM_COMPONENTBUILDER_FIELDTYPE_ID="Id"
 COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_DESCRIPTION="Select if the property is mandatory."
 COM_COMPONENTBUILDER_FIELDTYPE_MANDATORY_LABEL="Mandatory"
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_DESC="The last user that modified this Fieldtype."
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_DESC="The date this Fieldtype was modified."
+COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME="Name"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_FIELDTYPE_NAME_HINT="Name Here"
@@ -1962,10 +1982,10 @@ COM_COMPONENTBUILDER_FIELD_BIGINT="BIGINT"
 COM_COMPONENTBUILDER_FIELD_CATID_DESCRIPTION="select one of the following categories"
 COM_COMPONENTBUILDER_FIELD_CATID_LABEL="Category"
 COM_COMPONENTBUILDER_FIELD_CHAR="CHAR"
-COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC="The user that created the Field."
-COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date Field was created."
-COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC="The user that created this Field."
+COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC="The date this Field was created."
+COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEW="Css View"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS="Css Views"
 COM_COMPONENTBUILDER_FIELD_CSS_VIEWS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
@@ -2024,6 +2044,10 @@ COM_COMPONENTBUILDER_FIELD_JSON="JSON"
 COM_COMPONENTBUILDER_FIELD_KEY="KEY"
 COM_COMPONENTBUILDER_FIELD_LONGTEXT="LONGTEXT"
 COM_COMPONENTBUILDER_FIELD_MEDIUMTEXT="MEDIUMTEXT"
+COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC="The last user that modified this Field."
+COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_DESC="The date this Field was modified."
+COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_FIELD_NAME="Name"
 COM_COMPONENTBUILDER_FIELD_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_FIELD_NAME_HINT="Name Here"
@@ -2148,10 +2172,10 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE="Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ARTICLE_LABEL="Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT="Content"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_CONTENT_LABEL="Content"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC="The user that created the Help Document."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC="The date Help Document was created."
-COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC="The user that created this Help Document."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC="The date this Help Document was created."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_DETAILS="Details"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_EDIT="Editing the Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias."
@@ -2163,6 +2187,10 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_JOOMLA_ARTICLE="Joomla Article"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION="Location"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_DESCRIPTION="Select the help target location."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_LOCATION_LABEL="Location"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_DESC="The last user that modified this Help Document."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_DESC="The date this Help Document was modified."
+COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_NEW="A New Help Document"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_NOT_REQUIRED="Not Required"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_ORDERING_LABEL="Ordering"
@@ -2296,10 +2324,10 @@ COM_COMPONENTBUILDER_LAYOUT_ALIAS="Alias"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_HINT="codename"
 COM_COMPONENTBUILDER_LAYOUT_ALIAS_LABEL="Name in Code"
-COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC="The user that created the Layout."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date Layout was created."
-COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC="The user that created this Layout."
+COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC="The date this Layout was created."
+COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_LAYOUT_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_LAYOUT_DESCRIPTION_DESCRIPTION="Enter some description"
@@ -2317,6 +2345,10 @@ COM_COMPONENTBUILDER_LAYOUT_ID="Id"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_HINT="// Add the layout code here. $displayData is the Object that is used inside the layout file to build displayed output"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_LABEL="Layout"
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_DESC="The last user that modified this Layout."
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_DESC="The date this Layout was modified."
+COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_LAYOUT_NAME="Name"
 COM_COMPONENTBUILDER_LAYOUT_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_LAYOUT_NAME_HINT="Name Here"
@@ -2484,10 +2516,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_COMMENTS_TWO="Comments 2"
 COM_COMPONENTBUILDER_SITE_VIEW_COMPASS="Compass"
 COM_COMPONENTBUILDER_SITE_VIEW_CONTRACT="Contract"
 COM_COMPONENTBUILDER_SITE_VIEW_CONTRACT_TWO="Contract 2"
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_DESC="The user that created the Site View."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_DESC="The date Site View was created."
-COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_DESC="The user that created this Site View."
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_DESC="The date this Site View was created."
+COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT="Credit"
 COM_COMPONENTBUILDER_SITE_VIEW_CREDIT_TWO="Credit 2"
 COM_COMPONENTBUILDER_SITE_VIEW_CSS="Css"
@@ -2610,6 +2642,10 @@ COM_COMPONENTBUILDER_SITE_VIEW_METHOD_NAME_LABEL="Method Name"
 COM_COMPONENTBUILDER_SITE_VIEW_MINUS="Minus"
 COM_COMPONENTBUILDER_SITE_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_SITE_VIEW_MOBILE="Mobile"
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_DESC="The last user that modified this Site View."
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_DESC="The date this Site View was modified."
+COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_SITE_VIEW_MOVE="Move"
 COM_COMPONENTBUILDER_SITE_VIEW_MUSIC="Music"
 COM_COMPONENTBUILDER_SITE_VIEW_NAME="Name"
@@ -2822,10 +2858,10 @@ COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to update the submenu of the snippet"
 COM_COMPONENTBUILDER_SNIPPET_CHARTS="Charts"
 COM_COMPONENTBUILDER_SNIPPET_COMMON="Common"
-COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC="The user that created the Snippet."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date Snippet was created."
-COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC="The user that created this Snippet."
+COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC="The date this Snippet was created."
+COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_DESCRIPTION="Add Description Here"
 COM_COMPONENTBUILDER_SNIPPET_DESCRIPTION_HINT="Add Description Here"
@@ -2841,6 +2877,10 @@ COM_COMPONENTBUILDER_SNIPPET_HEADING_LABEL="Heading"
 COM_COMPONENTBUILDER_SNIPPET_ID="Id"
 COM_COMPONENTBUILDER_SNIPPET_JAVASCRIPT="JavaScript"
 COM_COMPONENTBUILDER_SNIPPET_LAYOUT="Layout"
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_DESC="The last user that modified this Snippet."
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_DESC="The date this Snippet was modified."
+COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_SNIPPET_NAME="Name"
 COM_COMPONENTBUILDER_SNIPPET_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_SNIPPET_NAME_HINT="Name Here"
@@ -2934,10 +2974,10 @@ COM_COMPONENTBUILDER_TEMPLATE_ALIAS="Alias"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_HINT="codename"
 COM_COMPONENTBUILDER_TEMPLATE_ALIAS_LABEL="Name in Code"
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC="The user that created the Template."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created by"
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date Template was created."
-COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL="Created date"
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC="The user that created this Template."
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL="Created By"
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC="The date this Template was created."
+COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_TEMPLATE_CUSTOM_SCRIPT="Custom Script"
 COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION="Description"
 COM_COMPONENTBUILDER_TEMPLATE_DESCRIPTION_DESCRIPTION="Enter some description"
@@ -2952,6 +2992,10 @@ COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL="Dynamic Values"
 COM_COMPONENTBUILDER_TEMPLATE_EDIT="Editing the Template"
 COM_COMPONENTBUILDER_TEMPLATE_ERROR_UNIQUE_ALIAS="Another Template has the same alias."
 COM_COMPONENTBUILDER_TEMPLATE_ID="Id"
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_DESC="The last user that modified this Template."
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_LABEL="Modified By"
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_DESC="The date this Template was modified."
+COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_TEMPLATE_NAME="Name"
 COM_COMPONENTBUILDER_TEMPLATE_NAME_DESCRIPTION="Enter Name Here"
 COM_COMPONENTBUILDER_TEMPLATE_NAME_HINT="Name Here"
diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php
index aa573f4e7..42fdb6c45 100644
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		css_fullwidth.php
diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php
index 48d5ecac9..c80df5edb 100644
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 3ad20d72f..d8f08eb69 100644
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 352115cbe..b75e5dcdb 100644
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_fullwidth.php
diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php
index 638feb541..4528a5760 100644
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d68e5d323..c57786faa 100644
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 6b8388e26..fa72b7118 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 494e4d4b9..08dc41fdb 100644
--- a/admin/layouts/admin_view/settings_above.php
+++ b/admin/layouts/admin_view/settings_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d5e89ff15..a263fb2fb 100644
--- a/admin/layouts/admin_view/settings_left.php
+++ b/admin/layouts/admin_view/settings_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 9c7c4258c..bb7b3e883 100644
--- a/admin/layouts/admin_view/settings_right.php
+++ b/admin/layouts/admin_view/settings_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 b93390f13..e32fac567 100644
--- a/admin/layouts/admin_view/settings_under.php
+++ b/admin/layouts/admin_view/settings_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_under.php
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 03614972f..80cd4239d 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		batchselection.php
diff --git a/admin/layouts/component/admin_views_fullwidth.php b/admin/layouts/component/admin_views_fullwidth.php
index a8d952d38..a3c223dc5 100644
--- a/admin/layouts/component/admin_views_fullwidth.php
+++ b/admin/layouts/component/admin_views_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views_fullwidth.php
diff --git a/admin/layouts/component/details_above.php b/admin/layouts/component/details_above.php
index a13e846ba..1684293a9 100644
--- a/admin/layouts/component/details_above.php
+++ b/admin/layouts/component/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_above.php
diff --git a/admin/layouts/component/details_left.php b/admin/layouts/component/details_left.php
index bca92d6b0..58274818a 100644
--- a/admin/layouts/component/details_left.php
+++ b/admin/layouts/component/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_left.php
diff --git a/admin/layouts/component/details_right.php b/admin/layouts/component/details_right.php
index 9f5c8930b..21d2f2e0f 100644
--- a/admin/layouts/component/details_right.php
+++ b/admin/layouts/component/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_right.php
diff --git a/admin/layouts/component/details_under.php b/admin/layouts/component/details_under.php
index 72ec0f15f..2cde8835a 100644
--- a/admin/layouts/component/details_under.php
+++ b/admin/layouts/component/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/component/ftp_servers_fullwidth.php b/admin/layouts/component/ftp_servers_fullwidth.php
index 1a6280df8..7e9c488ce 100644
--- a/admin/layouts/component/ftp_servers_fullwidth.php
+++ b/admin/layouts/component/ftp_servers_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ftp_servers_fullwidth.php
diff --git a/admin/layouts/component/publishing.php b/admin/layouts/component/publishing.php
index c221cf451..8d0b00502 100644
--- a/admin/layouts/component/publishing.php
+++ b/admin/layouts/component/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publishing.php
diff --git a/admin/layouts/component/publlshing.php b/admin/layouts/component/publlshing.php
index 460428198..567a24246 100644
--- a/admin/layouts/component/publlshing.php
+++ b/admin/layouts/component/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/layouts/component/readme_left.php b/admin/layouts/component/readme_left.php
index bd12d433f..5bedf7f02 100644
--- a/admin/layouts/component/readme_left.php
+++ b/admin/layouts/component/readme_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_left.php
diff --git a/admin/layouts/component/readme_right.php b/admin/layouts/component/readme_right.php
index 75bca5b49..ffb6b4fc2 100644
--- a/admin/layouts/component/readme_right.php
+++ b/admin/layouts/component/readme_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		readme_right.php
diff --git a/admin/layouts/component/scripts_fullwidth.php b/admin/layouts/component/scripts_fullwidth.php
index aa4dc8ba4..814ea0037 100644
--- a/admin/layouts/component/scripts_fullwidth.php
+++ b/admin/layouts/component/scripts_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		scripts_fullwidth.php
diff --git a/admin/layouts/component/settings_left.php b/admin/layouts/component/settings_left.php
index a4c8f80b0..550e7618d 100644
--- a/admin/layouts/component/settings_left.php
+++ b/admin/layouts/component/settings_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_left.php
diff --git a/admin/layouts/component/settings_right.php b/admin/layouts/component/settings_right.php
index 4fe413890..5529d3d7e 100644
--- a/admin/layouts/component/settings_right.php
+++ b/admin/layouts/component/settings_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		settings_right.php
diff --git a/admin/layouts/component/site_views_fullwidth.php b/admin/layouts/component/site_views_fullwidth.php
index 4e8b733b2..42e37562f 100644
--- a/admin/layouts/component/site_views_fullwidth.php
+++ b/admin/layouts/component/site_views_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views_fullwidth.php
diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
index df15bac67..3622843da 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 b5e886d8f..523544fbb 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_left.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 771451cd9..c87470ed1 100644
--- a/admin/layouts/custom_admin_view/custom_script_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 a13e846ba..1684293a9 100644
--- a/admin/layouts/custom_admin_view/details_above.php
+++ b/admin/layouts/custom_admin_view/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 fcf42f58a..3c67a3f42 100644
--- a/admin/layouts/custom_admin_view/details_fullwidth.php
+++ b/admin/layouts/custom_admin_view/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d32e4b834..674669f29 100644
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d080ccf92..a29652e16 100644
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d8460a4d1..7c0915f7c 100644
--- a/admin/layouts/custom_admin_view/details_rightside.php
+++ b/admin/layouts/custom_admin_view/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 72ec0f15f..2cde8835a 100644
--- a/admin/layouts/custom_admin_view/details_under.php
+++ b/admin/layouts/custom_admin_view/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php
index c221cf451..8d0b00502 100644
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 a0340d443..4555e0925 100644
--- a/admin/layouts/dynamic_get/abacus_fullwidth.php
+++ b/admin/layouts/dynamic_get/abacus_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 538d35c86..257e7645e 100644
--- a/admin/layouts/dynamic_get/abacus_left.php
+++ b/admin/layouts/dynamic_get/abacus_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c0ae97e9d..10d54f1b2 100644
--- a/admin/layouts/dynamic_get/custom_script_fullwidth.php
+++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 101c4847b..a16fcba0e 100644
--- a/admin/layouts/dynamic_get/gettable_above.php
+++ b/admin/layouts/dynamic_get/gettable_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d2f6be04c..6b805c3e7 100644
--- a/admin/layouts/dynamic_get/gettable_fullwidth.php
+++ b/admin/layouts/dynamic_get/gettable_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 32e591a25..ee06cf364 100644
--- a/admin/layouts/dynamic_get/gettable_left.php
+++ b/admin/layouts/dynamic_get/gettable_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 cfd294891..327b5417e 100644
--- a/admin/layouts/dynamic_get/gettable_right.php
+++ b/admin/layouts/dynamic_get/gettable_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 ab4611ac3..d897e1a25 100644
--- a/admin/layouts/dynamic_get/gettable_under.php
+++ b/admin/layouts/dynamic_get/gettable_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/dynamic_get/publishing.php
+++ b/admin/layouts/dynamic_get/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/dynamic_get/publlshing.php
+++ b/admin/layouts/dynamic_get/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460d7c092..0548f3c6c 100644
--- a/admin/layouts/field/details_fullwidth.php
+++ b/admin/layouts/field/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 605c245b8..de2698ab9 100644
--- a/admin/layouts/field/details_left.php
+++ b/admin/layouts/field/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 0205ee00f..c913cfb02 100644
--- a/admin/layouts/field/details_right.php
+++ b/admin/layouts/field/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 72ec0f15f..2cde8835a 100644
--- a/admin/layouts/field/details_under.php
+++ b/admin/layouts/field/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		details_under.php
diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php
index c221cf451..8d0b00502 100644
--- a/admin/layouts/field/publishing.php
+++ b/admin/layouts/field/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/field/publlshing.php
+++ b/admin/layouts/field/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 a9111c67c..4807fc1a8 100644
--- a/admin/layouts/field/scripts_left.php
+++ b/admin/layouts/field/scripts_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 e189959e8..4337294e2 100644
--- a/admin/layouts/field/scripts_right.php
+++ b/admin/layouts/field/scripts_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 0ca11d267..d1c925869 100644
--- a/admin/layouts/fieldtype/details_left.php
+++ b/admin/layouts/fieldtype/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 e9a6ef713..ca7fd00cd 100644
--- a/admin/layouts/fieldtype/details_right.php
+++ b/admin/layouts/fieldtype/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 48f2664aa..7c079ba46 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/fieldtype/publishing.php
+++ b/admin/layouts/fieldtype/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/fieldtype/publlshing.php
+++ b/admin/layouts/fieldtype/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 71b8d62ff..35be200e1 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 655b99080..5f5be6d1c 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 609bf25a7..3cb97cda3 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 6898496a8..bdbbeab81 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 72ec0f15f..2cde8835a 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 74f4803e8..4a362f1f0 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 9d1032665..b209dc514 100644
--- a/admin/layouts/layout/custom_script_fullwidth.php
+++ b/admin/layouts/layout/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 51aa033b5..95a7c6e71 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d32e4b834..674669f29 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d080ccf92..a29652e16 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 e6895b7c2..a420e5577 100644
--- a/admin/layouts/layout/details_rightside.php
+++ b/admin/layouts/layout/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 72ec0f15f..2cde8835a 100644
--- a/admin/layouts/layout/details_under.php
+++ b/admin/layouts/layout/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/layout/publishing.php
+++ b/admin/layouts/layout/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/layout/publlshing.php
+++ b/admin/layouts/layout/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 dd238306c..c186b6a66 100644
--- a/admin/layouts/site_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/site_view/custom_buttons_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_buttons_fullwidth.php
diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php
index a13e846ba..1684293a9 100644
--- a/admin/layouts/site_view/details_above.php
+++ b/admin/layouts/site_view/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 fcf42f58a..3c67a3f42 100644
--- a/admin/layouts/site_view/details_fullwidth.php
+++ b/admin/layouts/site_view/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d32e4b834..674669f29 100644
--- a/admin/layouts/site_view/details_left.php
+++ b/admin/layouts/site_view/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d080ccf92..a29652e16 100644
--- a/admin/layouts/site_view/details_right.php
+++ b/admin/layouts/site_view/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d8460a4d1..7c0915f7c 100644
--- a/admin/layouts/site_view/details_rightside.php
+++ b/admin/layouts/site_view/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 72ec0f15f..2cde8835a 100644
--- a/admin/layouts/site_view/details_under.php
+++ b/admin/layouts/site_view/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 bdbb2f14f..dc231dfb0 100644
--- a/admin/layouts/site_view/javascript_css_fullwidth.php
+++ b/admin/layouts/site_view/javascript_css_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		javascript_css_fullwidth.php
diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php
index 3c99fb7b5..6aacac8f9 100644
--- a/admin/layouts/site_view/php_fullwidth.php
+++ b/admin/layouts/site_view/php_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/site_view/publishing.php
+++ b/admin/layouts/site_view/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/site_view/publlshing.php
+++ b/admin/layouts/site_view/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 5813da080..fb03b2291 100644
--- a/admin/layouts/snippet/details_above.php
+++ b/admin/layouts/snippet/details_above.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 857162517..6dc954f79 100644
--- a/admin/layouts/snippet/details_left.php
+++ b/admin/layouts/snippet/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 021bed6ad..dbca233c3 100644
--- a/admin/layouts/snippet/details_right.php
+++ b/admin/layouts/snippet/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/snippet/publishing.php
+++ b/admin/layouts/snippet/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/snippet/publlshing.php
+++ b/admin/layouts/snippet/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 9d1032665..b209dc514 100644
--- a/admin/layouts/template/custom_script_fullwidth.php
+++ b/admin/layouts/template/custom_script_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 ad71ca9d5..c26c7d1d0 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d32e4b834..674669f29 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 d080ccf92..a29652e16 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 e6895b7c2..a420e5577 100644
--- a/admin/layouts/template/details_rightside.php
+++ b/admin/layouts/template/details_rightside.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 72ec0f15f..2cde8835a 100644
--- a/admin/layouts/template/details_under.php
+++ b/admin/layouts/template/details_under.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c221cf451..8d0b00502 100644
--- a/admin/layouts/template/publishing.php
+++ b/admin/layouts/template/publishing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 460428198..567a24246 100644
--- a/admin/layouts/template/publlshing.php
+++ b/admin/layouts/template/publlshing.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		publlshing.php
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 9f592740c..2a7a5ee1d 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index 919bc1f21..97c7d54e9 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_views.php
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index fcaf1a358..8448e6097 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		ajax.php
diff --git a/admin/models/compiler.php b/admin/models/compiler.php
index 14705f73a..fab70daf7 100644
--- a/admin/models/compiler.php
+++ b/admin/models/compiler.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		compiler.php
diff --git a/admin/models/component.php b/admin/models/component.php
index 4f27f9c11..d3f0572b8 100644
--- a/admin/models/component.php
+++ b/admin/models/component.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index b31660d60..a83add4fc 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/admin/models/components.php b/admin/models/components.php
index 44d5d79a3..950c8d9af 100644
--- a/admin/models/components.php
+++ b/admin/models/components.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 55a4492f5..73c65786e 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php
index 1b7437d38..a6c1e8d31 100644
--- a/admin/models/custom_admin_views.php
+++ b/admin/models/custom_admin_views.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_views.php
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index e33bb9ab0..a844effc5 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php
diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php
index a0fd5559b..d55827b09 100644
--- a/admin/models/dynamic_gets.php
+++ b/admin/models/dynamic_gets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_gets.php
diff --git a/admin/models/field.php b/admin/models/field.php
index 4877a7a99..4c29c5fad 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php
diff --git a/admin/models/fields.php b/admin/models/fields.php
index dcd6225df..6420701a1 100644
--- a/admin/models/fields.php
+++ b/admin/models/fields.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php
diff --git a/admin/models/fields/adminviews.php b/admin/models/fields/adminviews.php
index ccd7dbcc1..e8e3ca4b9 100644
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 8c8d1e720..f46faa897 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		articles.php
diff --git a/admin/models/fields/customadminviews.php b/admin/models/fields/customadminviews.php
index b14b1eecd..e41da7d8a 100644
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 3a68ee38a..9e661d3b9 100644
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 8c25b85e3..e5defb6e1 100644
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 155938e82..c809def24 100644
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 e92e25a52..97fb236c3 100644
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dbtables.php
diff --git a/admin/models/fields/dynamicgets.php b/admin/models/fields/dynamicgets.php
index d7bb54fe3..67cecb390 100644
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c602a76dc..302971a05 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 e24a457cf..c2c4d4af1 100644
--- a/admin/models/fields/fieldsmulti.php
+++ b/admin/models/fields/fieldsmulti.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 4d9f0c39b..15c5aa051 100644
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
diff --git a/admin/models/fields/maingets.php b/admin/models/fields/maingets.php
index 565f868b1..9a7293dd5 100644
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		maingets.php
diff --git a/admin/models/fields/siteviews.php b/admin/models/fields/siteviews.php
index 22cb1d91e..11944e339 100644
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 f8776160b..2f55e2b03 100644
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index d5057db80..88a3c0970 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php
diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php
index b912f12fc..23f343ba5 100644
--- a/admin/models/fieldtypes.php
+++ b/admin/models/fieldtypes.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index f0416684a..64c11e361 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.js
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 0c3c60d4e..e6ddf16e7 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/component.js b/admin/models/forms/component.js
index 5675c84db..295145f06 100644
--- a/admin/models/forms/component.js
+++ b/admin/models/forms/component.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.js
diff --git a/admin/models/forms/component.xml b/admin/models/forms/component.xml
index 6347fadea..ab31125e5 100644
--- a/admin/models/forms/component.xml
+++ b/admin/models/forms/component.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_COMPONENT_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_COMPONENT_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_COMPONENT_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_COMPONENT_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js
index 192b0d751..c1b39efe4 100644
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.js
diff --git a/admin/models/forms/custom_admin_view.xml b/admin/models/forms/custom_admin_view.xml
index 6cbb21d42..1583d30c7 100644
--- a/admin/models/forms/custom_admin_view.xml
+++ b/admin/models/forms/custom_admin_view.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js
index f26243075..6fb52694d 100644
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.js
diff --git a/admin/models/forms/dynamic_get.xml b/admin/models/forms/dynamic_get.xml
index dd39a8742..20fcdd326 100644
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_DYNAMIC_GET_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index 89cd186f6..bc17bd0e5 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.js
diff --git a/admin/models/forms/field.xml b/admin/models/forms/field.xml
index 8f1780b14..a31de33b4 100644
--- a/admin/models/forms/field.xml
+++ b/admin/models/forms/field.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_FIELD_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_FIELD_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_FIELD_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_FIELD_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_FIELD_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_FIELD_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js
index 089774060..62e44affc 100644
--- a/admin/models/forms/fieldtype.js
+++ b/admin/models/forms/fieldtype.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.js
diff --git a/admin/models/forms/fieldtype.xml b/admin/models/forms/fieldtype.xml
index f0d84a1a2..25a7b6a3a 100644
--- a/admin/models/forms/fieldtype.xml
+++ b/admin/models/forms/fieldtype.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_FIELDTYPE_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_FIELDTYPE_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 62b0ccbc0..32ef694a2 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.js
diff --git a/admin/models/forms/help_document.xml b/admin/models/forms/help_document.xml
index ef93c7ef2..947cb8b3c 100644
--- a/admin/models/forms/help_document.xml
+++ b/admin/models/forms/help_document.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_HELP_DOCUMENT_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -62,6 +66,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js
index c89b36926..64fac4aa0 100644
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.js
diff --git a/admin/models/forms/layout.xml b/admin/models/forms/layout.xml
index 3807388bf..b5aa9b5a6 100644
--- a/admin/models/forms/layout.xml
+++ b/admin/models/forms/layout.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_LAYOUT_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_LAYOUT_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_LAYOUT_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js
index b40f27ba9..90e3c105d 100644
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.js
diff --git a/admin/models/forms/site_view.xml b/admin/models/forms/site_view.xml
index 643deecbb..9e570862d 100644
--- a/admin/models/forms/site_view.xml
+++ b/admin/models/forms/site_view.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_SITE_VIEW_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_SITE_VIEW_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_SITE_VIEW_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/snippet.js b/admin/models/forms/snippet.js
index 1cdc636e5..d652006f8 100644
--- a/admin/models/forms/snippet.js
+++ b/admin/models/forms/snippet.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.js
diff --git a/admin/models/forms/snippet.xml b/admin/models/forms/snippet.xml
index 9a58e5a07..50cf16653 100644
--- a/admin/models/forms/snippet.xml
+++ b/admin/models/forms/snippet.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_SNIPPET_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_SNIPPET_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_SNIPPET_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js
index 5549e8b04..ed7779aa5 100644
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.js
diff --git a/admin/models/forms/template.xml b/admin/models/forms/template.xml
index 5a07088fe..6e8a0af8b 100644
--- a/admin/models/forms/template.xml
+++ b/admin/models/forms/template.xml
@@ -19,6 +19,7 @@
 			label="COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_LABEL"
 			description="COM_COMPONENTBUILDER_TEMPLATE_CREATED_DATE_DESC"
 			size="22"
+
 			format="%Y-%m-%d %H:%M:%S"
 			filter="user_utc"
 		/>
@@ -27,11 +28,13 @@
 			name="created_by"
 			type="user"
 			label="COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_LABEL"
+
 			description="COM_COMPONENTBUILDER_TEMPLATE_CREATED_BY_DESC"
 		/>
 		<!-- Published Field. Type: List (joomla) -->
 		<field name="published" type="list" label="JSTATUS"
 			description="JFIELD_PUBLISHED_DESC" class="chzn-color-state"
+
 			filter="intval" size="1" default="1" >
 			<option value="1">
 				JPUBLISHED</option>
@@ -44,11 +47,12 @@
 		</field>
 		<!-- Date Modified Field. Type: Calendar (joomla) -->
 		<field name="modified" type="calendar" class="readonly"
-			label="JGLOBAL_FIELD_MODIFIED_LABEL" description="COM_CONTENT_FIELD_MODIFIED_DESC"
+			label="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_LABEL" description="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_DATE_DESC"
 			size="22" readonly="true" format="%Y-%m-%d %H:%M:%S" filter="user_utc" />
 		<!-- User Modified Field. Type: User (joomla) -->
 		<field name="modified_by" type="user"
-			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			label="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_LABEL"
+			description="COM_COMPONENTBUILDER_TEMPLATE_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -59,6 +63,7 @@
 			label="JFIELD_ACCESS_LABEL"
 			description="JFIELD_ACCESS_DESC"
 			default="1"
+
 			required="false"
 		/>
 		<!-- Ordering Field. Type: Numbers (joomla) -->
@@ -70,6 +75,7 @@
 			description=""
 			default="0"
 			size="6"
+
 			required="false"
 		/>
 		<!-- Version Field. Type: Text (joomla) -->
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index 8abb6a909..3f41a2133 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index 9c8476710..5b84bfdf4 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_documents.php
diff --git a/admin/models/import.php b/admin/models/import.php
index fac86d428..acafcf372 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		import.php
diff --git a/admin/models/layout.php b/admin/models/layout.php
index 22392477f..9d58664bd 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php
diff --git a/admin/models/layouts.php b/admin/models/layouts.php
index f50379f4d..2c888f639 100644
--- a/admin/models/layouts.php
+++ b/admin/models/layouts.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layouts.php
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index c77716223..556ab5b4e 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
diff --git a/admin/models/site_views.php b/admin/models/site_views.php
index 70144218d..db2bde357 100644
--- a/admin/models/site_views.php
+++ b/admin/models/site_views.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_views.php
diff --git a/admin/models/snippet.php b/admin/models/snippet.php
index d570bce25..0f48b5298 100644
--- a/admin/models/snippet.php
+++ b/admin/models/snippet.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php
diff --git a/admin/models/snippets.php b/admin/models/snippets.php
index ea0bb1bd8..c8cdb510f 100644
--- a/admin/models/snippets.php
+++ b/admin/models/snippets.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php
diff --git a/admin/models/template.php b/admin/models/template.php
index 1dc3d6fd3..b2c09c0c3 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php
diff --git a/admin/models/templates.php b/admin/models/templates.php
index e41583f98..5058dc314 100644
--- a/admin/models/templates.php
+++ b/admin/models/templates.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		templates.php
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 74e61ae59..0eef80780 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -662,4 +662,9 @@ INSERT INTO `#__componentbuilder_fieldtype` (`id`, `asset_id`, `catid`, `descrip
 (11, 2992, '', 'The list form field type provides a drop down list or a list box of custom-defined entries. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'List', '{\"name\":[\"type\",\"name\",\"label\",\"description\",\"class\",\"multiple\",\"filter\",\"required\",\"option\",\"default\",\"showon\",\"onchange\"],\"example\":[\"list\",\"mylist\",\"Select an option\",\"\",\"list_class\",\"false\",\"\",\"\",\"0|Option 1,1|Option 2,2|Option 1\",\"0\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"description\":[\"(mandatory) must be list.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'inputbox\'.\",\"(optional) is whether multiple items can be selected at the same time (true or false).\",\"(optional) filter options\",\"(optional) The field must be filled before submitting the form.\",\"(mandatory) set the options of this radio. Separate options with commas and use the pipe symbol to separate value from text.\",\"(optional) is the default list item value.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a drop down list of custom-defined entries.', '', 1, 845, 450, '2015-03-16 18:07:48', '2016-02-22 19:09:08', '', '0000-00-00 00:00:00', 4, '', 5, ''),
 (17, 2998, '', 'The radio form field type provides radio buttons to select different options. If the field has a saved value this is selected when the page is first loaded. If not, the default value (if any) is selected.', 'Radio', '{\"name\":[\"type\",\"name\",\"label\",\"description\",\"class\",\"option\",\"default\",\"required\",\"showon\",\"onchange\"],\"example\":[\"radio\",\"myradiovalue\",\"Select an option\",\"\",\"btn-group btn-group-yesno\",\"1|Yes,0|No\",\"0\",\"\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"description\":[\"(mandatory) must be radio.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) New in Joomla 3, if set to class=\\\"btn-group btn-group-yesno\\\" will show the nice coloured buttons\",\"(mandatory) set the options of this radio. Separate options with commas and use the pipe symbol to separate value from text.\",\"(optional) is the default radio button item value.\",\"(optional) The field must be filled before submitting the form.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides radio buttons to select different options.', '', 1, 845, 450, '2015-03-16 18:29:51', '2016-02-22 19:08:47', '', '0000-00-00 00:00:00', 4, '', 5, ''),
 (24, 3005, '', 'The text form field type provides a text box for data entry. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Text', '{\"name\":[\"type\",\"name\",\"label\",\"size\",\"maxlength\",\"default\",\"description\",\"class\",\"readonly\",\"disabled\",\"required\",\"filter\",\"validate\",\"field\",\"message\",\"hint\",\"showon\",\"onchange\"],\"example\":[\"text\",\"mytextvalue\",\"Enter some text\",\"10\",\"50\",\"Some text\",\"Enter some description\",\"text_area\",\"false\",\"false\",\"false\",\"STRING\",\"\",\"\",\"Error! Please add some text here.\",\"Your Name Here\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\"],\"description\":[\"(mandatory) must be text.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(optional) is the width of the text box in characters. If omitted the width is determined by the browser. The value of size does not limit the number of characters that may be entered.\",\"(optional) limits the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) The field cannot be changed and will automatically inherit the default value\",\"(optional) The field cannot be changed and will automatically inherit the default value - it will also not submit\",\"(optional) The field must be filled before submitting the form.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) makes the system validate the data.\",\"(optional) used in validation of \\\"equals\\\" to link the field to match.\",\"(optional) The error message that will be displayed instead of the default message.\",\"(optional) The placeholder to display inside the text box.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a text box for data entry.', '', 1, 845, 450, '2015-03-19 14:58:08', '2016-02-22 19:11:00', '', '0000-00-00 00:00:00', 5, '', 5, ''),
-(25, 3006, '', 'The textarea form field type provides a text area for entry of multi-line text. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Textarea', '{\"name\":[\"type\",\"name\",\"label\",\"rows\",\"cols\",\"default\",\"description\",\"class\",\"filter\",\"hint\",\"required\",\"showon\",\"onchange\"],\"example\":[\"textarea\",\"mytextarea\",\"Enter some text\",\"10\",\"5\",\"default text\",\"Text Area\",\"text_area\",\"raw\",\"\",\"\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\"],\"description\":[\"(mandatory) must be textarea.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(mandatory) is the height of the visible text area in lines. If omitted the width is determined by the browser. The value of rows does not limit the number of lines that may be entered.\",\"(mandatory) is the width of the visible text area in characters. If omitted the width is determined by the browser. The value of cols does not limit the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) The placeholder to display inside the textarea.\",\"(optional) The field must be filled before submitting the form.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a text area for entry of multi-line text.', '', 1, 845, 450, '2015-03-28 06:13:26', '2016-02-22 19:11:23', '', '0000-00-00 00:00:00', 4, '', 1, '');
\ No newline at end of file
+(25, 3006, '', 'The textarea form field type provides a text area for entry of multi-line text. If the field has a value saved, this value is displayed when the page is first loaded. If not, the default value (if any) is selected.', 'Textarea', '{\"name\":[\"type\",\"name\",\"label\",\"rows\",\"cols\",\"default\",\"description\",\"class\",\"filter\",\"hint\",\"required\",\"showon\",\"onchange\"],\"example\":[\"textarea\",\"mytextarea\",\"Enter some text\",\"10\",\"5\",\"default text\",\"Text Area\",\"text_area\",\"raw\",\"\",\"\",\"\",\"\"],\"adjustable\":[\"0\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\"],\"mandatory\":[\"1\",\"1\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"],\"translatable\":[\"0\",\"0\",\"1\",\"0\",\"0\",\"0\",\"1\",\"0\",\"0\",\"1\",\"0\",\"0\",\"0\"],\"description\":[\"(mandatory) must be textarea.\",\"(mandatory) is the unique name of the field.\",\"(mandatory) (translatable) is the descriptive title of the field.\",\"(mandatory) is the height of the visible text area in lines. If omitted the width is determined by the browser. The value of rows does not limit the number of lines that may be entered.\",\"(mandatory) is the width of the visible text area in characters. If omitted the width is determined by the browser. The value of cols does not limit the number of characters that may be entered.\",\"(optional) (not translatable) is the default value.\",\"(optional) (translatable) is text that will be shown as a tooltip when the user moves the mouse over the drop-down box.\",\"(optional) is a CSS class name for the HTML form field. If omitted this will default to \'text_area\'.\",\"(optional) allow the system to save certain html tags or raw data.\",\"(optional) The placeholder to display inside the textarea.\",\"(optional) The field must be filled before submitting the form.\",\"(optional) Allows you to hide the field based on the value(s) of another field; for Joomla 3.2.4+\",\"(optional) HTML equivalent attribute (javascript use)\"]}', 'provides a text area for entry of multi-line text.', '', 1, 845, 450, '2015-03-28 06:13:26', '2016-02-22 19:11:23', '', '0000-00-00 00:00:00', 4, '', 1, '');
+
+--
+-- Always insure this column is large enough for all the access control values.
+--
+ALTER TABLE `#__assets` CHANGE `rules` `rules` MEDIUMTEXT NOT NULL COMMENT 'JSON encoded access control.';
diff --git a/admin/sql/updates/mysql/2.1.10.sql b/admin/sql/updates/mysql/2.1.10.sql
new file mode 100644
index 000000000..d3f5a12fa
--- /dev/null
+++ b/admin/sql/updates/mysql/2.1.10.sql
@@ -0,0 +1 @@
+
diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php
index 11cbe36a5..51a57b5f3 100644
--- a/admin/tables/admin_view.php
+++ b/admin/tables/admin_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		admin_view.php
diff --git a/admin/tables/component.php b/admin/tables/component.php
index 3d24f2892..905c0236f 100644
--- a/admin/tables/component.php
+++ b/admin/tables/component.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php
index f4ec8f307..7f2e0e461 100644
--- a/admin/tables/custom_admin_view.php
+++ b/admin/tables/custom_admin_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		custom_admin_view.php
diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php
index ba8fb9267..e006005a3 100644
--- a/admin/tables/dynamic_get.php
+++ b/admin/tables/dynamic_get.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamic_get.php
diff --git a/admin/tables/field.php b/admin/tables/field.php
index e9e4c4021..c2615510f 100644
--- a/admin/tables/field.php
+++ b/admin/tables/field.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		field.php
diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php
index 4c9b1ef52..24635ac5a 100644
--- a/admin/tables/fieldtype.php
+++ b/admin/tables/fieldtype.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtype.php
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 8abc85828..f33a264db 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help_document.php
diff --git a/admin/tables/layout.php b/admin/tables/layout.php
index 8c3961c3e..9b6ead9f0 100644
--- a/admin/tables/layout.php
+++ b/admin/tables/layout.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		layout.php
diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php
index 7560f630d..513fb8c1c 100644
--- a/admin/tables/site_view.php
+++ b/admin/tables/site_view.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site_view.php
diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php
index c018fe2bd..a0327552b 100644
--- a/admin/tables/snippet.php
+++ b/admin/tables/snippet.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippet.php
diff --git a/admin/tables/template.php b/admin/tables/template.php
index dbf4da565..80e7c99ac 100644
--- a/admin/tables/template.php
+++ b/admin/tables/template.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		template.php
diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js
index f1d1632a2..6e218eb81 100644
--- a/admin/views/admin_view/submitbutton.js
+++ b/admin/views/admin_view/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index b96479304..0ce91cf81 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php
index 997bf7f73..2a3a96adf 100644
--- a/admin/views/admin_view/view.html.php
+++ b/admin/views/admin_view/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php
index 544430187..78808f138 100644
--- a/admin/views/admin_views/tmpl/default.php
+++ b/admin/views/admin_views/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/admin_views/tmpl/default_batch_body.php b/admin/views/admin_views/tmpl/default_batch_body.php
index 79e85e5ec..c569b0ce5 100644
--- a/admin/views/admin_views/tmpl/default_batch_body.php
+++ b/admin/views/admin_views/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/admin_views/tmpl/default_batch_footer.php b/admin/views/admin_views/tmpl/default_batch_footer.php
index 27077bcac..8f9afb270 100644
--- a/admin/views/admin_views/tmpl/default_batch_footer.php
+++ b/admin/views/admin_views/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/admin_views/tmpl/default_body.php b/admin/views/admin_views/tmpl/default_body.php
index 60ef76046..24c681c3b 100644
--- a/admin/views/admin_views/tmpl/default_body.php
+++ b/admin/views/admin_views/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/admin_views/tmpl/default_foot.php b/admin/views/admin_views/tmpl/default_foot.php
index 627f39e5a..fc28cb871 100644
--- a/admin/views/admin_views/tmpl/default_foot.php
+++ b/admin/views/admin_views/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/admin_views/tmpl/default_head.php b/admin/views/admin_views/tmpl/default_head.php
index 8d7c00042..34e4c0d34 100644
--- a/admin/views/admin_views/tmpl/default_head.php
+++ b/admin/views/admin_views/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/admin_views/tmpl/default_toolbar.php b/admin/views/admin_views/tmpl/default_toolbar.php
index f4cfb2acc..3d33adc02 100644
--- a/admin/views/admin_views/tmpl/default_toolbar.php
+++ b/admin/views/admin_views/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php
index ca875b9aa..fadba908b 100644
--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php
index d4c765ae0..f229a8837 100644
--- a/admin/views/compiler/tmpl/default.php
+++ b/admin/views/compiler/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php
index bcc7eb751..7c2d880f3 100644
--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/component/submitbutton.js b/admin/views/component/submitbutton.js
index 7dae4bb2b..61a17b43c 100644
--- a/admin/views/component/submitbutton.js
+++ b/admin/views/component/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/component/tmpl/edit.php b/admin/views/component/tmpl/edit.php
index e7155497f..2956bd181 100644
--- a/admin/views/component/tmpl/edit.php
+++ b/admin/views/component/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/component/view.html.php b/admin/views/component/view.html.php
index 60dd751b7..b9e68e865 100644
--- a/admin/views/component/view.html.php
+++ b/admin/views/component/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/componentbuilder/tmpl/default.php b/admin/views/componentbuilder/tmpl/default.php
index 8c599e47f..299357e6e 100644
--- a/admin/views/componentbuilder/tmpl/default.php
+++ b/admin/views/componentbuilder/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/componentbuilder/tmpl/default_main.php b/admin/views/componentbuilder/tmpl/default_main.php
index 9b17f7dfc..8ff344cd2 100644
--- a/admin/views/componentbuilder/tmpl/default_main.php
+++ b/admin/views/componentbuilder/tmpl/default_main.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_main.php
diff --git a/admin/views/componentbuilder/tmpl/default_vdm.php b/admin/views/componentbuilder/tmpl/default_vdm.php
index 7ab56eeb1..3244912c7 100644
--- a/admin/views/componentbuilder/tmpl/default_vdm.php
+++ b/admin/views/componentbuilder/tmpl/default_vdm.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 802c2130d..441561d87 100644
--- a/admin/views/componentbuilder/view.html.php
+++ b/admin/views/componentbuilder/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/components/tmpl/default.php b/admin/views/components/tmpl/default.php
index c2512f36f..97856328e 100644
--- a/admin/views/components/tmpl/default.php
+++ b/admin/views/components/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/components/tmpl/default_batch_body.php b/admin/views/components/tmpl/default_batch_body.php
index befc58bbd..d08c2445c 100644
--- a/admin/views/components/tmpl/default_batch_body.php
+++ b/admin/views/components/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/components/tmpl/default_batch_footer.php b/admin/views/components/tmpl/default_batch_footer.php
index 7dca08864..047cee03d 100644
--- a/admin/views/components/tmpl/default_batch_footer.php
+++ b/admin/views/components/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/components/tmpl/default_body.php b/admin/views/components/tmpl/default_body.php
index 431d7f1b9..52f9edc7b 100644
--- a/admin/views/components/tmpl/default_body.php
+++ b/admin/views/components/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/components/tmpl/default_foot.php b/admin/views/components/tmpl/default_foot.php
index f91745902..965083dbe 100644
--- a/admin/views/components/tmpl/default_foot.php
+++ b/admin/views/components/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/components/tmpl/default_head.php b/admin/views/components/tmpl/default_head.php
index 83f19fb5e..05e66ef01 100644
--- a/admin/views/components/tmpl/default_head.php
+++ b/admin/views/components/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/components/tmpl/default_toolbar.php b/admin/views/components/tmpl/default_toolbar.php
index c82a136bc..de1fb25c5 100644
--- a/admin/views/components/tmpl/default_toolbar.php
+++ b/admin/views/components/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/components/view.html.php b/admin/views/components/view.html.php
index 435ee482e..b9bfb353f 100644
--- a/admin/views/components/view.html.php
+++ b/admin/views/components/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js
index 2d399f423..5ffd01fae 100644
--- a/admin/views/custom_admin_view/submitbutton.js
+++ b/admin/views/custom_admin_view/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php
index 2f558b200..dec1ac3f9 100644
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php
index a371adcfa..9f6db4983 100644
--- a/admin/views/custom_admin_view/view.html.php
+++ b/admin/views/custom_admin_view/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php
index afb4c9a99..054b297a7 100644
--- a/admin/views/custom_admin_views/tmpl/default.php
+++ b/admin/views/custom_admin_views/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/custom_admin_views/tmpl/default_batch_body.php b/admin/views/custom_admin_views/tmpl/default_batch_body.php
index 3c203de45..fadeae668 100644
--- a/admin/views/custom_admin_views/tmpl/default_batch_body.php
+++ b/admin/views/custom_admin_views/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/custom_admin_views/tmpl/default_batch_footer.php b/admin/views/custom_admin_views/tmpl/default_batch_footer.php
index 289f0dde5..2214909da 100644
--- a/admin/views/custom_admin_views/tmpl/default_batch_footer.php
+++ b/admin/views/custom_admin_views/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/custom_admin_views/tmpl/default_body.php b/admin/views/custom_admin_views/tmpl/default_body.php
index 885553645..de585c0ba 100644
--- a/admin/views/custom_admin_views/tmpl/default_body.php
+++ b/admin/views/custom_admin_views/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/custom_admin_views/tmpl/default_foot.php b/admin/views/custom_admin_views/tmpl/default_foot.php
index 075b11a0e..d4d2fafb7 100644
--- a/admin/views/custom_admin_views/tmpl/default_foot.php
+++ b/admin/views/custom_admin_views/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/custom_admin_views/tmpl/default_head.php b/admin/views/custom_admin_views/tmpl/default_head.php
index 0fcd17817..f49f0085c 100644
--- a/admin/views/custom_admin_views/tmpl/default_head.php
+++ b/admin/views/custom_admin_views/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/custom_admin_views/tmpl/default_toolbar.php b/admin/views/custom_admin_views/tmpl/default_toolbar.php
index eeca2ea58..4fd7d01ce 100644
--- a/admin/views/custom_admin_views/tmpl/default_toolbar.php
+++ b/admin/views/custom_admin_views/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index f11bc4145..e6f8ab728 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/dynamic_get/submitbutton.js b/admin/views/dynamic_get/submitbutton.js
index eaf8cab92..b507a9951 100644
--- a/admin/views/dynamic_get/submitbutton.js
+++ b/admin/views/dynamic_get/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php
index 429cfea0f..a3e4d23f1 100644
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php
index 79d5845f8..f86b505df 100644
--- a/admin/views/dynamic_get/view.html.php
+++ b/admin/views/dynamic_get/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/dynamic_gets/tmpl/default.php b/admin/views/dynamic_gets/tmpl/default.php
index df66d6f21..82579aecd 100644
--- a/admin/views/dynamic_gets/tmpl/default.php
+++ b/admin/views/dynamic_gets/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/dynamic_gets/tmpl/default_batch_body.php b/admin/views/dynamic_gets/tmpl/default_batch_body.php
index fe5db0935..debc3d1d7 100644
--- a/admin/views/dynamic_gets/tmpl/default_batch_body.php
+++ b/admin/views/dynamic_gets/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/dynamic_gets/tmpl/default_batch_footer.php b/admin/views/dynamic_gets/tmpl/default_batch_footer.php
index ec9b9ddbc..830ad6be7 100644
--- a/admin/views/dynamic_gets/tmpl/default_batch_footer.php
+++ b/admin/views/dynamic_gets/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/dynamic_gets/tmpl/default_body.php b/admin/views/dynamic_gets/tmpl/default_body.php
index f0539454e..1151ee9e0 100644
--- a/admin/views/dynamic_gets/tmpl/default_body.php
+++ b/admin/views/dynamic_gets/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/dynamic_gets/tmpl/default_foot.php b/admin/views/dynamic_gets/tmpl/default_foot.php
index 1600056d2..61a6d8a08 100644
--- a/admin/views/dynamic_gets/tmpl/default_foot.php
+++ b/admin/views/dynamic_gets/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/dynamic_gets/tmpl/default_head.php b/admin/views/dynamic_gets/tmpl/default_head.php
index afe4e336b..fbb77a7fd 100644
--- a/admin/views/dynamic_gets/tmpl/default_head.php
+++ b/admin/views/dynamic_gets/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/dynamic_gets/tmpl/default_toolbar.php b/admin/views/dynamic_gets/tmpl/default_toolbar.php
index 21608e85e..c4fb975e5 100644
--- a/admin/views/dynamic_gets/tmpl/default_toolbar.php
+++ b/admin/views/dynamic_gets/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php
index 4a49fca37..27d933f76 100644
--- a/admin/views/dynamic_gets/view.html.php
+++ b/admin/views/dynamic_gets/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/field/submitbutton.js b/admin/views/field/submitbutton.js
index 1e5da3c0a..e01576b54 100644
--- a/admin/views/field/submitbutton.js
+++ b/admin/views/field/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index b198690b0..66d37751c 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php
index f274af183..0cb60de4e 100644
--- a/admin/views/field/view.html.php
+++ b/admin/views/field/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php
index 719e915f4..9a31f9050 100644
--- a/admin/views/fields/tmpl/default.php
+++ b/admin/views/fields/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/fields/tmpl/default_batch_body.php b/admin/views/fields/tmpl/default_batch_body.php
index a5eb6fbfd..6dcec1102 100644
--- a/admin/views/fields/tmpl/default_batch_body.php
+++ b/admin/views/fields/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/fields/tmpl/default_batch_footer.php b/admin/views/fields/tmpl/default_batch_footer.php
index 14f77e253..acee2f392 100644
--- a/admin/views/fields/tmpl/default_batch_footer.php
+++ b/admin/views/fields/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/fields/tmpl/default_body.php b/admin/views/fields/tmpl/default_body.php
index 730a26fc3..2bc53d332 100644
--- a/admin/views/fields/tmpl/default_body.php
+++ b/admin/views/fields/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/fields/tmpl/default_foot.php b/admin/views/fields/tmpl/default_foot.php
index 0affccd01..72d4243ca 100644
--- a/admin/views/fields/tmpl/default_foot.php
+++ b/admin/views/fields/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/fields/tmpl/default_head.php b/admin/views/fields/tmpl/default_head.php
index 9d76c930a..1adfca6a1 100644
--- a/admin/views/fields/tmpl/default_head.php
+++ b/admin/views/fields/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/fields/tmpl/default_toolbar.php b/admin/views/fields/tmpl/default_toolbar.php
index 51a742b46..c463c8feb 100644
--- a/admin/views/fields/tmpl/default_toolbar.php
+++ b/admin/views/fields/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index da05ad418..6c3bb3d54 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/fieldtype/submitbutton.js b/admin/views/fieldtype/submitbutton.js
index ceb57222f..6a4106e6b 100644
--- a/admin/views/fieldtype/submitbutton.js
+++ b/admin/views/fieldtype/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php
index e663a081d..52e97b89e 100644
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index 8d3309849..f6745fc40 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php
index f57ceeb3f..af5b1e7da 100644
--- a/admin/views/fieldtypes/tmpl/default.php
+++ b/admin/views/fieldtypes/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/fieldtypes/tmpl/default_batch_body.php b/admin/views/fieldtypes/tmpl/default_batch_body.php
index 8f10f5d96..0d4e151f8 100644
--- a/admin/views/fieldtypes/tmpl/default_batch_body.php
+++ b/admin/views/fieldtypes/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/fieldtypes/tmpl/default_batch_footer.php b/admin/views/fieldtypes/tmpl/default_batch_footer.php
index f309b8461..6211d8e5a 100644
--- a/admin/views/fieldtypes/tmpl/default_batch_footer.php
+++ b/admin/views/fieldtypes/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/fieldtypes/tmpl/default_body.php b/admin/views/fieldtypes/tmpl/default_body.php
index 1a59836b3..676f6d85a 100644
--- a/admin/views/fieldtypes/tmpl/default_body.php
+++ b/admin/views/fieldtypes/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/fieldtypes/tmpl/default_foot.php b/admin/views/fieldtypes/tmpl/default_foot.php
index 1600056d2..61a6d8a08 100644
--- a/admin/views/fieldtypes/tmpl/default_foot.php
+++ b/admin/views/fieldtypes/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/fieldtypes/tmpl/default_head.php b/admin/views/fieldtypes/tmpl/default_head.php
index 0964f22a5..f5038a2aa 100644
--- a/admin/views/fieldtypes/tmpl/default_head.php
+++ b/admin/views/fieldtypes/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/fieldtypes/tmpl/default_toolbar.php b/admin/views/fieldtypes/tmpl/default_toolbar.php
index d361aef0c..55b5677d2 100644
--- a/admin/views/fieldtypes/tmpl/default_toolbar.php
+++ b/admin/views/fieldtypes/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php
index 852b02d35..058dce08f 100644
--- a/admin/views/fieldtypes/view.html.php
+++ b/admin/views/fieldtypes/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js
index 66c92200e..49f8ff361 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 b6e3e06fe..acdce2c34 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 07eec3fd1..e7aebdad4 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 bc00fa2da..9e3d8cfab 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 ad3015cbd..2cf081b73 100644
--- a/admin/views/help_documents/tmpl/default_batch_body.php
+++ b/admin/views/help_documents/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 d0af53931..1fc080adc 100644
--- a/admin/views/help_documents/tmpl/default_batch_footer.php
+++ b/admin/views/help_documents/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 2072fd345..a4db51273 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 f91745902..965083dbe 100644
--- a/admin/views/help_documents/tmpl/default_foot.php
+++ b/admin/views/help_documents/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 10c745e53..ea0ce2bd6 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 bebdf8504..fb21bc22a 100644
--- a/admin/views/help_documents/tmpl/default_toolbar.php
+++ b/admin/views/help_documents/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@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 8f4000b71..7e3e4e9f5 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index 43aca7375..edddd1d61 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@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 c8758af68..a554abf91 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/layout/submitbutton.js b/admin/views/layout/submitbutton.js
index 3b1149194..01bda59c3 100644
--- a/admin/views/layout/submitbutton.js
+++ b/admin/views/layout/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php
index 85db83c8a..5b410bc11 100644
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php
index 99819940f..ace80a6bf 100644
--- a/admin/views/layout/view.html.php
+++ b/admin/views/layout/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 150a26e6b..96df485f3 100644
--- a/admin/views/layouts/tmpl/default.php
+++ b/admin/views/layouts/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 ad2f3ccb3..2448df229 100644
--- a/admin/views/layouts/tmpl/default_batch_body.php
+++ b/admin/views/layouts/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 50eaf6edc..c18c8cecd 100644
--- a/admin/views/layouts/tmpl/default_batch_footer.php
+++ b/admin/views/layouts/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 3e89953c0..e08262254 100644
--- a/admin/views/layouts/tmpl/default_body.php
+++ b/admin/views/layouts/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 627f39e5a..fc28cb871 100644
--- a/admin/views/layouts/tmpl/default_foot.php
+++ b/admin/views/layouts/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 0e6cec9ac..93130d961 100644
--- a/admin/views/layouts/tmpl/default_head.php
+++ b/admin/views/layouts/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 3205b6a24..91281c692 100644
--- a/admin/views/layouts/tmpl/default_toolbar.php
+++ b/admin/views/layouts/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 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 afd12295a..28f44214b 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/site_view/submitbutton.js b/admin/views/site_view/submitbutton.js
index 291e3423b..62c233002 100644
--- a/admin/views/site_view/submitbutton.js
+++ b/admin/views/site_view/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php
index 384060978..2c2a13e7c 100644
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php
index 8a262a0c0..2ac4e8c3b 100644
--- a/admin/views/site_view/view.html.php
+++ b/admin/views/site_view/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php
index 206973f82..218789cbc 100644
--- a/admin/views/site_views/tmpl/default.php
+++ b/admin/views/site_views/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/site_views/tmpl/default_batch_body.php b/admin/views/site_views/tmpl/default_batch_body.php
index 769ca0551..11fcc1202 100644
--- a/admin/views/site_views/tmpl/default_batch_body.php
+++ b/admin/views/site_views/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/site_views/tmpl/default_batch_footer.php b/admin/views/site_views/tmpl/default_batch_footer.php
index f7450bcc0..c9ef0b38b 100644
--- a/admin/views/site_views/tmpl/default_batch_footer.php
+++ b/admin/views/site_views/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/site_views/tmpl/default_body.php b/admin/views/site_views/tmpl/default_body.php
index c213fd842..ca41f7faf 100644
--- a/admin/views/site_views/tmpl/default_body.php
+++ b/admin/views/site_views/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/site_views/tmpl/default_foot.php b/admin/views/site_views/tmpl/default_foot.php
index 075b11a0e..d4d2fafb7 100644
--- a/admin/views/site_views/tmpl/default_foot.php
+++ b/admin/views/site_views/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/site_views/tmpl/default_head.php b/admin/views/site_views/tmpl/default_head.php
index 7d16607a3..c993aa5c0 100644
--- a/admin/views/site_views/tmpl/default_head.php
+++ b/admin/views/site_views/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/site_views/tmpl/default_toolbar.php b/admin/views/site_views/tmpl/default_toolbar.php
index 41a6aa34c..daaada4aa 100644
--- a/admin/views/site_views/tmpl/default_toolbar.php
+++ b/admin/views/site_views/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index 0806032dc..bf800d9d3 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/snippet/submitbutton.js b/admin/views/snippet/submitbutton.js
index cb266fc4e..3821b0bcd 100644
--- a/admin/views/snippet/submitbutton.js
+++ b/admin/views/snippet/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/snippet/tmpl/edit.php b/admin/views/snippet/tmpl/edit.php
index 860e3697b..87c4b7e9a 100644
--- a/admin/views/snippet/tmpl/edit.php
+++ b/admin/views/snippet/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php
index 58631bd87..ec7acd3bb 100644
--- a/admin/views/snippet/view.html.php
+++ b/admin/views/snippet/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/snippets/tmpl/default.php b/admin/views/snippets/tmpl/default.php
index d98a4e4b9..098a3ca9e 100644
--- a/admin/views/snippets/tmpl/default.php
+++ b/admin/views/snippets/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/snippets/tmpl/default_batch_body.php b/admin/views/snippets/tmpl/default_batch_body.php
index a86dd95dc..c557e097b 100644
--- a/admin/views/snippets/tmpl/default_batch_body.php
+++ b/admin/views/snippets/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/snippets/tmpl/default_batch_footer.php b/admin/views/snippets/tmpl/default_batch_footer.php
index 9edc21cf8..e159f88cd 100644
--- a/admin/views/snippets/tmpl/default_batch_footer.php
+++ b/admin/views/snippets/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/snippets/tmpl/default_body.php b/admin/views/snippets/tmpl/default_body.php
index bfb0d4c00..22a3decbd 100644
--- a/admin/views/snippets/tmpl/default_body.php
+++ b/admin/views/snippets/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/snippets/tmpl/default_foot.php b/admin/views/snippets/tmpl/default_foot.php
index 627f39e5a..fc28cb871 100644
--- a/admin/views/snippets/tmpl/default_foot.php
+++ b/admin/views/snippets/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/snippets/tmpl/default_head.php b/admin/views/snippets/tmpl/default_head.php
index 2e22457e3..a35b5f269 100644
--- a/admin/views/snippets/tmpl/default_head.php
+++ b/admin/views/snippets/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/snippets/tmpl/default_toolbar.php b/admin/views/snippets/tmpl/default_toolbar.php
index 57202869b..3ed092551 100644
--- a/admin/views/snippets/tmpl/default_toolbar.php
+++ b/admin/views/snippets/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index 20b5ba23f..0b5471379 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/template/submitbutton.js b/admin/views/template/submitbutton.js
index 809e9224e..21fcdd0cb 100644
--- a/admin/views/template/submitbutton.js
+++ b/admin/views/template/submitbutton.js
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		submitbutton.js
diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php
index 94c5bfffe..97cacbe3a 100644
--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		edit.php
diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php
index 7a8da76b2..dc92f6642 100644
--- a/admin/views/template/view.html.php
+++ b/admin/views/template/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/admin/views/templates/tmpl/default.php b/admin/views/templates/tmpl/default.php
index 78cebf241..b2ad7a96b 100644
--- a/admin/views/templates/tmpl/default.php
+++ b/admin/views/templates/tmpl/default.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default.php
diff --git a/admin/views/templates/tmpl/default_batch_body.php b/admin/views/templates/tmpl/default_batch_body.php
index 597c83351..ac0ea1847 100644
--- a/admin/views/templates/tmpl/default_batch_body.php
+++ b/admin/views/templates/tmpl/default_batch_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_body.php
diff --git a/admin/views/templates/tmpl/default_batch_footer.php b/admin/views/templates/tmpl/default_batch_footer.php
index 7f4d541b5..ddc011e37 100644
--- a/admin/views/templates/tmpl/default_batch_footer.php
+++ b/admin/views/templates/tmpl/default_batch_footer.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/templates/tmpl/default_body.php b/admin/views/templates/tmpl/default_body.php
index 6703cb18e..deabd9a71 100644
--- a/admin/views/templates/tmpl/default_body.php
+++ b/admin/views/templates/tmpl/default_body.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_body.php
diff --git a/admin/views/templates/tmpl/default_foot.php b/admin/views/templates/tmpl/default_foot.php
index 627f39e5a..fc28cb871 100644
--- a/admin/views/templates/tmpl/default_foot.php
+++ b/admin/views/templates/tmpl/default_foot.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_foot.php
diff --git a/admin/views/templates/tmpl/default_head.php b/admin/views/templates/tmpl/default_head.php
index cf3c0ac8f..e11cf04de 100644
--- a/admin/views/templates/tmpl/default_head.php
+++ b/admin/views/templates/tmpl/default_head.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_head.php
diff --git a/admin/views/templates/tmpl/default_toolbar.php b/admin/views/templates/tmpl/default_toolbar.php
index cdf49413f..e6a02a68e 100644
--- a/admin/views/templates/tmpl/default_toolbar.php
+++ b/admin/views/templates/tmpl/default_toolbar.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		default_toolbar.php
diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php
index c4294e7a4..4d3460252 100644
--- a/admin/views/templates/view.html.php
+++ b/admin/views/templates/view.html.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		view.html.php
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 41ea6af44..524733188 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>31st May, 2016</creationDate>
+	<creationDate>2nd June, 2016</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>info@vdm.io</authorEmail>
 	<authorUrl>https://www.vdm.io/joomla-component-builder</authorUrl>
 	<copyright>Copyright (C) 2015. All Rights Reserved</copyright>
 	<license>GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html</license>
-	<version>2.1.10</version>
+	<version>2.1.11</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.1.10)</h1>
+		<h1>Component Builder (v.2.1.11)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for Joomla that is highly advanced, truly able to build extremely complex components in a fraction of the time.</p>
 		<p>Created by <a href="https://www.vdm.io/joomla-component-builder" target="_blank">Llewellyn van der Merwe</a><br /><small>Development started 30th April, 2015</small></p>
diff --git a/script.php b/script.php
index 1ebe443e2..7a35ad3e7 100644
--- a/script.php
+++ b/script.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		script.php
@@ -1815,7 +1815,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="https://www.vdm.io/joomla-component-builder" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/component-300.png"/>
 				</a>
-				<h3>Upgrade to Version 2.1.10 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.1.11 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}
 }
diff --git a/site/assets/css/site.css b/site/assets/css/site.css
index 32afe399b..61e8899c1 100644
--- a/site/assets/css/site.css
+++ b/site/assets/css/site.css
@@ -9,8 +9,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		site.css
diff --git a/site/componentbuilder.php b/site/componentbuilder.php
index 5284edca3..493991572 100644
--- a/site/componentbuilder.php
+++ b/site/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/site/controller.php b/site/controller.php
index ee83054ed..f7c9b6a6c 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		controller.php
diff --git a/site/controllers/help.php b/site/controllers/help.php
index a84c454ff..1a035ed1f 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		help.php
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index 2d1961fcb..591479aed 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		componentbuilder.php
diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php
index a5d81e9d9..00123e5b9 100644
--- a/site/helpers/headercheck.php
+++ b/site/helpers/headercheck.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		headercheck.php
diff --git a/site/helpers/route.php b/site/helpers/route.php
index 4e809fbf8..cd385b6eb 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		route.php
diff --git a/site/router.php b/site/router.php
index 47c180798..949cd84c6 100644
--- a/site/router.php
+++ b/site/router.php
@@ -10,8 +10,8 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		2.1.10
-	@build			31st May, 2016
+	@version		2.1.11
+	@build			2nd June, 2016
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		router.php