diff --git a/README.txt b/README.txt
index 4dd529f..f1027d0 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
 1- What is this?
 	* This is a Joomla! installation/upgrade package to version 3.x
 	* Joomla! Official site: http://www.joomla.org
-	* Joomla 3.1 version history - http://docs.joomla.org/Joomla_3.1_version_history
+	* Joomla 3.2 version history - http://docs.joomla.org/Joomla_3.2_version_history
 	* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
 
 2- What is Joomla?
@@ -65,7 +65,7 @@
 	* Are you a Web designer? http://docs.joomla.org/Web_designers
 
 Copyright:
-	* Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+	* Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 	* Credits: http://docs.joomla.org/Joomla_3_Credits
 	* Distributed under the GNU General Public License version 2 or later
 	* See Licenses details at http://docs.joomla.org/Joomla_Licenses
diff --git a/administrator/components/com_admin/admin.php b/administrator/components/com_admin/admin.php
index 3a7be9a..7e89a2f 100644
--- a/administrator/components/com_admin/admin.php
+++ b/administrator/components/com_admin/admin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,6 +12,6 @@
 
 // No access check.
 
-$controller	= JControllerLegacy::getInstance('Admin');
+$controller = JControllerLegacy::getInstance('Admin');
 $controller->execute(JFactory::getApplication()->input->get('task'));
 $controller->redirect();
diff --git a/administrator/components/com_admin/admin.xml b/administrator/components/com_admin/admin.xml
index 04d26c9..943b640 100644
--- a/administrator/components/com_admin/admin.xml
+++ b/administrator/components/com_admin/admin.xml
@@ -3,10 +3,9 @@
 	<name>com_admin</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
-	<license>GNU General Public License version 2 or later; see
-		LICENSE.txt</license>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
diff --git a/administrator/components/com_admin/controller.php b/administrator/components/com_admin/controller.php
index d89d39d..76ac053 100644
--- a/administrator/components/com_admin/controller.php
+++ b/administrator/components/com_admin/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/controllers/profile.php b/administrator/components/com_admin/controllers/profile.php
index 3d7f065..984c459 100644
--- a/administrator/components/com_admin/controllers/profile.php
+++ b/administrator/components/com_admin/controllers/profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -27,7 +27,7 @@ class AdminControllerProfile extends JControllerForm
 	 * @param   string  $key   The name of the key for the primary key.
 	 *
 	 * @return  boolean
-     *
+	 *
 	 * @since   1.6
 	 */
 	protected function allowEdit($data = array(), $key = 'id')
@@ -36,15 +36,15 @@ protected function allowEdit($data = array(), $key = 'id')
 	}
 
 	/**
-     * Overrides parent save method to check the submitted passwords match.
-     *
-     * @param   string  $key     The name of the primary key of the URL variable.
-     * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
-     *
-     * @return  boolean  True if successful, false otherwise.
-     *
-     * @since   3.2
-     */
+	 * Overrides parent save method to check the submitted passwords match.
+	 *
+	 * @param   string  $key     The name of the primary key of the URL variable.
+	 * @param   string  $urlVar  The name of the URL variable if different from the primary key (sometimes required to avoid router collisions).
+	 *
+	 * @return  boolean  True if successful, false otherwise.
+	 *
+	 * @since   3.2
+	 */
 	public function save($key = null, $urlVar = null)
 	{
 		$this->setRedirect(JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id=' . JFactory::getUser()->id, false));
diff --git a/administrator/components/com_admin/helpers/html/directory.php b/administrator/components/com_admin/helpers/html/directory.php
index 730ad6e..9ea9a8b 100644
--- a/administrator/components/com_admin/helpers/html/directory.php
+++ b/administrator/components/com_admin/helpers/html/directory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -46,7 +46,7 @@ public static function writable($writable)
 	 *
 	 * @return  string	html code
 	 */
-	public static function message($dir, $message, $visible=true)
+	public static function message($dir, $message, $visible = true)
 	{
 		if ($visible)
 		{
diff --git a/administrator/components/com_admin/helpers/html/phpsetting.php b/administrator/components/com_admin/helpers/html/phpsetting.php
index 9eb2002..3577eeb 100644
--- a/administrator/components/com_admin/helpers/html/phpsetting.php
+++ b/administrator/components/com_admin/helpers/html/phpsetting.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/helpers/html/system.php b/administrator/components/com_admin/helpers/html/system.php
index 679d691..c4fa369 100644
--- a/administrator/components/com_admin/helpers/html/system.php
+++ b/administrator/components/com_admin/helpers/html/system.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/models/help.php b/administrator/components/com_admin/models/help.php
index 50d99b9..9e6139c 100644
--- a/administrator/components/com_admin/models/help.php
+++ b/administrator/components/com_admin/models/help.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,6 +20,7 @@ class AdminModelHelp extends JModelLegacy
 {
 	/**
 	 * The search string
+	 *
 	 * @var    string
 	 *
 	 * @since  1.6
@@ -28,6 +29,7 @@ class AdminModelHelp extends JModelLegacy
 
 	/**
 	 * The page to be viewed
+	 *
 	 * @var    string
 	 *
 	 * @since  1.6
@@ -36,6 +38,7 @@ class AdminModelHelp extends JModelLegacy
 
 	/**
 	 * The iso language tag
+	 *
 	 * @var    string
 	 *
 	 * @since  1.6
@@ -46,6 +49,7 @@ class AdminModelHelp extends JModelLegacy
 	 * Table of contents
 	 *
 	 * @var    array
+	 *
 	 * @since  1.6
 	 */
 	protected $toc = null;
@@ -54,6 +58,7 @@ class AdminModelHelp extends JModelLegacy
 	 * URL for the latest version check
 	 *
 	 * @var    string
+	 *
 	 * @since  1.6
 	 */
 	protected $latest_version_check = null;
@@ -130,43 +135,58 @@ public function &getToc()
 			$lang_tag = $this->getLangTag();
 			$help_search = $this->getHelpSearch();
 
-			// Get Help files
-			jimport('joomla.filesystem.folder');
-			$files = JFolder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
-			$this->toc = array();
+			// New style - Check for a TOC JSON file
+			if (file_exists(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'))
+			{
+				$data = json_decode(file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/toc.json'));
 
-			foreach ($files as $file)
+				// Loop through the data array
+				foreach ($data as $key => $value)
+				{
+					$this->toc[$key] = JText::_('COM_ADMIN_HELP_' . $value);
+				}
+			}
+			else
 			{
-				$buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);
+				// Get Help files
+				jimport('joomla.filesystem.folder');
+				$files = JFolder::files(JPATH_BASE . '/help/' . $lang_tag, '\.xml$|\.html$');
+				$this->toc = array();
 
-				if (preg_match('#<title>(.*?)</title>#', $buffer, $m))
+				foreach ($files as $file)
 				{
-					$title = trim($m[1]);
+					$buffer = file_get_contents(JPATH_BASE . '/help/' . $lang_tag . '/' . $file);
 
-					if ($title)
+					if (preg_match('#<title>(.*?)</title>#', $buffer, $m))
 					{
-						// Translate the page title
-						$title = JText::_($title);
+						$title = trim($m[1]);
 
-						// Strip the extension
-						$file = preg_replace('#\.xml$|\.html$#', '', $file);
-
-						if ($help_search)
+						if ($title)
 						{
-							if (JString::strpos(JString::strtolower(strip_tags($buffer)), JString::strtolower($help_search)) !== false)
+							// Translate the page title
+							$title = JText::_($title);
+
+							// Strip the extension
+							$file = preg_replace('#\.xml$|\.html$#', '', $file);
+
+							if ($help_search)
+							{
+								if (JString::strpos(JString::strtolower(strip_tags($buffer)), JString::strtolower($help_search)) !== false)
+								{
+									// Add an item in the Table of Contents
+									$this->toc[$file] = $title;
+								}
+							}
+							else
 							{
 								// Add an item in the Table of Contents
 								$this->toc[$file] = $title;
 							}
 						}
-						else
-						{
-							// Add an item in the Table of Contents
-							$this->toc[$file] = $title;
-						}
 					}
 				}
 			}
+
 			// Sort the Table of Contents
 			asort($this->toc);
 		}
diff --git a/administrator/components/com_admin/models/profile.php b/administrator/components/com_admin/models/profile.php
index 1ecb2be..3552e96 100644
--- a/administrator/components/com_admin/models/profile.php
+++ b/administrator/components/com_admin/models/profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -46,7 +46,7 @@ public function getForm($data = array(), $loadData = true)
 		if ($this->loadFormData()->username)
 		{
 			$username = $this->loadFormData()->username;
-			$isUsernameCompliant  = !(preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $username) || strlen(utf8_decode($username)) < 2
+			$isUsernameCompliant = !(preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $username) || strlen(utf8_decode($username)) < 2
 				|| trim($username) != $username);
 		}
 
diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
index 36ccd28..199d0b3 100644
--- a/administrator/components/com_admin/models/sysinfo.php
+++ b/administrator/components/com_admin/models/sysinfo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/postinstall/eaccelerator.php b/administrator/components/com_admin/postinstall/eaccelerator.php
index 884b9bd..6df0d81 100644
--- a/administrator/components/com_admin/postinstall/eaccelerator.php
+++ b/administrator/components/com_admin/postinstall/eaccelerator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains post-installation message handling for eAccelerator compatibility.
diff --git a/administrator/components/com_admin/postinstall/phpversion.php b/administrator/components/com_admin/postinstall/phpversion.php
new file mode 100644
index 0000000..0a180ee
--- /dev/null
+++ b/administrator/components/com_admin/postinstall/phpversion.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_admin
+ *
+ * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * This file contains post-installation message handling for the checking minimum PHP version support
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Checks if the PHP version is less than 5.3.10.
+ *
+ * @return  integer
+ *
+ * @since   3.2
+ */
+function admin_postinstall_phpversion_condition()
+{
+	return version_compare(PHP_VERSION, '5.3.10', 'lt');
+}
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
index 5d6da37..1bbba1d 100644
--- a/administrator/components/com_admin/script.php
+++ b/administrator/components/com_admin/script.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -128,6 +128,7 @@ protected function updateManifestCaches()
 		$extensions[] = array('library', 'joomla', '', 0);
 		$extensions[] = array('library', 'idna_convert', '', 0);
 		$extensions[] = array('library', 'fof', '', 0);
+		$extensions[] = array('library', 'phpass', '', 0);
 
 		// Modules site
 		// Site
@@ -177,6 +178,7 @@ protected function updateManifestCaches()
 		$extensions[] = array('plugin', 'gmail', 'authentication', 0);
 		$extensions[] = array('plugin', 'joomla', 'authentication', 0);
 		$extensions[] = array('plugin', 'ldap', 'authentication', 0);
+		$extensions[] = array('plugin', 'contact', 'content', 0);
 		$extensions[] = array('plugin', 'emailcloak', 'content', 0);
 		$extensions[] = array('plugin', 'loadmodule', 'content', 0);
 		$extensions[] = array('plugin', 'pagebreak', 'content', 0);
@@ -244,10 +246,12 @@ protected function updateManifestCaches()
 
 		foreach ($extensions as $extension)
 		{
-			$query->where('type=' . $db->quote($extension[0])
+			$query->where(
+				'type=' . $db->quote($extension[0])
 				. ' AND element=' . $db->quote($extension[1])
 				. ' AND folder=' . $db->quote($extension[2])
-				. ' AND client_id=' . $extension[3], 'OR');
+				. ' AND client_id=' . $extension[3], 'OR'
+			);
 		}
 
 		$db->setQuery($query);
@@ -1119,12 +1123,12 @@ public function updateAssets()
 	{
 		// List all components added since 1.6
 		$newComponents = array(
-				'com_finder',
-				'com_joomlaupdate',
-				'com_tags',
-				'com_contenthistory',
-				'com_ajax',
-				'com_postinstall'
+			'com_finder',
+			'com_joomlaupdate',
+			'com_tags',
+			'com_contenthistory',
+			'com_ajax',
+			'com_postinstall'
 		);
 
 		foreach ($newComponents as $component)
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql
index e110174..f07bdc3 100644
--- a/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/3.1.0.sql
@@ -158,10 +158,10 @@ CREATE TABLE IF NOT EXISTS `#__ucm_content` (
  ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Contains core content data in name spaced fields';
 
 INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
 
 INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
 ('main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '0000-00-00 00:00:00', 0, 1, 'class:tags', 0, '', 45, 46, 0, '', 1);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
index 25a2426..d9d61a2 100644
--- a/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
+++ b/administrator/components/com_admin/sql/updates/mysql/3.2.0.sql
@@ -20,13 +20,13 @@ UPDATE `#__extensions` SET `params` = '{"template_positions_display":"0","upload
 UPDATE `#__extensions` SET `params` = '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}' WHERE `extension_id` = 410;
 
 INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
-(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
 
 INSERT INTO `#__menu` (`menutype`, `title`, `alias`, `note`, `path`, `link`, `type`, `published`, `parent_id`, `level`, `component_id`, `checked_out`, `checked_out_time`, `browserNav`, `access`, `img`, `template_style_id`, `params`, `lft`, `rgt`, `home`, `language`, `client_id`) VALUES
 ('main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '0000-00-00 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql
new file mode 100644
index 0000000..d372260
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-22.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `#__update_sites` ADD COLUMN `extra_query` VARCHAR(1000) DEFAULT '';
+ALTER TABLE `#__updates` ADD COLUMN `extra_query` VARCHAR(1000) DEFAULT '';
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-28.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-28.sql
new file mode 100644
index 0000000..2da6b1f
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2013-12-28.sql
@@ -0,0 +1 @@
+UPDATE `#__menu` SET `component_id` = (SELECT `extension_id` FROM `#__extensions` WHERE `element` = 'com_joomlaupdate') WHERE `link` = 'index.php?option=com_joomlaupdate';
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-08.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-08.sql
new file mode 100644
index 0000000..c80b1b2
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-08.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '0000-00-00 00:00:00', 1, 0);
\ No newline at end of file
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-15.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-15.sql
new file mode 100644
index 0000000..852f9ec
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`) VALUES
+(700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1);
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-18.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-18.sql
new file mode 100644
index 0000000..fa4aff3
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-18.sql
@@ -0,0 +1,2 @@
+/* Update updates version length */
+ALTER TABLE `#__updates` MODIFY `version` varchar(32) DEFAULT '';
diff --git a/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-23.sql b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-23.sql
new file mode 100644
index 0000000..a656354
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/3.2.2-2014-01-23.sql
@@ -0,0 +1,2 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '{"legacy":false,"name":"PHPass","type":"library","creationDate":"2004-2006","author":"Solar Designer","authorEmail":"solar@openwall.com","authorUrl":"http:\/\/www.openwall.com/phpass","version":"0.3","description":"LIB_PHPASS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql b/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql
index df3659d..a967381 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.1.0.sql
@@ -185,11 +185,11 @@ CREATE INDEX "#__ucm_content_idx_core_type_id" ON "#__ucm_content" ("core_type_i
 -- Add extensions table records
 --
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"legacy":false,"name":"com_tags","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(315, 'mod_stats_admin', 'module', 'mod_stats_admin', '', 1, 1, 1, 0, '{"name":"mod_stats_admin","type":"module","creationDate":"September 2012","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_STATS_XML_DESCRIPTION","group":""}', '{"serverinfo":"0","siteinfo":"0","counter":"0","increase":"0","cache":"1","cache_time":"900","cachemode":"static"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(316, 'mod_tags_popular', 'module', 'mod_tags_popular', '', 0, 1, 1, 0, '{"name":"mod_tags_popular","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_POPULAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","timeframe":"alltime","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(317, 'mod_tags_similar', 'module', 'mod_tags_similar', '', 0, 1, 1, 0, '{"name":"mod_tags_similar","type":"module","creationDate":"January 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"MOD_TAGS_SIMILAR_XML_DESCRIPTION","group":""}', '{"maximum":"5","matchtype":"any","owncache":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(447, 'plg_finder_tags', 'plugin', 'tags', 'finder', 0, 1, 1, 0, '{"name":"plg_finder_tags","type":"plugin","creationDate":"February 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_FINDER_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
 
 --
 -- Add menu table records
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql
index 6b3fbc5..0fec960 100644
--- a/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.0.sql
@@ -20,13 +20,13 @@ UPDATE "#__extensions" SET "params" = '{"template_positions_display":"0","upload
 UPDATE "#__extensions" SET "params" = '{"lineNumbers":"1","lineWrapping":"1","matchTags":"1","matchBrackets":"1","marker-gutter":"1","autoCloseTags":"1","autoCloseBrackets":"1","autoFocus":"1","theme":"default","tabmode":"indent"}' WHERE "extension_id" = 410;
 
 INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
-(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(30, 'com_contenthistory', 'component', 'com_contenthistory', '', 1, 1, 1, 0, '{"name":"com_contenthistory","type":"component","creationDate":"May 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_CONTENTHISTORY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(31, 'com_ajax', 'component', 'com_ajax', '', 1, 1, 1, 0, '{"name":"com_ajax","type":"component","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"COM_AJAX_DESC","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (32, 'com_postinstall', 'component', 'com_postinstall', '', 1, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"legacy":false,"name":"FOF","type":"library","creationDate":"2013-10-08","author":"Nicholas K. Dionysopoulos \/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\/\/www.akeebabackup.com","version":"2.1.rc4","description":"Framework-on-Framework (FOF) - A rapid component development framework for Joomla!","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(448, 'plg_twofactorauth_totp', 'plugin', 'totp', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_totp","type":"plugin","creationDate":"August 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_TOTP_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(449, 'plg_authentication_cookie', 'plugin', 'cookie', 'authentication', 0, 1, 1, 0, '{"name":"plg_authentication_cookie","type":"plugin","creationDate":"July 2013","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"PLG_AUTH_COOKIE_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(450, 'plg_twofactorauth_yubikey', 'plugin', 'yubikey', 'twofactorauth', 0, 0, 1, 0, '{"name":"plg_twofactorauth_yubikey","type":"plugin","creationDate":"Se[ptember 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.0","description":"PLG_TWOFACTORAUTH_YUBIKEY_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
 
 INSERT INTO "#__menu" ("menutype", "title", "alias", "note", "path", "link", "type", "published", "parent_id", "level", "component_id", "checked_out", "checked_out_time", "browserNav", "access", "img", "template_style_id", "params", "lft", "rgt", "home", "language", "client_id") VALUES
 ('main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql
new file mode 100644
index 0000000..38df3ba
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-22.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "#__update_sites" ADD COLUMN "extra_query" varchar(1000) DEFAULT '';
+ALTER TABLE "#__updates" ADD COLUMN "extra_query" varchar(1000) DEFAULT '';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-28.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-28.sql
new file mode 100644
index 0000000..0ea89b8
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2013-12-28.sql
@@ -0,0 +1 @@
+UPDATE "#__menu" SET "component_id" = (SELECT "extension_id" FROM "#__extensions" WHERE "element" = 'com_joomlaupdate') WHERE "link" = 'index.php?option=com_joomlaupdate';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-08.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-08.sql
new file mode 100644
index 0000000..bcd3f69
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-08.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 1, 0);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-15.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-15.sql
new file mode 100644
index 0000000..023e460
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
+(700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-18.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-18.sql
new file mode 100644
index 0000000..7e2dab0
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-18.sql
@@ -0,0 +1,2 @@
+/* Update updates version length */
+ALTER TABLE "#__updates" ALTER COLUMN "version" TYPE varchar(32);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-23.sql b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-23.sql
new file mode 100644
index 0000000..6b506f2
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/3.2.2-2014-01-23.sql
@@ -0,0 +1,2 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '{"legacy":false,"name":"PHPass","type":"library","creationDate":"2004-2006","author":"Solar Designer","authorEmail":"solar@openwall.com","authorUrl":"http:\/\/www.openwall.com/phpass","version":"0.3","description":"LIB_PHPASS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1970-01-01 00:00:00', 0, 0);
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql
index 5242ee9..a4eb8f3 100644
--- a/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.1.0.sql
@@ -324,7 +324,7 @@ CREATE NONCLUSTERED INDEX [idx_core_type_id] ON [#__ucm_content]
 SET IDENTITY_INSERT #__extensions  ON;
 
 INSERT INTO #__extensions (extension_id, name, type, element, folder, client_id, enabled, access, protected, manifest_cache, params, custom_data, system_data, checked_out, checked_out_time, ordering, state)
-  SELECT 29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"name":"com_joomlaupdate","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+  SELECT 29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '{"name":"com_joomlaupdate","type":"component","creationDate":"March 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.1.0","description":"COM_TAGS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '1900-01-01 00:00:00', 0, 0;
 
 SET IDENTITY_INSERT #__extensions  OFF;
 
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql
new file mode 100644
index 0000000..b629a80
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-22.sql
@@ -0,0 +1,2 @@
+ALTER TABLE [#__update_sites] ADD [extra_query] [nvarchar](1000) NULL DEFAULT '';
+ALTER TABLE [#__updates] ADD [extra_query] [nvarchar](1000) NULL DEFAULT '';
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-28.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-28.sql
new file mode 100644
index 0000000..ec8916d
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2013-12-28.sql
@@ -0,0 +1 @@
+UPDATE [#__menu] SET [component_id] = (SELECT [extension_id] FROM [#__extensions] WHERE [element] = 'com_joomlaupdate') WHERE [link] = 'index.php?option=com_joomlaupdate';
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-08.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-08.sql
new file mode 100644
index 0000000..f928fc2
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-08.sql
@@ -0,0 +1,6 @@
+SET IDENTITY_INSERT [#__extensions]  ON;
+
+INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 1, 0;
+
+SET IDENTITY_INSERT #__extensions  OFF;
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-15.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-15.sql
new file mode 100644
index 0000000..9903a08
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-15.sql
@@ -0,0 +1,2 @@
+INSERT INTO [#__postinstall_messages] ([extension_id], [title_key], [description_key], [action_key], [language_extension], [language_client_id], [type], [action_file], [action], [condition_file], [condition_method], [version_introduced], [enabled])
+SELECT 700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1;
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-18.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-18.sql
new file mode 100644
index 0000000..fd1fe85
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-18.sql
@@ -0,0 +1,2 @@
+/* Update updates version length */
+ALTER TABLE [#__updates] ALTER COLUMN [version] [nvarchar](32) '';
diff --git a/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-23.sql b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-23.sql
new file mode 100644
index 0000000..d77e722
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/sqlazure/3.2.2-2014-01-23.sql
@@ -0,0 +1,2 @@
+INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
+SELECT 106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
diff --git a/administrator/components/com_admin/views/help/tmpl/default.php b/administrator/components/com_admin/views/help/tmpl/default.php
index a5c3352..5f3de76 100644
--- a/administrator/components/com_admin/views/help/tmpl/default.php
+++ b/administrator/components/com_admin/views/help/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -24,7 +24,7 @@
 						<i class="icon-remove"></i></button>
 				</div>
 			</div>
-			<div class="clearfix"> </div>
+			<div class="clearfix"></div>
 			<div class="sidebar-nav">
 				<ul class="nav nav-list">
 					<li><?php echo JHtml::_('link', JHelp::createUrl('JHELP_START_HERE'), JText::_('COM_ADMIN_START_HERE'), array('target' => 'helpFrame')) ?></li>
@@ -33,17 +33,17 @@
 					<li><?php echo JHtml::_('link', JHelp::createUrl('JHELP_GLOSSARY'), JText::_('COM_ADMIN_GLOSSARY'), array('target' => 'helpFrame')) ?></li>
 					<hr class="hr-condensed" />
 					<li class="nav-header"><?php echo JText::_('COM_ADMIN_ALPHABETICAL_INDEX'); ?></li>
-					<?php foreach ($this->toc as $k => $v):?>
+					<?php foreach ($this->toc as $k => $v): ?>
 						<li>
-						    <?php $url = JHelp::createUrl('JHELP_' . strtoupper($k)); ?>
-							<?php echo JHtml::_('link', $url, $v, array('target' => 'helpFrame'));?>
+							<?php $url = JHelp::createUrl('JHELP_' . strtoupper($k)); ?>
+							<?php echo JHtml::_('link', $url, $v, array('target' => 'helpFrame')); ?>
 						</li>
-					<?php endforeach;?>
+					<?php endforeach; ?>
 				</ul>
 			</div>
 		</div>
 		<div class="span9">
-			<iframe name="helpFrame" height="2100px" src="<?php echo $this->page;?>" class="helpFrame table table-bordered"></iframe>
+			<iframe name="helpFrame" height="2100px" src="<?php echo $this->page; ?>" class="helpFrame table table-bordered"></iframe>
 		</div>
 	</div>
 	<input class="textarea" type="hidden" name="option" value="com_admin" />
diff --git a/administrator/components/com_admin/views/help/view.html.php b/administrator/components/com_admin/views/help/view.html.php
index 2f4768d..01d6290 100644
--- a/administrator/components/com_admin/views/help/view.html.php
+++ b/administrator/components/com_admin/views/help/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -62,6 +62,7 @@ public function display($tpl = null)
 		$this->addToolbar();
 		parent::display($tpl);
 	}
+
 	/**
 	 * Setup the Toolbar
 	 *
diff --git a/administrator/components/com_admin/views/profile/tmpl/edit.php b/administrator/components/com_admin/views/profile/tmpl/edit.php
index afe7d95..86f35a1 100644
--- a/administrator/components/com_admin/views/profile/tmpl/edit.php
+++ b/administrator/components/com_admin/views/profile/tmpl/edit.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 // Include the component HTML helpers.
-JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 
 JHtml::_('behavior.formvalidation');
 
@@ -31,39 +31,40 @@
 	}
 </script>
 
-<form action="<?php echo JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id='.$this->item->id); ?>" method="post" name="adminForm" id="profile-form" class="form-validate form-horizontal" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_admin&view=profile&layout=edit&id=' . $this->item->id); ?>" method="post" name="adminForm" id="profile-form" class="form-validate form-horizontal" enctype="multipart/form-data">
 	<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'account')); ?>
 
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'account', JText::_('COM_ADMIN_USER_ACCOUNT_DETAILS', true)); ?>
-			<?php foreach ($this->form->getFieldset('user_details') as $field) : ?>
-				<div class="control-group">
-					<div class="control-label"><?php echo $field->label; ?></div>
-					<div class="controls"><?php echo $field->input; ?></div>
-				</div>
-			<?php endforeach; ?>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'account', JText::_('COM_ADMIN_USER_ACCOUNT_DETAILS', true)); ?>
+	<?php foreach ($this->form->getFieldset('user_details') as $field) : ?>
+		<div class="control-group">
+			<div class="control-label"><?php echo $field->label; ?></div>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php endforeach; ?>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
 
+	<?php foreach ($fieldsets as $fieldset) : ?>
 		<?php
-		foreach ($fieldsets as $fieldset) :
-			if ($fieldset->name == 'user_details') :
-				continue;
-			endif;
+		if ($fieldset->name == 'user_details')
+		{
+			continue;
+		}
 		?>
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', $fieldset->name, JText::_($fieldset->label, true)); ?>
-			<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
-				<?php if ($field->hidden) : ?>
+		<?php foreach ($this->form->getFieldset($fieldset->name) as $field) : ?>
+			<?php if ($field->hidden) : ?>
 				<div class="control-group">
 					<div class="controls"><?php echo $field->input; ?></div>
 				</div>
-				<?php else: ?>
+			<?php else: ?>
 				<div class="control-group">
 					<div class="control-label"><?php echo $field->label; ?></div>
 					<div class="controls"><?php echo $field->input; ?></div>
 				</div>
-				<?php endif; ?>
-			<?php endforeach; ?>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
 		<?php endforeach; ?>
+		<?php echo JHtml::_('bootstrap.endTab'); ?>
+	<?php endforeach; ?>
 
 	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 	<input type="hidden" name="task" value="" />
diff --git a/administrator/components/com_admin/views/profile/view.html.php b/administrator/components/com_admin/views/profile/view.html.php
index b07d3f4..ed8f3be 100644
--- a/administrator/components/com_admin/views/profile/view.html.php
+++ b/administrator/components/com_admin/views/profile/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default.php b/administrator/components/com_admin/views/sysinfo/tmpl/default.php
index c1b1bc4..a380134 100644
--- a/administrator/components/com_admin/views/sysinfo/tmpl/default.php
+++ b/administrator/components/com_admin/views/sysinfo/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,25 +19,25 @@
 		<div class="span12">
 			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'site')); ?>
 
-				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'site', JText::_('COM_ADMIN_SYSTEM_INFORMATION', true)); ?>
-					<?php echo $this->loadTemplate('system'); ?>
-				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'site', JText::_('COM_ADMIN_SYSTEM_INFORMATION', true)); ?>
+			<?php echo $this->loadTemplate('system'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'phpsettings', JText::_('COM_ADMIN_PHP_SETTINGS', true)); ?>
-					<?php echo $this->loadTemplate('phpsettings'); ?>
-				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'phpsettings', JText::_('COM_ADMIN_PHP_SETTINGS', true)); ?>
+			<?php echo $this->loadTemplate('phpsettings'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'config', JText::_('COM_ADMIN_CONFIGURATION_FILE', true)); ?>
-					<?php echo $this->loadTemplate('config'); ?>
-				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'config', JText::_('COM_ADMIN_CONFIGURATION_FILE', true)); ?>
+			<?php echo $this->loadTemplate('config'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS', true)); ?>
-					<?php echo $this->loadTemplate('directory'); ?>
-				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'directory', JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS', true)); ?>
+			<?php echo $this->loadTemplate('directory'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'phpinfo', JText::_('COM_ADMIN_PHP_INFORMATION', true)); ?>
-					<?php echo $this->loadTemplate('phpinfo'); ?>
-				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'phpinfo', JText::_('COM_ADMIN_PHP_INFORMATION', true)); ?>
+			<?php echo $this->loadTemplate('phpinfo'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
 			<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 		</div>
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
index e34f80b..408fca4 100644
--- a/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
+++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,33 +11,33 @@
 ?>
 <fieldset class="adminform">
 	<legend><?php echo JText::_('COM_ADMIN_CONFIGURATION_FILE'); ?></legend>
-		<table class="table table-striped">
-			<thead>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th width="300">
+					<?php echo JText::_('COM_ADMIN_SETTING'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_VALUE'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<?php foreach ($this->config as $key => $value): ?>
 				<tr>
-					<th width="300">
-						<?php echo JText::_('COM_ADMIN_SETTING'); ?>
-					</th>
-					<th>
-						<?php echo JText::_('COM_ADMIN_VALUE'); ?>
-					</th>
+					<td>
+						<?php echo $key; ?>
+					</td>
+					<td>
+						<?php echo htmlspecialchars($value, ENT_QUOTES); ?>
+					</td>
 				</tr>
-			</thead>
-			<tfoot>
-				<tr>
-					<td colspan="2">&#160;</td>
-				</tr>
-			</tfoot>
-			<tbody>
-				<?php foreach ($this->config as $key => $value):?>
-					<tr>
-						<td>
-							<?php echo $key;?>
-						</td>
-						<td>
-							<?php echo htmlspecialchars($value, ENT_QUOTES);?>
-						</td>
-					</tr>
-				<?php endforeach;?>
-			</tbody>
-		</table>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
 </fieldset>
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
index fecaac5..439cffe 100644
--- a/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
+++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_directory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,33 +11,33 @@
 ?>
 <fieldset class="adminform">
 	<legend><?php echo JText::_('COM_ADMIN_DIRECTORY_PERMISSIONS'); ?></legend>
-		<table class="table table-striped">
-			<thead>
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th width="650">
+					<?php echo JText::_('COM_ADMIN_DIRECTORY'); ?>
+				</th>
+				<th>
+					<?php echo JText::_('COM_ADMIN_STATUS'); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="2">&#160;</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<?php foreach ($this->directory as $dir => $info) : ?>
 				<tr>
-					<th width="650">
-						<?php echo JText::_('COM_ADMIN_DIRECTORY'); ?>
-					</th>
-					<th>
-						<?php echo JText::_('COM_ADMIN_STATUS'); ?>
-					</th>
+					<td>
+						<?php echo JHtml::_('directory.message', $dir, $info['message']); ?>
+					</td>
+					<td>
+						<?php echo JHtml::_('directory.writable', $info['writable']); ?>
+					</td>
 				</tr>
-			</thead>
-			<tfoot>
-				<tr>
-					<td colspan="2">&#160;</td>
-				</tr>
-			</tfoot>
-			<tbody>
-				<?php foreach ($this->directory as $dir => $info) : ?>
-					<tr>
-						<td>
-							<?php echo JHtml::_('directory.message', $dir, $info['message']);?>
-						</td>
-						<td>
-							<?php echo JHtml::_('directory.writable', $info['writable']);?>
-						</td>
-					</tr>
-				<?php endforeach; ?>
-			</tbody>
-		</table>
+			<?php endforeach; ?>
+		</tbody>
+	</table>
 </fieldset>
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php
index 5a7a07b..d221826 100644
--- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php
+++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpinfo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,5 +11,5 @@
 ?>
 <fieldset class="adminform">
 	<legend><?php echo JText::_('COM_ADMIN_PHP_INFORMATION'); ?></legend>
-	<?php echo $this->php_info;?>
+	<?php echo $this->php_info; ?>
 </fieldset>
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php
index 6faa4af..3bd9519 100644
--- a/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php
+++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_phpsettings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
index 6845f73..9b8f9c4 100644
--- a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
+++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_PHP_BUILT_ON'); ?></strong>
 				</td>
 				<td>
-					<?php echo $this->info['php'];?>
+					<?php echo $this->info['php']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -41,7 +41,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_DATABASE_VERSION'); ?></strong>
 				</td>
 				<td>
-					<?php echo $this->info['dbversion'];?>
+					<?php echo $this->info['dbversion']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -49,7 +49,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_DATABASE_COLLATION'); ?></strong>
 				</td>
 				<td>
-					<?php echo $this->info['dbcollation'];?>
+					<?php echo $this->info['dbcollation']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -57,7 +57,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_PHP_VERSION'); ?></strong>
 				</td>
 				<td>
-					<?php echo $this->info['phpversion'];?>
+					<?php echo $this->info['phpversion']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -73,7 +73,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_WEBSERVER_TO_PHP_INTERFACE'); ?></strong>
 				</td>
 				<td>
-					<?php echo $this->info['sapi_name'];?>
+					<?php echo $this->info['sapi_name']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -81,7 +81,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_JOOMLA_VERSION'); ?></strong>
 				</td>
 				<td>
-					<?php echo $this->info['version'];?>
+					<?php echo $this->info['version']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -89,7 +89,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_PLATFORM_VERSION'); ?></strong>
 				</td>
 				<td>
-					<?php echo $this->info['platform'];?>
+					<?php echo $this->info['platform']; ?>
 				</td>
 			</tr>
 			<tr>
@@ -97,7 +97,7 @@
 					<strong><?php echo JText::_('COM_ADMIN_USER_AGENT'); ?></strong>
 				</td>
 				<td>
-					<?php echo htmlspecialchars($this->info['useragent']);?>
+					<?php echo htmlspecialchars($this->info['useragent']); ?>
 				</td>
 			</tr>
 		</tbody>
diff --git a/administrator/components/com_admin/views/sysinfo/view.html.php b/administrator/components/com_admin/views/sysinfo/view.html.php
index f369730..2156a64 100644
--- a/administrator/components/com_admin/views/sysinfo/view.html.php
+++ b/administrator/components/com_admin/views/sysinfo/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_ajax/ajax.php b/administrator/components/com_ajax/ajax.php
index 5aa762f..357acaa 100644
--- a/administrator/components/com_ajax/ajax.php
+++ b/administrator/components/com_ajax/ajax.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_ajax
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_ajax/ajax.xml b/administrator/components/com_ajax/ajax.xml
index 71c16f1..5e24aa6 100644
--- a/administrator/components/com_ajax/ajax.xml
+++ b/administrator/components/com_ajax/ajax.xml
@@ -3,8 +3,8 @@
 	<name>com_ajax</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2013</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
-	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.2.0</version>
diff --git a/administrator/components/com_banners/banners.php b/administrator/components/com_banners/banners.php
index f232624..c0d5c6f 100644
--- a/administrator/components/com_banners/banners.php
+++ b/administrator/components/com_banners/banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,6 +16,6 @@
 }
 
 // Execute the task.
-$controller	= JControllerLegacy::getInstance('Banners');
+$controller = JControllerLegacy::getInstance('Banners');
 $controller->execute(JFactory::getApplication()->input->get('task'));
 $controller->redirect();
diff --git a/administrator/components/com_banners/banners.xml b/administrator/components/com_banners/banners.xml
index b504f02..f7ac8c3 100644
--- a/administrator/components/com_banners/banners.xml
+++ b/administrator/components/com_banners/banners.xml
@@ -3,7 +3,7 @@
 	<name>com_banners</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>GNU General Public License version 2 or later; see
 		LICENSE.txt</license>
diff --git a/administrator/components/com_banners/config.xml b/administrator/components/com_banners/config.xml
index 2a20a2a..a40a1c4 100644
--- a/administrator/components/com_banners/config.xml
+++ b/administrator/components/com_banners/config.xml
@@ -58,7 +58,7 @@
 		label="COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_LABEL"
 		description="COM_BANNERS_FIELDSET_CONFIG_BANNER_OPTIONS_DESC">
 	
-			<field
+		<field
 			name="save_history"
 			type="radio"
 			class="btn-group btn-group-yesno"
diff --git a/administrator/components/com_banners/controller.php b/administrator/components/com_banners/controller.php
index 3e44254..0c8e923 100644
--- a/administrator/components/com_banners/controller.php
+++ b/administrator/components/com_banners/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,7 +29,7 @@ class BannersController extends JControllerLegacy
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		require_once JPATH_COMPONENT.'/helpers/banners.php';
+		require_once JPATH_COMPONENT . '/helpers/banners.php';
 		BannersHelper::updateReset();
 
 		$view   = $this->input->get('view', 'banners');
@@ -37,7 +37,8 @@ public function display($cachable = false, $urlparams = false)
 		$id     = $this->input->getInt('id');
 
 		// Check for edit form.
-		if ($view == 'banner' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.banner', $id)) {
+		if ($view == 'banner' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.banner', $id))
+		{
 
 			// Somehow the person just went to the form - we don't allow that.
 			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
@@ -46,7 +47,8 @@ public function display($cachable = false, $urlparams = false)
 
 			return false;
 		}
-		elseif ($view == 'client' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.client', $id)) {
+		elseif ($view == 'client' && $layout == 'edit' && !$this->checkEditId('com_banners.edit.client', $id))
+		{
 
 			// Somehow the person just went to the form - we don't allow that.
 			$this->setError(JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
diff --git a/administrator/components/com_banners/controllers/banner.php b/administrator/components/com_banners/controllers/banner.php
index db20c8b..4b32be7 100644
--- a/administrator/components/com_banners/controllers/banner.php
+++ b/administrator/components/com_banners/controllers/banner.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -43,7 +43,7 @@ protected function allowAdd($data = array())
 		if ($categoryId)
 		{
 			// If the category has been passed in the URL check it.
-			$allow	= $user->authorise('core.create', $this->option . '.category.' . $categoryId);
+			$allow = $user->authorise('core.create', $this->option . '.category.' . $categoryId);
 		}
 
 		if ($allow === null)
@@ -111,5 +111,4 @@ public function batch($model = null)
 
 		return parent::batch($model);
 	}
-
 }
diff --git a/administrator/components/com_banners/controllers/banners.php b/administrator/components/com_banners/controllers/banners.php
index 6706a1a..bb147df 100644
--- a/administrator/components/com_banners/controllers/banners.php
+++ b/administrator/components/com_banners/controllers/banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,7 +19,8 @@
 class BannersControllerBanners extends JControllerAdmin
 {
 	/**
-	 * @var		string	The prefix to use with controller messages.
+	 * @var     string  The prefix to use with controller messages.
+	 *
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_BANNERS_BANNERS';
@@ -27,7 +28,8 @@ class BannersControllerBanners extends JControllerAdmin
 	/**
 	 * Constructor.
 	 *
-	 * @param   array An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -35,20 +37,32 @@ public function __construct($config = array())
 	{
 		parent::__construct($config);
 
-		$this->registerTask('sticky_unpublish',	'sticky_publish');
+		$this->registerTask('sticky_unpublish', 'sticky_publish');
 	}
 
 	/**
 	 * Proxy for getModel.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  object  The model.
+	 *
 	 * @since   1.6
 	 */
 	public function getModel($name = 'Banner', $prefix = 'BannersModel', $config = array('ignore_request' => true))
 	{
 		$model = parent::getModel($name, $prefix, $config);
+
 		return $model;
 	}
 
 	/**
+	 * Stick items
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public function sticky_publish()
@@ -68,19 +82,24 @@ public function sticky_publish()
 		else
 		{
 			// Get the model.
-			$model	= $this->getModel();
+			$model = $this->getModel();
 
 			// Change the state of the records.
 			if (!$model->stick($ids, $value))
 			{
 				JError::raiseWarning(500, $model->getError());
-			} else {
+			}
+			else
+			{
 				if ($value == 1)
 				{
 					$ntext = 'COM_BANNERS_N_BANNERS_STUCK';
-				} else {
+				}
+				else
+				{
 					$ntext = 'COM_BANNERS_N_BANNERS_UNSTUCK';
 				}
+
 				$this->setMessage(JText::plural($ntext, count($ids)));
 			}
 		}
diff --git a/administrator/components/com_banners/controllers/client.php b/administrator/components/com_banners/controllers/client.php
index e2821f0..1554db2 100644
--- a/administrator/components/com_banners/controllers/client.php
+++ b/administrator/components/com_banners/controllers/client.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,7 +19,8 @@
 class BannersControllerClient extends JControllerForm
 {
 	/**
-	 * @var		string	The prefix to use with controller messages.
+	 * @var     string  The prefix to use with controller messages.
+	 * 
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_BANNERS_CLIENT';
diff --git a/administrator/components/com_banners/controllers/clients.php b/administrator/components/com_banners/controllers/clients.php
index 586f965..cd53ddf 100644
--- a/administrator/components/com_banners/controllers/clients.php
+++ b/administrator/components/com_banners/controllers/clients.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,7 +19,8 @@
 class BannersControllerClients extends JControllerAdmin
 {
 	/**
-	 * @var		string	The prefix to use with controller messages.
+	 * @var     string  The prefix to use with controller messages.
+	 *
 	 * @since   1.6
 	 */
 	protected $text_prefix = 'COM_BANNERS_CLIENTS';
@@ -38,6 +39,7 @@ class BannersControllerClients extends JControllerAdmin
 	public function getModel($name = 'Client', $prefix = 'BannersModel', $config = array('ignore_request' => true))
 	{
 		$model = parent::getModel($name, $prefix, $config);
+
 		return $model;
 	}
 }
diff --git a/administrator/components/com_banners/controllers/tracks.php b/administrator/components/com_banners/controllers/tracks.php
index 09b86e2..0c2905b 100644
--- a/administrator/components/com_banners/controllers/tracks.php
+++ b/administrator/components/com_banners/controllers/tracks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,7 +19,8 @@
 class BannersControllerTracks extends JControllerLegacy
 {
 	/**
-	 * @var		string	The context for persistent state.
+	 * @var     string  The prefix to use with controller messages.
+	 *
 	 * @since   1.6
 	 */
 	protected $context = 'com_banners.tracks';
@@ -38,6 +39,7 @@ class BannersControllerTracks extends JControllerLegacy
 	public function getModel($name = 'Tracks', $prefix = 'BannersModel', $config = array('ignore_request' => true))
 	{
 		$model = parent::getModel($name, $prefix, $config);
+
 		return $model;
 	}
 
@@ -45,6 +47,7 @@ public function getModel($name = 'Tracks', $prefix = 'BannersModel', $config = a
 	 * Method to remove a record.
 	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public function delete()
@@ -58,25 +61,26 @@ public function delete()
 		// Load the filter state.
 		$app = JFactory::getApplication();
 
-		$type = $app->getUserState($this->context.'.filter.type');
+		$type = $app->getUserState($this->context . '.filter.type');
 		$model->setState('filter.type', $type);
 
-		$begin = $app->getUserState($this->context.'.filter.begin');
+		$begin = $app->getUserState($this->context . '.filter.begin');
 		$model->setState('filter.begin', $begin);
 
-		$end = $app->getUserState($this->context.'.filter.end');
+		$end = $app->getUserState($this->context . '.filter.end');
 		$model->setState('filter.end', $end);
 
-		$categoryId = $app->getUserState($this->context.'.filter.category_id');
+		$categoryId = $app->getUserState($this->context . '.filter.category_id');
 		$model->setState('filter.category_id', $categoryId);
 
-		$clientId = $app->getUserState($this->context.'.filter.client_id');
+		$clientId = $app->getUserState($this->context . '.filter.client_id');
 		$model->setState('filter.client_id', $clientId);
 
 		$model->setState('list.limit', 0);
 		$model->setState('list.start', 0);
 
 		$count = $model->getTotal();
+
 		// Remove the items.
 		if (!$model->delete())
 		{
diff --git a/administrator/components/com_banners/controllers/tracks.raw.php b/administrator/components/com_banners/controllers/tracks.raw.php
index 90b4257..ac0fe4c 100644
--- a/administrator/components/com_banners/controllers/tracks.raw.php
+++ b/administrator/components/com_banners/controllers/tracks.raw.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,35 +19,40 @@
 class BannersControllerTracks extends JControllerLegacy
 {
 	/**
-	 * @var		string	The context for persistent state.
-	 * @since   1.6
+	 * @var    string  The context for persistent state.
+	 *
+	 * @since  1.6
 	 */
 	protected $context = 'com_banners.tracks';
 
 	/**
 	 * Proxy for getModel.
 	 *
-	 * @param   string	$name	The name of the model.
-	 * @param   string	$prefix	The prefix for the model class name.
+	 * @param   string  $name    The name of the model.
+	 * @param   string  $prefix  The prefix for the model class name.
+	 * @param   array   $config  Configuration array for model. Optional.
 	 *
 	 * @return  JModel
+	 *
 	 * @since   1.6
 	 */
 	public function getModel($name = 'Tracks', $prefix = 'BannersModel', $config = array())
 	{
 		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
+
 		return $model;
 	}
 
 	/**
 	 * Display method for the raw track data.
 	 *
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean  $cachable   If true, the view output will be cached
+	 * @param   array    $urlparams  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 *
+	 * @return  JController  This object to support chaining.
 	 *
-	 * @return  JController		This object to support chaining.
 	 * @since   1.5
-	 * @todo	This should be done as a view, not here!
+	 * @todo    This should be done as a view, not here!
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
@@ -65,19 +70,19 @@ public function display($cachable = false, $urlparams = false)
 			// Load the filter state.
 			$app = JFactory::getApplication();
 
-			$type = $app->getUserState($this->context.'.filter.type');
+			$type = $app->getUserState($this->context . '.filter.type');
 			$model->setState('filter.type', $type);
 
-			$begin = $app->getUserState($this->context.'.filter.begin');
+			$begin = $app->getUserState($this->context . '.filter.begin');
 			$model->setState('filter.begin', $begin);
 
-			$end = $app->getUserState($this->context.'.filter.end');
+			$end = $app->getUserState($this->context . '.filter.end');
 			$model->setState('filter.end', $end);
 
-			$categoryId = $app->getUserState($this->context.'.filter.category_id');
+			$categoryId = $app->getUserState($this->context . '.filter.category_id');
 			$model->setState('filter.category_id', $categoryId);
 
-			$clientId = $app->getUserState($this->context.'.filter.client_id');
+			$clientId = $app->getUserState($this->context . '.filter.client_id');
 			$model->setState('filter.client_id', $clientId);
 
 			$model->setState('list.limit', 0);
@@ -91,8 +96,8 @@ public function display($cachable = false, $urlparams = false)
 			$cookie_domain = $config->get('cookie_domain', '');
 			$cookie_path = $config->get('cookie_path', '/');
 
-			setcookie(JApplication::getHash($this->context.'.basename'), $form['basename'], time() + 365 * 86400, $cookie_path, $cookie_domain);
-			setcookie(JApplication::getHash($this->context.'.compressed'), $form['compressed'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+			setcookie(JApplication::getHash($this->context . '.basename'), $form['basename'], time() + 365 * 86400, $cookie_path, $cookie_domain);
+			setcookie(JApplication::getHash($this->context . '.compressed'), $form['compressed'], time() + 365 * 86400, $cookie_path, $cookie_domain);
 
 			// Push the model into the view (as default).
 			$view->setModel($model, true);
diff --git a/administrator/components/com_banners/helpers/banners.php b/administrator/components/com_banners/helpers/banners.php
index f1c3da8..a7a339d 100644
--- a/administrator/components/com_banners/helpers/banners.php
+++ b/administrator/components/com_banners/helpers/banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,9 +21,10 @@ class BannersHelper extends JHelperContent
 	/**
 	 * Configure the Linkbar.
 	 *
-	 * @param   string	The name of the active view.
+	 * @param   string  $vName  The name of the active view.
 	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public static function addSubmenu($vName)
@@ -54,7 +55,10 @@ public static function addSubmenu($vName)
 	}
 
 	/**
+	 * Update / reset the banners
+	 *
 	 * @return  boolean
+	 *
 	 * @since   1.6
 	 */
 	public static function updateReset()
@@ -78,6 +82,7 @@ public static function updateReset()
 		catch (RuntimeException $e)
 		{
 			JError::raiseWarning(500, $e->getMessage());
+
 			return false;
 		}
 
@@ -100,25 +105,25 @@ public static function updateReset()
 				$purchase_type = $params->get('purchase_type');
 			}
 
-			switch($purchase_type)
+			switch ($purchase_type)
 			{
 				case 1:
 					$reset = $nullDate;
 					break;
 				case 2:
-					$date = JFactory::getDate('+1 year '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+1 year ' . date('Y-m-d', strtotime('now')));
 					$reset = $db->quote($date->toSql());
 					break;
 				case 3:
-					$date = JFactory::getDate('+1 month '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+1 month ' . date('Y-m-d', strtotime('now')));
 					$reset = $db->quote($date->toSql());
 					break;
 				case 4:
-					$date = JFactory::getDate('+7 day '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+7 day ' . date('Y-m-d', strtotime('now')));
 					$reset = $db->quote($date->toSql());
 					break;
 				case 5:
-					$date = JFactory::getDate('+1 day '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+1 day ' . date('Y-m-d', strtotime('now')));
 					$reset = $db->quote($date->toSql());
 					break;
 			}
@@ -139,6 +144,7 @@ public static function updateReset()
 			catch (RuntimeException $e)
 			{
 				JError::raiseWarning(500, $db->getMessage());
+
 				return false;
 			}
 		}
@@ -146,6 +152,11 @@ public static function updateReset()
 		return true;
 	}
 
+	/**
+	 * Get client list in text/value format for a select field
+	 *
+	 * @return  array
+	 */
 	public static function getClientOptions()
 	{
 		$options = array();
@@ -169,7 +180,7 @@ public static function getClientOptions()
 		}
 
 		// Merge any additional options in the XML definition.
-		//$options = array_merge(parent::getOptions(), $options);
+		// $options = array_merge(parent::getOptions(), $options);
 
 		array_unshift($options, JHtml::_('select.option', '0', JText::_('COM_BANNERS_NO_CLIENT')));
 
diff --git a/administrator/components/com_banners/helpers/html/banner.php b/administrator/components/com_banners/helpers/html/banner.php
index b4dafb6..a380e14 100644
--- a/administrator/components/com_banners/helpers/html/banner.php
+++ b/administrator/components/com_banners/helpers/html/banner.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -48,6 +48,7 @@ public static function clients()
 	 * Method to get the field options.
 	 *
 	 * @return  array  The field option objects.
+	 *
 	 * @since   1.6
 	 */
 	public static function clientlist()
@@ -76,14 +77,14 @@ public static function clientlist()
 	/**
 	 * Returns a pinned state on a grid
 	 *
-	 * @param   integer       $value			The state value.
-	 * @param   integer       $i				The row index
-	 * @param   boolean       $enabled		An optional setting for access control on the action.
-	 * @param   string        $checkbox		An optional prefix for checkboxes.
+	 * @param   integer  $value     The state value.
+	 * @param   integer  $i         The row index
+	 * @param   boolean  $enabled   An optional setting for access control on the action.
+	 * @param   string   $checkbox  An optional prefix for checkboxes.
 	 *
-	 * @return  string        The Html code
+	 * @return  string   The Html code
 	 *
-	 * @see JHtmlJGrid::state
+	 * @see     JHtmlJGrid::state
 	 *
 	 * @since   2.5.5
 	 */
@@ -112,5 +113,4 @@ public static function pinned($value, $i, $enabled = true, $checkbox = 'cb')
 
 		return JHtml::_('jgrid.state', $states, $value, $i, 'banners.', $enabled, true, $checkbox);
 	}
-
 }
diff --git a/administrator/components/com_banners/models/banner.php b/administrator/components/com_banners/models/banner.php
index fdf612d..54948fc 100644
--- a/administrator/components/com_banners/models/banner.php
+++ b/administrator/components/com_banners/models/banner.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -35,9 +35,9 @@ class BannersModelBanner extends JModelAdmin
 	/**
 	 * Method to perform batch operations on an item or a set of items.
 	 *
-	 * @param   array   $commands   An array of commands to perform.
-	 * @param   array   $pks        An array of item ids.
-	 * @param   array   $contexts   An array of item contexts.
+	 * @param   array  $commands  An array of commands to perform.
+	 * @param   array  $pks       An array of item ids.
+	 * @param   array  $contexts  An array of item contexts.
 	 *
 	 * @return  boolean   Returns true on success, false on failure.
 	 *
@@ -58,6 +58,7 @@ public function batch($commands, $pks, $contexts)
 		if (empty($pks))
 		{
 			$this->setError(JText::_('JGLOBAL_NO_ITEM_SELECTED'));
+
 			return false;
 		}
 
@@ -70,6 +71,7 @@ public function batch($commands, $pks, $contexts)
 			if ($cmd == 'c')
 			{
 				$result = $this->batchCopy($commands['category_id'], $pks, $contexts);
+
 				if (is_array($result))
 				{
 					$pks = $result;
@@ -83,6 +85,7 @@ public function batch($commands, $pks, $contexts)
 			{
 				return false;
 			}
+
 			$done = true;
 		}
 
@@ -109,6 +112,7 @@ public function batch($commands, $pks, $contexts)
 		if (!$done)
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_INSUFFICIENT_BATCH_INFORMATION'));
+
 			return false;
 		}
 
@@ -146,12 +150,14 @@ protected function batchClient($value, $pks, $contexts)
 				if (!$table->store())
 				{
 					$this->setError($table->getError());
+
 					return false;
 				}
 			}
 			else
 			{
 				$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_EDIT'));
+
 				return false;
 			}
 		}
@@ -184,17 +190,20 @@ protected function batchCopy($value, $pks, $contexts)
 		if ($categoryId)
 		{
 			$categoryTable = JTable::getInstance('Category');
+
 			if (!$categoryTable->load($categoryId))
 			{
 				if ($error = $categoryTable->getError())
 				{
 					// Fatal error
 					$this->setError($error);
+
 					return false;
 				}
 				else
 				{
 					$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
+
 					return false;
 				}
 			}
@@ -203,14 +212,17 @@ protected function batchCopy($value, $pks, $contexts)
 		if (empty($categoryId))
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_MOVE_CATEGORY_NOT_FOUND'));
+
 			return false;
 		}
 
 		// Check that the user has create permission for the component
 		$user = JFactory::getUser();
+
 		if (!$user->authorise('core.create', 'com_banners.category.' . $categoryId))
 		{
 			$this->setError(JText::_('JLIB_APPLICATION_ERROR_BATCH_CANNOT_CREATE'));
+
 			return false;
 		}
 
@@ -229,6 +241,7 @@ protected function batchCopy($value, $pks, $contexts)
 				{
 					// Fatal error
 					$this->setError($error);
+
 					return false;
 				}
 				else
@@ -251,12 +264,13 @@ protected function batchCopy($value, $pks, $contexts)
 			$table->catid = $categoryId;
 
 			// TODO: Deal with ordering?
-			//$table->ordering	= 1;
+			// $table->ordering	= 1;
 
 			// Check the row.
 			if (!$table->check())
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 
@@ -264,6 +278,7 @@ protected function batchCopy($value, $pks, $contexts)
 			if (!$table->store())
 			{
 				$this->setError($table->getError());
+
 				return false;
 			}
 
@@ -271,7 +286,7 @@ protected function batchCopy($value, $pks, $contexts)
 			$newId = $table->get('id');
 
 			// Add the new ID to the array
-			$newIds[$i]	= $newId;
+			$newIds[$i] = $newId;
 			$i++;
 		}
 
@@ -298,6 +313,7 @@ protected function canDelete($record)
 			{
 				return;
 			}
+
 			$user = JFactory::getUser();
 
 			if (!empty($record->catid))
@@ -366,6 +382,7 @@ public function getForm($data = array(), $loadData = true)
 	{
 		// Get the form.
 		$form = $this->loadForm('com_banners.banner', 'banner', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -415,7 +432,7 @@ public function getForm($data = array(), $loadData = true)
 	protected function loadFormData()
 	{
 		// Check the session for previously entered form data.
-		$app  = JFactory::getApplication();
+		$app = JFactory::getApplication();
 		$data = $app->getUserState('com_banners.edit.banner.data', array());
 
 		if (empty($data))
@@ -425,7 +442,10 @@ protected function loadFormData()
 			// Prime some default values.
 			if ($this->getState('banner.id') == 0)
 			{
-				$data->set('catid', $app->input->getInt('catid', $app->getUserState('com_banners.banners.filter.category_id')));
+				$filters = (array) $app->getUserState('com_banners.banners.filter');
+				$filterCatId = isset($filters['category_id']) ? $filters['category_id'] : null;
+
+				$data->set('catid', $app->input->getInt('catid', $filterCatId));
 			}
 		}
 
@@ -468,6 +488,7 @@ public function stick(&$pks, $value = 1)
 		if (!$table->stick($pks, $value, $user->get('id')))
 		{
 			$this->setError($table->getError());
+
 			return false;
 		}
 
@@ -486,13 +507,20 @@ public function stick(&$pks, $value = 1)
 	protected function getReorderConditions($table)
 	{
 		$condition = array();
-		$condition[] = 'catid = '. (int) $table->catid;
+		$condition[] = 'catid = ' . (int) $table->catid;
 		$condition[] = 'state >= 0';
+
 		return $condition;
 	}
 
 	/**
-	 * @since  3.0
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
 	 */
 	protected function prepareTable($table)
 	{
@@ -502,7 +530,7 @@ protected function prepareTable($table)
 		if (empty($table->id))
 		{
 			// Set the values
-			$table->created	= $date->toSql();
+			$table->created = $date->toSql();
 
 			// Set ordering to the last item if not set
 			if (empty($table->ordering))
@@ -531,9 +559,10 @@ protected function prepareTable($table)
 	/**
 	 * Method to save the form data.
 	 *
-	 * @param   array  The form data.
+	 * @param   array  $data  The form data.
 	 *
 	 * @return  boolean  True on success.
+	 *
 	 * @since   1.6
 	 */
 
@@ -557,5 +586,4 @@ public function save($data)
 
 		return false;
 	}
-
 }
diff --git a/administrator/components/com_banners/models/banners.php b/administrator/components/com_banners/models/banners.php
index ea5e2ee..e7a550f 100644
--- a/administrator/components/com_banners/models/banners.php
+++ b/administrator/components/com_banners/models/banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,7 +21,8 @@ class BannersModelBanners extends JModelList
 	/**
 	 * Constructor.
 	 *
-	 * @param   array  An optional associative array of configuration settings.
+	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -59,6 +60,8 @@ public function __construct($config = array())
 	/**
 	 * Method to get the maximum ordering value for each category.
 	 *
+	 * @return  array
+	 *
 	 * @since   1.6
 	 */
 	public function &getCategoryOrders()
@@ -74,6 +77,7 @@ public function &getCategoryOrders()
 			$db->setQuery($query);
 			$this->cache['categoryorders'] = $db->loadAssocList('catid', 0);
 		}
+
 		return $this->cache['categoryorders'];
 	}
 
@@ -81,6 +85,7 @@ public function &getCategoryOrders()
 	 * Build an SQL query to load the list data.
 	 *
 	 * @return  JDatabaseQuery
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -93,13 +98,13 @@ protected function getListQuery()
 			$this->getState(
 				'list.select',
 				'a.id AS id, a.name AS name, a.alias AS alias,' .
-					'a.checked_out AS checked_out,' .
-					'a.checked_out_time AS checked_out_time, a.catid AS catid,' .
-					'a.clicks AS clicks, a.metakey AS metakey, a.sticky AS sticky,' .
-					'a.impmade AS impmade, a.imptotal AS imptotal,' .
-					'a.state AS state, a.ordering AS ordering,' .
-					'a.purchase_type as purchase_type,' .
-					'a.language, a.publish_up, a.publish_down'
+				'a.checked_out AS checked_out,' .
+				'a.checked_out_time AS checked_out_time, a.catid AS catid,' .
+				'a.clicks AS clicks, a.metakey AS metakey, a.sticky AS sticky,' .
+				'a.impmade AS impmade, a.imptotal AS imptotal,' .
+				'a.state AS state, a.ordering AS ordering,' .
+				'a.purchase_type as purchase_type,' .
+				'a.language, a.publish_up, a.publish_down'
 			)
 		);
 		$query->from($db->quoteName('#__banners') . ' AS a');
@@ -122,6 +127,7 @@ protected function getListQuery()
 
 		// Filter by published state
 		$published = $this->getState('filter.state');
+
 		if (is_numeric($published))
 		{
 			$query->where('a.state = ' . (int) $published);
@@ -133,6 +139,7 @@ protected function getListQuery()
 
 		// Filter by category.
 		$categoryId = $this->getState('filter.category_id');
+
 		if (is_numeric($categoryId))
 		{
 			$query->where('a.catid = ' . (int) $categoryId);
@@ -140,6 +147,7 @@ protected function getListQuery()
 
 		// Filter by client.
 		$clientId = $this->getState('filter.client_id');
+
 		if (is_numeric($clientId))
 		{
 			$query->where('a.cid = ' . (int) $clientId);
@@ -147,6 +155,7 @@ protected function getListQuery()
 
 		// Filter by search in title
 		$search = $this->getState('filter.search');
+
 		if (!empty($search))
 		{
 			if (stripos($search, 'id:') === 0)
@@ -169,14 +178,17 @@ protected function getListQuery()
 		// Add the list ordering clause.
 		$orderCol = $this->state->get('list.ordering', 'ordering');
 		$orderDirn = $this->state->get('list.direction', 'ASC');
+
 		if ($orderCol == 'ordering' || $orderCol == 'category_title')
 		{
 			$orderCol = 'c.title ' . $orderDirn . ', a.ordering';
 		}
+
 		if ($orderCol == 'client_name')
 		{
 			$orderCol = 'cl.name';
 		}
+
 		$query->order($db->escape($orderCol . ' ' . $orderDirn));
 
 		return $query;
@@ -189,8 +201,10 @@ protected function getListQuery()
 	 * different modules that might need different sets of data or different
 	 * ordering requirements.
 	 *
-	 * @param   string  $id    A prefix for the store id.
+	 * @param   string  $id  A prefix for the store id.
+	 *
 	 * @return  string  A store id.
+	 *
 	 * @since   1.6
 	 */
 	protected function getStoreId($id = '')
@@ -208,10 +222,12 @@ protected function getStoreId($id = '')
 	/**
 	 * Returns a reference to the a Table object, always creating it.
 	 *
-	 * @param   type      The table type to instantiate
-	 * @param   string    A prefix for the table class name. Optional.
-	 * @param   array     Configuration array for model. Optional.
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
 	 * @return  JTable    A database object
+	 *
 	 * @since   1.6
 	 */
 	public function getTable($type = 'Banner', $prefix = 'BannersTable', $config = array())
@@ -224,6 +240,11 @@ public function getTable($type = 'Banner', $prefix = 'BannersTable', $config = a
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
diff --git a/administrator/components/com_banners/models/client.php b/administrator/components/com_banners/models/client.php
index 875964c..69a4661 100644
--- a/administrator/components/com_banners/models/client.php
+++ b/administrator/components/com_banners/models/client.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,6 @@
  */
 class BannersModelClient extends JModelAdmin
 {
-
 	/**
 	 * The type alias for this content type.
 	 *
@@ -30,25 +29,29 @@ class BannersModelClient extends JModelAdmin
 	/**
 	 * Method to test whether a record can be deleted.
 	 *
-	 * @param   object	A record object.
+	 * @param   object  $record  A record object.
+	 *
 	 * @return  boolean  True if allowed to delete the record. Defaults to the permission set in the component.
+	 *
 	 * @since   1.6
 	 */
 	protected function canDelete($record)
 	{
 		if (!empty($record->id))
+		{
+			if ($record->state != -2)
 			{
-				if ($record->state != -2)
-				{
-					return;
-				}
+				return;
+			}
+
 			$user = JFactory::getUser();
 
 			if (!empty($record->catid))
 			{
-				return $user->authorise('core.delete', 'com_banners.category.'.(int) $record->catid);
+				return $user->authorise('core.delete', 'com_banners.category.' . (int) $record->catid);
 			}
-			else {
+			else
+			{
 				return $user->authorise('core.delete', 'com_banners');
 			}
 		}
@@ -57,7 +60,8 @@ protected function canDelete($record)
 	/**
 	 * Method to test whether a record can be deleted.
 	 *
-	 * @param   object   A record object.
+	 * @param   object  $record  A record object.
+	 *
 	 * @return  boolean  True if allowed to change the state of the record.
 	 *                   Defaults to the permission set in the component.
 	 *
@@ -69,7 +73,7 @@ protected function canEditState($record)
 
 		if (!empty($record->catid))
 		{
-			return $user->authorise('core.edit.state', 'com_banners.category.'.(int) $record->catid);
+			return $user->authorise('core.edit.state', 'com_banners.category.' . (int) $record->catid);
 		}
 		else
 		{
@@ -80,10 +84,12 @@ protected function canEditState($record)
 	/**
 	 * Returns a reference to the a Table object, always creating it.
 	 *
-	 * @param   type	The table type to instantiate
-	 * @param   string	A prefix for the table class name. Optional.
-	 * @param   array  Configuration array for model. Optional.
+	 * @param   string  $type    The table type to instantiate
+	 * @param   string  $prefix  A prefix for the table class name. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
 	 * @return  JTable	A database object
+	 *
 	 * @since   1.6
 	 */
 	public function getTable($type = 'Client', $prefix = 'BannersTable', $config = array())
@@ -98,12 +104,14 @@ public function getTable($type = 'Client', $prefix = 'BannersTable', $config = a
 	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
 	 *
 	 * @return  mixed    A JForm object on success, false on failure
+	 *
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Get the form.
 		$form = $this->loadForm('com_banners.client', 'client', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -116,6 +124,7 @@ public function getForm($data = array(), $loadData = true)
 	 * Method to get the data that should be injected in the form.
 	 *
 	 * @return  mixed  The data for the form.
+	 *
 	 * @since   1.6
 	 */
 	protected function loadFormData()
@@ -134,9 +143,12 @@ protected function loadFormData()
 	}
 
 	/**
-	 * Prepare and sanitise the table data prior to saving.
+	 * Prepare and sanitise the table prior to saving.
+	 *
+	 * @param   JTable  $table  A JTable object.
+	 *
+	 * @return  void
 	 *
-	 * @param   JTable	A JTable object.
 	 * @since   1.6
 	 */
 	protected function prepareTable($table)
diff --git a/administrator/components/com_banners/models/clients.php b/administrator/components/com_banners/models/clients.php
index 9929cef..955d9d0 100644
--- a/administrator/components/com_banners/models/clients.php
+++ b/administrator/components/com_banners/models/clients.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -114,13 +114,13 @@ protected function getListQuery()
 			$this->getState(
 				'list.select',
 				'a.id AS id,' .
-					'a.name AS name,' .
-					'a.contact AS contact,' .
-					'a.checked_out AS checked_out,' .
-					'a.checked_out_time AS checked_out_time, ' .
-					'a.state AS state,' .
-					'a.metakey AS metakey,' .
-					'a.purchase_type as purchase_type'
+				'a.name AS name,' .
+				'a.contact AS contact,' .
+				'a.checked_out AS checked_out,' .
+				'a.checked_out_time AS checked_out_time, ' .
+				'a.state AS state,' .
+				'a.metakey AS metakey,' .
+				'a.purchase_type as purchase_type'
 			)
 		);
 
diff --git a/administrator/components/com_banners/models/download.php b/administrator/components/com_banners/models/download.php
index ce48395..81cb803 100644
--- a/administrator/components/com_banners/models/download.php
+++ b/administrator/components/com_banners/models/download.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,36 +21,40 @@ class BannersModelDownload extends JModelForm
 	protected $_context = 'com_banners.tracks';
 
 	/**
-	 * Method to auto-populate the model state.
+	 * Auto-populate the model state.
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState()
 	{
 		$input = JFactory::getApplication()->input;
 
-		$basename = $input->cookie->getString(JApplication::getHash($this->_context.'.basename'), '__SITE__');
+		$basename = $input->cookie->getString(JApplication::getHash($this->_context . '.basename'), '__SITE__');
 		$this->setState('basename', $basename);
 
-		$compressed = $input->cookie->getInt(JApplication::getHash($this->_context.'.compressed'), 1);
+		$compressed = $input->cookie->getInt(JApplication::getHash($this->_context . '.compressed'), 1);
 		$this->setState('compressed', $compressed);
 	}
 
 	/**
 	 * Method to get the record form.
 	 *
-	 * @param   array  $data		Data for the form.
-	 * @param   boolean	$loadData	True if the form is to load its own data (default case), false if not.
+	 * @param   array    $data      Data for the form.
+	 * @param   boolean  $loadData  True if the form is to load its own data (default case), false if not.
 	 *
 	 * @return  mixed  A JForm object on success, false on failure
+	 *
 	 * @since   1.6
 	 */
 	public function getForm($data = array(), $loadData = true)
 	{
 		// Get the form.
 		$form = $this->loadForm('com_banners.download', 'download', array('control' => 'jform', 'load_data' => $loadData));
+
 		if (empty($form))
 		{
 			return false;
@@ -63,6 +67,7 @@ public function getForm($data = array(), $loadData = true)
 	 * Method to get the data that should be injected in the form.
 	 *
 	 * @return  mixed  The data for the form.
+	 *
 	 * @since   1.6
 	 */
 	protected function loadFormData()
diff --git a/administrator/components/com_banners/models/fields/bannerclient.php b/administrator/components/com_banners/models/fields/bannerclient.php
index c7a1d90..8f0b257 100644
--- a/administrator/components/com_banners/models/fields/bannerclient.php
+++ b/administrator/components/com_banners/models/fields/bannerclient.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -41,6 +41,6 @@ public function getOptions()
 	{
 		$options = BannersHelper::getClientOptions();
 
-		return  array_merge(parent::getOptions(), $options);
+		return array_merge(parent::getOptions(), $options);
 	}
 }
diff --git a/administrator/components/com_banners/models/fields/clicks.php b/administrator/components/com_banners/models/fields/clicks.php
index 0beaaeb..1ac8028 100644
--- a/administrator/components/com_banners/models/fields/clicks.php
+++ b/administrator/components/com_banners/models/fields/clicks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,12 +30,16 @@ class JFormFieldClicks extends JFormField
 	 * Method to get the field input markup.
 	 *
 	 * @return  string	The field input markup.
+	 *
 	 * @since   1.6
 	 */
 	protected function getInput()
 	{
-		$onclick	= ' onclick="document.id(\''.$this->id.'\').value=\'0\';"';
+		$onclick = ' onclick="document.id(\'' . $this->id . '\').value=\'0\';"';
 
-		return '<input class="input-small" type="text" name="' . $this->name . '" id="' . $this->id . '" value="' . htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> <a class="btn" ' . $onclick . '><i class="icon-refresh"></i> ' . JText::_('COM_BANNERS_RESET_CLICKS') . '</a>';
+		return
+			'<input class="input-small" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
+			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> <a class="btn" ' . $onclick . '><i class="icon-refresh"></i> '
+			. JText::_('COM_BANNERS_RESET_CLICKS') . '</a>';
 	}
 }
diff --git a/administrator/components/com_banners/models/fields/impmade.php b/administrator/components/com_banners/models/fields/impmade.php
index 56c453f..908b888 100644
--- a/administrator/components/com_banners/models/fields/impmade.php
+++ b/administrator/components/com_banners/models/fields/impmade.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,12 +30,16 @@ class JFormFieldImpMade extends JFormField
 	 * Method to get the field input markup.
 	 *
 	 * @return  string	The field input markup.
+	 *
 	 * @since   1.6
 	 */
 	protected function getInput()
 	{
-		$onclick	= ' onclick="document.id(\''.$this->id.'\').value=\'0\';"';
+		$onclick = ' onclick="document.id(\'' . $this->id . '\').value=\'0\';"';
 
-		return '<input class="input-small" type="text" name="'.$this->name.'" id="'.$this->id.'" value="'.htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8').'" readonly="readonly" /> <a class="btn" '.$onclick.'><i class="icon-refresh"></i> '.JText::_('COM_BANNERS_RESET_IMPMADE').'</a>';
+		return
+			'<input class="input-small" type="text" name="' . $this->name . '" id="' . $this->id . '" value="'
+			. htmlspecialchars($this->value, ENT_COMPAT, 'UTF-8') . '" readonly="readonly" /> <a class="btn" ' . $onclick . '><i class="icon-refresh"></i> '
+			. JText::_('COM_BANNERS_RESET_IMPMADE') . '</a>';
 	}
 }
diff --git a/administrator/components/com_banners/models/fields/imptotal.php b/administrator/components/com_banners/models/fields/imptotal.php
index b6c5e28..8f42f5c 100644
--- a/administrator/components/com_banners/models/fields/imptotal.php
+++ b/administrator/components/com_banners/models/fields/imptotal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,18 +30,21 @@ class JFormFieldImpTotal extends JFormField
 	 * Method to get the field input markup.
 	 *
 	 * @return  string	The field input markup.
+	 *
 	 * @since   1.6
 	 */
 	protected function getInput()
 	{
 		$class		= ' class="validate-numeric text_area"';
-		$onchange	= ' onchange="document.id(\''.$this->id.'_unlimited\').checked=document.id(\''.$this->id.'\').value==\'\';"';
-		$onclick	= ' onclick="if (document.id(\''.$this->id.'_unlimited\').checked) document.id(\''.$this->id.'\').value=\'\';"';
+		$onchange	= ' onchange="document.id(\'' . $this->id . '_unlimited\').checked=document.id(\'' . $this->id . '\').value==\'\';"';
+		$onclick	= ' onclick="if (document.id(\'' . $this->id . '_unlimited\').checked) document.id(\'' . $this->id . '\').value=\'\';"';
 		$value		= empty($this->value) ? '' : $this->value;
 		$checked	= empty($this->value) ? ' checked="checked"' : '';
 
-		return '<input type="text" name="'.$this->name.'" id="'.$this->id.'" size="9" value="'.htmlspecialchars($value, ENT_COMPAT, 'UTF-8').'" '.$class.$onchange.' />
-		<fieldset class="checkboxes impunlimited"><input id="'.$this->id.'_unlimited" type="checkbox"'.$checked.$onclick.' />
-		<label for="'.$this->id.'_unlimited" id="jform-imp" type="text">'.JText::_('COM_BANNERS_UNLIMITED').'</label></fieldset>';
+		return
+			'<input type="text" name="' . $this->name . '" id="' . $this->id . '" size="9" value="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8')
+			. '" ' . $class . $onchange . ' />'
+			. '<fieldset class="checkboxes impunlimited"><input id="' . $this->id . '_unlimited" type="checkbox"' . $checked . $onclick . ' />'
+			. '<label for="' . $this->id . '_unlimited" id="jform-imp" type="text">' . JText::_('COM_BANNERS_UNLIMITED') . '</label></fieldset>';
 	}
 }
diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml
index 5a68f6b..d7fed9e 100644
--- a/administrator/components/com_banners/models/forms/banner.xml
+++ b/administrator/components/com_banners/models/forms/banner.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
 	<fieldset name="details"
-		addfieldpath="/administrator/components/com_banners/models/fields" >
+		addfieldpath="/administrator/components/com_banners/models/fields">
 
 		<field name="id" type="text" default="0"
 			readonly="true" class="readonly"
-			label="JGLOBAL_FIELD_ID_LABEL" 	description ="JGLOBAL_FIELD_ID_DESC" />
+			label="JGLOBAL_FIELD_ID_LABEL" description="JGLOBAL_FIELD_ID_DESC" />
 
 		<field name="name" type="text"
 			class="inputbox input-xxlarge input-large-text"
@@ -25,7 +25,7 @@
 		<field name="state" type="list"
 			label="JSTATUS" description="COM_BANNERS_FIELD_STATE_DESC"
 			class="chzn-color-state"
-			size="1" default="1" >
+			size="1" default="1">
 			<option value="1">JPUBLISHED</option>
 			<option value="0">JUNPUBLISHED</option>
 			<option value="2">JARCHIVED</option>
@@ -37,7 +37,7 @@
 			table="#__banners" />
 
 		<field name="language" type="contentlanguage" label="JFIELD_LANGUAGE_LABEL"
-			description="COM_BANNERS_FIELD_LANGUAGE_DESC" class="inputbox" >
+			description="COM_BANNERS_FIELD_LANGUAGE_DESC" class="inputbox">
 			<option value="*">JALL</option>
 		</field>
 
@@ -71,7 +71,7 @@
 	</fieldset>
 
 	<fieldset name="publish"
-		label="COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS" >
+		label="COM_BANNERS_GROUP_LABEL_PUBLISHING_DETAILS">
 
 		<field name="created" type="calendar"
 			label="COM_BANNERS_FIELD_CREATED_LABEL" description="COM_BANNERS_FIELD_CREATED_DESC"
@@ -111,7 +111,7 @@
 	</fieldset>
 
 	<fieldset name="bannerdetails"
-		label="COM_BANNERS_GROUP_LABEL_BANNER_DETAILS" >
+		label="COM_BANNERS_GROUP_LABEL_BANNER_DETAILS">
 
 		<field name="sticky" type="radio" default="0"
 			label="COM_BANNERS_FIELD_STICKY_LABEL"
@@ -137,7 +137,7 @@
 
 		<field name="purchase_type" type="list"
 			label="COM_BANNERS_FIELD_PURCHASETYPE_LABEL" description="COM_BANNERS_FIELD_PURCHASETYPE_DESC"
-			default="0" class="inputbox" >
+			default="0" class="inputbox">
 			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT
 			</option>
 			<option value="1">COM_BANNERS_FIELD_VALUE_1
@@ -154,7 +154,7 @@
 
 		<field name="track_impressions" type="list" default="0"
 			label="COM_BANNERS_FIELD_TRACKIMPRESSION_LABEL"
-			description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC" >
+			description="COM_BANNERS_FIELD_TRACKIMPRESSION_DESC">
 			<option value="-1">COM_BANNERS_FIELD_VALUE_USECLIENTDEFAULT
 			</option>
 			<option value="0">JNO</option>
@@ -171,7 +171,7 @@
 	</fieldset>
 
 	<fieldset name="metadata"
-		label="JGLOBAL_FIELDSET_METADATA_OPTIONS" >
+		label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
 
 		<field name="metakey" type="textarea" class="inputbox"
 			rows="3" cols="30" label="JFIELD_META_KEYWORDS_LABEL"
@@ -211,7 +211,7 @@
 		</fieldset>
 	</fields>
 
-	<fieldset name="custom" >
+	<fieldset name="custom">
 		<field name="bannercode" type="textarea" class="inputbox"
 			rows="3" cols="30" filter="raw"
 			label="COM_BANNERS_FIELD_CUSTOMCODE_LABEL" description="COM_BANNERS_FIELD_CUSTOMCODE_DESC" />
diff --git a/administrator/components/com_banners/models/forms/client.xml b/administrator/components/com_banners/models/forms/client.xml
index 76d5a3e..4c1914c 100644
--- a/administrator/components/com_banners/models/forms/client.xml
+++ b/administrator/components/com_banners/models/forms/client.xml
@@ -5,7 +5,7 @@
 	>
 		<field name="id" type="text" default="0"
 			readonly="true" class="readonly"
-			label="JGLOBAL_FIELD_ID_LABEL" description ="JGLOBAL_FIELD_ID_DESC"/>
+			label="JGLOBAL_FIELD_ID_LABEL" description="JGLOBAL_FIELD_ID_DESC" />
 
 		<field name="name" type="text"
 			class="inputbox input-xxlarge input-large-text"
diff --git a/administrator/components/com_banners/models/tracks.php b/administrator/components/com_banners/models/tracks.php
index 5879c29..65fd187 100644
--- a/administrator/components/com_banners/models/tracks.php
+++ b/administrator/components/com_banners/models/tracks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -22,6 +22,7 @@ class BannersModelTracks extends JModelList
 	 * Constructor.
 	 *
 	 * @param   array  $config  An optional associative array of configuration settings.
+	 *
 	 * @see     JController
 	 * @since   1.6
 	 */
@@ -52,6 +53,11 @@ public function __construct($config = array())
 	 *
 	 * Note. Calling getState in this method will result in recursion.
 	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function populateState($ordering = null, $direction = null)
@@ -84,6 +90,7 @@ protected function populateState($ordering = null, $direction = null)
 	 * Build an SQL query to load the list data.
 	 *
 	 * @return  JDatabaseQuery
+	 *
 	 * @since   1.6
 	 */
 	protected function getListQuery()
@@ -97,8 +104,8 @@ protected function getListQuery()
 		// Select the required fields from the table.
 		$query->select(
 			'a.track_date as track_date,'
-				. 'a.track_type as track_type,'
-				. $db->quoteName('a.count') . ' as ' . $db->quoteName('count')
+			. 'a.track_type as track_type,'
+			. $db->quoteName('a.count') . ' as ' . $db->quoteName('count')
 		);
 		$query->from($db->quoteName('#__banner_tracks') . ' AS a');
 
@@ -116,6 +123,7 @@ protected function getListQuery()
 
 		// Filter by type
 		$type = $this->getState('filter.type');
+
 		if (!empty($type))
 		{
 			$query->where('a.track_type = ' . (int) $type);
@@ -123,6 +131,7 @@ protected function getListQuery()
 
 		// Filter by client
 		$clientId = $this->getState('filter.client_id');
+
 		if (is_numeric($clientId))
 		{
 			$query->where('b.cid = ' . (int) $clientId);
@@ -130,6 +139,7 @@ protected function getListQuery()
 
 		// Filter by category
 		$catedoryId = $this->getState('filter.category_id');
+
 		if (is_numeric($catedoryId))
 		{
 			$query->where('b.catid = ' . (int) $catedoryId);
@@ -138,6 +148,7 @@ protected function getListQuery()
 		// Filter by begin date
 
 		$begin = $this->getState('filter.begin');
+
 		if (!empty($begin))
 		{
 			$query->where('a.track_date >= ' . $db->quote($begin));
@@ -145,6 +156,7 @@ protected function getListQuery()
 
 		// Filter by end date
 		$end = $this->getState('filter.end');
+
 		if (!empty($end))
 		{
 			$query->where('a.track_date <= ' . $db->quote($end));
@@ -160,8 +172,6 @@ protected function getListQuery()
 	/**
 	 * Method to delete rows.
 	 *
-	 * @param   array  An array of item ids.
-	 *
 	 * @return  boolean  Returns true on success, false on failure.
 	 */
 	public function delete()
@@ -188,6 +198,7 @@ public function delete()
 
 			// Filter by type
 			$type = $this->getState('filter.type');
+
 			if (!empty($type))
 			{
 				$query->where('track_type = ' . (int) $type);
@@ -195,6 +206,7 @@ public function delete()
 
 			// Filter by begin date
 			$begin = $this->getState('filter.begin');
+
 			if (!empty($begin))
 			{
 				$query->where('track_date >= ' . $db->quote($begin));
@@ -202,14 +214,17 @@ public function delete()
 
 			// Filter by end date
 			$end = $this->getState('filter.end');
+
 			if (!empty($end))
 			{
 				$query->where('track_date <= ' . $db->quote($end));
 			}
 
 			$where = '1';
+
 			// Filter by client
 			$clientId = $this->getState('filter.client_id');
+
 			if (!empty($clientId))
 			{
 				$where .= ' AND cid = ' . (int) $clientId;
@@ -233,6 +248,7 @@ public function delete()
 			catch (RuntimeException $e)
 			{
 				$this->setError($e->getMessage());
+
 				return false;
 			}
 		}
@@ -248,13 +264,13 @@ public function delete()
 	 * Get file name
 	 *
 	 * @return  string    The file name
+	 *
 	 * @since   1.6
 	 */
 	public function getBaseName()
 	{
 		if (!isset($this->basename))
 		{
-
 			$app = JFactory::getApplication();
 			$basename = $this->getState('basename');
 			$basename = str_replace('__SITE__', $app->getCfg('sitename'), $basename);
@@ -270,6 +286,7 @@ public function getBaseName()
 				{
 					$basename = str_replace('__CATID__', '', $basename);
 				}
+
 				$categoryName = $this->getCategoryName();
 				$basename = str_replace('__CATNAME__', $categoryName, $basename);
 			}
@@ -280,9 +297,9 @@ public function getBaseName()
 			}
 
 			$clientId = $this->getState('filter.client_id');
+
 			if (is_numeric($clientId))
 			{
-
 				if ($clientId > 0)
 				{
 					$basename = str_replace('__CLIENTID__', $clientId, $basename);
@@ -291,20 +308,20 @@ public function getBaseName()
 				{
 					$basename = str_replace('__CLIENTID__', '', $basename);
 				}
+
 				$clientName = $this->getClientName();
 				$basename = str_replace('__CLIENTNAME__', $clientName, $basename);
 			}
 			else
 			{
-
 				$basename = str_replace('__CLIENTID__', '', $basename);
 				$basename = str_replace('__CLIENTNAME__', '', $basename);
 			}
 
 			$type = $this->getState('filter.type');
+
 			if ($type > 0)
 			{
-
 				$basename = str_replace('__TYPE__', $type, $basename);
 				$typeName = JText::_('COM_BANNERS_TYPE' . $type);
 				$basename = str_replace('__TYPENAME__', $typeName, $basename);
@@ -316,6 +333,7 @@ public function getBaseName()
 			}
 
 			$begin = $this->getState('filter.begin');
+
 			if (!empty($begin))
 			{
 				$basename = str_replace('__BEGIN__', $begin, $basename);
@@ -326,6 +344,7 @@ public function getBaseName()
 			}
 
 			$end = $this->getState('filter.end');
+
 			if (!empty($end))
 			{
 				$basename = str_replace('__END__', $end, $basename);
@@ -345,6 +364,7 @@ public function getBaseName()
 	 * Get the category name.
 	 *
 	 * @return  string    The category name
+	 *
 	 * @since   1.6
 	 */
 	protected function getCategoryName()
@@ -367,6 +387,7 @@ protected function getCategoryName()
 			catch (RuntimeException $e)
 			{
 				$this->setError($e->getMessage());
+
 				return false;
 			}
 		}
@@ -382,6 +403,7 @@ protected function getCategoryName()
 	 * Get the category name
 	 *
 	 * @return  string    The category name.
+	 *
 	 * @since   1.6
 	 */
 	protected function getClientName()
@@ -404,6 +426,7 @@ protected function getClientName()
 			catch (RuntimeException $e)
 			{
 				$this->setError($e->getMessage());
+
 				return false;
 			}
 		}
@@ -419,6 +442,7 @@ protected function getClientName()
 	 * Get the file type.
 	 *
 	 * @return  string    The file type
+	 *
 	 * @since   1.6
 	 */
 	public function getFileType()
@@ -430,6 +454,7 @@ public function getFileType()
 	 * Get the mime type.
 	 *
 	 * @return  string    The mime type.
+	 *
 	 * @since   1.6
 	 */
 	public function getMimeType()
@@ -441,32 +466,31 @@ public function getMimeType()
 	 * Get the content
 	 *
 	 * @return  string    The content.
+	 *
 	 * @since   1.6
 	 */
 	public function getContent()
 	{
 		if (!isset($this->content))
 		{
-
 			$this->content = '';
 			$this->content .=
 				'"' . str_replace('"', '""', JText::_('COM_BANNERS_HEADING_NAME')) . '","' .
-					str_replace('"', '""', JText::_('COM_BANNERS_HEADING_CLIENT')) . '","' .
-					str_replace('"', '""', JText::_('JCATEGORY')) . '","' .
-					str_replace('"', '""', JText::_('COM_BANNERS_HEADING_TYPE')) . '","' .
-					str_replace('"', '""', JText::_('COM_BANNERS_HEADING_COUNT')) . '","' .
-					str_replace('"', '""', JText::_('JDATE')) . '"' . "\n";
+				str_replace('"', '""', JText::_('COM_BANNERS_HEADING_CLIENT')) . '","' .
+				str_replace('"', '""', JText::_('JCATEGORY')) . '","' .
+				str_replace('"', '""', JText::_('COM_BANNERS_HEADING_TYPE')) . '","' .
+				str_replace('"', '""', JText::_('COM_BANNERS_HEADING_COUNT')) . '","' .
+				str_replace('"', '""', JText::_('JDATE')) . '"' . "\n";
 
 			foreach ($this->getItems() as $item)
 			{
-
 				$this->content .=
 					'"' . str_replace('"', '""', $item->name) . '","' .
-						str_replace('"', '""', $item->client_name) . '","' .
-						str_replace('"', '""', $item->category_title) . '","' .
-						str_replace('"', '""', ($item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'))) . '","' .
-						str_replace('"', '""', $item->count) . '","' .
-						str_replace('"', '""', $item->track_date) . '"' . "\n";
+					str_replace('"', '""', $item->client_name) . '","' .
+					str_replace('"', '""', $item->category_title) . '","' .
+					str_replace('"', '""', ($item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'))) . '","' .
+					str_replace('"', '""', $item->count) . '","' .
+					str_replace('"', '""', $item->track_date) . '"' . "\n";
 			}
 
 			if ($this->getState('compressed'))
@@ -480,7 +504,7 @@ public function getContent()
 				$files['track']['time'] = time();
 				$ziproot = $app->getCfg('tmp_path') . '/' . uniqid('banners_tracks_') . '.zip';
 
-				// run the packager
+				// Run the packager
 				jimport('joomla.filesystem.folder');
 				jimport('joomla.filesystem.file');
 				$delete = JFolder::files($app->getCfg('tmp_path') . '/', uniqid('banners_tracks_'), false, true);
@@ -491,6 +515,7 @@ public function getContent()
 					{
 						// JFile::delete throws an error
 						$this->setError(JText::_('COM_BANNERS_ERR_ZIP_DELETE_FAILURE'));
+
 						return false;
 					}
 				}
@@ -498,11 +523,13 @@ public function getContent()
 				if (!$packager = JArchive::getAdapter('zip'))
 				{
 					$this->setError(JText::_('COM_BANNERS_ERR_ZIP_ADAPTER_FAILURE'));
+
 					return false;
 				}
 				elseif (!$packager->create($ziproot, $files))
 				{
 					$this->setError(JText::_('COM_BANNERS_ERR_ZIP_CREATE_FAILURE'));
+
 					return false;
 				}
 
diff --git a/administrator/components/com_banners/tables/banner.php b/administrator/components/com_banners/tables/banner.php
index cefb6c0..159b6a8 100644
--- a/administrator/components/com_banners/tables/banner.php
+++ b/administrator/components/com_banners/tables/banner.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,6 +21,8 @@ class BannersTableBanner extends JTable
 	/**
 	 * Constructor
 	 *
+	 * @param   JDatabaseDriver  &$_db  Database connector object
+	 *
 	 * @since   1.5
 	 */
 	public function __construct(&$_db)
@@ -30,11 +32,16 @@ public function __construct(&$_db)
 		$this->created = $date->toSql();
 	}
 
+	/**
+	 * Increase click count
+	 *
+	 * @return  void
+	 */
 	public function clicks()
 	{
 		$query = 'UPDATE #__banners'
-		. ' SET clicks = (clicks + 1)'
-		. ' WHERE id = ' . (int) $this->id;
+			. ' SET clicks = (clicks + 1)'
+			. ' WHERE id = ' . (int) $this->id;
 
 		$this->_db->setQuery($query);
 		$this->_db->execute();
@@ -44,6 +51,7 @@ public function clicks()
 	 * Overloaded check function
 	 *
 	 * @return  boolean
+	 *
 	 * @see     JTable::check
 	 * @since   1.5
 	 */
@@ -54,6 +62,7 @@ public function check()
 
 		// Set alias
 		$this->alias = JApplication::stringURLSafe($this->alias);
+
 		if (empty($this->alias))
 		{
 			$this->alias = JApplication::stringURLSafe($this->name);
@@ -63,6 +72,7 @@ public function check()
 		if ($this->publish_down > $this->_db->getNullDate() && $this->publish_down < $this->publish_up)
 		{
 			$this->setError(JText::_('JGLOBAL_START_PUBLISH_AFTER_FINISH'));
+
 			return false;
 		}
 
@@ -71,10 +81,11 @@ public function check()
 		{
 			// Set ordering to 0 if state is archived or trashed
 			$this->ordering = 0;
-		} elseif (empty($this->ordering))
+		}
+		elseif (empty($this->ordering))
 		{
 			// Set ordering to last if ordering was 0
-			$this->ordering = self::getNextOrder($this->_db->quoteName('catid').'=' . $this->_db->quote($this->catid).' AND state>=0');
+			$this->ordering = self::getNextOrder($this->_db->quoteName('catid') . '=' . $this->_db->quote($this->catid) . ' AND state>=0');
 		}
 
 		return true;
@@ -83,10 +94,12 @@ public function check()
 	/**
 	 * Overloaded bind function
 	 *
-	 * @param   array  $hash named array
-	 * @return  null|string	null is operation was satisfactory, otherwise returns an error
-	 * @see JTable:bind
-	 * @since 1.5
+	 * @param   array  $array   Named array to bind
+	 * @param   mixed  $ignore  An optional array or space separated list of properties to ignore while binding.
+	 *
+	 * @return  mixed  Null if operation was satisfactory, otherwise returns an error
+	 *
+	 * @since   1.5
 	 */
 	public function bind($array, $ignore = array())
 	{
@@ -95,13 +108,17 @@ public function bind($array, $ignore = array())
 			$registry = new JRegistry;
 			$registry->loadArray($array['params']);
 
-			if ((int) $registry->get('width', 0) < 0){
+			if ((int) $registry->get('width', 0) < 0)
+			{
 				$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_WIDTH_LABEL')));
+
 				return false;
 			}
 
-			if ((int) $registry->get('height', 0) < 0){
+			if ((int) $registry->get('height', 0) < 0)
+			{
 				$this->setError(JText::sprintf('JLIB_DATABASE_ERROR_NEGATIVE_NOT_PERMITTED', JText::_('COM_BANNERS_FIELD_HEIGHT_LABEL')));
+
 				return false;
 			}
 
@@ -123,47 +140,52 @@ public function bind($array, $ignore = array())
 
 		return parent::bind($array, $ignore);
 	}
+
 	/**
 	 * Method to store a row
 	 *
-	 * @param boolean $updateNulls True to update fields even if they are null.
+	 * @param   boolean  $updateNulls  True to update fields even if they are null.
+	 *
+	 * @return  boolean  True on success, false on failure.
 	 */
 	public function store($updateNulls = false)
 	{
 		if (empty($this->id))
 		{
 			$purchase_type = $this->purchase_type;
+
 			if ($purchase_type < 0 && $this->cid)
 			{
 				$client = JTable::getInstance('Client', 'BannersTable');
 				$client->load($this->cid);
 				$purchase_type = $client->purchase_type;
 			}
+
 			if ($purchase_type < 0)
 			{
 				$params = JComponentHelper::getParams('com_banners');
 				$purchase_type = $params->get('purchase_type');
 			}
 
-			switch($purchase_type)
+			switch ($purchase_type)
 			{
 				case 1:
 					$this->reset = $this->_db->getNullDate();
 					break;
 				case 2:
-					$date = JFactory::getDate('+1 year '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+1 year ' . date('Y-m-d', strtotime('now')));
 					$this->reset = $this->_db->quote($date->toSql());
 					break;
 				case 3:
-					$date = JFactory::getDate('+1 month '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+1 month ' . date('Y-m-d', strtotime('now')));
 					$this->reset = $this->_db->quote($date->toSql());
 					break;
 				case 4:
-					$date = JFactory::getDate('+7 day '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+7 day ' . date('Y-m-d', strtotime('now')));
 					$this->reset = $this->_db->quote($date->toSql());
 					break;
 				case 5:
-					$date = JFactory::getDate('+1 day '.date('Y-m-d', strtotime('now')));
+					$date = JFactory::getDate('+1 day ' . date('Y-m-d', strtotime('now')));
 					$this->reset = $this->_db->quote($date->toSql());
 					break;
 			}
@@ -174,6 +196,7 @@ public function store($updateNulls = false)
 		{
 			// Get the old row
 			$oldrow = JTable::getInstance('Banner', 'BannersTable');
+
 			if (!$oldrow->load($this->id) && $oldrow->getError())
 			{
 				$this->setError($oldrow->getError());
@@ -181,9 +204,11 @@ public function store($updateNulls = false)
 
 			// Verify that the alias is unique
 			$table = JTable::getInstance('Banner', 'BannersTable');
+
 			if ($table->load(array('alias' => $this->alias, 'catid' => $this->catid)) && ($table->id != $this->id || $this->id == 0))
 			{
 				$this->setError(JText::_('COM_BANNERS_ERROR_UNIQUE_ALIAS'));
+
 				return false;
 			}
 
@@ -194,9 +219,10 @@ public function store($updateNulls = false)
 			if ($oldrow->state >= 0 && ($this->state < 0 || $oldrow->catid != $this->catid))
 			{
 				// Reorder the oldrow
-				$this->reorder($this->_db->quoteName('catid').'=' . $this->_db->quote($oldrow->catid).' AND state>=0');
+				$this->reorder($this->_db->quoteName('catid') . '=' . $this->_db->quote($oldrow->catid) . ' AND state>=0');
 			}
 		}
+
 		return count($this->getErrors()) == 0;
 	}
 
@@ -205,11 +231,12 @@ public function store($updateNulls = false)
 	 * table.  The method respects checked out rows by other users and will attempt
 	 * to checkin rows that it can after adjustments are made.
 	 *
-	 * @param   mixed	An optional array of primary key values to update.  If not
-	 *					set the instance property value is used.
-	 * @param   integer The publishing state. eg. [0 = unpublished, 1 = published, 2=archived, -2=trashed]
-	 * @param   integer The user id of the user performing the operation.
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published, 2=archived, -2=trashed]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
 	 * @return  boolean  True on success.
+	 *
 	 * @since   1.6
 	 */
 	public function publish($pks = null, $state = 1, $userId = 0)
@@ -219,7 +246,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		// Sanitize input.
 		JArrayHelper::toInteger($pks);
 		$userId = (int) $userId;
-		$state  = (int) $state;
+		$state = (int) $state;
 
 		// If there are no primary keys set check to see if the instance key is set.
 		if (empty($pks))
@@ -229,8 +256,10 @@ public function publish($pks = null, $state = 1, $userId = 0)
 				$pks = array($this->$k);
 			}
 			// Nothing to set publishing state on, return false.
-			else {
+			else
+			{
 				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
 				return false;
 			}
 		}
@@ -265,6 +294,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 				}
 			}
 		}
+
 		return count($this->getErrors()) == 0;
 	}
 
@@ -273,11 +303,12 @@ public function publish($pks = null, $state = 1, $userId = 0)
 	 * table.  The method respects checked out rows by other users and will attempt
 	 * to checkin rows that it can after adjustments are made.
 	 *
-	 * @param   mixed	An optional array of primary key values to update.  If not
-	 *					set the instance property value is used.
-	 * @param   integer The sticky state. eg. [0 = unsticked, 1 = sticked]
-	 * @param   integer The user id of the user performing the operation.
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not set the instance property value is used.
+	 * @param   integer  $state   The sticky state. eg. [0 = unsticked, 1 = sticked]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
 	 * @return  boolean  True on success.
+	 *
 	 * @since   1.6
 	 */
 	public function stick($pks = null, $state = 1, $userId = 0)
@@ -297,8 +328,10 @@ public function stick($pks = null, $state = 1, $userId = 0)
 				$pks = array($this->$k);
 			}
 			// Nothing to set publishing state on, return false.
-			else {
+			else
+			{
 				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
 				return false;
 			}
 		}
@@ -333,6 +366,7 @@ public function stick($pks = null, $state = 1, $userId = 0)
 				}
 			}
 		}
+
 		return count($this->getErrors()) == 0;
 	}
 }
diff --git a/administrator/components/com_banners/tables/client.php b/administrator/components/com_banners/tables/client.php
index a0e1a9f..b744600 100644
--- a/administrator/components/com_banners/tables/client.php
+++ b/administrator/components/com_banners/tables/client.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,6 +18,13 @@
  */
 class BannersTableClient extends JTable
 {
+	/**
+	 * Constructor
+	 *
+	 * @param   JDatabaseDriver  &$_db  Database connector object
+	 *
+	 * @since   1.5
+	 */
 	public function __construct(&$_db)
 	{
 		$this->checked_out_time = $_db->getNullDate();
@@ -29,11 +36,12 @@ public function __construct(&$_db)
 	 * table.  The method respects checked out rows by other users and will attempt
 	 * to checkin rows that it can after adjustments are made.
 	 *
-	 * @param   mixed	An optional array of primary key values to update.  If not
-	 *					set the instance property value is used.
-	 * @param   integer The publishing state. eg. [0 = unpublished, 1 = published]
-	 * @param   integer The user id of the user performing the operation.
+	 * @param   mixed    $pks     An optional array of primary key values to update.  If not set the instance property value is used.
+	 * @param   integer  $state   The publishing state. eg. [0 = unpublished, 1 = published, 2=archived, -2=trashed]
+	 * @param   integer  $userId  The user id of the user performing the operation.
+	 *
 	 * @return  boolean  True on success.
+	 *
 	 * @since   1.0.4
 	 */
 	public function publish($pks = null, $state = 1, $userId = 0)
@@ -53,14 +61,16 @@ public function publish($pks = null, $state = 1, $userId = 0)
 				$pks = array($this->$k);
 			}
 			// Nothing to set publishing state on, return false.
-			else {
+			else
+			{
 				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
 				return false;
 			}
 		}
 
 		// Build the WHERE clause for the primary keys.
-		$where = $k.'='.implode(' OR '.$k.'=', $pks);
+		$where = $k . '=' . implode(' OR ' . $k . '=', $pks);
 
 		// Determine if there is checkin support for the table.
 		if (!property_exists($this, 'checked_out') || !property_exists($this, 'checked_out_time'))
@@ -69,14 +79,14 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		}
 		else
 		{
-			$checkin = ' AND (checked_out = 0 OR checked_out = '.(int) $userId.')';
+			$checkin = ' AND (checked_out = 0 OR checked_out = ' . (int) $userId . ')';
 		}
 
 		// Update the publishing state for rows with the given primary keys.
 		$this->_db->setQuery(
-			'UPDATE '.$this->_db->quoteName($this->_tbl).
-			' SET '.$this->_db->quoteName('state').' = '.(int) $state .
-			' WHERE ('.$where.')' .
+			'UPDATE ' . $this->_db->quoteName($this->_tbl) .
+			' SET ' . $this->_db->quoteName('state') . ' = ' . (int) $state .
+			' WHERE (' . $where . ')' .
 			$checkin
 		);
 
@@ -87,6 +97,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		catch (RuntimeException $e)
 		{
 			$this->setError($e->getMessage());
+
 			return false;
 		}
 
@@ -107,6 +118,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		}
 
 		$this->setError('');
+
 		return true;
 	}
 }
diff --git a/administrator/components/com_banners/views/banner/tmpl/edit.php b/administrator/components/com_banners/views/banner/tmpl/edit.php
index 4945334..8b11c41 100644
--- a/administrator/components/com_banners/views/banner/tmpl/edit.php
+++ b/administrator/components/com_banners/views/banner/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,7 +33,8 @@
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
 	{
-		if (task == 'banner.cancel' || document.formvalidator.isValid(document.id('banner-form'))) {
+		if (task == 'banner.cancel' || document.formvalidator.isValid(document.id('banner-form')))
+		{
 			Joomla.submitform(task, document.getElementById('banner-form'));
 		}
 	}
diff --git a/administrator/components/com_banners/views/banner/view.html.php b/administrator/components/com_banners/views/banner/view.html.php
index 76df29b..1055ee7 100644
--- a/administrator/components/com_banners/views/banner/view.html.php
+++ b/administrator/components/com_banners/views/banner/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,6 +28,10 @@ class BannersViewBanner extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -40,6 +44,7 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -52,6 +57,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -64,7 +71,7 @@ protected function addToolbar()
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
 
 		// Since we don't track these assets at the item level, use the category id.
-		$canDo		= JHelperContent::getActions($this->item->catid, 0, 'com_banners');
+		$canDo		= JHelperContent::getActions('com_banners', 'category', $this->item->catid);
 
 		JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_BANNER_NEW') : JText::_('COM_BANNERS_MANAGER_BANNER_EDIT'), 'bookmark banners');
 
diff --git a/administrator/components/com_banners/views/banners/tmpl/default.php b/administrator/components/com_banners/views/banners/tmpl/default.php
index bced426..01f11ab 100644
--- a/administrator/components/com_banners/views/banners/tmpl/default.php
+++ b/administrator/components/com_banners/views/banners/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -51,14 +51,10 @@
 	}
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=banners'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if (!empty( $this->sidebar)) : ?>
 	<div id="j-sidebar-container" class="span2">
 		<?php echo $this->sidebar; ?>
 	</div>
 	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif;?>
 		<?php
 		// Search tools bar
 		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
@@ -111,95 +107,95 @@
 					</tr>
 				</tfoot>
 				<tbody>
-				<?php foreach ($this->items as $i => $item) :
-					$ordering  = ($listOrder == 'ordering');
-					$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]=' . $item->catid);
-					$canCreate  = $user->authorise('core.create',     'com_banners.category.' . $item->catid);
-					$canEdit    = $user->authorise('core.edit',       'com_banners.category.' . $item->catid);
-					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
-					$canChange  = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin;
-					?>
-					<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid?>">
-						<td class="order nowrap center hidden-phone">
-							<?php
-							$iconClass = '';
-							if (!$canChange)
-							{
-								$iconClass = ' inactive';
-							}
-							elseif (!$saveOrder)
-							{
-								$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
-							}
-							?>
-							<span class="sortable-handler <?php echo $iconClass ?>">
-								<i class="icon-menu"></i>
-							</span>
-							<?php if ($canChange && $saveOrder) : ?>
-								<input type="text" style="display:none" name="order[]" size="5"
-									value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
-							<?php endif; ?>
-						</td>
-						<td class="center hidden-phone">
-							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
-						</td>
-						<td class="center">
-							<div class="btn-group">
-								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+					<?php foreach ($this->items as $i => $item) :
+						$ordering  = ($listOrder == 'ordering');
+						$item->cat_link = JRoute::_('index.php?option=com_categories&extension=com_banners&task=edit&type=other&cid[]=' . $item->catid);
+						$canCreate  = $user->authorise('core.create',     'com_banners.category.' . $item->catid);
+						$canEdit    = $user->authorise('core.edit',       'com_banners.category.' . $item->catid);
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $userId || $item->checked_out == 0;
+						$canChange  = $user->authorise('core.edit.state', 'com_banners.category.' . $item->catid) && $canCheckin;
+						?>
+						<tr class="row<?php echo $i % 2; ?>" sortable-group-id="<?php echo $item->catid; ?>">
+							<td class="order nowrap center hidden-phone">
 								<?php
-								// Create dropdown items
-								$action = $archived ? 'unarchive' : 'archive';
-								JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');
-
-								$action = $trashed ? 'untrash' : 'trash';
-								JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');
-
-								// Render dropdown list
-								echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
+								$iconClass = '';
+								if (!$canChange)
+								{
+									$iconClass = ' inactive';
+								}
+								elseif (!$saveOrder)
+								{
+									$iconClass = ' inactive tip-top hasTooltip" title="' . JHtml::tooltipText('JORDERINGDISABLED');
+								}
 								?>
-							</div>
-						</td>
-						<td class="nowrap has-context">
-							<div class="pull-left">
-								<?php if ($item->checked_out) : ?>
-									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
+								<span class="sortable-handler <?php echo $iconClass ?>">
+									<i class="icon-menu"></i>
+								</span>
+								<?php if ($canChange && $saveOrder) : ?>
+									<input type="text" style="display:none" name="order[]" size="5"
+										value="<?php echo $item->ordering; ?>" class="width-20 text-area-order " />
 								<?php endif; ?>
-								<?php if ($canEdit) : ?>
-									<a href="<?php echo JRoute::_('index.php?option=com_banners&task=banner.edit&id='.(int) $item->id); ?>">
-										<?php echo $this->escape($item->name); ?></a>
-								<?php else : ?>
-									<?php echo $this->escape($item->name); ?>
-								<?php endif; ?>
-								<div class="small">
-									<?php echo $this->escape($item->category_title); ?>
+							</td>
+							<td class="center hidden-phone">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->state, $i, 'banners.', $canChange, 'cb', $item->publish_up, $item->publish_down); ?>
+									<?php
+									// Create dropdown items
+									$action = $archived ? 'unarchive' : 'archive';
+									JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');
+
+									$action = $trashed ? 'untrash' : 'trash';
+									JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'banners');
+
+									// Render dropdown list
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
+									?>
 								</div>
-							</div>
-						</td>
-						<td class="center hidden-phone">
-							<?php echo JHtml::_('banner.pinned', $item->sticky, $i, $canChange); ?>
-						</td>
-						<td class="small hidden-phone">
-							<?php echo $item->client_name;?>
-						</td>
-						<td class="small hidden-phone">
-							<?php echo JText::sprintf('COM_BANNERS_IMPRESSIONS', $item->impmade, $item->imptotal ? $item->imptotal : JText::_('COM_BANNERS_UNLIMITED'));?>
-						</td>
-						<td class="center small hidden-phone">
-							<?php echo $item->clicks;?> -
-							<?php echo sprintf('%.2f%%', $item->impmade ? 100 * $item->clicks / $item->impmade : 0);?>
-						</td>
+							</td>
+							<td class="nowrap has-context">
+								<div class="pull-left">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'banners.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_banners&task=banner.edit&id=' . (int) $item->id); ?>">
+											<?php echo $this->escape($item->name); ?></a>
+									<?php else : ?>
+										<?php echo $this->escape($item->name); ?>
+									<?php endif; ?>
+									<div class="small">
+										<?php echo $this->escape($item->category_title); ?>
+									</div>
+								</div>
+							</td>
+							<td class="center hidden-phone">
+								<?php echo JHtml::_('banner.pinned', $item->sticky, $i, $canChange); ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $item->client_name; ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo JText::sprintf('COM_BANNERS_IMPRESSIONS', $item->impmade, $item->imptotal ? $item->imptotal : JText::_('COM_BANNERS_UNLIMITED')); ?>
+							</td>
+							<td class="center small hidden-phone">
+								<?php echo $item->clicks; ?> -
+								<?php echo sprintf('%.2f%%', $item->impmade ? 100 * $item->clicks / $item->impmade : 0); ?>
+							</td>
 
-						<td class="small nowrap hidden-phone">
-							<?php if ($item->language == '*'):?>
-								<?php echo JText::alt('JALL', 'language'); ?>
-							<?php else:?>
-								<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
-							<?php endif;?>
-						</td>
-						<td class="center hidden-phone">
-							<?php echo $item->id; ?>
-						</td>
-					</tr>
+							<td class="small nowrap hidden-phone">
+								<?php if ($item->language == '*'): ?>
+									<?php echo JText::alt('JALL', 'language'); ?>
+								<?php else: ?>
+									<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
+								<?php endif; ?>
+							</td>
+							<td class="center hidden-phone">
+								<?php echo $item->id; ?>
+							</td>
+						</tr>
 					<?php endforeach; ?>
 				</tbody>
 			</table>
diff --git a/administrator/components/com_banners/views/banners/tmpl/default_batch.php b/administrator/components/com_banners/views/banners/tmpl/default_batch.php
index 4bf641f..3f212bb 100644
--- a/administrator/components/com_banners/views/banners/tmpl/default_batch.php
+++ b/administrator/components/com_banners/views/banners/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,27 +14,31 @@
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_BANNERS_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_BANNERS_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_BANNERS_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('banner.clients');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('banner.clients'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
 		</div>
-		<?php if ($published >= 0) : ?>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.item', 'com_banners');?>
-			</div>
+		<div class="row-fluid">
+			<?php if ($published >= 0) : ?>
+				<div class="control-group span6">
+					<div class="controls">
+						<?php echo JHtml::_('batch.item', 'com_banners'); ?>
+					</div>
+				</div>
+			<?php endif; ?>
 		</div>
-		<?php endif; ?>
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-category-id').value='';document.id('batch-client-id').value='';document.id('batch-language-id').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_banners/views/banners/view.html.php b/administrator/components/com_banners/views/banners/view.html.php
index ff0309d..7924caa 100644
--- a/administrator/components/com_banners/views/banners/view.html.php
+++ b/administrator/components/com_banners/views/banners/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -75,7 +75,7 @@ protected function addToolbar()
 	{
 		require_once JPATH_COMPONENT . '/helpers/banners.php';
 
-		$canDo = JHelperContent::getActions($this->state->get('filter.category_id'), 0, 'com_banners');
+		$canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
 		$user = JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_banners/views/client/tmpl/edit.php b/administrator/components/com_banners/views/client/tmpl/edit.php
index f5042cc..cc27a40 100644
--- a/administrator/components/com_banners/views/client/tmpl/edit.php
+++ b/administrator/components/com_banners/views/client/tmpl/edit.php
@@ -3,17 +3,15 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
-JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
-
-$canDo = JHelperContent::getActions(0, 0, 'com_banners');
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
@@ -25,7 +23,7 @@
 	}
 </script>
 
-<form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_banners&layout=edit&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="client-form" class="form-validate">
 
 	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
@@ -54,7 +52,7 @@
 		<?php echo $this->form->getControlGroups('metadata'); ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-	<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 	</div>
 
 	<input type="hidden" name="task" value="" />
diff --git a/administrator/components/com_banners/views/client/view.html.php b/administrator/components/com_banners/views/client/view.html.php
index a657c49..542eb28 100644
--- a/administrator/components/com_banners/views/client/view.html.php
+++ b/administrator/components/com_banners/views/client/view.html.php
@@ -3,13 +3,13 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
-JLoader::register('BannersHelper', JPATH_COMPONENT.'/helpers/banners.php');
+JLoader::register('BannersHelper', JPATH_COMPONENT . '/helpers/banners.php');
 
 /**
  * View to edit a client.
@@ -33,18 +33,23 @@ class BannersViewClient extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
-		$this->form	= $this->get('Form');
-		$this->item	= $this->get('Item');
+		$this->form		= $this->get('Form');
+		$this->item		= $this->get('Item');
 		$this->state	= $this->get('State');
-		$this->canDo = JHelperContent::getActions(0, 0, 'com_banners');
+		$this->canDo	= JHelperContent::getActions('com_banners');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
@@ -55,6 +60,8 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
@@ -69,13 +76,14 @@ protected function addToolbar()
 		JToolbarHelper::title($isNew ? JText::_('COM_BANNERS_MANAGER_CLIENT_NEW') : JText::_('COM_BANNERS_MANAGER_CLIENT_EDIT'), 'bookmark banners-clients');
 
 		// If not checked out, can save the item.
-		if (!$checkedOut && ($canDo->get('core.edit')||$canDo->get('core.create')))
+		if (!$checkedOut && ($canDo->get('core.edit') || $canDo->get('core.create')))
 		{
 			JToolbarHelper::apply('client.apply');
 			JToolbarHelper::save('client.save');
 		}
-		if (!$checkedOut && $canDo->get('core.create')) {
 
+		if (!$checkedOut && $canDo->get('core.create'))
+		{
 			JToolbarHelper::save2new('client.save2new');
 		}
 		// If an existing item, can save to a copy.
diff --git a/administrator/components/com_banners/views/clients/tmpl/default.php b/administrator/components/com_banners/views/clients/tmpl/default.php
index 3449632..c498ace 100644
--- a/administrator/components/com_banners/views/clients/tmpl/default.php
+++ b/administrator/components/com_banners/views/clients/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,14 +42,10 @@
 	}
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=clients'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if (!empty( $this->sidebar)) : ?>
 	<div id="j-sidebar-container" class="span2">
 		<?php echo $this->sidebar; ?>
 	</div>
 	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif;?>
 		<?php
 		// Search tools bar
 		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
@@ -93,63 +89,63 @@
 					</tr>
 				</tfoot>
 				<tbody>
-				<?php foreach ($this->items as $i => $item) :
-					$ordering   = ($listOrder == 'ordering');
-					$canCreate  = $user->authorise('core.create',     'com_banners');
-					$canEdit    = $user->authorise('core.edit',       'com_banners');
-					$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
-					$canChange  = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
-					?>
-					<tr class="row<?php echo $i % 2; ?>">
-						<td class="center hidden-phone">
-							<?php echo JHtml::_('grid.id', $i, $item->id); ?>
-						</td>
-						<td class="center">
-							<div class="btn-group">
-								<?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange);?>
-								<?php
-								// Create dropdown items
-								$action = $archived ? 'unarchive' : 'archive';
-								JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');
+					<?php foreach ($this->items as $i => $item) :
+						$ordering   = ($listOrder == 'ordering');
+						$canCreate  = $user->authorise('core.create',     'com_banners');
+						$canEdit    = $user->authorise('core.edit',       'com_banners');
+						$canCheckin = $user->authorise('core.manage',     'com_checkin') || $item->checked_out == $user->get('id') || $item->checked_out == 0;
+						$canChange  = $user->authorise('core.edit.state', 'com_banners') && $canCheckin;
+						?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="center hidden-phone">
+								<?php echo JHtml::_('grid.id', $i, $item->id); ?>
+							</td>
+							<td class="center">
+								<div class="btn-group">
+									<?php echo JHtml::_('jgrid.published', $item->state, $i, 'clients.', $canChange); ?>
+									<?php
+									// Create dropdown items
+									$action = $archived ? 'unarchive' : 'archive';
+									JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');
 
-								$action = $trashed ? 'untrash' : 'trash';
-								JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');
+									$action = $trashed ? 'untrash' : 'trash';
+									JHtml::_('actionsdropdown.' . $action, 'cb' . $i, 'clients');
 
-								// Render dropdown list
-								echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
-								?>
-							</div>
-						</td>
-						<td class="nowrap has-context">
-							<div class="pull-left">
-								<?php if ($item->checked_out) : ?>
-									<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
-								<?php endif; ?>
-								<?php if ($canEdit) : ?>
-									<a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id='.(int) $item->id); ?>">
-										<?php echo $this->escape($item->name); ?></a>
-								<?php else : ?>
+									// Render dropdown list
+									echo JHtml::_('actionsdropdown.render', $this->escape($item->name));
+									?>
+								</div>
+							</td>
+							<td class="nowrap has-context">
+								<div class="pull-left">
+									<?php if ($item->checked_out) : ?>
+										<?php echo JHtml::_('jgrid.checkedout', $i, $item->editor, $item->checked_out_time, 'clients.', $canCheckin); ?>
+									<?php endif; ?>
+									<?php if ($canEdit) : ?>
+										<a href="<?php echo JRoute::_('index.php?option=com_banners&task=client.edit&id=' . (int) $item->id); ?>">
+											<?php echo $this->escape($item->name); ?></a>
+									<?php else : ?>
 										<?php echo $this->escape($item->name); ?>
+									<?php endif; ?>
+								</div>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $item->contact; ?>
+							</td>
+							<td class="center hidden-phone">
+								<?php echo $item->nbanners; ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php if ($item->purchase_type < 0): ?>
+									<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_' . $params->get('purchase_type'))); ?>
+								<?php else: ?>
+									<?php echo JText::_('COM_BANNERS_FIELD_VALUE_' . $item->purchase_type); ?>
 								<?php endif; ?>
-							</div>
-						</td>
-						<td class="small hidden-phone">
-							<?php echo $item->contact;?>
-						</td>
-						<td class="center hidden-phone">
-							<?php echo $item->nbanners; ?>
-						</td>
-						<td class="small hidden-phone">
-							<?php if ($item->purchase_type < 0):?>
-								<?php echo JText::sprintf('COM_BANNERS_DEFAULT', JText::_('COM_BANNERS_FIELD_VALUE_'.$params->get('purchase_type')));?>
-							<?php else:?>
-								<?php echo JText::_('COM_BANNERS_FIELD_VALUE_'.$item->purchase_type);?>
-							<?php endif;?>
-						</td>
-						<td class="center hidden-phone">
-							<?php echo $item->id; ?>
-						</td>
-					</tr>
+							</td>
+							<td class="center hidden-phone">
+								<?php echo $item->id; ?>
+							</td>
+						</tr>
 					<?php endforeach; ?>
 				</tbody>
 			</table>
diff --git a/administrator/components/com_banners/views/clients/view.html.php b/administrator/components/com_banners/views/clients/view.html.php
index 1639ceb..c2641b8 100644
--- a/administrator/components/com_banners/views/clients/view.html.php
+++ b/administrator/components/com_banners/views/clients/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,7 +65,7 @@ protected function addToolbar()
 	{
 		require_once JPATH_COMPONENT . '/helpers/banners.php';
 
-		$canDo	= JHelperContent::getActions(0, 0, 'com_banners');
+		$canDo = JHelperContent::getActions('com_banners');
 
 		JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_CLIENTS'), 'banners-clients.png');
 
diff --git a/administrator/components/com_banners/views/download/tmpl/default.php b/administrator/components/com_banners/views/download/tmpl/default.php
index c7c4e17..e31c35b 100644
--- a/administrator/components/com_banners/views/download/tmpl/default.php
+++ b/administrator/components/com_banners/views/download/tmpl/default.php
@@ -3,20 +3,20 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 ?>
 <form
-	action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw');?>"
+	action="<?php echo JRoute::_('index.php?option=com_banners&task=tracks.display&format=raw'); ?>"
 	method="post"
 	name="adminForm"
 	id="download-form"
 	class="form-validate">
 	<fieldset class="adminform">
-		<legend><?php echo JText::_('COM_BANNERS_TRACKS_DOWNLOAD');?></legend>
+		<legend><?php echo JText::_('COM_BANNERS_TRACKS_DOWNLOAD'); ?></legend>
 
 		<?php foreach ($this->form->getFieldset() as $field) : ?>
 			<?php if (!$field->hidden) : ?>
@@ -25,8 +25,8 @@ class="form-validate">
 			<?php echo $field->input; ?>
 		<?php endforeach; ?>
 		<div class="clr"></div>
-		<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.SqueezeBox.close()', 700);"><?php echo JText::_('COM_BANNERS_TRACKS_EXPORT');?></button>
-		<button type="button" class="btn" onclick="window.parent.SqueezeBox.close();"><?php echo JText::_('COM_BANNERS_CANCEL');?></button>
+		<button type="button" class="btn" onclick="this.form.submit();window.top.setTimeout('window.parent.SqueezeBox.close()', 700);"><?php echo JText::_('COM_BANNERS_TRACKS_EXPORT'); ?></button>
+		<button type="button" class="btn" onclick="window.parent.SqueezeBox.close();"><?php echo JText::_('COM_BANNERS_CANCEL'); ?></button>
 
 	</fieldset>
 </form>
diff --git a/administrator/components/com_banners/views/download/view.html.php b/administrator/components/com_banners/views/download/view.html.php
index a6a7398..7a56a70 100644
--- a/administrator/components/com_banners/views/download/view.html.php
+++ b/administrator/components/com_banners/views/download/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,17 +19,23 @@
 class BannersViewDownload extends JViewLegacy
 {
 	protected $form;
+
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
-		$this->form	= $this->get('Form');
+		$this->form = $this->get('Form');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
diff --git a/administrator/components/com_banners/views/tracks/tmpl/default.php b/administrator/components/com_banners/views/tracks/tmpl/default.php
index 76f7e4d..c649c60 100644
--- a/administrator/components/com_banners/views/tracks/tmpl/default.php
+++ b/administrator/components/com_banners/views/tracks/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -38,44 +38,40 @@
 	}
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_banners&view=tracks'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if (!empty( $this->sidebar)) : ?>
-		<div id="j-sidebar-container" class="span2">
-			<?php echo $this->sidebar; ?>
-		</div>
-		<div id="j-main-container" class="span10">
-	<?php else : ?>
-		<div id="j-main-container">
-	<?php endif;?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
 		<div id="filter-bar" class="btn-toolbar">
 			<div class="filter-search btn-group pull-left">
 				<label class="filter-hide-lbl" for="filter_begin"><?php echo JText::_('COM_BANNERS_BEGIN_LABEL'); ?></label>
-				<?php echo JHtml::_('calendar', $this->state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()"));?>
+				<?php echo JHtml::_('calendar', $this->state->get('filter.begin'), 'filter_begin', 'filter_begin', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()")); ?>
 			</div>
 			<div class="filter-search btn-group pull-left">
 				<label class="filter-hide-lbl" for="filter_end"><?php echo JText::_('COM_BANNERS_END_LABEL'); ?></label>
-				<?php echo JHtml::_('calendar', $this->state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()"));?>
+				<?php echo JHtml::_('calendar', $this->state->get('filter.end'), 'filter_end', 'filter_end', '%Y-%m-%d', array('size' => 10, 'onchange' => "this.form.fireEvent('submit');this.form.submit()")); ?>
 			</div>
 			<div class="btn-group pull-right hidden-phone">
-				<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC');?></label>
+				<label for="limit" class="element-invisible"><?php echo JText::_('JFIELD_PLG_SEARCH_SEARCHLIMIT_DESC'); ?></label>
 				<?php echo $this->pagination->getLimitBox(); ?>
 			</div>
 			<div class="btn-group pull-right hidden-phone">
-				<label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC');?></label>
+				<label for="directionTable" class="element-invisible"><?php echo JText::_('JFIELD_ORDERING_DESC'); ?></label>
 				<select name="directionTable" id="directionTable" class="input-medium" onchange="Joomla.orderTable()">
-					<option value=""><?php echo JText::_('JFIELD_ORDERING_DESC');?></option>
-					<option value="asc" <?php if ($listDirn == 'asc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING');?></option>
-					<option value="desc" <?php if ($listDirn == 'desc') echo 'selected="selected"'; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING');?></option>
+					<option value=""><?php echo JText::_('JFIELD_ORDERING_DESC'); ?></option>
+					<option value="asc" <?php echo $listDirn == 'asc' ? 'selected="selected"' : ''; ?>><?php echo JText::_('JGLOBAL_ORDER_ASCENDING'); ?></option>
+					<option value="desc" <?php echo $listDirn == 'desc' ? 'selected="selected"' : ''; ?>><?php echo JText::_('JGLOBAL_ORDER_DESCENDING'); ?></option>
 				</select>
 			</div>
 			<div class="btn-group pull-right">
-				<label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY');?></label>
+				<label for="sortTable" class="element-invisible"><?php echo JText::_('JGLOBAL_SORT_BY'); ?></label>
 				<select name="sortTable" id="sortTable" class="input-medium" onchange="Joomla.orderTable()">
-					<option value=""><?php echo JText::_('JGLOBAL_SORT_BY');?></option>
-					<?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder);?>
+					<option value=""><?php echo JText::_('JGLOBAL_SORT_BY'); ?></option>
+					<?php echo JHtml::_('select.options', $sortFields, 'value', 'text', $listOrder); ?>
 				</select>
 			</div>
 		</div>
-		<div class="clearfix"> </div>
+		<div class="clearfix"></div>
 		<?php if (empty($this->items)) : ?>
 			<div class="alert alert-no-items">
 				<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
@@ -85,19 +81,19 @@
 				<thead>
 					<tr>
 						<th class="title">
-							<?php echo JText::_('COM_BANNERS_HEADING_NAME');?>
+							<?php echo JText::_('COM_BANNERS_HEADING_NAME'); ?>
 						</th>
 						<th width="20%" class="nowrap">
-							<?php echo JText::_('COM_BANNERS_HEADING_CLIENT');?>
+							<?php echo JText::_('COM_BANNERS_HEADING_CLIENT'); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JText::_('COM_BANNERS_HEADING_TYPE');?>
+							<?php echo JText::_('COM_BANNERS_HEADING_TYPE'); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JText::_('COM_BANNERS_HEADING_COUNT');?>
+							<?php echo JText::_('COM_BANNERS_HEADING_COUNT'); ?>
 						</th>
 						<th width="10%" class="nowrap hidden-phone">
-							<?php echo JText::_('JDATE');?>
+							<?php echo JText::_('JDATE'); ?>
 						</th>
 					</tr>
 				</thead>
@@ -109,28 +105,28 @@
 					</tr>
 				</tfoot>
 				<tbody>
-				<?php foreach ($this->items as $i => $item) :?>
-					<tr class="row<?php echo $i % 2; ?>">
-						<td>
-							<?php echo $item->name;?>
-							<div class="small">
-								<?php echo $item->category_title;?>
-							</div>
-						</td>
-						<td>
-							<?php echo $item->client_name;?>
-						</td>
-						<td class="small hidden-phone">
-							<?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK');?>
-						</td>
-						<td class="hidden-phone">
-							<?php echo $item->count;?>
-						</td>
-						<td class="hidden-phone">
-							<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC4').' H:i');?>
-						</td>
-					</tr>
-				<?php endforeach; ?>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td>
+								<?php echo $item->name; ?>
+								<div class="small">
+									<?php echo $item->category_title; ?>
+								</div>
+							</td>
+							<td>
+								<?php echo $item->client_name; ?>
+							</td>
+							<td class="small hidden-phone">
+								<?php echo $item->track_type == 1 ? JText::_('COM_BANNERS_IMPRESSION') : JText::_('COM_BANNERS_CLICK'); ?>
+							</td>
+							<td class="hidden-phone">
+								<?php echo $item->count; ?>
+							</td>
+							<td class="hidden-phone">
+								<?php echo JHtml::_('date', $item->track_date, JText::_('DATE_FORMAT_LC4') . ' H:i'); ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
 				</tbody>
 			</table>
 		<?php endif; ?>
diff --git a/administrator/components/com_banners/views/tracks/view.html.php b/administrator/components/com_banners/views/tracks/view.html.php
index f5d02b9..f8bb7db 100644
--- a/administrator/components/com_banners/views/tracks/view.html.php
+++ b/administrator/components/com_banners/views/tracks/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -26,6 +26,10 @@ class BannersViewTracks extends JViewLegacy
 
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -37,13 +41,14 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
 		BannersHelper::addSubmenu('tracks');
 
 		$this->addToolbar();
-		require_once JPATH_COMPONENT .'/models/fields/bannerclient.php';
+		require_once JPATH_COMPONENT . '/models/fields/bannerclient.php';
 		$this->sidebar = JHtmlSidebar::render();
 		parent::display($tpl);
 	}
@@ -51,28 +56,33 @@ public function display($tpl = null)
 	/**
 	 * Add the page title and toolbar.
 	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	protected function addToolbar()
 	{
-		require_once JPATH_COMPONENT.'/helpers/banners.php';
+		require_once JPATH_COMPONENT . '/helpers/banners.php';
 
-		$canDo	= JHelperContent::getActions($this->state->get('filter.category_id'), 0, 'com_banners');
+		$canDo = JHelperContent::getActions('com_banners', 'category', $this->state->get('filter.category_id'));
 
 		JToolbarHelper::title(JText::_('COM_BANNERS_MANAGER_TRACKS'), 'bookmark banners-tracks');
 
 		$bar = JToolBar::getInstance('toolbar');
-		$bar->appendButton('Slider', 'export', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&amp;view=download&amp;tmpl=component', 600, 300);
+		$bar->appendButton('Popup', 'export', 'JTOOLBAR_EXPORT', 'index.php?option=com_banners&amp;view=download&amp;tmpl=component', 600, 300);
+
 		if ($canDo->get('core.delete'))
 		{
 			$bar->appendButton('Confirm', 'COM_BANNERS_DELETE_MSG', 'delete', 'COM_BANNERS_TRACKS_DELETE', 'tracks.delete', false);
 			JToolbarHelper::divider();
 		}
+
 		if ($canDo->get('core.admin'))
 		{
 			JToolbarHelper::preferences('com_banners');
 			JToolbarHelper::divider();
 		}
+
 		JToolbarHelper::help('JHELP_COMPONENTS_BANNERS_TRACKS');
 
 		JHtmlSidebar::setAction('index.php?option=com_banners&view=tracks');
diff --git a/administrator/components/com_banners/views/tracks/view.raw.php b/administrator/components/com_banners/views/tracks/view.raw.php
index 84bcd82..742faea 100644
--- a/administrator/components/com_banners/views/tracks/view.raw.php
+++ b/administrator/components/com_banners/views/tracks/view.raw.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,6 +20,10 @@ class BannersViewTracks extends JViewLegacy
 {
 	/**
 	 * Display the view
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  void
 	 */
 	public function display($tpl = null)
 	{
@@ -32,12 +36,13 @@ public function display($tpl = null)
 		if (count($errors = $this->get('Errors')))
 		{
 			JError::raiseError(500, implode("\n", $errors));
+
 			return false;
 		}
 
 		$document = JFactory::getDocument();
 		$document->setMimeEncoding($mimetype);
-		JFactory::getApplication()->setHeader('Content-disposition', 'attachment; filename="'.$basename.'.'.$filetype.'"; creation-date="'.JFactory::getDate()->toRFC822().'"', true);
+		JFactory::getApplication()->setHeader('Content-disposition', 'attachment; filename="' . $basename . '.' . $filetype . '"; creation-date="' . JFactory::getDate()->toRFC822() . '"', true);
 		echo $content;
 	}
 }
diff --git a/administrator/components/com_cache/cache.php b/administrator/components/com_cache/cache.php
index 873060e..f99c62d 100644
--- a/administrator/components/com_cache/cache.php
+++ b/administrator/components/com_cache/cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,6 +14,6 @@
 	return JError::raiseWarning(404, JText::_('JERROR_ALERTNOAUTHOR'));
 }
 
-$controller	= JControllerLegacy::getInstance('Cache');
+$controller = JControllerLegacy::getInstance('Cache');
 $controller->execute(JFactory::getApplication()->input->get('task'));
 $controller->redirect();
diff --git a/administrator/components/com_cache/cache.xml b/administrator/components/com_cache/cache.xml
index 135efc2..e66147f 100644
--- a/administrator/components/com_cache/cache.xml
+++ b/administrator/components/com_cache/cache.xml
@@ -3,8 +3,8 @@
 	<name>com_cache</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
-	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
 	<version>3.0.0</version>
diff --git a/administrator/components/com_cache/controller.php b/administrator/components/com_cache/controller.php
index 3ceb309..96157d1 100644
--- a/administrator/components/com_cache/controller.php
+++ b/administrator/components/com_cache/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,15 +19,15 @@
 class CacheController extends JControllerLegacy
 {
 	/**
-	 * @param   boolean			If true, the view output will be cached
-	 * @param   array  An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
+	 * @param   boolean      If true, the view output will be cached
+	 * @param   array        An array of safe url parameters and their variable types, for valid values see {@link JFilterInput::clean()}.
 	 *
-	 * @return  JController		This object to support chaining.
+	 * @return  JController  This object to support chaining.
 	 * @since   1.5
 	 */
 	public function display($cachable = false, $urlparams = false)
 	{
-		require_once JPATH_COMPONENT.'/helpers/cache.php';
+		require_once JPATH_COMPONENT . '/helpers/cache.php';
 
 		// Get the document object.
 		$document = JFactory::getDocument();
@@ -81,7 +81,7 @@ public function delete()
 			$model->cleanlist($cid);
 		}
 
-		$this->setRedirect('index.php?option=com_cache&client='.$model->getClient()->id);
+		$this->setRedirect('index.php?option=com_cache&client=' . $model->getClient()->id);
 	}
 
 	public function purge()
diff --git a/administrator/components/com_cache/helpers/cache.php b/administrator/components/com_cache/helpers/cache.php
index 2fbd889..83f22b8 100644
--- a/administrator/components/com_cache/helpers/cache.php
+++ b/administrator/components/com_cache/helpers/cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -26,16 +26,16 @@ class CacheHelper
 	public static function getClientOptions()
 	{
 		// Build the filter options.
-		$options	= array();
-		$options[]	= JHtml::_('select.option', '0', JText::_('JSITE'));
-		$options[]	= JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
+		$options   = array();
+		$options[] = JHtml::_('select.option', '0', JText::_('JSITE'));
+		$options[] = JHtml::_('select.option', '1', JText::_('JADMINISTRATOR'));
 		return $options;
 	}
 
 	/**
 	 * Configure the Linkbar.
 	 *
-	 * @param   string	The name of the active view.
+	 * @param   string  The name of the active view.
 	 *
 	 * @return  void
 	 * @since   1.6
diff --git a/administrator/components/com_cache/models/cache.php b/administrator/components/com_cache/models/cache.php
index 3216813..1ac58d5 100644
--- a/administrator/components/com_cache/models/cache.php
+++ b/administrator/components/com_cache/models/cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -48,10 +48,10 @@ class CacheModelCache extends JModelList
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
-		$clientId = $this->getUserStateFromRequest($this->context.'.filter.client_id', 'filter_client_id', 0, 'int');
+		$clientId = $this->getUserStateFromRequest($this->context . '.filter.client_id', 'filter_client_id', 0, 'int');
 		$this->setState('clientId', $clientId == 1 ? 1 : 0);
 
-		$client	= JApplicationHelper::getClientInfo($clientId);
+		$client = JApplicationHelper::getClientInfo($clientId);
 		$this->setState('client', $client);
 
 		parent::populateState('group', 'asc');
@@ -67,7 +67,7 @@ public function getData()
 		if (empty($this->_data))
 		{
 			$cache = $this->getCache();
-			$data  = $cache->getAll();
+			$data = $cache->getAll();
 
 			if ($data != false)
 			{
@@ -77,8 +77,8 @@ public function getData()
 				if ($this->_total)
 				{
 					// Apply custom ordering
-					$ordering 	= $this->getState('list.ordering');
-					$direction 	= ($this->getState('list.direction') == 'asc') ? 1 : -1;
+					$ordering = $this->getState('list.ordering');
+					$direction = ($this->getState('list.direction') == 'asc') ? 1 : -1;
 
 					jimport('joomla.utilities.arrayhelper');
 					$this->_data = JArrayHelper::sortObjects($data, $ordering, $direction);
@@ -89,7 +89,9 @@ public function getData()
 						$this->_data = array_slice($this->_data, $this->getState('list.start'), $this->getState('list.limit'));
 					}
 				}
-			} else {
+			}
+			else
+			{
 				$this->_data = array();
 			}
 		}
diff --git a/administrator/components/com_cache/views/cache/tmpl/default.php b/administrator/components/com_cache/views/cache/tmpl/default.php
index 8359974..10452b5 100644
--- a/administrator/components/com_cache/views/cache/tmpl/default.php
+++ b/administrator/components/com_cache/views/cache/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,65 +16,61 @@
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_cache'); ?>" method="post" name="adminForm" id="adminForm">
-  <?php if (!empty( $this->sidebar)) : ?>
-    <div id="j-sidebar-container" class="span2">
-      <?php echo $this->sidebar; ?>
-    </div>
-    <div id="j-main-container" class="span10">
-  <?php else : ?>
-    <div id="j-main-container">
-  <?php endif;?>
-  	<table class="table table-striped">
-  		<thead>
-  			<tr>
-  				<th width="20">
-  					<?php echo JHtml::_('grid.checkall'); ?>
-  				</th>
-  				<th class="title nowrap">
-  					<?php echo JHtml::_('grid.sort',  'COM_CACHE_GROUP', 'group', $listDirn, $listOrder); ?>
-  				</th>
-  				<th width="5%" class="center nowrap">
-  					<?php echo JHtml::_('grid.sort',  'COM_CACHE_NUMBER_OF_FILES', 'count', $listDirn, $listOrder); ?>
-  				</th>
-  				<th width="10%" class="center">
-  					<?php echo JHtml::_('grid.sort',  'COM_CACHE_SIZE', 'size', $listDirn, $listOrder); ?>
-  				</th>
-  			</tr>
-  		</thead>
-  		<tfoot>
-  			<tr>
-  				<td colspan="4">
-  				<?php echo $this->pagination->getListFooter(); ?>
-  				</td>
-  			</tr>
-  		</tfoot>
-  		<tbody>
-  			<?php
-  			$i = 0;
-  			foreach ($this->data as $folder => $item) : ?>
-  				<tr class="row<?php echo $i % 2; ?>">
-  					<td>
-  						<input type="checkbox" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $item->group; ?>" onclick="Joomla.isChecked(this.checked);" />
-  					</td>
-  					<td>
-  						<strong><?php echo $item->group; ?></strong>
-  					</td>
-  					<td class="center">
-  						<?php echo $item->count; ?>
-  					</td>
-  					<td class="center">
-  						<?php echo JHtml::_('number.bytes', $item->size*1024); ?>
-  					</td>
-  				</tr>
-  			<?php $i++; endforeach; ?>
-  		</tbody>
-  	</table>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<table class="table table-striped">
+		<thead>
+			<tr>
+				<th width="20">
+					<?php echo JHtml::_('grid.checkall'); ?>
+				</th>
+				<th class="title nowrap">
+					<?php echo JHtml::_('grid.sort', 'COM_CACHE_GROUP', 'group', $listDirn, $listOrder); ?>
+				</th>
+				<th width="5%" class="center nowrap">
+					<?php echo JHtml::_('grid.sort', 'COM_CACHE_NUMBER_OF_FILES', 'count', $listDirn, $listOrder); ?>
+				</th>
+				<th width="10%" class="center">
+					<?php echo JHtml::_('grid.sort', 'COM_CACHE_SIZE', 'size', $listDirn, $listOrder); ?>
+				</th>
+			</tr>
+		</thead>
+		<tfoot>
+			<tr>
+				<td colspan="4">
+				<?php echo $this->pagination->getListFooter(); ?>
+				</td>
+			</tr>
+		</tfoot>
+		<tbody>
+			<?php
+			$i = 0;
+			foreach ($this->data as $folder => $item) : ?>
+				<tr class="row<?php echo $i % 2; ?>">
+					<td>
+						<input type="checkbox" id="cb<?php echo $i;?>" name="cid[]" value="<?php echo $item->group; ?>" onclick="Joomla.isChecked(this.checked);" />
+					</td>
+					<td>
+						<strong><?php echo $item->group; ?></strong>
+					</td>
+					<td class="center">
+						<?php echo $item->count; ?>
+					</td>
+					<td class="center">
+						<?php echo JHtml::_('number.bytes', $item->size*1024); ?>
+					</td>
+				</tr>
+			<?php $i++; endforeach; ?>
+		</tbody>
+	</table>
 
-  	<input type="hidden" name="task" value="" />
-  	<input type="hidden" name="boxchecked" value="0" />
-  	<input type="hidden" name="client" value="<?php echo $this->client->id;?>" />
-  	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
-  	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-  	<?php echo JHtml::_('form.token'); ?>
+	<input type="hidden" name="task" value="" />
+	<input type="hidden" name="boxchecked" value="0" />
+	<input type="hidden" name="client" value="<?php echo $this->client->id;?>" />
+	<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
+	<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/components/com_cache/views/cache/view.html.php b/administrator/components/com_cache/views/cache/view.html.php
index 3b125dd..7fcb3f4 100644
--- a/administrator/components/com_cache/views/cache/view.html.php
+++ b/administrator/components/com_cache/views/cache/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cache/views/purge/tmpl/default.php b/administrator/components/com_cache/views/purge/tmpl/default.php
index 6103098..0a32d7e 100644
--- a/administrator/components/com_cache/views/purge/tmpl/default.php
+++ b/administrator/components/com_cache/views/purge/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,22 +11,18 @@
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_cache'); ?>" method="post" name="adminForm" id="adminForm">
-  <?php if (!empty( $this->sidebar)) : ?>
-    <div id="j-sidebar-container" class="span2">
-      <?php echo $this->sidebar; ?>
-    </div>  
-    <div id="j-main-container" class="span10">
-  <?php else : ?>
-    <div id="j-main-container">
-  <?php endif;?>
-  	<fieldset>
-  		<legend><?php echo JText::_('COM_CACHE_PURGE_EXPIRED_ITEMS'); ?></legend>
-  		<p><?php echo JText::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
-  	</fieldset>
-  	<div class="alert">
-  		<p><?php echo JText::_('COM_CACHE_RESOURCE_INTENSIVE_WARNING'); ?></p>
-  	</div>
-  	<input type="hidden" name="task" value="" />
-  	<?php echo JHtml::_('form.token'); ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+	<fieldset>
+		<legend><?php echo JText::_('COM_CACHE_PURGE_EXPIRED_ITEMS'); ?></legend>
+		<p><?php echo JText::_('COM_CACHE_PURGE_INSTRUCTIONS'); ?></p>
+	</fieldset>
+	<div class="alert">
+		<p><?php echo JText::_('COM_CACHE_RESOURCE_INTENSIVE_WARNING'); ?></p>
+	</div>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
diff --git a/administrator/components/com_cache/views/purge/view.html.php b/administrator/components/com_cache/views/purge/view.html.php
index 49b397c..79b5178 100644
--- a/administrator/components/com_cache/views/purge/view.html.php
+++ b/administrator/components/com_cache/views/purge/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/categories.php b/administrator/components/com_categories/categories.php
index eefdcbb..a00ae54 100644
--- a/administrator/components/com_categories/categories.php
+++ b/administrator/components/com_categories/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/categories.xml b/administrator/components/com_categories/categories.xml
index 166fb1d..4a4ab19 100644
--- a/administrator/components/com_categories/categories.xml
+++ b/administrator/components/com_categories/categories.xml
@@ -3,7 +3,7 @@
 	<name>com_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2007</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_categories/controller.php b/administrator/components/com_categories/controller.php
index 1f571b0..1dda5e8 100644
--- a/administrator/components/com_categories/controller.php
+++ b/administrator/components/com_categories/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/controllers/categories.php b/administrator/components/com_categories/controllers/categories.php
index bbadf22..6dda9e3 100644
--- a/administrator/components/com_categories/controllers/categories.php
+++ b/administrator/components/com_categories/controllers/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,6 +23,7 @@ class CategoriesControllerCategories extends JControllerAdmin
 	 *
 	 * @param   string  $name    The model name. Optional.
 	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  The array of possible config values. Optional.
 	 *
 	 * @return  object  The model.
 	 *
@@ -31,6 +32,7 @@ class CategoriesControllerCategories extends JControllerAdmin
 	public function getModel($name = 'Category', $prefix = 'CategoriesModel', $config = array('ignore_request' => true))
 	{
 		$model = parent::getModel($name, $prefix, $config);
+
 		return $model;
 	}
 
@@ -54,12 +56,14 @@ public function rebuild()
 		{
 			// Rebuild succeeded.
 			$this->setMessage(JText::_('COM_CATEGORIES_REBUILD_SUCCESS'));
+
 			return true;
 		}
 		else
 		{
 			// Rebuild failed.
 			$this->setMessage(JText::_('COM_CATEGORIES_REBUILD_FAILURE'));
+
 			return false;
 		}
 	}
@@ -88,6 +92,7 @@ public function saveorder()
 		{
 			// Nothing to reorder
 			$this->setRedirect(JRoute::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
+
 			return true;
 		}
 	}
diff --git a/administrator/components/com_categories/controllers/category.php b/administrator/components/com_categories/controllers/category.php
index de60de7..f1c0572 100644
--- a/administrator/components/com_categories/controllers/category.php
+++ b/administrator/components/com_categories/controllers/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,7 +29,8 @@ class CategoriesControllerCategory extends JControllerForm
 	/**
 	 * Constructor.
 	 *
-	 * @param  array  $config  An optional associative array of configuration settings.
+	 * @param  array   $config  An optional associative array of configuration settings.
+	 *
 	 * @since  1.6
 	 * @see    JController
 	 */
@@ -56,6 +57,7 @@ public function __construct($config = array())
 	protected function allowAdd($data = array())
 	{
 		$user = JFactory::getUser();
+
 		return ($user->authorise('core.create', $this->extension) || count($user->getAuthorisedCategories($this->extension, 'core.create')));
 	}
 
@@ -93,6 +95,7 @@ protected function allowEdit($data = array(), $key = 'parent_id')
 		{
 			// Now test the owner is the user.
 			$ownerId = (int) isset($data['created_user_id']) ? $data['created_user_id'] : 0;
+
 			if (empty($ownerId) && $recordId)
 			{
 				// Need to do a lookup from the model.
@@ -112,13 +115,14 @@ protected function allowEdit($data = array(), $key = 'parent_id')
 				return true;
 			}
 		}
+
 		return false;
 	}
 
 	/**
 	 * Method to run batch operations.
 	 *
-	 * @param   object   $model  The model.
+	 * @param   object  $model  The model.
 	 *
 	 * @return  boolean  True if successful, false otherwise and internal error is set.
 	 *
@@ -190,6 +194,7 @@ protected function postSaveHook(JModelLegacy $model, $validData = array())
 			$registry->loadArray($item->params);
 			$item->params = (string) $registry;
 		}
+
 		if (isset($item->metadata) && is_array($item->metadata))
 		{
 			$registry = new JRegistry;
diff --git a/administrator/components/com_categories/helpers/association.php b/administrator/components/com_categories/helpers/association.php
index 3b08a06..fb833df 100644
--- a/administrator/components/com_categories/helpers/association.php
+++ b/administrator/components/com_categories/helpers/association.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -44,6 +44,7 @@ public static function getCategoryAssociations($id = 0, $extension = 'com_conten
 			$helperClassname = ucfirst(substr($extension, 4)) . 'HelperRoute';
 
 			$associations = CategoriesHelper::getAssociations($id, $extension);
+
 			foreach ($associations as $tag => $item)
 			{
 				if (class_exists($helperClassname) && is_callable(array($helperClassname, 'getCategoryRoute')))
diff --git a/administrator/components/com_categories/helpers/categories.php b/administrator/components/com_categories/helpers/categories.php
index 6cdd422..80ba147 100644
--- a/administrator/components/com_categories/helpers/categories.php
+++ b/administrator/components/com_categories/helpers/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,6 @@
  */
 class CategoriesHelper
 {
-
 	/**
 	 * Configure the Submenu links.
 	 *
@@ -57,11 +56,11 @@ public static function addSubmenu($extension)
 
 			if (class_exists($cName))
 			{
-
 				if (is_callable(array($cName, 'addSubmenu')))
 				{
 					$lang = JFactory::getLanguage();
-					// loading language file from the administrator/language directory then
+
+					// Loading language file from the administrator/language directory then
 					// loading language file from the administrator/components/*extension*/language directory
 					$lang->load($component, JPATH_BASE, null, false, true)
 					|| $lang->load($component, JPath::clean(JPATH_ADMINISTRATOR . '/components/' . $component), null, false, true);
@@ -72,44 +71,6 @@ public static function addSubmenu($extension)
 		}
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @param   string   $extension   The extension.
-	 * @param   integer  $categoryId  The category ID.
-	 *
-	 * @return  JObject
-	 *
-	 * @since   1.6
-	 */
-	public static function getActions($extension, $categoryId = 0)
-	{
-		$user = JFactory::getUser();
-		$result = new JObject;
-		$parts = explode('.', $extension);
-		$component = $parts[0];
-
-		if (empty($categoryId))
-		{
-			$assetName = $component;
-			$level = 'component';
-		}
-		else
-		{
-			$assetName = $component . '.category.' . (int) $categoryId;
-			$level = 'category';
-		}
-
-		$actions = JAccess::getActions($component, $level);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name, $user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-
 	public static function getAssociations($pk, $extension = 'com_content')
 	{
 		$associations = array();
@@ -133,6 +94,7 @@ public static function getAssociations($pk, $extension = 'com_content')
 		if ($error = $db->getErrorMsg())
 		{
 			JError::raiseWarning(500, $error);
+
 			return false;
 		}
 
diff --git a/administrator/components/com_categories/helpers/html/categoriesadministrator.php b/administrator/components/com_categories/helpers/html/categoriesadministrator.php
index 809c545..1ee5b34 100644
--- a/administrator/components/com_categories/helpers/html/categoriesadministrator.php
+++ b/administrator/components/com_categories/helpers/html/categoriesadministrator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,8 +12,12 @@
 JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
 
 /**
+ * Administrator category HTML
+ *
  * @package     Joomla.Administrator
  * @subpackage  com_categories
+ *
+ * @since       3.2
  */
 abstract class JHtmlCategoriesAdministrator
 {
diff --git a/administrator/components/com_categories/models/categories.php b/administrator/components/com_categories/models/categories.php
index 4ce6e14..6e525a7 100644
--- a/administrator/components/com_categories/models/categories.php
+++ b/administrator/components/com_categories/models/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/models/category.php b/administrator/components/com_categories/models/category.php
index e544e0b..df4d733 100644
--- a/administrator/components/com_categories/models/category.php
+++ b/administrator/components/com_categories/models/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/models/fields/categoryedit.php b/administrator/components/com_categories/models/fields/categoryedit.php
index 2b60b4b..e55cd31 100644
--- a/administrator/components/com_categories/models/fields/categoryedit.php
+++ b/administrator/components/com_categories/models/fields/categoryedit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/models/fields/categoryparent.php b/administrator/components/com_categories/models/fields/categoryparent.php
index c0290a3..a54e2af 100644
--- a/administrator/components/com_categories/models/fields/categoryparent.php
+++ b/administrator/components/com_categories/models/fields/categoryparent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/models/fields/modal/category.php b/administrator/components/com_categories/models/fields/modal/category.php
index 1a3b412..6b861d7 100644
--- a/administrator/components/com_categories/models/fields/modal/category.php
+++ b/administrator/components/com_categories/models/fields/modal/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -49,18 +49,18 @@ protected function getInput()
 		$script = array();
 
 		// Select button script
-		$script[] = '	function jSelectCategory_'.$this->id.'(id, title, object) {';
-		$script[] = '		document.getElementById("'.$this->id.'_id").value = id;';
-		$script[] = '		document.getElementById("'.$this->id.'_name").value = title;';
+		$script[] = '	function jSelectCategory_' . $this->id . '(id, title, object) {';
+		$script[] = '		document.getElementById("' . $this->id . '_id").value = id;';
+		$script[] = '		document.getElementById("' . $this->id . '_name").value = title;';
 
 		if ($allowEdit)
 		{
-			$script[] = '		jQuery("#'.$this->id.'_edit").removeClass("hidden");';
+			$script[] = '		jQuery("#' . $this->id . '_edit").removeClass("hidden");';
 		}
 
 		if ($allowClear)
 		{
-			$script[] = '		jQuery("#'.$this->id.'_clear").removeClass("hidden");';
+			$script[] = '		jQuery("#' . $this->id . '_clear").removeClass("hidden");';
 		}
 
 		$script[] = '		SqueezeBox.close();';
@@ -75,7 +75,7 @@ protected function getInput()
 
 			$script[] = '	function jClearCategory(id) {';
 			$script[] = '		document.getElementById(id + "_id").value = "";';
-			$script[] = '		document.getElementById(id + "_name").value = "'.htmlspecialchars(JText::_('COM_CATEGORIES_SELECT_A_CATEGORY', true), ENT_COMPAT, 'UTF-8').'";';
+			$script[] = '		document.getElementById(id + "_name").value = "' . htmlspecialchars(JText::_('COM_CATEGORIES_SELECT_A_CATEGORY', true), ENT_COMPAT, 'UTF-8') . '";';
 			$script[] = '		jQuery("#"+id + "_clear").addClass("hidden");';
 			$script[] = '		if (document.getElementById(id + "_edit")) {';
 			$script[] = '			jQuery("#"+id + "_edit").addClass("hidden");';
@@ -88,19 +88,19 @@ protected function getInput()
 		JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
 
 		// Setup variables for display.
-		$html	= array();
-		$link	= 'index.php?option=com_categories&amp;view=categories&amp;layout=modal&amp;tmpl=component&amp;extension='.$extension.'&amp;function=jSelectCategory_'.$this->id;
+		$html = array();
+		$link = 'index.php?option=com_categories&amp;view=categories&amp;layout=modal&amp;tmpl=component&amp;extension=' . $extension . '&amp;function=jSelectCategory_' . $this->id;
 
 		if (isset($this->element['language']))
 		{
-			$link .= '&amp;forcedLanguage='.$this->element['language'];
+			$link .= '&amp;forcedLanguage=' . $this->element['language'];
 		}
 
-		$db	= JFactory::getDbo();
+		$db = JFactory::getDbo();
 		$db->setQuery(
 			'SELECT title' .
 			' FROM #__categories' .
-			' WHERE id = '.(int) $this->value
+			' WHERE id = ' . (int) $this->value
 		);
 
 		try
@@ -130,19 +130,19 @@ protected function getInput()
 
 		// The current category display field.
 		$html[] = '<span class="input-append">';
-		$html[] = '<input type="text" class="input-medium" id="'.$this->id.'_name" value="'.$title.'" disabled="disabled" size="35" />';
-		$html[] = '<a class="modal btn hasTooltip" title="'.JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY').'"  href="'.$link.'&amp;'.JSession::getFormToken().'=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> '.JText::_('JSELECT').'</a>';
+		$html[] = '<input type="text" class="input-medium" id="' . $this->id . '_name" value="' . $title . '" disabled="disabled" size="35" />';
+		$html[] = '<a class="modal btn hasTooltip" title="' . JHtml::tooltipText('COM_CATEGORIES_CHANGE_CATEGORY') . '"  href="' . $link . '&amp;' . JSession::getFormToken() . '=1" rel="{handler: \'iframe\', size: {x: 800, y: 450}}"><i class="icon-file"></i> ' . JText::_('JSELECT') . '</a>';
 
 		// Edit category button
 		if ($allowEdit)
 		{
-			$html[] = '<a class="btn hasTooltip'.($value ? '' : ' hidden').'" href="index.php?option=com_categories&layout=modal&tmpl=component&task=category.edit&id=' . $value. '" target="_blank" title="'.JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY').'" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
+			$html[] = '<a class="btn hasTooltip' . ($value ? '' : ' hidden') . '" href="index.php?option=com_categories&layout=modal&tmpl=component&task=category.edit&id=' . $value . '" target="_blank" title="' . JHtml::tooltipText('COM_CATEGORIES_EDIT_CATEGORY') . '" ><span class="icon-edit"></span> ' . JText::_('JACTION_EDIT') . '</a>';
 		}
 
 		// Clear category button
 		if ($allowClear)
 		{
-			$html[] = '<button id="'.$this->id.'_clear" class="btn'.($value ? '' : ' hidden').'" onclick="return jClearCategory(\''.$this->id.'\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
+			$html[] = '<button id="' . $this->id . '_clear" class="btn' . ($value ? '' : ' hidden') . '" onclick="return jClearCategory(\'' . $this->id . '\')"><span class="icon-remove"></span> ' . JText::_('JCLEAR') . '</button>';
 		}
 
 		$html[] = '</span>';
@@ -154,7 +154,7 @@ protected function getInput()
 			$class = ' class="required modal-value"';
 		}
 
-		$html[] = '<input type="hidden" id="'.$this->id.'_id"'.$class.' name="'.$this->name.'" value="'.$value.'" />';
+		$html[] = '<input type="hidden" id="' . $this->id . '_id"' . $class . ' name="' . $this->name . '" value="' . $value . '" />';
 
 		return implode("\n", $html);
 	}
diff --git a/administrator/components/com_categories/tables/category.php b/administrator/components/com_categories/tables/category.php
index a42715c..b6b168e 100644
--- a/administrator/components/com_categories/tables/category.php
+++ b/administrator/components/com_categories/tables/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/views/categories/tmpl/default.php b/administrator/components/com_categories/views/categories/tmpl/default.php
index 5e5165c..a360de9 100644
--- a/administrator/components/com_categories/views/categories/tmpl/default.php
+++ b/administrator/components/com_categories/views/categories/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -40,22 +40,22 @@
 		table = document.getElementById("sortTable");
 		direction = document.getElementById("directionTable");
 		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $listOrder; ?>') {
+		if (order != '<?php echo $listOrder; ?>')
+		{
 			dirn = 'asc';
 		}
-		else {
+		else
+		{
 			dirn = direction.options[direction.selectedIndex].value;
 		}
 		Joomla.tableOrdering(order, dirn, '');
 	}
 </script>
 <form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories'); ?>" method="post" name="adminForm" id="adminForm">
-	<?php if (!empty($this->sidebar)) : ?>
-		<div id="j-sidebar-container" class="span2">
-			<?php echo $this->sidebar; ?>
-		</div>
-	<?php endif; ?>
-	<div id="j-main-container"<?php echo !empty($this->sidebar) ? ' class="span10"' : ''; ?>>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
 		<?php
 		// Search tools bar
 		echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
@@ -152,8 +152,8 @@
 								}
 								?>
 								<span class="sortable-handler<?php echo $iconClass ?>">
-								<i class="icon-menu"></i>
-							</span>
+									<i class="icon-menu"></i>
+								</span>
 								<?php if ($canChange && $saveOrder) : ?>
 									<input type="text" style="display:none" name="order[]" size="5" value="<?php echo $orderkey + 1; ?>" />
 								<?php endif; ?>
@@ -176,12 +176,12 @@
 									<?php echo $this->escape($item->title); ?>
 								<?php endif; ?>
 								<span class="small" title="<?php echo $this->escape($item->path); ?>">
-								<?php if (empty($item->note)) : ?>
-									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
-								<?php else : ?>
-									<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
-								<?php endif; ?>
-							</span>
+									<?php if (empty($item->note)) : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS', $this->escape($item->alias)); ?>
+									<?php else : ?>
+										<?php echo JText::sprintf('JGLOBAL_LIST_ALIAS_NOTE', $this->escape($item->alias), $this->escape($item->note)); ?>
+									<?php endif; ?>
+								</span>
 							</td>
 							<td class="small hidden-phone">
 								<?php echo $this->escape($item->access_level); ?>
@@ -201,8 +201,8 @@
 								<?php endif; ?>
 							</td>
 							<td class="center hidden-phone">
-							<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
-								<?php echo (int) $item->id; ?></span>
+								<span title="<?php echo sprintf('%d-%d', $item->lft, $item->rgt); ?>">
+									<?php echo (int) $item->id; ?></span>
 							</td>
 						</tr>
 					<?php endforeach; ?>
diff --git a/administrator/components/com_categories/views/categories/tmpl/default_batch.php b/administrator/components/com_categories/views/categories/tmpl/default_batch.php
index 8aa340a..242896d 100644
--- a/administrator/components/com_categories/views/categories/tmpl/default_batch.php
+++ b/administrator/components/com_categories/views/categories/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,41 +23,45 @@
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
 		<h3><?php echo JText::_('COM_CATEGORIES_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_CATEGORIES_BATCH_TIP'); ?></p>
-
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access'); ?>
-			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.tag'); ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.tag'); ?>
+				</div>
 			</div>
 		</div>
-		<?php if ($published >= 0) : ?>
-			<div class="control-group">
-				<label id="batch-choose-action-lbl" for="batch-category-id" class="control-label">
-					<?php echo JText::_('COM_CATEGORIES_BATCH_CATEGORY_LABEL'); ?>
-				</label>
-
-				<div id="batch-choose-action" class="combo controls">
-					<select name="batch[category_id]" class="inputbox" id="batch-category-id">
-						<option value=""><?php echo JText::_('JSELECT') ?></option>
-						<?php echo JHtml::_('select.options', JHtml::_('category.categories', $extension, array('filter.published' => $published))); ?>
-					</select>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
 				</div>
 			</div>
-			<div class="control-group radio">
-				<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
-			</div>
-		<?php endif; ?>
+			<?php if ($published >= 0) : ?>
+				<div class="span6">
+					<div class="control-group">
+						<label id="batch-choose-action-lbl" for="batch-category-id" class="control-label">
+							<?php echo JText::_('COM_CATEGORIES_BATCH_CATEGORY_LABEL'); ?>
+						</label>
+						<div id="batch-choose-action" class="combo controls">
+							<select name="batch[category_id]" class="inputbox" id="batch-category-id">
+								<option value=""><?php echo JText::_('JSELECT') ?></option>
+								<?php echo JHtml::_('select.options', JHtml::_('category.categories', $extension, array('filter.published' => $published))); ?>
+							</select>
+						</div>
+					</div>
+					<div class="control-group radio">
+						<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+					</div>
+				</div>
+			<?php endif; ?>
+		</div>
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-category-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_categories/views/categories/tmpl/modal.php b/administrator/components/com_categories/views/categories/tmpl/modal.php
index 5bd8be8..8060242 100644
--- a/administrator/components/com_categories/views/categories/tmpl/modal.php
+++ b/administrator/components/com_categories/views/categories/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,7 +28,7 @@
 $listDirn	= $this->escape($this->state->get('list.direction'));
 ?>
 
-<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories&layout=modal&tmpl=component&function='.$function.'&'.JSession::getFormToken().'=1');?>" method="post" name="adminForm" id="adminForm">
+<form action="<?php echo JRoute::_('index.php?option=com_categories&view=categories&layout=modal&tmpl=component&function=' . $function . '&' . JSession::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm">
 	<fieldset class="filter clearfix">
 		<div class="btn-toolbar">
 			<div class="btn-group pull-left">
@@ -50,23 +50,23 @@
 		<hr class="hr-condensed" />
 		<div class="filters pull-left">
 			<select name="filter_access" class="input-medium" onchange="this.form.submit()">
-				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS');?></option>
-				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'));?>
+				<option value=""><?php echo JText::_('JOPTION_SELECT_ACCESS'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access')); ?>
 			</select>
 
 			<select name="filter_published" class="input-medium" onchange="this.form.submit()">
-				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED');?></option>
-				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true);?>
+				<option value=""><?php echo JText::_('JOPTION_SELECT_PUBLISHED'); ?></option>
+				<?php echo JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true); ?>
 			</select>
 
 			<?php if ($this->state->get('filter.forcedLanguage')) : ?>
-			<input type="hidden" name="forcedLanguage" value="<?php echo $this->escape($this->state->get('filter.forcedLanguage')); ?>" />
-			<input type="hidden" name="filter_language" value="<?php echo $this->escape($this->state->get('filter.language')); ?>" />
+				<input type="hidden" name="forcedLanguage" value="<?php echo $this->escape($this->state->get('filter.forcedLanguage')); ?>" />
+				<input type="hidden" name="filter_language" value="<?php echo $this->escape($this->state->get('filter.language')); ?>" />
 			<?php else : ?>
-			<select name="filter_language" class="input-medium" onchange="this.form.submit()">
-				<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE');?></option>
-				<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language'));?>
-			</select>
+				<select name="filter_language" class="input-medium" onchange="this.form.submit()">
+					<option value=""><?php echo JText::_('JOPTION_SELECT_LANGUAGE'); ?></option>
+					<?php echo JHtml::_('select.options', JHtml::_('contentlanguage.existing', true, true), 'value', 'text', $this->state->get('filter.language')); ?>
+				</select>
 			<?php endif; ?>
 		</div>
 	</fieldset>
@@ -74,15 +74,23 @@
 	<table class="table table-striped" id="categoryList">
 		<thead>
 			<tr>
-			<th>
-				<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
-			</th>
-			<th width="10%" class="nowrap hidden-phone">
-				<?php echo JHtml::_('grid.sort',  'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
-			</th>
-			<th width="5%" class="nowrap hidden-phone">
-				<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_LANGUAGE', 'language', $this->state->get('list.direction'), $this->state->get('list.ordering')); ?>
-			</th>
+				<th>
+					<?php echo JHtml::_('grid.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
+				</th>
+				<th width="10%" class="nowrap hidden-phone">
+					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
+				</th>
+				<th width="5%" class="nowrap hidden-phone">
+					<?php
+					echo JHtml::_(
+						'grid.sort',
+						'JGRID_HEADING_LANGUAGE',
+						'language',
+						$this->state->get('list.direction'),
+						$this->state->get('list.ordering')
+					);
+					?>
+				</th>
 				<th width="1%" class="nowrap hidden-phone">
 					<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 				</th>
@@ -108,7 +116,8 @@
 					{
 						$lang = substr($item->language, 0, 3);
 					}
-					else {
+					else
+					{
 						$lang = "";
 					}
 				}
@@ -120,7 +129,7 @@
 				<tr class="row<?php echo $i % 2; ?>">
 					<td>
 						<?php echo str_repeat('<span class="gi">&mdash;</span>', $item->level - 1) ?>
-						<a href="javascript:void()" onclick="if (window.parent) window.parent.<?php echo $this->escape($function);?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->title)); ?>', null, '<?php echo $this->escape(ContentHelperRoute::getCategoryRoute($item->id, $item->language)); ?>', '<?php echo $this->escape($lang); ?>', null);">
+						<a href="javascript:void()" onclick="if (window.parent) window.parent.<?php echo $this->escape($function); ?>('<?php echo $item->id; ?>', '<?php echo $this->escape(addslashes($item->title)); ?>', null, '<?php echo $this->escape(ContentHelperRoute::getCategoryRoute($item->id, $item->language)); ?>', '<?php echo $this->escape($lang); ?>', null);">
 							<?php echo $this->escape($item->title); ?>
 						</a>
 					</td>
@@ -128,11 +137,11 @@
 						<?php echo $this->escape($item->access_level); ?>
 					</td>
 					<td class="center nowrap">
-						<?php if ($item->language == '*'):?>
+						<?php if ($item->language == '*'): ?>
 							<?php echo JText::alt('JALL', 'language'); ?>
-						<?php else:?>
+						<?php else: ?>
 							<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
-						<?php endif;?>
+						<?php endif; ?>
 					</td>
 					<td class="center hidden-phone">
 						<?php echo (int) $item->id; ?></span>
diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php
index f56f5c2..529780a 100644
--- a/administrator/components/com_categories/views/categories/view.html.php
+++ b/administrator/components/com_categories/views/categories/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -88,7 +88,7 @@ protected function addToolbar()
 		$categoryId	= $this->state->get('filter.category_id');
 		$component	= $this->state->get('filter.component');
 		$section	= $this->state->get('filter.section');
-		$canDo		= null;
+		$canDo		= JHelperContent::getActions($component, 'category', $categoryId);
 		$user		= JFactory::getUser();
 		$extension  = JFactory::getApplication()->input->get('extension', '', 'word');
 
@@ -109,9 +109,6 @@ protected function addToolbar()
 		// Load the category helper.
 		require_once JPATH_COMPONENT . '/helpers/categories.php';
 
-		// Get the results for each action.
-		$canDo = CategoriesHelper::getActions($component, $categoryId);
-
 		// If a component categories title string is present, let's use it.
 		if ($lang->hasKey($component_title_key = strtoupper($component . ($section ? "_$section" : '')) . '_CATEGORIES_TITLE'))
 		{
diff --git a/administrator/components/com_categories/views/category/tmpl/edit.php b/administrator/components/com_categories/views/category/tmpl/edit.php
index 1c7a7e5..aa50b81 100644
--- a/administrator/components/com_categories/views/category/tmpl/edit.php
+++ b/administrator/components/com_categories/views/category/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -25,7 +25,8 @@
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
 	{
-		if (task == 'category.cancel' || document.formvalidator.isValid(document.id('item-form'))) {
+		if (task == 'category.cancel' || document.formvalidator.isValid(document.id('item-form')))
+		{
 			<?php echo $this->form->getField('description')->save(); ?>
 			Joomla.submitform(task, document.getElementById('item-form'));
 		}
@@ -64,13 +65,13 @@
 
 		<?php if ($assoc) : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'associations', JText::_('JGLOBAL_FIELDSET_ASSOCIATIONS', true)); ?>
-				<?php echo $this->loadTemplate('associations'); ?>
+			<?php echo $this->loadTemplate('associations'); ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 
 		<?php if ($this->canDo->get('core.admin')) : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'rules', JText::_('COM_CATEGORIES_FIELDSET_RULES', true)); ?>
-				<?php echo $this->form->getInput('rules'); ?>
+			<?php echo $this->form->getInput('rules'); ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 
diff --git a/administrator/components/com_categories/views/category/tmpl/edit_associations.php b/administrator/components/com_categories/views/category/tmpl/edit_associations.php
index 64c9c45..884d65b 100644
--- a/administrator/components/com_categories/views/category/tmpl/edit_associations.php
+++ b/administrator/components/com_categories/views/category/tmpl/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php b/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php
index 24bbcdf..2985482 100644
--- a/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php
+++ b/administrator/components/com_categories/views/category/tmpl/edit_extrafields.php
@@ -3,10 +3,10 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * @deprecated  3.2
  */
 
-defined('_JEXEC') or die;
\ No newline at end of file
+defined('_JEXEC') or die;
diff --git a/administrator/components/com_categories/views/category/tmpl/edit_metadata.php b/administrator/components/com_categories/views/category/tmpl/edit_metadata.php
index 9162e21..75cc55f 100644
--- a/administrator/components/com_categories/views/category/tmpl/edit_metadata.php
+++ b/administrator/components/com_categories/views/category/tmpl/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/views/category/tmpl/edit_options.php b/administrator/components/com_categories/views/category/tmpl/edit_options.php
index 24bbcdf..2985482 100644
--- a/administrator/components/com_categories/views/category/tmpl/edit_options.php
+++ b/administrator/components/com_categories/views/category/tmpl/edit_options.php
@@ -3,10 +3,10 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * @deprecated  3.2
  */
 
-defined('_JEXEC') or die;
\ No newline at end of file
+defined('_JEXEC') or die;
diff --git a/administrator/components/com_categories/views/category/tmpl/modal.php b/administrator/components/com_categories/views/category/tmpl/modal.php
index 2bad863..ca6862f 100644
--- a/administrator/components/com_categories/views/category/tmpl/modal.php
+++ b/administrator/components/com_categories/views/category/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,60 +42,61 @@
 </script>
 <div class="container-popup">
 
-<div class="pull-right">
-	<button class="btn btn-primary" type="button" onclick="Joomla.submitbutton('category.apply');"><?php echo JText::_('JTOOLBAR_APPLY') ?></button>
-	<button class="btn btn-primary" type="button" onclick="Joomla.submitbutton('category.save');"><?php echo JText::_('JTOOLBAR_SAVE') ?></button>
-	<button class="btn" type="button" onclick="Joomla.submitbutton('category.cancel');"><?php echo JText::_('JCANCEL') ?></button>
-</div>
+	<div class="pull-right">
+		<button class="btn btn-primary" type="button" onclick="Joomla.submitbutton('category.apply');"><?php echo JText::_('JTOOLBAR_APPLY') ?></button>
+		<button class="btn btn-primary" type="button" onclick="Joomla.submitbutton('category.save');"><?php echo JText::_('JTOOLBAR_SAVE') ?></button>
+		<button class="btn" type="button" onclick="Joomla.submitbutton('category.cancel');"><?php echo JText::_('JCANCEL') ?></button>
+	</div>
 
-<div class="clearfix"> </div>
-<hr class="hr-condensed" />
+	<div class="clearfix"></div>
+	<hr class="hr-condensed" />
 
-<form action="<?php echo JRoute::_('index.php?option=com_categories&extension=' . $input->getCmd('extension', 'com_content') . '&layout=modal&tmpl=component&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate form-horizontal">
-	<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
+	<form action="<?php echo JRoute::_('index.php?option=com_categories&extension=' . $input->getCmd('extension', 'com_content') . '&layout=modal&tmpl=component&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate form-horizontal">
+		<?php echo JLayoutHelper::render('joomla.edit.title_alias', $this); ?>
 
-	<div class="form-horizontal">
-		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
+		<div class="form-horizontal">
+			<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'general')); ?>
 
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('JCATEGORY', true)); ?>
-		<div class="row-fluid">
-			<div class="span9">
-				<?php echo $this->form->getLabel('description'); ?>
-				<?php echo $this->form->getInput('description'); ?>
-			</div>
-			<div class="span3">
-				<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'general', JText::_('JCATEGORY', true)); ?>
+			<div class="row-fluid">
+				<div class="span9">
+					<?php echo $this->form->getLabel('description'); ?>
+					<?php echo $this->form->getInput('description'); ?>
+				</div>
+				<div class="span3">
+					<?php echo JLayoutHelper::render('joomla.edit.global', $this); ?>
+				</div>
 			</div>
-		</div>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('COM_CATEGORIES_FIELDSET_PUBLISHING', true)); ?>
-		<div class="row-fluid form-horizontal-desktop">
-			<div class="span6">
-				<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
-			</div>
-			<div class="span6">
-				<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'publishing', JText::_('COM_CATEGORIES_FIELDSET_PUBLISHING', true)); ?>
+			<div class="row-fluid form-horizontal-desktop">
+				<div class="span6">
+					<?php echo JLayoutHelper::render('joomla.edit.publishingdata', $this); ?>
+				</div>
+				<div class="span6">
+					<?php echo JLayoutHelper::render('joomla.edit.metadata', $this); ?>
+				</div>
 			</div>
-		</div>
-		<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-		<?php if ($assoc) : ?>
-			<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
-		<?php endif; ?>
+			<?php if ($assoc) : ?>
+				<div class="hidden"><?php echo $this->loadTemplate('associations'); ?></div>
+			<?php endif; ?>
 
-		<?php if ($this->canDo->get('core.admin')) : ?>
-			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'rules', JText::_('COM_CATEGORIES_FIELDSET_RULES', true)); ?>
+			<?php if ($this->canDo->get('core.admin')) : ?>
+				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'rules', JText::_('COM_CATEGORIES_FIELDSET_RULES', true)); ?>
 				<?php echo $this->form->getInput('rules'); ?>
-			<?php echo JHtml::_('bootstrap.endTab'); ?>
-		<?php endif; ?>
+				<?php echo JHtml::_('bootstrap.endTab'); ?>
+			<?php endif; ?>
 
-		<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
+			<?php echo JLayoutHelper::render('joomla.edit.params', $this); ?>
 
-		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
+			<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 
-		<?php echo $this->form->getInput('extension'); ?>
-		<input type="hidden" name="task" value="" />
-		<?php echo JHtml::_('form.token'); ?>
-	</div>
-</form>
+			<?php echo $this->form->getInput('extension'); ?>
+			<input type="hidden" name="task" value="" />
+			<?php echo JHtml::_('form.token'); ?>
+		</div>
+	</form>
+</div>
diff --git a/administrator/components/com_categories/views/category/tmpl/modal_associations.php b/administrator/components/com_categories/views/category/tmpl/modal_associations.php
index 64c9c45..884d65b 100644
--- a/administrator/components/com_categories/views/category/tmpl/modal_associations.php
+++ b/administrator/components/com_categories/views/category/tmpl/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php b/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php
index 216ff20..2f89c05 100644
--- a/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php
+++ b/administrator/components/com_categories/views/category/tmpl/modal_extrafields.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/views/category/tmpl/modal_metadata.php b/administrator/components/com_categories/views/category/tmpl/modal_metadata.php
index 9162e21..75cc55f 100644
--- a/administrator/components/com_categories/views/category/tmpl/modal_metadata.php
+++ b/administrator/components/com_categories/views/category/tmpl/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_categories/views/category/tmpl/modal_options.php b/administrator/components/com_categories/views/category/tmpl/modal_options.php
index 5212358..9bd5f2c 100644
--- a/administrator/components/com_categories/views/category/tmpl/modal_options.php
+++ b/administrator/components/com_categories/views/category/tmpl/modal_options.php
@@ -3,45 +3,46 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
-?>
-<?php
-	echo JHtml::_('bootstrap.startAccordion', 'categoryOptions', array('active' => 'collapse0'));
-	$fieldSets = $this->form->getFieldsets('params');
-	$i = 0;
 
-	foreach ($fieldSets as $name => $fieldSet) :
-		$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_'.$name.'_FIELDSET_LABEL';
-		echo JHtml::_('bootstrap.addSlide', 'categoryOptions', JText::_($label), 'collapse' . $i++);
-			if (isset($fieldSet->description) && trim($fieldSet->description)) :
-				echo '<p class="tip">'.$this->escape(JText::_($fieldSet->description)).'</p>';
-			endif;
-			?>
-				<?php foreach ($this->form->getFieldset($name) as $field) : ?>
-					<div class="control-group">
-						<div class="control-label">
-							<?php echo $field->label; ?>
-						</div>
-						<div class="controls">
-							<?php echo $field->input; ?>
-						</div>
-					</div>
-				<?php endforeach; ?>
+echo JHtml::_('bootstrap.startAccordion', 'categoryOptions', array('active' => 'collapse0'));
+$fieldSets = $this->form->getFieldsets('params');
+$i = 0;
+?>
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<?php
+	$label = !empty($fieldSet->label) ? $fieldSet->label : 'COM_CATEGORIES_' . $name . '_FIELDSET_LABEL';
+	echo JHtml::_('bootstrap.addSlide', 'categoryOptions', JText::_($label), 'collapse' . $i++);
+	if (isset($fieldSet->description) && trim($fieldSet->description))
+	{
+		echo '<p class="tip">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	}
+	?>
+	<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $field->label; ?>
+			</div>
+			<div class="controls">
+				<?php echo $field->input; ?>
+			</div>
+		</div>
+	<?php endforeach; ?>
 
-				<?php if ($name == 'basic'):?>
-					<div class="control-group">
-						<div class="control-label">
-							<?php echo $this->form->getLabel('note'); ?>
-						</div>
-						<div class="controls">
-							<?php echo $this->form->getInput('note'); ?>
-						</div>
-					</div>
-				<?php endif;
-		echo JHtml::_('bootstrap.endSlide');
-	endforeach;
-echo JHtml::_('bootstrap.endAccordion');
+	<?php if ($name == 'basic'): ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $this->form->getLabel('note'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $this->form->getInput('note'); ?>
+			</div>
+		</div>
+	<?php endif; ?>
+	<?php echo JHtml::_('bootstrap.endSlide'); ?>
+<?php endforeach; ?>
+<?php echo JHtml::_('bootstrap.endAccordion'); ?>
diff --git a/administrator/components/com_categories/views/category/view.html.php b/administrator/components/com_categories/views/category/view.html.php
index 26080b1..a63e882 100644
--- a/administrator/components/com_categories/views/category/view.html.php
+++ b/administrator/components/com_categories/views/category/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -34,7 +34,7 @@ public function display($tpl = null)
 		$this->form = $this->get('Form');
 		$this->item = $this->get('Item');
 		$this->state = $this->get('State');
-		$this->canDo = CategoriesHelper::getActions($this->state->get('category.component'));
+		$this->canDo = JHelperContent::getActions($this->state->get('category.extension'), 'category', $this->item->id);
 		$this->assoc = $this->get('Assoc');
 
 		$input = JFactory::getApplication()->input;
@@ -101,7 +101,7 @@ protected function addToolbar()
 		require_once JPATH_COMPONENT . '/helpers/categories.php';
 
 		// Get the results for each action.
-		$canDo = CategoriesHelper::getActions($component, $this->item->id);
+		$canDo = $this->canDo;
 
 		// If a component categories title string is present, let's use it.
 		if ($lang->hasKey($component_title_key = $component . ($section ? "_$section" : '') . '_CATEGORY_' . ($isNew ? 'ADD' : 'EDIT') . '_TITLE'))
diff --git a/administrator/components/com_checkin/checkin.php b/administrator/components/com_checkin/checkin.php
index d43bd9a..3c1052a 100644
--- a/administrator/components/com_checkin/checkin.php
+++ b/administrator/components/com_checkin/checkin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_checkin/controller.php b/administrator/components/com_checkin/controller.php
index 1d2366c..072fa87 100644
--- a/administrator/components/com_checkin/controller.php
+++ b/administrator/components/com_checkin/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_checkin/models/checkin.php b/administrator/components/com_checkin/models/checkin.php
index 63d8e8d..ddda0d4 100644
--- a/administrator/components/com_checkin/models/checkin.php
+++ b/administrator/components/com_checkin/models/checkin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_checkin/views/checkin/tmpl/default.php b/administrator/components/com_checkin/views/checkin/tmpl/default.php
index a2f9cb0..2ecb08f 100644
--- a/administrator/components/com_checkin/views/checkin/tmpl/default.php
+++ b/administrator/components/com_checkin/views/checkin/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,12 +15,10 @@
 $listDirn = $this->escape($this->state->get('list.direction'));
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_checkin'); ?>" method="post" name="adminForm" id="adminForm">
-	<?php if (!empty($this->sidebar)) : ?>
-		<div id="j-sidebar-container" class="span2">
-			<?php echo $this->sidebar; ?>
-		</div>
-	<?php endif; ?>
-	<div id="j-main-container"<?php echo !empty($this->sidebar) ? ' class="span10"' : ''; ?>>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
 		<div id="filter-bar" class="btn-toolbar">
 			<div class="filter-search btn-group pull-left">
 				<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo JHtml::tooltipText('COM_CHECKIN_FILTER_SEARCH_DESC'); ?>" />
diff --git a/administrator/components/com_checkin/views/checkin/view.html.php b/administrator/components/com_checkin/views/checkin/view.html.php
index c44b702..92866c0 100644
--- a/administrator/components/com_checkin/views/checkin/view.html.php
+++ b/administrator/components/com_checkin/views/checkin/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/access.xml b/administrator/components/com_config/access.xml
index f67aea9..861fef0 100644
--- a/administrator/components/com_config/access.xml
+++ b/administrator/components/com_config/access.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <access component="com_config">
-  <section name="component">
-    <action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
-  </section>
-</access>
\ No newline at end of file
+	<section name="component">
+		<action name="core.admin" title="JACTION_ADMIN" description="JACTION_ADMIN_COMPONENT_DESC" />
+	</section>
+</access>
diff --git a/administrator/components/com_config/config.php b/administrator/components/com_config/config.php
index 0796ac8..deb4a86 100644
--- a/administrator/components/com_config/config.php
+++ b/administrator/components/com_config/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/config.xml b/administrator/components/com_config/config.xml
index bbc8d23..c8f7959 100644
--- a/administrator/components/com_config/config.xml
+++ b/administrator/components/com_config/config.xml
@@ -3,7 +3,7 @@
 	<name>com_config</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_config/controller.php b/administrator/components/com_config/controller.php
index 302b3d9..2d6bdbc 100644
--- a/administrator/components/com_config/controller.php
+++ b/administrator/components/com_config/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/controller/application/cancel.php b/administrator/components/com_config/controller/application/cancel.php
index ebd01d0..5a80c18 100644
--- a/administrator/components/com_config/controller/application/cancel.php
+++ b/administrator/components/com_config/controller/application/cancel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/controller/application/display.php b/administrator/components/com_config/controller/application/display.php
index b89f5b4..5cce21e 100644
--- a/administrator/components/com_config/controller/application/display.php
+++ b/administrator/components/com_config/controller/application/display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Joomla.Config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/controller/application/refreshhelp.php b/administrator/components/com_config/controller/application/refreshhelp.php
index 511a13f..0063b03 100644
--- a/administrator/components/com_config/controller/application/refreshhelp.php
+++ b/administrator/components/com_config/controller/application/refreshhelp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerApplicationRefreshhelp extends JControllerBase
 {
 	/**
diff --git a/administrator/components/com_config/controller/application/removeroot.php b/administrator/components/com_config/controller/application/removeroot.php
index a8aa303..66cb9b2 100644
--- a/administrator/components/com_config/controller/application/removeroot.php
+++ b/administrator/components/com_config/controller/application/removeroot.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -14,7 +14,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerApplicationRemoveroot extends JControllerBase
 {
 	/**
diff --git a/administrator/components/com_config/controller/application/save.php b/administrator/components/com_config/controller/application/save.php
index 671d84b..d397ccd 100644
--- a/administrator/components/com_config/controller/application/save.php
+++ b/administrator/components/com_config/controller/application/save.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -14,7 +14,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerApplicationSave extends JControllerBase
 {
 	/**
diff --git a/administrator/components/com_config/controller/component/cancel.php b/administrator/components/com_config/controller/component/cancel.php
index 6797bf6..f11c05a 100644
--- a/administrator/components/com_config/controller/component/cancel.php
+++ b/administrator/components/com_config/controller/component/cancel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerComponentCancel extends ConfigControllerCanceladmin
 {
 	/**
diff --git a/administrator/components/com_config/controller/component/display.php b/administrator/components/com_config/controller/component/display.php
index 5ff31ac..860ddfb 100644
--- a/administrator/components/com_config/controller/component/display.php
+++ b/administrator/components/com_config/controller/component/display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Joomla.Config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/controller/component/save.php b/administrator/components/com_config/controller/component/save.php
index 6d73fb0..82bc026 100644
--- a/administrator/components/com_config/controller/component/save.php
+++ b/administrator/components/com_config/controller/component/save.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  * @since       3.2
-*/
+ */
 class ConfigControllerComponentSave extends JControllerBase
 {
 	/**
diff --git a/administrator/components/com_config/controllers/application.php b/administrator/components/com_config/controllers/application.php
index f422688..c005e71 100644
--- a/administrator/components/com_config/controllers/application.php
+++ b/administrator/components/com_config/controllers/application.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/controllers/component.php b/administrator/components/com_config/controllers/component.php
index 4071674..3b2fea6 100644
--- a/administrator/components/com_config/controllers/component.php
+++ b/administrator/components/com_config/controllers/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/helper/config.php b/administrator/components/com_config/helper/config.php
index 9fbd0b9..3a95a58 100644
--- a/administrator/components/com_config/helper/config.php
+++ b/administrator/components/com_config/helper/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/model/component.php b/administrator/components/com_config/model/component.php
index 2858e12..f3f8046 100644
--- a/administrator/components/com_config/model/component.php
+++ b/administrator/components/com_config/model/component.php
@@ -104,8 +104,8 @@ public function getComponent()
 
 		// Load common and local language files.
 		$lang = JFactory::getLanguage();
-			$lang->load($option, JPATH_BASE, null, false, true)
-		||	$lang->load($option, JPATH_BASE . "/components/$option", null, false, true);
+		$lang->load($option, JPATH_BASE, null, false, true)
+		|| $lang->load($option, JPATH_BASE . "/components/$option", null, false, true);
 
 		$result = JComponentHelper::getComponent($option);
 
diff --git a/administrator/components/com_config/model/field/filters.php b/administrator/components/com_config/model/field/filters.php
index 76fe32a..103438f 100644
--- a/administrator/components/com_config/model/field/filters.php
+++ b/administrator/components/com_config/model/field/filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/models/application.php b/administrator/components/com_config/models/application.php
index 650f058..4e6ebf1 100644
--- a/administrator/components/com_config/models/application.php
+++ b/administrator/components/com_config/models/application.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/models/component.php b/administrator/components/com_config/models/component.php
index f6af0cd..f0b90fd 100644
--- a/administrator/components/com_config/models/component.php
+++ b/administrator/components/com_config/models/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/html.php b/administrator/components/com_config/view/application/html.php
index b23d26b..fdf1efc 100644
--- a/administrator/components/com_config/view/application/html.php
+++ b/administrator/components/com_config/view/application/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/json.php b/administrator/components/com_config/view/application/json.php
index fa08537..5965d90 100644
--- a/administrator/components/com_config/view/application/json.php
+++ b/administrator/components/com_config/view/application/json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default.php b/administrator/components/com_config/view/application/tmpl/default.php
index 08b231c..d3b5b16 100644
--- a/administrator/components/com_config/view/application/tmpl/default.php
+++ b/administrator/components/com_config/view/application/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,27 +17,29 @@
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
 	{
-		if (task == 'application.cancel' || document.formvalidator.isValid(document.id('application-form'))) {
+		if (task == 'application.cancel' || document.formvalidator.isValid(document.id('application-form')))
+		{
 			Joomla.submitform(task, document.getElementById('application-form'));
 		}
 	}
 </script>
 
-<form action="<?php echo JRoute::_('index.php?option=com_config');?>" id="application-form" method="post" name="adminForm" class="form-validate">
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="application-form" method="post" name="adminForm" class="form-validate">
 	<div class="row-fluid">
 		<!-- Begin Sidebar -->
 		<div id="sidebar" class="span2">
 			<div class="sidebar-nav">
 				<?php echo $this->loadTemplate('navigation'); ?>
 				<?php
-					// Display the submenu position modules
-					$this->submenumodules = JModuleHelper::getModules('submenu');
-					foreach ($this->submenumodules as $submenumodule) {
-						$output = JModuleHelper::renderModule($submenumodule);
-						$params = new JRegistry;
-						$params->loadString($submenumodule->params);
-						echo $output;
-					}
+				// Display the submenu position modules
+				$this->submenumodules = JModuleHelper::getModules('submenu');
+				foreach ($this->submenumodules as $submenumodule)
+				{
+					$output = JModuleHelper::renderModule($submenumodule);
+					$params = new JRegistry;
+					$params->loadString($submenumodule->params);
+					echo $output;
+				}
 				?>
 			</div>
 		</div>
@@ -45,13 +47,13 @@
 		<!-- Begin Content -->
 		<div class="span10">
 			<ul class="nav nav-tabs">
-				<li class="active"><a href="#page-site" data-toggle="tab"><?php echo JText::_('JSITE');?></a></li>
-				<li><a href="#page-system" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SYSTEM');?></a></li>
-				<li><a href="#page-server" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SERVER');?></a></li>
-				<li><a href="#page-permissions" data-toggle="tab"><?php echo JText::_('COM_CONFIG_PERMISSIONS');?></a></li>
-				<li><a href="#page-filters" data-toggle="tab"><?php echo JText::_('COM_CONFIG_TEXT_FILTERS');?></a></li>
+				<li class="active"><a href="#page-site" data-toggle="tab"><?php echo JText::_('JSITE'); ?></a></li>
+				<li><a href="#page-system" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SYSTEM'); ?></a></li>
+				<li><a href="#page-server" data-toggle="tab"><?php echo JText::_('COM_CONFIG_SERVER'); ?></a></li>
+				<li><a href="#page-permissions" data-toggle="tab"><?php echo JText::_('COM_CONFIG_PERMISSIONS'); ?></a></li>
+				<li><a href="#page-filters" data-toggle="tab"><?php echo JText::_('COM_CONFIG_TEXT_FILTERS'); ?></a></li>
 				<?php if ($this->ftp) : ?>
-					<li><a href="#page-ftp" data-toggle="tab"><?php echo JText::_('COM_CONFIG_FTP_SETTINGS');?></a></li>
+					<li><a href="#page-ftp" data-toggle="tab"><?php echo JText::_('COM_CONFIG_FTP_SETTINGS'); ?></a></li>
 				<?php endif; ?>
 			</ul>
 			<div id="config-document" class="tab-content">
@@ -108,7 +110,7 @@
 				<input type="hidden" name="task" value="" />
 				<?php echo JHtml::_('form.token'); ?>
 			</div>
-			</div>
+		</div>
 		<!-- End Content -->
 	</div>
 </form>
diff --git a/administrator/components/com_config/view/application/tmpl/default_cache.php b/administrator/components/com_config/view/application/tmpl/default_cache.php
index 89bbab8..a1256dd 100644
--- a/administrator/components/com_config/view/application/tmpl/default_cache.php
+++ b/administrator/components/com_config/view/application/tmpl/default_cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_cookie.php b/administrator/components/com_config/view/application/tmpl/default_cookie.php
index 2e8ad20..302e35e 100644
--- a/administrator/components/com_config/view/application/tmpl/default_cookie.php
+++ b/administrator/components/com_config/view/application/tmpl/default_cookie.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_database.php b/administrator/components/com_config/view/application/tmpl/default_database.php
index b4c39df..675ea6f 100644
--- a/administrator/components/com_config/view/application/tmpl/default_database.php
+++ b/administrator/components/com_config/view/application/tmpl/default_database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_debug.php b/administrator/components/com_config/view/application/tmpl/default_debug.php
index 2e6196a..d343e41 100644
--- a/administrator/components/com_config/view/application/tmpl/default_debug.php
+++ b/administrator/components/com_config/view/application/tmpl/default_debug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_filters.php b/administrator/components/com_config/view/application/tmpl/default_filters.php
index ab9d344..1f426b2 100644
--- a/administrator/components/com_config/view/application/tmpl/default_filters.php
+++ b/administrator/components/com_config/view/application/tmpl/default_filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_ftp.php b/administrator/components/com_config/view/application/tmpl/default_ftp.php
index 67f231a..5025c3d 100644
--- a/administrator/components/com_config/view/application/tmpl/default_ftp.php
+++ b/administrator/components/com_config/view/application/tmpl/default_ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php b/administrator/components/com_config/view/application/tmpl/default_ftplogin.php
index 625ad80..a287d95 100644
--- a/administrator/components/com_config/view/application/tmpl/default_ftplogin.php
+++ b/administrator/components/com_config/view/application/tmpl/default_ftplogin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_locale.php b/administrator/components/com_config/view/application/tmpl/default_locale.php
index f875d10..a850963 100644
--- a/administrator/components/com_config/view/application/tmpl/default_locale.php
+++ b/administrator/components/com_config/view/application/tmpl/default_locale.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_mail.php b/administrator/components/com_config/view/application/tmpl/default_mail.php
index 5f47ee6..d4c242f 100644
--- a/administrator/components/com_config/view/application/tmpl/default_mail.php
+++ b/administrator/components/com_config/view/application/tmpl/default_mail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_metadata.php b/administrator/components/com_config/view/application/tmpl/default_metadata.php
index a6ffd4d..f31ae15 100644
--- a/administrator/components/com_config/view/application/tmpl/default_metadata.php
+++ b/administrator/components/com_config/view/application/tmpl/default_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_navigation.php b/administrator/components/com_config/view/application/tmpl/default_navigation.php
index 296aad9..d8aa05e 100644
--- a/administrator/components/com_config/view/application/tmpl/default_navigation.php
+++ b/administrator/components/com_config/view/application/tmpl/default_navigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_permissions.php b/administrator/components/com_config/view/application/tmpl/default_permissions.php
index 6855183..f6c60ca 100644
--- a/administrator/components/com_config/view/application/tmpl/default_permissions.php
+++ b/administrator/components/com_config/view/application/tmpl/default_permissions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_seo.php b/administrator/components/com_config/view/application/tmpl/default_seo.php
index a57edab..b637c84 100644
--- a/administrator/components/com_config/view/application/tmpl/default_seo.php
+++ b/administrator/components/com_config/view/application/tmpl/default_seo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_server.php b/administrator/components/com_config/view/application/tmpl/default_server.php
index 3307f7e..5ca15b2 100644
--- a/administrator/components/com_config/view/application/tmpl/default_server.php
+++ b/administrator/components/com_config/view/application/tmpl/default_server.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_session.php b/administrator/components/com_config/view/application/tmpl/default_session.php
index 0fdac2a..564253a 100644
--- a/administrator/components/com_config/view/application/tmpl/default_session.php
+++ b/administrator/components/com_config/view/application/tmpl/default_session.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_site.php b/administrator/components/com_config/view/application/tmpl/default_site.php
index b3456ca..7edae43 100644
--- a/administrator/components/com_config/view/application/tmpl/default_site.php
+++ b/administrator/components/com_config/view/application/tmpl/default_site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/application/tmpl/default_system.php b/administrator/components/com_config/view/application/tmpl/default_system.php
index c78d4fc..a402fd4 100644
--- a/administrator/components/com_config/view/application/tmpl/default_system.php
+++ b/administrator/components/com_config/view/application/tmpl/default_system.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_config/view/component/html.php b/administrator/components/com_config/view/component/html.php
index 803b812..a35113a 100644
--- a/administrator/components/com_config/view/component/html.php
+++ b/administrator/components/com_config/view/component/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -40,7 +40,7 @@ public function render()
 		try
 		{
 			$form = $this->model->getForm();
-			$component	= $this->model->getComponent();
+			$component = $this->model->getComponent();
 			$user = JFactory::getUser();
 		}
 		catch (Exception $e)
diff --git a/administrator/components/com_config/view/component/tmpl/default.php b/administrator/components/com_config/view/component/tmpl/default.php
index 1b6b18d..aea845c 100644
--- a/administrator/components/com_config/view/component/tmpl/default.php
+++ b/administrator/components/com_config/view/component/tmpl/default.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 
-$app      = JFactory::getApplication();
+$app = JFactory::getApplication();
 $template = $app->getTemplate();
 
 // Load the tooltip behavior.
@@ -20,12 +20,13 @@
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
 	{
-		if (document.formvalidator.isValid(document.id('component-form'))) {
+		if (document.formvalidator.isValid(document.id('component-form')))
+		{
 			Joomla.submitform(task, document.getElementById('component-form'));
 		}
 	}
 </script>
-<form action="<?php echo JRoute::_('index.php?option=com_config');?>" id="component-form" method="post" name="adminForm" autocomplete="off" class="form-validate form-horizontal">
+<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off" class="form-validate form-horizontal">
 	<div class="row-fluid">
 		<!-- Begin Sidebar -->
 		<div id="sidebar" class="span2">
@@ -36,56 +37,60 @@
 		<!-- End Sidebar -->
 		<div class="span10">
 			<ul class="nav nav-tabs" id="configTabs">
-				<?php
-					$fieldSets = $this->form->getFieldsets();
-					foreach ($fieldSets as $name => $fieldSet) :
-						$label = empty($fieldSet->label) ? 'COM_CONFIG_'.$name.'_FIELDSET_LABEL' : $fieldSet->label;
-				?>
-					<li><a href="#<?php echo $name;?>" data-toggle="tab"><?php echo  JText::_($label);?></a></li>
-				<?php
-					endforeach;
-				?>
+				<?php $fieldSets = $this->form->getFieldsets(); ?>
+				<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+					<?php $label = empty($fieldSet->label) ? 'COM_CONFIG_' . $name . '_FIELDSET_LABEL' : $fieldSet->label; ?>
+					<li><a href="#<?php echo $name; ?>" data-toggle="tab"><?php echo JText::_($label); ?></a></li>
+				<?php endforeach; ?>
 			</ul>
 			<div class="tab-content">
-				<?php
-					$fieldSets = $this->form->getFieldsets();
-					foreach ($fieldSets as $name => $fieldSet) :
-				?>
-					<div class="tab-pane" id="<?php echo $name;?>">
+				<?php $fieldSets = $this->form->getFieldsets(); ?>
+				<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+					<div class="tab-pane" id="<?php echo $name; ?>">
 						<?php
-							if (isset($fieldSet->description) && !empty($fieldSet->description)) :
-								echo '<p class="tab-description">'.JText::_($fieldSet->description).'</p>';
-							endif;
-							foreach ($this->form->getFieldset($name) as $field):
+						if (isset($fieldSet->description) && !empty($fieldSet->description))
+						{
+							echo '<p class="tab-description">' . JText::_($fieldSet->description) . '</p>';
+						}
 						?>
-							<div class="control-group">
-						<?php if (!$field->hidden && $name != "permissions") : ?>
-								<div class="control-label">
-									<?php echo $field->label; ?>
+						<?php foreach ($this->form->getFieldset($name) as $field) : ?>
+							<?php
+							$class = '';
+							$rel = '';
+							if ($showon = $field->getAttribute('showon'))
+							{
+								JHtml::_('jquery.framework');
+								JHtml::_('script', 'jui/cms.js', false, true);
+								$id = $this->form->getFormControl();
+								$showon = explode(':', $showon, 2);
+								$class = ' showon_' . implode(' showon_', explode(',', $showon[1]));
+								$rel = ' rel="showon_' . $id . '[' . $showon[0] . ']"';
+							}
+							?>
+							<div class="control-group<?php echo $class; ?>"<?php echo $rel; ?>>
+								<?php if (!$field->hidden && $name != "permissions") : ?>
+									<div class="control-label">
+										<?php echo $field->label; ?>
+									</div>
+								<?php endif; ?>
+								<div class="<?php if ($name != "permissions") : ?>controls<?php endif; ?>">
+									<?php echo $field->input; ?>
 								</div>
-						<?php endif; ?>
-						<div class="<?php if ($name != "permissions") : ?>controls<?php endif; ?>">
-							<?php echo $field->input; ?>
-						</div>
+							</div>
+						<?php endforeach; ?>
 					</div>
-				<?php
-					endforeach;
-				?>
-				</div>
-				<?php
-				endforeach;
-				?>
+				<?php endforeach; ?>
 			</div>
 		</div>
 	</div>
 	<div>
-		<input type="hidden" name="id" value="<?php echo $this->component->id;?>" />
-		<input type="hidden" name="component" value="<?php echo $this->component->option;?>" />
-		<input type="hidden" name="return" value="<?php echo $this->return;?>" />
+		<input type="hidden" name="id" value="<?php echo $this->component->id; ?>" />
+		<input type="hidden" name="component" value="<?php echo $this->component->option; ?>" />
+		<input type="hidden" name="return" value="<?php echo $this->return; ?>" />
 		<input type="hidden" name="task" value="" />
 		<?php echo JHtml::_('form.token'); ?>
 	</div>
 </form>
 <script type="text/javascript">
-		jQuery('#configTabs a:first').tab('show'); // Select first tab
+	jQuery('#configTabs a:first').tab('show'); // Select first tab
 </script>
diff --git a/administrator/components/com_config/view/component/tmpl/default_navigation.php b/administrator/components/com_config/view/component/tmpl/default_navigation.php
index a95a396..796e23d 100644
--- a/administrator/components/com_config/view/component/tmpl/default_navigation.php
+++ b/administrator/components/com_config/view/component/tmpl/default_navigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/contact.php b/administrator/components/com_contact/contact.php
index 284f3b3..9689760 100644
--- a/administrator/components/com_contact/contact.php
+++ b/administrator/components/com_contact/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/contact.xml b/administrator/components/com_contact/contact.xml
index 4c4896e..b45f633 100644
--- a/administrator/components/com_contact/contact.xml
+++ b/administrator/components/com_contact/contact.xml
@@ -3,7 +3,7 @@
 	<name>com_contact</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>GNU General Public License version 2 or later; see
 		LICENSE.txt</license>
diff --git a/administrator/components/com_contact/controller.php b/administrator/components/com_contact/controller.php
index 72a867d..d9cb6d9 100644
--- a/administrator/components/com_contact/controller.php
+++ b/administrator/components/com_contact/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/controllers/contact.php b/administrator/components/com_contact/controllers/contact.php
index 4040b62..db4605b 100644
--- a/administrator/components/com_contact/controllers/contact.php
+++ b/administrator/components/com_contact/controllers/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/controllers/contacts.php b/administrator/components/com_contact/controllers/contacts.php
index 163f6a4..9bce87d 100644
--- a/administrator/components/com_contact/controllers/contacts.php
+++ b/administrator/components/com_contact/controllers/contacts.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/helpers/contact.php b/administrator/components/com_contact/helpers/contact.php
index 4ec04fd..3ae9c78 100644
--- a/administrator/components/com_contact/helpers/contact.php
+++ b/administrator/components/com_contact/helpers/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/helpers/html/contact.php b/administrator/components/com_contact/helpers/html/contact.php
index bb4c968..3f576de 100644
--- a/administrator/components/com_contact/helpers/html/contact.php
+++ b/administrator/components/com_contact/helpers/html/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/models/contact.php b/administrator/components/com_contact/models/contact.php
index 9a6186a..7e27045 100644
--- a/administrator/components/com_contact/models/contact.php
+++ b/administrator/components/com_contact/models/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/models/contacts.php b/administrator/components/com_contact/models/contacts.php
index dba10cc..e9b8fc1 100644
--- a/administrator/components/com_contact/models/contacts.php
+++ b/administrator/components/com_contact/models/contacts.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/models/fields/modal/contact.php b/administrator/components/com_contact/models/fields/modal/contact.php
index ecffca4..4e08ad5 100644
--- a/administrator/components/com_contact/models/fields/modal/contact.php
+++ b/administrator/components/com_contact/models/fields/modal/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/tables/contact.php b/administrator/components/com_contact/tables/contact.php
index 68f2d10..d6726ac 100644
--- a/administrator/components/com_contact/tables/contact.php
+++ b/administrator/components/com_contact/tables/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/edit.php b/administrator/components/com_contact/views/contact/tmpl/edit.php
index 69ea83d..debe574 100644
--- a/administrator/components/com_contact/views/contact/tmpl/edit.php
+++ b/administrator/components/com_contact/views/contact/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
index 7b50892..1f14cc8 100644
--- a/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
+++ b/administrator/components/com_contact/views/contact/tmpl/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php b/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
index a316d32..987f833 100644
--- a/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
+++ b/administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/edit_params.php b/administrator/components/com_contact/views/contact/tmpl/edit_params.php
index ec7ff1d..e62694a 100644
--- a/administrator/components/com_contact/views/contact/tmpl/edit_params.php
+++ b/administrator/components/com_contact/views/contact/tmpl/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/modal.php b/administrator/components/com_contact/views/contact/tmpl/modal.php
index 2f6b417..05e2fd6 100644
--- a/administrator/components/com_contact/views/contact/tmpl/modal.php
+++ b/administrator/components/com_contact/views/contact/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/modal_associations.php b/administrator/components/com_contact/views/contact/tmpl/modal_associations.php
index 7b50892..1f14cc8 100644
--- a/administrator/components/com_contact/views/contact/tmpl/modal_associations.php
+++ b/administrator/components/com_contact/views/contact/tmpl/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php b/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php
index a316d32..987f833 100644
--- a/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php
+++ b/administrator/components/com_contact/views/contact/tmpl/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/tmpl/modal_params.php b/administrator/components/com_contact/views/contact/tmpl/modal_params.php
index ec7ff1d..e62694a 100644
--- a/administrator/components/com_contact/views/contact/tmpl/modal_params.php
+++ b/administrator/components/com_contact/views/contact/tmpl/modal_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contact/view.html.php b/administrator/components/com_contact/views/contact/view.html.php
index a124bb7..cbcc5f9 100644
--- a/administrator/components/com_contact/views/contact/view.html.php
+++ b/administrator/components/com_contact/views/contact/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -64,8 +64,9 @@ protected function addToolbar()
 		$userId		= $user->get('id');
 		$isNew		= ($this->item->id == 0);
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
+
 		// Since we don't track these assets at the item level, use the category id.
-		$canDo		= JHelperContent::getActions($this->item->catid, 0, 'com_contact');
+		$canDo		= JHelperContent::getActions('com_contact', 'category', $this->item->catid);
 
 		JToolbarHelper::title(JText::_('COM_CONTACT_MANAGER_CONTACT'), 'address contact');
 
diff --git a/administrator/components/com_contact/views/contacts/tmpl/default.php b/administrator/components/com_contact/views/contacts/tmpl/default.php
index 46fbe71..0080da9 100644
--- a/administrator/components/com_contact/views/contacts/tmpl/default.php
+++ b/administrator/components/com_contact/views/contacts/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contacts/tmpl/default_batch.php b/administrator/components/com_contact/views/contacts/tmpl/default_batch.php
index 92f0056..faab744 100644
--- a/administrator/components/com_contact/views/contacts/tmpl/default_batch.php
+++ b/administrator/components/com_contact/views/contacts/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,37 +14,43 @@
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_CONTACT_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_CONTACT_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_CONTACT_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.user'); ?>
+				</div>
 			</div>
 		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.user'); ?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.tag');?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.tag'); ?>
+				</div>
 			</div>
 		</div>
-		<?php if ($published >= 0) : ?>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.item', 'com_contact');?>
-			</div>
+		<div class="row-fluid">
+			<?php if ($published >= 0) : ?>
+				<div class="control-group">
+					<div class="controls">
+						<?php echo JHtml::_('batch.item', 'com_contact'); ?>
+					</div>
+				</div>
+			<?php endif; ?>
 		</div>
-		<?php endif; ?>
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-category-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value='';document.id('batch-user-id').value='';document.id('batch-tag-id)').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_contact/views/contacts/tmpl/modal.php b/administrator/components/com_contact/views/contacts/tmpl/modal.php
index 9172a00..9647ec5 100644
--- a/administrator/components/com_contact/views/contacts/tmpl/modal.php
+++ b/administrator/components/com_contact/views/contacts/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contact/views/contacts/view.html.php b/administrator/components/com_contact/views/contacts/view.html.php
index dc50b1e..9fb24ff 100644
--- a/administrator/components/com_contact/views/contacts/view.html.php
+++ b/administrator/components/com_contact/views/contacts/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -64,8 +64,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		require_once JPATH_COMPONENT . '/helpers/contact.php';
-		$canDo	= JHelperContent::getActions($this->state->get('filter.category_id'), 0, 'com_contact');
+		$canDo	= JHelperContent::getActions('com_contact', 'category', $this->state->get('filter.category_id'));
 		$user	= JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_content/content.php b/administrator/components/com_content/content.php
index 8118e8e..be019a4 100644
--- a/administrator/components/com_content/content.php
+++ b/administrator/components/com_content/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/content.xml b/administrator/components/com_content/content.xml
index 13d5cac..7a50daf 100644
--- a/administrator/components/com_content/content.xml
+++ b/administrator/components/com_content/content.xml
@@ -3,7 +3,7 @@
 	<name>com_content</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_content/controller.php b/administrator/components/com_content/controller.php
index 25eb5ea..d121baf 100644
--- a/administrator/components/com_content/controller.php
+++ b/administrator/components/com_content/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/controllers/article.php b/administrator/components/com_content/controllers/article.php
index 1091a43..f8d175b 100644
--- a/administrator/components/com_content/controllers/article.php
+++ b/administrator/components/com_content/controllers/article.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/controllers/articles.php b/administrator/components/com_content/controllers/articles.php
index 3142a5d..de2728c 100644
--- a/administrator/components/com_content/controllers/articles.php
+++ b/administrator/components/com_content/controllers/articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/controllers/featured.php b/administrator/components/com_content/controllers/featured.php
index 2d1bb7d..a3e6ce4 100644
--- a/administrator/components/com_content/controllers/featured.php
+++ b/administrator/components/com_content/controllers/featured.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php
index 369b4f6..c9ccfea 100644
--- a/administrator/components/com_content/helpers/content.php
+++ b/administrator/components/com_content/helpers/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/helpers/html/contentadministrator.php b/administrator/components/com_content/helpers/html/contentadministrator.php
index b7cbff3..b98534a 100644
--- a/administrator/components/com_content/helpers/html/contentadministrator.php
+++ b/administrator/components/com_content/helpers/html/contentadministrator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php
index 6ce53ab..8109949 100644
--- a/administrator/components/com_content/models/article.php
+++ b/administrator/components/com_content/models/article.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -400,7 +400,10 @@ protected function loadFormData()
 			// Prime some default values.
 			if ($this->getState('article.id') == 0)
 			{
-				$data->set('catid', $app->input->getInt('catid', $app->getUserState('com_content.articles.filter.category_id')));
+				$filters = (array) $app->getUserState('com_content.articles.filter');
+				$filterCatId = isset($filters['category_id']) ? $filters['category_id'] : null;
+
+				$data->set('catid', $app->input->getInt('catid', $filterCatId));
 			}
 		}
 
diff --git a/administrator/components/com_content/models/articles.php b/administrator/components/com_content/models/articles.php
index 3af0694..fcde330 100644
--- a/administrator/components/com_content/models/articles.php
+++ b/administrator/components/com_content/models/articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/models/feature.php b/administrator/components/com_content/models/feature.php
index 9681218..9c7a1eb 100644
--- a/administrator/components/com_content/models/feature.php
+++ b/administrator/components/com_content/models/feature.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/models/featured.php b/administrator/components/com_content/models/featured.php
index c837b41..0ef057c 100644
--- a/administrator/components/com_content/models/featured.php
+++ b/administrator/components/com_content/models/featured.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/models/fields/modal/article.php b/administrator/components/com_content/models/fields/modal/article.php
index 0e7107b..9f96ca9 100644
--- a/administrator/components/com_content/models/fields/modal/article.php
+++ b/administrator/components/com_content/models/fields/modal/article.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/tables/featured.php b/administrator/components/com_content/tables/featured.php
index d24da04..40b6503 100644
--- a/administrator/components/com_content/tables/featured.php
+++ b/administrator/components/com_content/tables/featured.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/tmpl/edit.php b/administrator/components/com_content/views/article/tmpl/edit.php
index 6b8b814..9ccde00 100644
--- a/administrator/components/com_content/views/article/tmpl/edit.php
+++ b/administrator/components/com_content/views/article/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/tmpl/edit_associations.php b/administrator/components/com_content/views/article/tmpl/edit_associations.php
index b0dcd5b..cd8a036 100644
--- a/administrator/components/com_content/views/article/tmpl/edit_associations.php
+++ b/administrator/components/com_content/views/article/tmpl/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/tmpl/edit_metadata.php b/administrator/components/com_content/views/article/tmpl/edit_metadata.php
index d46af94..82b2fb9 100644
--- a/administrator/components/com_content/views/article/tmpl/edit_metadata.php
+++ b/administrator/components/com_content/views/article/tmpl/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/tmpl/modal.php b/administrator/components/com_content/views/article/tmpl/modal.php
index ec90ea1..efb2bd4 100644
--- a/administrator/components/com_content/views/article/tmpl/modal.php
+++ b/administrator/components/com_content/views/article/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/tmpl/modal_associations.php b/administrator/components/com_content/views/article/tmpl/modal_associations.php
index b0dcd5b..cd8a036 100644
--- a/administrator/components/com_content/views/article/tmpl/modal_associations.php
+++ b/administrator/components/com_content/views/article/tmpl/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/tmpl/modal_metadata.php b/administrator/components/com_content/views/article/tmpl/modal_metadata.php
index d46af94..82b2fb9 100644
--- a/administrator/components/com_content/views/article/tmpl/modal_metadata.php
+++ b/administrator/components/com_content/views/article/tmpl/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/tmpl/pagebreak.php b/administrator/components/com_content/views/article/tmpl/pagebreak.php
index 805f59d..a4502c9 100644
--- a/administrator/components/com_content/views/article/tmpl/pagebreak.php
+++ b/administrator/components/com_content/views/article/tmpl/pagebreak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/article/view.html.php b/administrator/components/com_content/views/article/view.html.php
index f858f48..fa8ebe9 100644
--- a/administrator/components/com_content/views/article/view.html.php
+++ b/administrator/components/com_content/views/article/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -44,7 +44,7 @@ public function display($tpl = null)
 		$this->form		= $this->get('Form');
 		$this->item		= $this->get('Item');
 		$this->state	= $this->get('State');
-		$this->canDo	= JHelperContent::getActions($this->state->get('filter.category_id'), 0, 'com_content');
+		$this->canDo	= JHelperContent::getActions('com_content', 'article', $this->item->id);
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
diff --git a/administrator/components/com_content/views/articles/tmpl/default.php b/administrator/components/com_content/views/articles/tmpl/default.php
index 2b07d1d..fa8b033 100644
--- a/administrator/components/com_content/views/articles/tmpl/default.php
+++ b/administrator/components/com_content/views/articles/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/articles/tmpl/default_batch.php b/administrator/components/com_content/views/articles/tmpl/default_batch.php
index 284df52..20b923f 100644
--- a/administrator/components/com_content/views/articles/tmpl/default_batch.php
+++ b/administrator/components/com_content/views/articles/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,33 +13,37 @@
 ?>
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
-		<button type="button" role="presentation" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_CONTENT_BATCH_OPTIONS');?></h3>
+		<button type="button" class="close" data-dismiss="modal">&#215;</button>
+		<h3><?php echo JText::_('COM_CONTENT_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_CONTENT_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.tag'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.tag');?>
-			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
 		</div>
-		<?php if ($published >= 0) : ?>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.item', 'com_content');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
+				</div>
 			</div>
+			<?php if ($published >= 0) : ?>
+				<div class="control-group span6">
+					<div class="controls">
+						<?php echo JHtml::_('batch.item', 'com_content'); ?>
+					</div>
+				</div>
+			<?php endif; ?>
 		</div>
-		<?php endif; ?>
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-category-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value='';document.id('batch-tag-id)').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_content/views/articles/tmpl/modal.php b/administrator/components/com_content/views/articles/tmpl/modal.php
index 195b627..bac008f 100644
--- a/administrator/components/com_content/views/articles/tmpl/modal.php
+++ b/administrator/components/com_content/views/articles/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/articles/view.html.php b/administrator/components/com_content/views/articles/view.html.php
index 6a54472..ff81e37 100644
--- a/administrator/components/com_content/views/articles/view.html.php
+++ b/administrator/components/com_content/views/articles/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -87,7 +87,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo = JHelperContent::getActions($this->state->get('filter.category_id'), 0, 'com_content');
+		$canDo = JHelperContent::getActions('com_content', 'category', $this->state->get('filter.category_id'));
 		$user  = JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_content/views/featured/tmpl/default.php b/administrator/components/com_content/views/featured/tmpl/default.php
index 8f32425..954791e 100644
--- a/administrator/components/com_content/views/featured/tmpl/default.php
+++ b/administrator/components/com_content/views/featured/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_content/views/featured/view.html.php b/administrator/components/com_content/views/featured/view.html.php
index d5fd779..63a5d49 100644
--- a/administrator/components/com_content/views/featured/view.html.php
+++ b/administrator/components/com_content/views/featured/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -80,7 +80,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$state	= $this->get('State');
-		$canDo	= JHelperContent::getActions($this->state->get('filter.category_id'), 0, 'com_content');
+		$canDo	= JHelperContent::getActions('com_content', 'category', $this->state->get('filter.category_id'));
 
 		JToolbarHelper::title(JText::_('COM_CONTENT_FEATURED_TITLE'), 'star featured');
 
diff --git a/administrator/components/com_contenthistory/contenthistory.php b/administrator/components/com_contenthistory/contenthistory.php
index fcb0044..a5033ed 100644
--- a/administrator/components/com_contenthistory/contenthistory.php
+++ b/administrator/components/com_contenthistory/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/contenthistory.xml b/administrator/components/com_contenthistory/contenthistory.xml
index 393d5ce..0ce8a85 100644
--- a/administrator/components/com_contenthistory/contenthistory.xml
+++ b/administrator/components/com_contenthistory/contenthistory.xml
@@ -3,7 +3,7 @@
 	<name>com_contenthistory</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2013</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_contenthistory/controller.php b/administrator/components/com_contenthistory/controller.php
index 2fcc534..7444dfb 100644
--- a/administrator/components/com_contenthistory/controller.php
+++ b/administrator/components/com_contenthistory/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/controllers/history.php b/administrator/components/com_contenthistory/controllers/history.php
index 4683709..830b5b5 100644
--- a/administrator/components/com_contenthistory/controllers/history.php
+++ b/administrator/components/com_contenthistory/controllers/history.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/controllers/preview.php b/administrator/components/com_contenthistory/controllers/preview.php
index 311700c..b5558f2 100644
--- a/administrator/components/com_contenthistory/controllers/preview.php
+++ b/administrator/components/com_contenthistory/controllers/preview.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/helpers/contenthistory.php b/administrator/components/com_contenthistory/helpers/contenthistory.php
index 9318b3e..a92755d 100644
--- a/administrator/components/com_contenthistory/helpers/contenthistory.php
+++ b/administrator/components/com_contenthistory/helpers/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/helpers/html/textdiff.php b/administrator/components/com_contenthistory/helpers/html/textdiff.php
index 67ead41..6a6e888 100644
--- a/administrator/components/com_contenthistory/helpers/html/textdiff.php
+++ b/administrator/components/com_contenthistory/helpers/html/textdiff.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_contenthistory/models/compare.php b/administrator/components/com_contenthistory/models/compare.php
index 7574822..7c2eab8 100644
--- a/administrator/components/com_contenthistory/models/compare.php
+++ b/administrator/components/com_contenthistory/models/compare.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/models/history.php b/administrator/components/com_contenthistory/models/history.php
index 0c253f9..f019041 100644
--- a/administrator/components/com_contenthistory/models/history.php
+++ b/administrator/components/com_contenthistory/models/history.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/models/preview.php b/administrator/components/com_contenthistory/models/preview.php
index 7b4e149..692fe85 100644
--- a/administrator/components/com_contenthistory/models/preview.php
+++ b/administrator/components/com_contenthistory/models/preview.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php
index 6e2af00..8227ac9 100644
--- a/administrator/components/com_contenthistory/views/compare/tmpl/compare.php
+++ b/administrator/components/com_contenthistory/views/compare/tmpl/compare.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/views/compare/view.html.php b/administrator/components/com_contenthistory/views/compare/view.html.php
index 8d59aa5..89b622d 100644
--- a/administrator/components/com_contenthistory/views/compare/view.html.php
+++ b/administrator/components/com_contenthistory/views/compare/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/views/history/tmpl/modal.php b/administrator/components/com_contenthistory/views/history/tmpl/modal.php
index d2aaff4..63de039 100644
--- a/administrator/components/com_contenthistory/views/history/tmpl/modal.php
+++ b/administrator/components/com_contenthistory/views/history/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/views/history/view.html.php b/administrator/components/com_contenthistory/views/history/view.html.php
index 7b2e20b..f93dbb9 100644
--- a/administrator/components/com_contenthistory/views/history/view.html.php
+++ b/administrator/components/com_contenthistory/views/history/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/views/preview/tmpl/preview.php b/administrator/components/com_contenthistory/views/preview/tmpl/preview.php
index 3d31c91..b3c3c0a 100644
--- a/administrator/components/com_contenthistory/views/preview/tmpl/preview.php
+++ b/administrator/components/com_contenthistory/views/preview/tmpl/preview.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_contenthistory/views/preview/view.html.php b/administrator/components/com_contenthistory/views/preview/view.html.php
index 6d16fc0..e734d8e 100644
--- a/administrator/components/com_contenthistory/views/preview/view.html.php
+++ b/administrator/components/com_contenthistory/views/preview/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/controller.php b/administrator/components/com_cpanel/controller.php
index 2894762..ee287b3 100644
--- a/administrator/components/com_cpanel/controller.php
+++ b/administrator/components/com_cpanel/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/cpanel.php b/administrator/components/com_cpanel/cpanel.php
index f39cad0..6e8a223 100644
--- a/administrator/components/com_cpanel/cpanel.php
+++ b/administrator/components/com_cpanel/cpanel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/cpanel.xml b/administrator/components/com_cpanel/cpanel.xml
index a8cffd5..7da6b75 100644
--- a/administrator/components/com_cpanel/cpanel.xml
+++ b/administrator/components/com_cpanel/cpanel.xml
@@ -3,7 +3,7 @@
 	<name>com_cpanel</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_cpanel/views/cpanel/tmpl/default.php b/administrator/components/com_cpanel/views/cpanel/tmpl/default.php
index 2153cab..2942f20 100644
--- a/administrator/components/com_cpanel/views/cpanel/tmpl/default.php
+++ b/administrator/components/com_cpanel/views/cpanel/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_cpanel/views/cpanel/view.html.php b/administrator/components/com_cpanel/views/cpanel/view.html.php
index bc39567..b7ce022 100644
--- a/administrator/components/com_cpanel/views/cpanel/view.html.php
+++ b/administrator/components/com_cpanel/views/cpanel/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cpanel
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_finder/controller.php b/administrator/components/com_finder/controller.php
index b233a65..8d92f6d 100644
--- a/administrator/components/com_finder/controller.php
+++ b/administrator/components/com_finder/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/controllers/filter.php b/administrator/components/com_finder/controllers/filter.php
index 1ccbc92..fe45dfc 100644
--- a/administrator/components/com_finder/controllers/filter.php
+++ b/administrator/components/com_finder/controllers/filter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/controllers/filters.php b/administrator/components/com_finder/controllers/filters.php
index ea1184e..5d48529 100644
--- a/administrator/components/com_finder/controllers/filters.php
+++ b/administrator/components/com_finder/controllers/filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/controllers/index.php b/administrator/components/com_finder/controllers/index.php
index 1df822f..f5e654c 100644
--- a/administrator/components/com_finder/controllers/index.php
+++ b/administrator/components/com_finder/controllers/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/controllers/indexer.json.php b/administrator/components/com_finder/controllers/indexer.json.php
index 86a39ef..15e20bd 100644
--- a/administrator/components/com_finder/controllers/indexer.json.php
+++ b/administrator/components/com_finder/controllers/indexer.json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/controllers/maps.php b/administrator/components/com_finder/controllers/maps.php
index 55c82be..c1f91c6 100644
--- a/administrator/components/com_finder/controllers/maps.php
+++ b/administrator/components/com_finder/controllers/maps.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/finder.php b/administrator/components/com_finder/finder.php
index 6727751..751bd00 100644
--- a/administrator/components/com_finder/finder.php
+++ b/administrator/components/com_finder/finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/finder.xml b/administrator/components/com_finder/finder.xml
index a749938..811a89b 100644
--- a/administrator/components/com_finder/finder.xml
+++ b/administrator/components/com_finder/finder.xml
@@ -2,7 +2,7 @@
 <extension type="component" version="3.1" method="upgrade">
 	<name>com_finder</name>
 	<author>Joomla! Project</author>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<creationDate>August 2011</creationDate>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/components/com_finder/helpers/finder.php b/administrator/components/com_finder/helpers/finder.php
index f06deed..b0d7838 100644
--- a/administrator/components/com_finder/helpers/finder.php
+++ b/administrator/components/com_finder/helpers/finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -51,27 +51,4 @@ public static function addSubmenu($vName)
 			$vName == 'filters'
 		);
 	}
-
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject  A JObject containing the allowed actions.
-	 *
-	 * @since   2.5
-	 */
-	public static function getActions()
-	{
-		$user = JFactory::getUser();
-		$result = new JObject;
-		$assetName = 'com_finder';
-
-		$actions = JAccess::getActions($assetName, 'component');
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name, $user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
 }
diff --git a/administrator/components/com_finder/helpers/html/finder.php b/administrator/components/com_finder/helpers/html/finder.php
index 6f04660..38bd6d9 100644
--- a/administrator/components/com_finder/helpers/html/finder.php
+++ b/administrator/components/com_finder/helpers/html/finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/adapter.php b/administrator/components/com_finder/helpers/indexer/adapter.php
index d947026..565a981 100644
--- a/administrator/components/com_finder/helpers/indexer/adapter.php
+++ b/administrator/components/com_finder/helpers/indexer/adapter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/driver/mysql.php b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
index 6386d6f..4c8d1e8 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/mysql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
index 114bdba..19e53e4 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
index 56e80e6..7192d57 100644
--- a/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
+++ b/administrator/components/com_finder/helpers/indexer/driver/sqlsrv.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php
index ee0dae1..86d2924 100644
--- a/administrator/components/com_finder/helpers/indexer/helper.php
+++ b/administrator/components/com_finder/helpers/indexer/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php
index 63eb688..171dd83 100644
--- a/administrator/components/com_finder/helpers/indexer/indexer.php
+++ b/administrator/components/com_finder/helpers/indexer/indexer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/parser.php b/administrator/components/com_finder/helpers/indexer/parser.php
index 0f87e29..42f22e8 100644
--- a/administrator/components/com_finder/helpers/indexer/parser.php
+++ b/administrator/components/com_finder/helpers/indexer/parser.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/parser/html.php b/administrator/components/com_finder/helpers/indexer/parser/html.php
index e9830f3..1c2c031 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/html.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/parser/rtf.php b/administrator/components/com_finder/helpers/indexer/parser/rtf.php
index 7563c19..290e5a1 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/rtf.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/rtf.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/parser/txt.php b/administrator/components/com_finder/helpers/indexer/parser/txt.php
index 7b8c8ca..7f7ad41 100644
--- a/administrator/components/com_finder/helpers/indexer/parser/txt.php
+++ b/administrator/components/com_finder/helpers/indexer/parser/txt.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/query.php b/administrator/components/com_finder/helpers/indexer/query.php
index 5604861..536cfc4 100644
--- a/administrator/components/com_finder/helpers/indexer/query.php
+++ b/administrator/components/com_finder/helpers/indexer/query.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/result.php b/administrator/components/com_finder/helpers/indexer/result.php
index 1d05bea..4184f5d 100644
--- a/administrator/components/com_finder/helpers/indexer/result.php
+++ b/administrator/components/com_finder/helpers/indexer/result.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer.php b/administrator/components/com_finder/helpers/indexer/stemmer.php
index d2c9a81..a182a44 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
index 05c9556..24bd6de 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer/fr.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
index 330143f..11593e7 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer/porter_en.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
index e387da4..39fd441 100644
--- a/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
+++ b/administrator/components/com_finder/helpers/indexer/stemmer/snowball.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/taxonomy.php b/administrator/components/com_finder/helpers/indexer/taxonomy.php
index 05668dd..8cd52ea 100644
--- a/administrator/components/com_finder/helpers/indexer/taxonomy.php
+++ b/administrator/components/com_finder/helpers/indexer/taxonomy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/indexer/token.php b/administrator/components/com_finder/helpers/indexer/token.php
index 45a6930..de3affd 100644
--- a/administrator/components/com_finder/helpers/indexer/token.php
+++ b/administrator/components/com_finder/helpers/indexer/token.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/helpers/language.php b/administrator/components/com_finder/helpers/language.php
index 5c0c9d2..4f289ba 100644
--- a/administrator/components/com_finder/helpers/language.php
+++ b/administrator/components/com_finder/helpers/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/fields/directories.php b/administrator/components/com_finder/models/fields/directories.php
index d64f424..b906fb2 100644
--- a/administrator/components/com_finder/models/fields/directories.php
+++ b/administrator/components/com_finder/models/fields/directories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/fields/searchfilter.php b/administrator/components/com_finder/models/fields/searchfilter.php
index 59f3dc0..999c4f2 100644
--- a/administrator/components/com_finder/models/fields/searchfilter.php
+++ b/administrator/components/com_finder/models/fields/searchfilter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/filter.php b/administrator/components/com_finder/models/filter.php
index 83f3997..b46e716 100644
--- a/administrator/components/com_finder/models/filter.php
+++ b/administrator/components/com_finder/models/filter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/filters.php b/administrator/components/com_finder/models/filters.php
index 3a59700..67dc9f5 100644
--- a/administrator/components/com_finder/models/filters.php
+++ b/administrator/components/com_finder/models/filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/index.php b/administrator/components/com_finder/models/index.php
index c70d9cf..d80de20 100644
--- a/administrator/components/com_finder/models/index.php
+++ b/administrator/components/com_finder/models/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/indexer.php b/administrator/components/com_finder/models/indexer.php
index 784b50a..7c86d99 100644
--- a/administrator/components/com_finder/models/indexer.php
+++ b/administrator/components/com_finder/models/indexer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/maps.php b/administrator/components/com_finder/models/maps.php
index 0129542..ec93535 100644
--- a/administrator/components/com_finder/models/maps.php
+++ b/administrator/components/com_finder/models/maps.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/models/statistics.php b/administrator/components/com_finder/models/statistics.php
index dd52625..2605378 100644
--- a/administrator/components/com_finder/models/statistics.php
+++ b/administrator/components/com_finder/models/statistics.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/tables/filter.php b/administrator/components/com_finder/tables/filter.php
index 30fd952..b644d9f 100644
--- a/administrator/components/com_finder/tables/filter.php
+++ b/administrator/components/com_finder/tables/filter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/tables/link.php b/administrator/components/com_finder/tables/link.php
index 057f3c6..92f7b1b 100644
--- a/administrator/components/com_finder/tables/link.php
+++ b/administrator/components/com_finder/tables/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/tables/map.php b/administrator/components/com_finder/tables/map.php
index c2dec33..5a77daf 100644
--- a/administrator/components/com_finder/tables/map.php
+++ b/administrator/components/com_finder/tables/map.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/filter/tmpl/edit.php b/administrator/components/com_finder/views/filter/tmpl/edit.php
index cd43d41..d3bc66d 100644
--- a/administrator/components/com_finder/views/filter/tmpl/edit.php
+++ b/administrator/components/com_finder/views/filter/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/filter/view.html.php b/administrator/components/com_finder/views/filter/view.html.php
index a5b570d..db4dbda 100644
--- a/administrator/components/com_finder/views/filter/view.html.php
+++ b/administrator/components/com_finder/views/filter/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -66,7 +66,7 @@ protected function addToolbar()
 		$userId = $user->get('id');
 		$isNew = ($this->item->filter_id == 0);
 		$checkedOut = !($this->item->checked_out == 0 || $this->item->checked_out == $userId);
-		$canDo = FinderHelper::getActions();
+		$canDo = JHelperContent::getActions('com_finder');
 
 		// Configure the toolbar.
 		JToolbarHelper::title(JText::_('COM_FINDER_FILTER_EDIT_TOOLBAR_TITLE'), 'zoom-in finder');
diff --git a/administrator/components/com_finder/views/filters/tmpl/default.php b/administrator/components/com_finder/views/filters/tmpl/default.php
index 999f7ce..d647332 100644
--- a/administrator/components/com_finder/views/filters/tmpl/default.php
+++ b/administrator/components/com_finder/views/filters/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/filters/view.html.php b/administrator/components/com_finder/views/filters/view.html.php
index aa5087e..cbdaf3d 100644
--- a/administrator/components/com_finder/views/filters/view.html.php
+++ b/administrator/components/com_finder/views/filters/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -61,7 +61,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo = FinderHelper::getActions();
+		$canDo = JHelperContent::getActions('com_finder');
 
 		JToolbarHelper::title(JText::_('COM_FINDER_FILTERS_TOOLBAR_TITLE'), 'zoom-in finder');
 		$toolbar = JToolbar::getInstance('toolbar');
diff --git a/administrator/components/com_finder/views/index/tmpl/default.php b/administrator/components/com_finder/views/index/tmpl/default.php
index b34444a..db1ff59 100644
--- a/administrator/components/com_finder/views/index/tmpl/default.php
+++ b/administrator/components/com_finder/views/index/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/index/view.html.php b/administrator/components/com_finder/views/index/view.html.php
index 206e42f..e6c0488 100644
--- a/administrator/components/com_finder/views/index/view.html.php
+++ b/administrator/components/com_finder/views/index/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -66,7 +66,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo	= FinderHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_finder');
 
 		JToolbarHelper::title(JText::_('COM_FINDER_INDEX_TOOLBAR_TITLE'), 'zoom-in finder');
 
diff --git a/administrator/components/com_finder/views/indexer/tmpl/default.php b/administrator/components/com_finder/views/indexer/tmpl/default.php
index 34f3195..b49e3f5 100644
--- a/administrator/components/com_finder/views/indexer/tmpl/default.php
+++ b/administrator/components/com_finder/views/indexer/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/indexer/view.html.php b/administrator/components/com_finder/views/indexer/view.html.php
index 02a6548..46c52c8 100644
--- a/administrator/components/com_finder/views/indexer/view.html.php
+++ b/administrator/components/com_finder/views/indexer/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/maps/tmpl/default.php b/administrator/components/com_finder/views/maps/tmpl/default.php
index 954aad8..45c041a 100644
--- a/administrator/components/com_finder/views/maps/tmpl/default.php
+++ b/administrator/components/com_finder/views/maps/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/maps/view.html.php b/administrator/components/com_finder/views/maps/view.html.php
index a7a19c0..63014ee 100644
--- a/administrator/components/com_finder/views/maps/view.html.php
+++ b/administrator/components/com_finder/views/maps/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -66,9 +66,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		// For whatever reason, the helper isn't being found
-		include_once JPATH_COMPONENT . '/helpers/finder.php';
-		$canDo	= FinderHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_finder');
 
 		JToolbarHelper::title(JText::_('COM_FINDER_MAPS_TOOLBAR_TITLE'), 'zoom-in finder');
 		$toolbar = JToolbar::getInstance('toolbar');
diff --git a/administrator/components/com_finder/views/statistics/tmpl/default.php b/administrator/components/com_finder/views/statistics/tmpl/default.php
index d2236f9..8f73e77 100644
--- a/administrator/components/com_finder/views/statistics/tmpl/default.php
+++ b/administrator/components/com_finder/views/statistics/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_finder/views/statistics/view.html.php b/administrator/components/com_finder/views/statistics/view.html.php
index 123405b..ed3c871 100644
--- a/administrator/components/com_finder/views/statistics/view.html.php
+++ b/administrator/components/com_finder/views/statistics/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/administrator/components/com_installer/controller.php b/administrator/components/com_installer/controller.php
index f3fdc8a..e4f1520 100644
--- a/administrator/components/com_installer/controller.php
+++ b/administrator/components/com_installer/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/controllers/database.php b/administrator/components/com_installer/controllers/database.php
index bc424cb..0808a80 100644
--- a/administrator/components/com_installer/controllers/database.php
+++ b/administrator/components/com_installer/controllers/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/controllers/discover.php b/administrator/components/com_installer/controllers/discover.php
index 6515b0e..10a911d 100644
--- a/administrator/components/com_installer/controllers/discover.php
+++ b/administrator/components/com_installer/controllers/discover.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/controllers/install.php b/administrator/components/com_installer/controllers/install.php
index 1d8b997..f67c56c 100644
--- a/administrator/components/com_installer/controllers/install.php
+++ b/administrator/components/com_installer/controllers/install.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/controllers/languages.php b/administrator/components/com_installer/controllers/languages.php
index ad69687..f96c727 100644
--- a/administrator/components/com_installer/controllers/languages.php
+++ b/administrator/components/com_installer/controllers/languages.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_installer
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License, see LICENSE.php
  */
 
diff --git a/administrator/components/com_installer/controllers/manage.php b/administrator/components/com_installer/controllers/manage.php
index c174ad5..029365e 100644
--- a/administrator/components/com_installer/controllers/manage.php
+++ b/administrator/components/com_installer/controllers/manage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/controllers/update.php b/administrator/components/com_installer/controllers/update.php
index 6f69a52..37b2aaa 100644
--- a/administrator/components/com_installer/controllers/update.php
+++ b/administrator/components/com_installer/controllers/update.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/helpers/html/manage.php b/administrator/components/com_installer/helpers/html/manage.php
index d9d770e..f0eb944 100644
--- a/administrator/components/com_installer/helpers/html/manage.php
+++ b/administrator/components/com_installer/helpers/html/manage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/helpers/installer.php b/administrator/components/com_installer/helpers/installer.php
index 5d2fbf1..e1387d1 100644
--- a/administrator/components/com_installer/helpers/installer.php
+++ b/administrator/components/com_installer/helpers/installer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -115,28 +115,4 @@ public static function getExtensionGroupes()
 
 		return $options;
 	}
-
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @since   1.6
-	 */
-	public static function getActions()
-	{
-		$user	= JFactory::getUser();
-		$result	= new JObject;
-
-		$assetName = 'com_installer';
-
-		$actions = JAccess::getActions($assetName);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name,	$user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
 }
diff --git a/administrator/components/com_installer/installer.php b/administrator/components/com_installer/installer.php
index c2ec74a..cd72e66 100644
--- a/administrator/components/com_installer/installer.php
+++ b/administrator/components/com_installer/installer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/installer.xml b/administrator/components/com_installer/installer.xml
index 16eea9a..11712d0 100644
--- a/administrator/components/com_installer/installer.xml
+++ b/administrator/components/com_installer/installer.xml
@@ -3,7 +3,7 @@
 	<name>com_installer</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_installer/models/database.php b/administrator/components/com_installer/models/database.php
index 03eadfa..3a19f8a 100644
--- a/administrator/components/com_installer/models/database.php
+++ b/administrator/components/com_installer/models/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/models/discover.php b/administrator/components/com_installer/models/discover.php
index bf8cd6b..91412ff 100644
--- a/administrator/components/com_installer/models/discover.php
+++ b/administrator/components/com_installer/models/discover.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/models/extension.php b/administrator/components/com_installer/models/extension.php
index bd34bb2..ce653cb 100644
--- a/administrator/components/com_installer/models/extension.php
+++ b/administrator/components/com_installer/models/extension.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/models/install.php b/administrator/components/com_installer/models/install.php
index 7517704..e540b06 100644
--- a/administrator/components/com_installer/models/install.php
+++ b/administrator/components/com_installer/models/install.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/models/languages.php b/administrator/components/com_installer/models/languages.php
index 30d72ec..9ceff18 100644
--- a/administrator/components/com_installer/models/languages.php
+++ b/administrator/components/com_installer/models/languages.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_installer
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/models/manage.php b/administrator/components/com_installer/models/manage.php
index 5eb5795..c49a512 100644
--- a/administrator/components/com_installer/models/manage.php
+++ b/administrator/components/com_installer/models/manage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/models/update.php b/administrator/components/com_installer/models/update.php
index a9eeca0..17b7790 100644
--- a/administrator/components/com_installer/models/update.php
+++ b/administrator/components/com_installer/models/update.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -237,6 +237,7 @@ public function update($uids)
 			$instance = JTable::getInstance('update');
 			$instance->load($uid);
 			$update->loadFromXML($instance->detailsurl);
+			$update->set('extra_query', $instance->extra_query);
 
 			// Install sets state and enqueues messages
 			$res = $this->install($update);
@@ -268,6 +269,22 @@ private function install($update)
 		if (isset($update->get('downloadurl')->_data))
 		{
 			$url = $update->downloadurl->_data;
+
+			$extra_query = $update->get('extra_query');
+
+			if ($extra_query)
+			{
+				if (strpos($url, '?') === false)
+				{
+					$url .= '?';
+				}
+				else
+				{
+					$url .= '&amp;';
+				}
+
+				$url .= $extra_query;
+			}
 		}
 		else
 		{
diff --git a/administrator/components/com_installer/models/warnings.php b/administrator/components/com_installer/models/warnings.php
index 34ffb44..9a8bede 100644
--- a/administrator/components/com_installer/models/warnings.php
+++ b/administrator/components/com_installer/models/warnings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/database/tmpl/default.php b/administrator/components/com_installer/views/database/tmpl/default.php
index de74b42..1917b44 100644
--- a/administrator/components/com_installer/views/database/tmpl/default.php
+++ b/administrator/components/com_installer/views/database/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/database/view.html.php b/administrator/components/com_installer/views/database/view.html.php
index 388f42f..2a7dbc2 100644
--- a/administrator/components/com_installer/views/database/view.html.php
+++ b/administrator/components/com_installer/views/database/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/default/tmpl/default_ftp.php b/administrator/components/com_installer/views/default/tmpl/default_ftp.php
index 3fec65f..f306bd4 100644
--- a/administrator/components/com_installer/views/default/tmpl/default_ftp.php
+++ b/administrator/components/com_installer/views/default/tmpl/default_ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/default/tmpl/default_message.php b/administrator/components/com_installer/views/default/tmpl/default_message.php
index 5100178..a967b7a 100644
--- a/administrator/components/com_installer/views/default/tmpl/default_message.php
+++ b/administrator/components/com_installer/views/default/tmpl/default_message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/default/view.php b/administrator/components/com_installer/views/default/view.php
index 73c7c1c..ac37422 100644
--- a/administrator/components/com_installer/views/default/view.php
+++ b/administrator/components/com_installer/views/default/view.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -72,7 +72,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo	= InstallerHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_installer');
 		JToolbarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install');
 
 		if ($canDo->get('core.admin'))
diff --git a/administrator/components/com_installer/views/discover/tmpl/default.php b/administrator/components/com_installer/views/discover/tmpl/default.php
index c9124a3..4f5a58b 100644
--- a/administrator/components/com_installer/views/discover/tmpl/default.php
+++ b/administrator/components/com_installer/views/discover/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/discover/tmpl/default_item.php b/administrator/components/com_installer/views/discover/tmpl/default_item.php
index c1485ce..82f28fa 100644
--- a/administrator/components/com_installer/views/discover/tmpl/default_item.php
+++ b/administrator/components/com_installer/views/discover/tmpl/default_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/discover/view.html.php b/administrator/components/com_installer/views/discover/view.html.php
index 6adf42e..4baf0e9 100644
--- a/administrator/components/com_installer/views/discover/view.html.php
+++ b/administrator/components/com_installer/views/discover/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/install/tmpl/default.php b/administrator/components/com_installer/views/install/tmpl/default.php
index 53358c3..2f1a8b0 100644
--- a/administrator/components/com_installer/views/install/tmpl/default.php
+++ b/administrator/components/com_installer/views/install/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/install/view.html.php b/administrator/components/com_installer/views/install/view.html.php
index b5e4173..654ef5a 100644
--- a/administrator/components/com_installer/views/install/view.html.php
+++ b/administrator/components/com_installer/views/install/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/languages/tmpl/default.php b/administrator/components/com_installer/views/languages/tmpl/default.php
index 599b8c0..a81cb24 100644
--- a/administrator/components/com_installer/views/languages/tmpl/default.php
+++ b/administrator/components/com_installer/views/languages/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/languages/tmpl/default_filter.php b/administrator/components/com_installer/views/languages/tmpl/default_filter.php
index eb6616c..395aae0 100644
--- a/administrator/components/com_installer/views/languages/tmpl/default_filter.php
+++ b/administrator/components/com_installer/views/languages/tmpl/default_filter.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_installer
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/languages/view.html.php b/administrator/components/com_installer/views/languages/view.html.php
index 4b4f18f..7749c66 100644
--- a/administrator/components/com_installer/views/languages/view.html.php
+++ b/administrator/components/com_installer/views/languages/view.html.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_installer
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,7 +65,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo = InstallerHelper::getActions();
+		$canDo = JHelperContent::getActions('com_installer');
 		JToolBarHelper::title(JText::_('COM_INSTALLER_HEADER_' . $this->getName()), 'puzzle install');
 
 		if ($canDo->get('core.admin'))
diff --git a/administrator/components/com_installer/views/manage/tmpl/default.php b/administrator/components/com_installer/views/manage/tmpl/default.php
index 9f4004c..707ebae 100644
--- a/administrator/components/com_installer/views/manage/tmpl/default.php
+++ b/administrator/components/com_installer/views/manage/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/manage/view.html.php b/administrator/components/com_installer/views/manage/view.html.php
index 3737826..2a668d0 100644
--- a/administrator/components/com_installer/views/manage/view.html.php
+++ b/administrator/components/com_installer/views/manage/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -76,7 +76,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo	= InstallerHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_installer');
 		if ($canDo->get('core.edit.state'))
 		{
 			JToolbarHelper::publish('manage.publish', 'JTOOLBAR_ENABLE', true);
diff --git a/administrator/components/com_installer/views/update/tmpl/default.php b/administrator/components/com_installer/views/update/tmpl/default.php
index 8a4027f..3f9ac6e 100644
--- a/administrator/components/com_installer/views/update/tmpl/default.php
+++ b/administrator/components/com_installer/views/update/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,14 +18,10 @@
 ?>
 <div id="installer-update">
 	<form action="<?php echo JRoute::_('index.php?option=com_installer&view=update');?>" method="post" name="adminForm" id="adminForm">
-	<?php if (!empty($this->sidebar)) : ?>
-		<div id="j-sidebar-container" class="span2">
-			<?php echo $this->sidebar; ?>
-		</div>
-		<div id="j-main-container" class="span10">
-	<?php else : ?>
-		<div id="j-main-container">
-	<?php endif; ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
 
 	<?php if ($this->showMessage) : ?>
 		<div class="alert alert-info">
diff --git a/administrator/components/com_installer/views/update/view.html.php b/administrator/components/com_installer/views/update/view.html.php
index 79b0f0d..120618a 100644
--- a/administrator/components/com_installer/views/update/view.html.php
+++ b/administrator/components/com_installer/views/update/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/warnings/tmpl/default.php b/administrator/components/com_installer/views/warnings/tmpl/default.php
index 2d041e8..b745c2f 100644
--- a/administrator/components/com_installer/views/warnings/tmpl/default.php
+++ b/administrator/components/com_installer/views/warnings/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_installer/views/warnings/view.html.php b/administrator/components/com_installer/views/warnings/view.html.php
index 461656c..8f70c85 100644
--- a/administrator/components/com_installer/views/warnings/view.html.php
+++ b/administrator/components/com_installer/views/warnings/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_jaextmanager/lib/UpdaterClient.php b/administrator/components/com_jaextmanager/lib/UpdaterClient.php
index 8e6748b..f92ba8f 100644
--- a/administrator/components/com_jaextmanager/lib/UpdaterClient.php
+++ b/administrator/components/com_jaextmanager/lib/UpdaterClient.php
@@ -704,9 +704,9 @@ function _downloadUpgradePackageLocal($product, $upgradeVersion)
 				$vResult = $compare->checkToBuildUpgradePackage($oldPro, $vUpgrade);
 			}
 			
-			$tmpDir = $FileSystemHelper->tmpDir(null, 'ja', 0777);
+			$tmpDir = $FileSystemHelper->tmpDir(null, 'ja', 0755);
 			$tmpDir = $tmpDir . $oldPro->extKey.'/';
-			if (JFolder::create($tmpDir, 0777) === false) {
+			if (JFolder::create($tmpDir, 0755) === false) {
 				jaucRaiseMessage("UpdaterService: cannot build upgrade package", true);
 				return false;
 			}
@@ -732,7 +732,7 @@ function _buildUpgradePackage($src, $dst, $objectFilter)
 		
 		if (JFolder::exists($src)) {
 			if (!JFolder::exists($dst)) {
-				JFolder::create($dst, 0777);
+				JFolder::create($dst, 0755);
 			}
 			$dir = opendir($src);
 			while (false !== ($file = readdir($dir))) {
@@ -1010,7 +1010,7 @@ function getLocalPatchPath($product)
 		$FileSystemHelper = new FileSystemHelper();
 		$path = $this->getLocalBasePath($product) . "patch/";
 		if (!JFolder::exists($path)) {
-			if (!$FileSystemHelper->createDirRecursive($path, 0777)) {
+			if (!$FileSystemHelper->createDirRecursive($path, 0755)) {
 				return false;
 			}
 		}
@@ -1023,7 +1023,7 @@ function getLocalBackupPath($product)
 		$FileSystemHelper = new FileSystemHelper();
 		$path = $this->getLocalBasePath($product) . "backup/";
 		if (!JFolder::exists($path)) {
-			if (!$FileSystemHelper->createDirRecursive($path, 0777)) {
+			if (!$FileSystemHelper->createDirRecursive($path, 0755)) {
 				return false;
 			}
 		}
@@ -1042,7 +1042,7 @@ function getLocalConflictPath($product, $folder = '')
 		//store same folder with backup files
 		$path = $this->getLocalBasePath($product) . "backup/".$folder.'/';
 		if (!JFolder::exists($path)) {
-			if (!$FileSystemHelper->createDirRecursive($path, 0777)) {
+			if (!$FileSystemHelper->createDirRecursive($path, 0755)) {
 				return false;
 			}
 		}
@@ -1055,7 +1055,7 @@ function getLocalConflictBasePath($product)
 		$FileSystemHelper = new FileSystemHelper();
 		$path = $this->getLocalBasePath($product) . "backup/";
 		if (!JFolder::exists($path)) {
-			if (!$FileSystemHelper->createDirRecursive($path, 0777)) {
+			if (!$FileSystemHelper->createDirRecursive($path, 0755)) {
 				return false;
 			}
 		}
diff --git a/administrator/components/com_jaextmanager/lib/config.php b/administrator/components/com_jaextmanager/lib/config.php
index ad0b61f..516d114 100644
--- a/administrator/components/com_jaextmanager/lib/config.php
+++ b/administrator/components/com_jaextmanager/lib/config.php
@@ -27,12 +27,12 @@ function jaucRaiseMessage($message, $error = false)
 
 $errMsg = "";
 if (!JFolder::exists(JA_WORKING_DATA_FOLDER)) {
-	if (!JFolder::create(JA_WORKING_DATA_FOLDER, 0777)) {
+	if (!JFolder::create(JA_WORKING_DATA_FOLDER, 0755)) {
 		$errMsg .= "JA Updater can not create below folder automatically. Please manual create and chmod it to wriable!" . "<br />";
 		$errMsg .= "<i>" . JA_WORKING_DATA_FOLDER . "</i>";
 	}
 } elseif (!is_writeable(JA_WORKING_DATA_FOLDER)) {
-	if (!chmod(JA_WORKING_DATA_FOLDER, 0777)) {
+	if (!chmod(JA_WORKING_DATA_FOLDER, 0755)) {
 		$errMsg .= "JA Updater can not automatically chmod for below folder to wriable. Please manual chmod it to wriable!" . "<br />";
 		$errMsg .= "<i>" . JA_WORKING_DATA_FOLDER . "</i>";
 	}
diff --git a/administrator/components/com_jaextmanager/lib/config_joomla.php b/administrator/components/com_jaextmanager/lib/config_joomla.php
index 433ae98..2c4b864 100644
--- a/administrator/components/com_jaextmanager/lib/config_joomla.php
+++ b/administrator/components/com_jaextmanager/lib/config_joomla.php
@@ -53,12 +53,12 @@ function jaucValidServiceSettings($params)
 {
 	$errMsg = "";
 	if (!JFolder::exists(JA_WORKING_DATA_FOLDER)) {
-		if (!JFolder::create(JA_WORKING_DATA_FOLDER, 0777)) {
+		if (!JFolder::create(JA_WORKING_DATA_FOLDER, 0755)) {
 			$errMsg .= JText::_("JA_UPDATER_CAN_NOT_CREATE_BELOW_FOLDER_AUTOMATICALLY_PLEASE_MANUAL_DO_IT") . "<br />";
 			$errMsg .= "<i>" . JA_WORKING_DATA_FOLDER . "</i>";
 		}
 	} elseif (!is_writeable(JA_WORKING_DATA_FOLDER)) {
-		if (!chmod(JA_WORKING_DATA_FOLDER, 0777)) {
+		if (!chmod(JA_WORKING_DATA_FOLDER, 0755)) {
 			$errMsg .= JText::_("JA_UPDATER_CAN_NOT_AUTOMATICALLY_CHMOD_FOR_BELOW_FOLDER_TO_WRIABLE_PLEASE_MANUAL_DO_IT") . "<br />";
 			$errMsg .= "<i>" . JA_WORKING_DATA_FOLDER . "</i>";
 		}
diff --git a/administrator/components/com_jaextmanager/lib/jaupdater/core/bean/Products.php b/administrator/components/com_jaextmanager/lib/jaupdater/core/bean/Products.php
index 27b6769..71d44c8 100644
--- a/administrator/components/com_jaextmanager/lib/jaupdater/core/bean/Products.php
+++ b/administrator/components/com_jaextmanager/lib/jaupdater/core/bean/Products.php
@@ -293,7 +293,7 @@ function doUpgrade($upgradePackage, $upgradeVersion)
 		$fileBackup = $this->doBackup();
 		
 		//upgrade process
-		$workingDir = $FileSystemHelper->tmpDir(null, 'ja', 0777);
+		$workingDir = $FileSystemHelper->tmpDir(null, 'ja', 0755);
 		$zipFile = $workingDir . $this->extKey . ".zip";
 		JFile::copy($upgradePackage, $zipFile);
 		
@@ -331,7 +331,7 @@ function doRecovery($product, $folder, $file)
 		//auto backup when recovery
 		$this->doBackup();
 		// upgrade process
-		$workingDir = $FileSystemHelper->tmpDir(null, 'ja', 0777);
+		$workingDir = $FileSystemHelper->tmpDir(null, 'ja', 0755);
 		$zipFile = $folder . $file;
 		
 		ArchiveHelper::unZip($zipFile, $workingDir);
@@ -820,7 +820,7 @@ function _doBackupConflictedFiles($path, $relativePath, $data)
 			if (is_object($item)) {
 				$subPath = $path . $k.'/';
 				$relativeSubPath = $relativePath . $k . "/";
-				$FileSystemHelper->createDirRecursive($subPath, 0777);
+				$FileSystemHelper->createDirRecursive($subPath, 0755);
 				
 				$subConflicted = $this->_doBackupConflictedFiles($subPath, $relativeSubPath, $item);
 				if ($subConflicted) {
@@ -846,9 +846,9 @@ function doBackup()
 	{
 		$config = $this->config;
 		$FileSystemHelper = new FileSystemHelper();
-		$workingDir = $FileSystemHelper->tmpDir(null, 'ja', 0777);
+		$workingDir = $FileSystemHelper->tmpDir(null, 'ja', 0755);
 		$workingDir .= $this->extKey.'/';
-		if (JFolder::create($workingDir, 0777) === false) {
+		if (JFolder::create($workingDir, 0755) === false) {
 			return false;
 		}
 		$backupDir = $this->getBackupPath();
@@ -860,9 +860,9 @@ function doBackup()
 		$cnt = count($locations);
 		foreach ($locations as $name => $path) {
 			if ($name != 'location')
-				$FileSystemHelper->cp($path, $workingDir . $name, true, 0777);
+				$FileSystemHelper->cp($path, $workingDir . $name, true, 0755);
 			else
-				$FileSystemHelper->cp($path, $workingDir, true, 0777);
+				$FileSystemHelper->cp($path, $workingDir, true, 0755);
 		}
 		
 		$this->_backupLanguages($workingDir);
@@ -929,7 +929,7 @@ function _backupLanguages($workingDir)
 		if (JFile::exists($srcFile)) {
 			$dstFolder = $workingDir . "lang/site/";
 			$dstFile = $dstFolder . $languageFile;
-			if (JFolder::create($dstFolder, 0777) !== false) {
+			if (JFolder::create($dstFolder, 0755) !== false) {
 				JFile::copy($srcFile, $dstFile);
 			}
 		}
@@ -938,7 +938,7 @@ function _backupLanguages($workingDir)
 		if (JFile::exists($srcFile)) {
 			$dstFolder = $workingDir . "lang/admin/";
 			$dstFile = $dstFolder . $languageFile;
-			if (JFolder::create($dstFolder, 0777) !== false) {
+			if (JFolder::create($dstFolder, 0755) !== false) {
 				JFile::copy($srcFile, $dstFile);
 			}
 		}
@@ -951,7 +951,7 @@ function _backupDatabase($workingDir)
 		$config = $this->config;
 		
 		if ($this->type == 'component') {
-			if (JFolder::create($workingDir . "db", 0777) !== false) {
+			if (JFolder::create($workingDir . "db", 0755) !== false) {
 				$workingDir .= "db/";
 			}
 			
diff --git a/administrator/components/com_jaextmanager/lib/jaupdater/core/helper/MysqlHelper.php b/administrator/components/com_jaextmanager/lib/jaupdater/core/helper/MysqlHelper.php
index 06a3408..56a1e02 100644
--- a/administrator/components/com_jaextmanager/lib/jaupdater/core/helper/MysqlHelper.php
+++ b/administrator/components/com_jaextmanager/lib/jaupdater/core/helper/MysqlHelper.php
@@ -98,7 +98,7 @@ function restore($backupFile)
 			return false;
 		}
 		//create temp file with replaced #__ by db prefix
-		$tmpDir = $FileSystemHelper->tmpDir(null, 'ja', 0777);
+		$tmpDir = $FileSystemHelper->tmpDir(null, 'ja', 0755);
 		$tmpFile = $tmpDir . basename($backupFile);
 		$sql = file_get_contents($backupFile);
 		$sql = preg_replace('/\`\#__([a-zA-Z_0-9]*)\`/', "`" . $this->_prefix . "$1`", $sql);
diff --git a/administrator/components/com_jaextmanager/models/default.php b/administrator/components/com_jaextmanager/models/default.php
index f7473b5..e87c7e7 100644
--- a/administrator/components/com_jaextmanager/models/default.php
+++ b/administrator/components/com_jaextmanager/models/default.php
@@ -229,6 +229,7 @@ function _getTotalExtensions($lists)
 		$query = "
 			SELECT COUNT(extension_id) FROM #__extensions 
 			WHERE (`type` = " . $db->Quote($type) . " OR '' = " . $db->Quote($type) . ")
+			AND `element` NOT LIKE '%jaupdater.%'
 			{$sFilter}
 		";
 		$db->setQuery($query);
@@ -263,9 +264,10 @@ function _loadExtensions($limitstart = 0, $limit = 20, $lists = array())
 					element, client_id, folder 
 				FROM #__extensions 
 				WHERE (`type` = " . $db->Quote($type) . " OR '' = " . $db->Quote($type) . ")
-				{$sFilter} 
+				AND `element` NOT LIKE '%jaupdater.%'
+				{$sFilter}
 				GROUP BY extension_id
-				ORDER BY `type`, name
+				ORDER BY `type`, `name`
 				LIMIT {$limitstart}, {$limit}";
 		//echo nl2br($query);
 		//die($query);
diff --git a/administrator/components/com_joomlaupdate/controller.php b/administrator/components/com_joomlaupdate/controller.php
index 9f08a78..ed33f7f 100644
--- a/administrator/components/com_joomlaupdate/controller.php
+++ b/administrator/components/com_joomlaupdate/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/controllers/update.php b/administrator/components/com_joomlaupdate/controllers/update.php
index bb70a43..17b3328 100644
--- a/administrator/components/com_joomlaupdate/controllers/update.php
+++ b/administrator/components/com_joomlaupdate/controllers/update.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/helpers/download.php b/administrator/components/com_joomlaupdate/helpers/download.php
index 9a7ed1f..a4fc427 100644
--- a/administrator/components/com_joomlaupdate/helpers/download.php
+++ b/administrator/components/com_joomlaupdate/helpers/download.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php b/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
deleted file mode 100644
index c572e66..0000000
--- a/administrator/components/com_joomlaupdate/helpers/joomlaupdate.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * @package     Joomla.Administrator
- * @subpackage  com_joomlaupdate
- *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-/**
- * Joomla! update helper.
- *
- * @package     Joomla.Administrator
- * @subpackage  com_joomlaupdate
- * @since       2.5.4
- */
-class JoomlaupdateHelper
-{
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @since	2.5.4
-	 */
-	public static function getActions()
-	{
-		$user	= JFactory::getUser();
-		$result	= new JObject;
-
-		$assetName = 'com_joomlaupdate';
-
-		$actions = JAccess::getActions($assetName);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name,	$user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-}
diff --git a/administrator/components/com_joomlaupdate/helpers/select.php b/administrator/components/com_joomlaupdate/helpers/select.php
index 719b141..3c33eb0 100644
--- a/administrator/components/com_joomlaupdate/helpers/select.php
+++ b/administrator/components/com_joomlaupdate/helpers/select.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.php b/administrator/components/com_joomlaupdate/joomlaupdate.php
index 347a90b..a45e67c 100644
--- a/administrator/components/com_joomlaupdate/joomlaupdate.php
+++ b/administrator/components/com_joomlaupdate/joomlaupdate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/joomlaupdate.xml b/administrator/components/com_joomlaupdate/joomlaupdate.xml
index e42005f..003bb1d 100644
--- a/administrator/components/com_joomlaupdate/joomlaupdate.xml
+++ b/administrator/components/com_joomlaupdate/joomlaupdate.xml
@@ -3,7 +3,7 @@
 	<name>com_joomlaupdate</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2012</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_joomlaupdate/models/default.php b/administrator/components/com_joomlaupdate/models/default.php
index ef45115..9d9bbf1 100644
--- a/administrator/components/com_joomlaupdate/models/default.php
+++ b/administrator/components/com_joomlaupdate/models/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php b/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php
index 06df3ad..c7de7e3 100644
--- a/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php
+++ b/administrator/components/com_joomlaupdate/views/default/tmpl/complete.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
index b6fffa5..4547bbd 100644
--- a/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
+++ b/administrator/components/com_joomlaupdate/views/default/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/views/default/view.html.php b/administrator/components/com_joomlaupdate/views/default/view.html.php
index bd48284..204cd16 100644
--- a/administrator/components/com_joomlaupdate/views/default/view.html.php
+++ b/administrator/components/com_joomlaupdate/views/default/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
index 2e1c219..07ba104 100644
--- a/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
+++ b/administrator/components/com_joomlaupdate/views/update/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_joomlaupdate/views/update/view.html.php b/administrator/components/com_joomlaupdate/views/update/view.html.php
index 9228f61..163063d 100644
--- a/administrator/components/com_joomlaupdate/views/update/view.html.php
+++ b/administrator/components/com_joomlaupdate/views/update/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/controller.php b/administrator/components/com_languages/controller.php
index 600b43b..78b05db 100644
--- a/administrator/components/com_languages/controller.php
+++ b/administrator/components/com_languages/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/controllers/installed.php b/administrator/components/com_languages/controllers/installed.php
index db6c68b..7e83c4e 100644
--- a/administrator/components/com_languages/controllers/installed.php
+++ b/administrator/components/com_languages/controllers/installed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/controllers/language.php b/administrator/components/com_languages/controllers/language.php
index 2a0adf1..a55b03e 100644
--- a/administrator/components/com_languages/controllers/language.php
+++ b/administrator/components/com_languages/controllers/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/controllers/languages.php b/administrator/components/com_languages/controllers/languages.php
index a7c2a52..4a9ee46 100644
--- a/administrator/components/com_languages/controllers/languages.php
+++ b/administrator/components/com_languages/controllers/languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/controllers/override.php b/administrator/components/com_languages/controllers/override.php
index 9f1d777..c25350a 100644
--- a/administrator/components/com_languages/controllers/override.php
+++ b/administrator/components/com_languages/controllers/override.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/controllers/overrides.php b/administrator/components/com_languages/controllers/overrides.php
index 358c472..978f805 100644
--- a/administrator/components/com_languages/controllers/overrides.php
+++ b/administrator/components/com_languages/controllers/overrides.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/controllers/strings.json.php b/administrator/components/com_languages/controllers/strings.json.php
index ddc5270..a77c7ee 100644
--- a/administrator/components/com_languages/controllers/strings.json.php
+++ b/administrator/components/com_languages/controllers/strings.json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/helpers/html/languages.php b/administrator/components/com_languages/helpers/html/languages.php
index 61aa20a..d6a5acf 100644
--- a/administrator/components/com_languages/helpers/html/languages.php
+++ b/administrator/components/com_languages/helpers/html/languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/helpers/jsonresponse.php b/administrator/components/com_languages/helpers/jsonresponse.php
index 631f4cf..585d677 100644
--- a/administrator/components/com_languages/helpers/jsonresponse.php
+++ b/administrator/components/com_languages/helpers/jsonresponse.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/helpers/languages.php b/administrator/components/com_languages/helpers/languages.php
index ebe7367..3b99b1a 100644
--- a/administrator/components/com_languages/helpers/languages.php
+++ b/administrator/components/com_languages/helpers/languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -50,27 +50,6 @@ public static function addSubmenu($vName, $client = 0)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 */
-	public static function getActions()
-	{
-		$user		= JFactory::getUser();
-		$result		= new JObject;
-		$assetName	= 'com_languages';
-
-		$actions = JAccess::getActions($assetName);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name,	$user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Method for parsing ini files
 	 *
diff --git a/administrator/components/com_languages/helpers/multilangstatus.php b/administrator/components/com_languages/helpers/multilangstatus.php
index 7bf461a..232a5f6 100644
--- a/administrator/components/com_languages/helpers/multilangstatus.php
+++ b/administrator/components/com_languages/helpers/multilangstatus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/languages.php b/administrator/components/com_languages/languages.php
index e16e5ba..03594d2 100644
--- a/administrator/components/com_languages/languages.php
+++ b/administrator/components/com_languages/languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/languages.xml b/administrator/components/com_languages/languages.xml
index 402c8c6..914d4d8 100644
--- a/administrator/components/com_languages/languages.xml
+++ b/administrator/components/com_languages/languages.xml
@@ -3,7 +3,7 @@
 	<name>com_languages</name>
 	<author>Joomla! Project</author>
 	<creationDate>2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>GNU General Public License version 2 or later; see
 		LICENSE.txt</license>
diff --git a/administrator/components/com_languages/models/installed.php b/administrator/components/com_languages/models/installed.php
index 63a01e0..e26e037 100644
--- a/administrator/components/com_languages/models/installed.php
+++ b/administrator/components/com_languages/models/installed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/models/language.php b/administrator/components/com_languages/models/language.php
index 87903b0..b4eed70 100644
--- a/administrator/components/com_languages/models/language.php
+++ b/administrator/components/com_languages/models/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -76,6 +76,12 @@ public function getItem($langId = null)
 			return $false;
 		}
 
+		// Set a valid accesslevel in case '0' is stored due to a bug in the installation SQL (was fixed with PR 2714).
+		if ($table->access == '0')
+		{
+			$table->access = (int) JFactory::getConfig()->get('access');
+		}
+
 		$properties = $table->getProperties(1);
 		$value = JArrayHelper::toObject($properties, 'JObject');
 
@@ -149,6 +155,12 @@ public function save($data)
 			$isNew = false;
 		}
 
+		// Prevent white spaces, including East Asian double bytes
+		$spaces = array('/\xE3\x80\x80/', ' ');
+
+		$data['lang_code'] = str_replace($spaces, '', $data['lang_code']);
+		$data['sef'] = str_replace($spaces, '', $data['sef']);
+
 		// Bind the data
 		if (!$table->bind($data))
 		{
diff --git a/administrator/components/com_languages/models/languages.php b/administrator/components/com_languages/models/languages.php
index 7d69828..ffbd785 100644
--- a/administrator/components/com_languages/models/languages.php
+++ b/administrator/components/com_languages/models/languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/models/override.php b/administrator/components/com_languages/models/override.php
index 118ca8e..53db9c8 100644
--- a/administrator/components/com_languages/models/override.php
+++ b/administrator/components/com_languages/models/override.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/models/overrides.php b/administrator/components/com_languages/models/overrides.php
index 6808bf3..b38591b 100644
--- a/administrator/components/com_languages/models/overrides.php
+++ b/administrator/components/com_languages/models/overrides.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/models/strings.php b/administrator/components/com_languages/models/strings.php
index dd8fcb9..4f44c40 100644
--- a/administrator/components/com_languages/models/strings.php
+++ b/administrator/components/com_languages/models/strings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/views/installed/tmpl/default.php b/administrator/components/com_languages/views/installed/tmpl/default.php
index eb0e9a2..ef0fb9c 100644
--- a/administrator/components/com_languages/views/installed/tmpl/default.php
+++ b/administrator/components/com_languages/views/installed/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/views/installed/view.html.php b/administrator/components/com_languages/views/installed/view.html.php
index e61c4d3..b7c1cae 100644
--- a/administrator/components/com_languages/views/installed/view.html.php
+++ b/administrator/components/com_languages/views/installed/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -73,9 +73,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		require_once JPATH_COMPONENT.'/helpers/languages.php';
-
-		$canDo	= LanguagesHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_languages');
 
 		JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_INSTALLED_TITLE'), 'comments-2 langmanager');
 
diff --git a/administrator/components/com_languages/views/language/tmpl/edit.php b/administrator/components/com_languages/views/language/tmpl/edit.php
index b7415bf..435fd5c 100644
--- a/administrator/components/com_languages/views/language/tmpl/edit.php
+++ b/administrator/components/com_languages/views/language/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,8 +13,6 @@
 
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
-
-$canDo = LanguagesHelper::getActions();
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
@@ -77,7 +75,7 @@
 						<?php echo $this->form->getInput('lang_code'); ?>
 					</div>
 			</div>
-			<?php if ($canDo->get('core.edit.state')) : ?>
+			<?php if ($this->canDo->get('core.edit.state')) : ?>
 				<div class="control-group">
 					<div class="control-label">
 						<?php echo $this->form->getLabel('published'); ?>
diff --git a/administrator/components/com_languages/views/language/view.html.php b/administrator/components/com_languages/views/language/view.html.php
index 60898ab..883a2fa 100644
--- a/administrator/components/com_languages/views/language/view.html.php
+++ b/administrator/components/com_languages/views/language/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,9 +29,10 @@ class LanguagesViewLanguage extends JViewLegacy
 	 */
 	public function display($tpl = null)
 	{
-		$this->item = $this->get('Item');
-		$this->form = $this->get('Form');
-		$this->state = $this->get('State');
+		$this->item 	= $this->get('Item');
+		$this->form 	= $this->get('Form');
+		$this->state 	= $this->get('State');
+		$this->canDo	= JHelperContent::getActions('com_languages');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -55,7 +56,7 @@ protected function addToolbar()
 
 		JFactory::getApplication()->input->set('hidemainmenu', 1);
 		$isNew = empty($this->item->lang_id);
-		$canDo = LanguagesHelper::getActions();
+		$canDo = $this->canDo;
 
 		JToolbarHelper::title(JText::_($isNew ? 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_NEW_TITLE' : 'COM_LANGUAGES_VIEW_LANGUAGE_EDIT_EDIT_TITLE'), 'comments-2 langmanager');
 
diff --git a/administrator/components/com_languages/views/languages/tmpl/default.php b/administrator/components/com_languages/views/languages/tmpl/default.php
index 19168e6..495e3e2 100644
--- a/administrator/components/com_languages/views/languages/tmpl/default.php
+++ b/administrator/components/com_languages/views/languages/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/views/languages/view.html.php b/administrator/components/com_languages/views/languages/view.html.php
index 73f0d36..a55f7b6 100644
--- a/administrator/components/com_languages/views/languages/view.html.php
+++ b/administrator/components/com_languages/views/languages/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -54,8 +54,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		require_once JPATH_COMPONENT.'/helpers/languages.php';
-		$canDo	= LanguagesHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_languages');
 
 		JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_LANGUAGES_TITLE'), 'comments-2 langmanager');
 
diff --git a/administrator/components/com_languages/views/multilangstatus/tmpl/default.php b/administrator/components/com_languages/views/multilangstatus/tmpl/default.php
index f534b11..a3d5f01 100644
--- a/administrator/components/com_languages/views/multilangstatus/tmpl/default.php
+++ b/administrator/components/com_languages/views/multilangstatus/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -64,6 +64,16 @@
 					</td>
 				</tr>
 			<?php endif; ?>
+			<?php if (!array_key_exists($contentlang->lang_code, $this->site_langs)) : ?>
+				<tr class="warning">
+					<td>
+						<i class="icon-pending"></i>
+					</td>
+					<td>
+						<?php echo JText::sprintf('COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG', $contentlang->lang_code); ?>
+					</td>
+				</tr>
+			<?php endif; ?>
 		<?php endforeach; ?>
 		<?php if ($this->listUsersError) : ?>
 			<tr class="info">
@@ -145,13 +155,13 @@
 				<th>
 					<?php echo JText::_('JGRID_HEADING_LANGUAGE'); ?>
 				</th>
-				<th>
+				<th class="center">
 					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_SITE_LANG_PUBLISHED'); ?>
 				</th>
-				<th>
+				<th class="center">
 					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED'); ?>
 				</th>
-				<th>
+				<th class="center">
 					<?php echo JText::_('COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED'); ?>
 				</th>
 			</tr>
diff --git a/administrator/components/com_languages/views/multilangstatus/view.html.php b/administrator/components/com_languages/views/multilangstatus/view.html.php
index ce500c7..56a1661 100644
--- a/administrator/components/com_languages/views/multilangstatus/view.html.php
+++ b/administrator/components/com_languages/views/multilangstatus/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/views/override/tmpl/edit.php b/administrator/components/com_languages/views/override/tmpl/edit.php
index d70274b..2f18164 100644
--- a/administrator/components/com_languages/views/override/tmpl/edit.php
+++ b/administrator/components/com_languages/views/override/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/views/override/view.html.php b/administrator/components/com_languages/views/override/view.html.php
index a183aba..a6c5774 100644
--- a/administrator/components/com_languages/views/override/view.html.php
+++ b/administrator/components/com_languages/views/override/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -93,7 +93,7 @@ protected function addToolbar()
 	{
 		JFactory::getApplication()->input->set('hidemainmenu', true);
 
-		$canDo	= LanguagesHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_languages');
 
 		JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_OVERRIDE_EDIT_TITLE'), 'comments-2 langmanager');
 
diff --git a/administrator/components/com_languages/views/overrides/tmpl/default.php b/administrator/components/com_languages/views/overrides/tmpl/default.php
index 7162514..eb2aabf 100644
--- a/administrator/components/com_languages/views/overrides/tmpl/default.php
+++ b/administrator/components/com_languages/views/overrides/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_languages/views/overrides/view.html.php b/administrator/components/com_languages/views/overrides/view.html.php
index 4ee1172..1893211 100644
--- a/administrator/components/com_languages/views/overrides/view.html.php
+++ b/administrator/components/com_languages/views/overrides/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -80,7 +80,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		// Get the results for each action
-		$canDo = LanguagesHelper::getActions();
+		$canDo = JHelperContent::getActions('com_languages');
 
 		JToolbarHelper::title(JText::_('COM_LANGUAGES_VIEW_OVERRIDES_TITLE'), 'comments-2 langmanager');
 
diff --git a/administrator/components/com_login/controller.php b/administrator/components/com_login/controller.php
index c029b65..73ee4bc 100644
--- a/administrator/components/com_login/controller.php
+++ b/administrator/components/com_login/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/login.php b/administrator/components/com_login/login.php
index 8296f99..7572105 100644
--- a/administrator/components/com_login/login.php
+++ b/administrator/components/com_login/login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/login.xml b/administrator/components/com_login/login.xml
index d407f8d..151ac16 100644
--- a/administrator/components/com_login/login.xml
+++ b/administrator/components/com_login/login.xml
@@ -3,7 +3,7 @@
 	<name>com_login</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_login/models/login.php b/administrator/components/com_login/models/login.php
index 8bca7f4..e553cf2 100644
--- a/administrator/components/com_login/models/login.php
+++ b/administrator/components/com_login/models/login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/views/login/tmpl/default.php b/administrator/components/com_login/views/login/tmpl/default.php
index a382867..9cb5f18 100644
--- a/administrator/components/com_login/views/login/tmpl/default.php
+++ b/administrator/components/com_login/views/login/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_login/views/login/view.html.php b/administrator/components/com_login/views/login/view.html.php
index 864be40..09f0949 100644
--- a/administrator/components/com_login/views/login/view.html.php
+++ b/administrator/components/com_login/views/login/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/controller.php b/administrator/components/com_media/controller.php
index 505b9d7..82405c5 100644
--- a/administrator/components/com_media/controller.php
+++ b/administrator/components/com_media/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/controllers/file.json.php b/administrator/components/com_media/controllers/file.json.php
index 504fa9d..52223a2 100644
--- a/administrator/components/com_media/controllers/file.json.php
+++ b/administrator/components/com_media/controllers/file.json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/controllers/file.php b/administrator/components/com_media/controllers/file.php
index fbc2405..9203713 100644
--- a/administrator/components/com_media/controllers/file.php
+++ b/administrator/components/com_media/controllers/file.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/controllers/folder.php b/administrator/components/com_media/controllers/folder.php
index 0f243da..829e600 100644
--- a/administrator/components/com_media/controllers/folder.php
+++ b/administrator/components/com_media/controllers/folder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/helpers/media.php b/administrator/components/com_media/helpers/media.php
index 6fcb0e8..6e03d05 100644
--- a/administrator/components/com_media/helpers/media.php
+++ b/administrator/components/com_media/helpers/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/layouts/toolbar/deletemedia.php b/administrator/components/com_media/layouts/toolbar/deletemedia.php
index 5dacada..d6ab1d6 100644
--- a/administrator/components/com_media/layouts/toolbar/deletemedia.php
+++ b/administrator/components/com_media/layouts/toolbar/deletemedia.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/layouts/toolbar/newfolder.php b/administrator/components/com_media/layouts/toolbar/newfolder.php
index a4e5d53..3bcaf59 100644
--- a/administrator/components/com_media/layouts/toolbar/newfolder.php
+++ b/administrator/components/com_media/layouts/toolbar/newfolder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/layouts/toolbar/uploadmedia.php b/administrator/components/com_media/layouts/toolbar/uploadmedia.php
index 9a485aa..302d283 100644
--- a/administrator/components/com_media/layouts/toolbar/uploadmedia.php
+++ b/administrator/components/com_media/layouts/toolbar/uploadmedia.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/media.php b/administrator/components/com_media/media.php
index c6551cb..5aae4ad 100644
--- a/administrator/components/com_media/media.php
+++ b/administrator/components/com_media/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/media.xml b/administrator/components/com_media/media.xml
index 12ab75e..6f8a8eb 100644
--- a/administrator/components/com_media/media.xml
+++ b/administrator/components/com_media/media.xml
@@ -3,7 +3,7 @@
 	<name>com_media</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_media/models/list.php b/administrator/components/com_media/models/list.php
index 0b64b9d..09fde76 100644
--- a/administrator/components/com_media/models/list.php
+++ b/administrator/components/com_media/models/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/models/manager.php b/administrator/components/com_media/models/manager.php
index d0ff5a6..8cd2e14 100644
--- a/administrator/components/com_media/models/manager.php
+++ b/administrator/components/com_media/models/manager.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/images/tmpl/default.php b/administrator/components/com_media/views/images/tmpl/default.php
index 48c7a1f..a0975ba 100644
--- a/administrator/components/com_media/views/images/tmpl/default.php
+++ b/administrator/components/com_media/views/images/tmpl/default.php
@@ -3,13 +3,15 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 JHtml::_('formbehavior.chosen', 'select');
+// Load tooltip instance without HTML support because we have a HTML tag in the tip
+JHtml::_('bootstrap.tooltip', '.noHtmlTip', array('html' => false));
 
 $user  = JFactory::getUser();
 $input = JFactory::getApplication()->input;
@@ -55,15 +57,15 @@
 			<?php if (!$this->state->get('field.id')):?>
 			<div class="span6 control-group">
 				<div class="control-label">
-					<label for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN') ?></label>
+					<label title="<?php echo JText::_('COM_MEDIA_ALIGN_DESC'); ?>" class="noHtmlTip" for="f_align"><?php echo JText::_('COM_MEDIA_ALIGN') ?></label>
 				</div>
 				<div class="controls">
 					<select size="1" id="f_align">
 						<option value="" selected="selected"><?php echo JText::_('COM_MEDIA_NOT_SET') ?></option>
 						<option value="left"><?php echo JText::_('JGLOBAL_LEFT') ?></option>
+						<option value="center"><?php echo JText::_('JGLOBAL_CENTER') ?></option>
 						<option value="right"><?php echo JText::_('JGLOBAL_RIGHT') ?></option>
 					</select>
-					<p class="help-block"><?php echo JText::_('COM_MEDIA_ALIGN_DESC');?></p>
 				</div>
 			</div>
 			<?php endif;?>
@@ -88,16 +90,25 @@
 			</div>
 		</div>
 		<div class="row">
-			<div class="span12 control-group">
+			<div class="span6 control-group">
 				<div class="control-label">
 					<label for="f_caption"><?php echo JText::_('COM_MEDIA_CAPTION') ?></label>
 				</div>
 				<div class="controls">
-					<select size="1" id="f_caption" >
-						<option value="" selected="selected" ><?php echo JText::_('JNO') ?></option>
-						<option value="1"><?php echo JText::_('JYES') ?></option>
-					</select>
-					<p class="help-block"><?php echo JText::_('COM_MEDIA_CAPTION_DESC');?></p>
+					<input type="text" id="f_caption" value="" />
+				</div>
+			</div>
+			<div class="span6 control-group">
+				<div class="control-label">
+					<label title="<?php echo JText::_('COM_MEDIA_CAPTION_CLASS_DESC'); ?>" class="noHtmlTip" for="f_caption_class"><?php echo JText::_('COM_MEDIA_CAPTION_CLASS_LABEL') ?></label>
+				</div>
+				<div class="controls">
+					<input type="text" list="d_caption_class" id="f_caption_class" value="" />
+					<datalist id="d_caption_class">
+						<option value="text-left">
+						<option value="text-center">
+						<option value="text-right">
+					</datalist>
 				</div>
 			</div>
 		</div>
diff --git a/administrator/components/com_media/views/images/view.html.php b/administrator/components/com_media/views/images/view.html.php
index 8b26600..252e66d 100644
--- a/administrator/components/com_media/views/images/view.html.php
+++ b/administrator/components/com_media/views/images/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/imageslist/tmpl/default.php b/administrator/components/com_media/views/imageslist/tmpl/default.php
index bc64053..246564d 100644
--- a/administrator/components/com_media/views/imageslist/tmpl/default.php
+++ b/administrator/components/com_media/views/imageslist/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php
index ddecbfc..c27aa54 100644
--- a/administrator/components/com_media/views/imageslist/tmpl/default_folder.php
+++ b/administrator/components/com_media/views/imageslist/tmpl/default_folder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/imageslist/tmpl/default_image.php b/administrator/components/com_media/views/imageslist/tmpl/default_image.php
index 440feb0..1dfa18f 100644
--- a/administrator/components/com_media/views/imageslist/tmpl/default_image.php
+++ b/administrator/components/com_media/views/imageslist/tmpl/default_image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/imageslist/view.html.php b/administrator/components/com_media/views/imageslist/view.html.php
index 135bde7..2647e71 100644
--- a/administrator/components/com_media/views/imageslist/view.html.php
+++ b/administrator/components/com_media/views/imageslist/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/media/tmpl/default.php b/administrator/components/com_media/views/media/tmpl/default.php
index 99b4f1d..d86c31b 100644
--- a/administrator/components/com_media/views/media/tmpl/default.php
+++ b/administrator/components/com_media/views/media/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/media/tmpl/default_folders.php b/administrator/components/com_media/views/media/tmpl/default_folders.php
index dc8a489..91e3b2f 100644
--- a/administrator/components/com_media/views/media/tmpl/default_folders.php
+++ b/administrator/components/com_media/views/media/tmpl/default_folders.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/media/tmpl/default_navigation.php b/administrator/components/com_media/views/media/tmpl/default_navigation.php
index e83b0aa..f9863eb 100644
--- a/administrator/components/com_media/views/media/tmpl/default_navigation.php
+++ b/administrator/components/com_media/views/media/tmpl/default_navigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/media/view.html.php b/administrator/components/com_media/views/media/view.html.php
index 4d0340e..73d0729 100644
--- a/administrator/components/com_media/views/media/view.html.php
+++ b/administrator/components/com_media/views/media/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/default.php b/administrator/components/com_media/views/medialist/tmpl/default.php
index caf6c58..9df7640 100644
--- a/administrator/components/com_media/views/medialist/tmpl/default.php
+++ b/administrator/components/com_media/views/medialist/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/details.php b/administrator/components/com_media/views/medialist/tmpl/details.php
index 8293f0c..ba5b606 100644
--- a/administrator/components/com_media/views/medialist/tmpl/details.php
+++ b/administrator/components/com_media/views/medialist/tmpl/details.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/details_doc.php b/administrator/components/com_media/views/medialist/tmpl/details_doc.php
index ca25af6..b63693b 100644
--- a/administrator/components/com_media/views/medialist/tmpl/details_doc.php
+++ b/administrator/components/com_media/views/medialist/tmpl/details_doc.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_media/views/medialist/tmpl/details_folder.php b/administrator/components/com_media/views/medialist/tmpl/details_folder.php
index 6265241..9a4a6fe 100644
--- a/administrator/components/com_media/views/medialist/tmpl/details_folder.php
+++ b/administrator/components/com_media/views/medialist/tmpl/details_folder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/administrator/components/com_media/views/medialist/tmpl/details_img.php b/administrator/components/com_media/views/medialist/tmpl/details_img.php
index 2a09aa3..9ce8f30 100644
--- a/administrator/components/com_media/views/medialist/tmpl/details_img.php
+++ b/administrator/components/com_media/views/medialist/tmpl/details_img.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/details_up.php b/administrator/components/com_media/views/medialist/tmpl/details_up.php
index 4f4ebda..52d5c97 100644
--- a/administrator/components/com_media/views/medialist/tmpl/details_up.php
+++ b/administrator/components/com_media/views/medialist/tmpl/details_up.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs.php b/administrator/components/com_media/views/medialist/tmpl/thumbs.php
index 09913c0..97dc47d 100644
--- a/administrator/components/com_media/views/medialist/tmpl/thumbs.php
+++ b/administrator/components/com_media/views/medialist/tmpl/thumbs.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php
index 2714ca0..d20cbd2 100644
--- a/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php
+++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_doc.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php
index 1b6653c..b2e6996 100644
--- a/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php
+++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_folder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php
index 3f01495..5316957 100644
--- a/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php
+++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_img.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php
index 2e204c6..0cbf0c2 100644
--- a/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php
+++ b/administrator/components/com_media/views/medialist/tmpl/thumbs_up.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_media/views/medialist/view.html.php b/administrator/components/com_media/views/medialist/view.html.php
index 40c73ce..6353b32 100644
--- a/administrator/components/com_media/views/medialist/view.html.php
+++ b/administrator/components/com_media/views/medialist/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/controller.php b/administrator/components/com_menus/controller.php
index 28881f5..1e88225 100644
--- a/administrator/components/com_menus/controller.php
+++ b/administrator/components/com_menus/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/controllers/item.php b/administrator/components/com_menus/controllers/item.php
index d6d1af6..f62ea5b 100644
--- a/administrator/components/com_menus/controllers/item.php
+++ b/administrator/components/com_menus/controllers/item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/controllers/items.php b/administrator/components/com_menus/controllers/items.php
index 34cf74f..2074743 100644
--- a/administrator/components/com_menus/controllers/items.php
+++ b/administrator/components/com_menus/controllers/items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/controllers/menu.php b/administrator/components/com_menus/controllers/menu.php
index a4146c4..31e1544 100644
--- a/administrator/components/com_menus/controllers/menu.php
+++ b/administrator/components/com_menus/controllers/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -49,7 +49,8 @@ public function save($key = null, $urlVar = null)
 		$recordId = $this->input->getInt('id');
 
 		// Make sure we are not trying to modify an administrator menu.
-		if (isset($data['client_id']) && $data['client_id'] == 1){
+		if (isset($data['client_id']) && $data['client_id'] == 1)
+		{
 			JError::raiseNotice(0, JText::_('COM_MENUS_MENU_TYPE_NOT_ALLOWED'));
 
 			// Redirect back to the edit screen.
@@ -58,6 +59,18 @@ public function save($key = null, $urlVar = null)
 			return false;
 		}
 
+		// Prevent using 'menu' or 'main' as menutype as this is reserved for back-end menus
+		if (strtolower($data['menutype']) == 'menu' || strtolower($data['menutype']) == 'main')
+		{
+			$msg = JText::_('COM_MENUS_ERROR_MENUTYPE');
+			JFactory::getApplication()->enqueueMessage($msg, 'error');
+
+			// Redirect back to the edit screen.
+			$this->setRedirect(JRoute::_('index.php?option=com_menus&view=menu&layout=edit', false));
+
+			return false;
+		}
+
 		// Populate the row id from the session.
 		$data['id'] = $recordId;
 
diff --git a/administrator/components/com_menus/controllers/menus.php b/administrator/components/com_menus/controllers/menus.php
index 9d07134..5ceddda 100644
--- a/administrator/components/com_menus/controllers/menus.php
+++ b/administrator/components/com_menus/controllers/menus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/helpers/html/menus.php b/administrator/components/com_menus/helpers/html/menus.php
index bb0a06f..f290e2b 100644
--- a/administrator/components/com_menus/helpers/html/menus.php
+++ b/administrator/components/com_menus/helpers/html/menus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/helpers/menus.php b/administrator/components/com_menus/helpers/menus.php
index c837249..2ed8ee1 100644
--- a/administrator/components/com_menus/helpers/menus.php
+++ b/administrator/components/com_menus/helpers/menus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,38 +42,6 @@ public static function addSubmenu($vName)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @param   integer  The menu ID.
-	 *
-	 * @return  JObject
-	 * @since   1.6
-	 */
-	public static function getActions($parentId = 0)
-	{
-		$user = JFactory::getUser();
-		$result = new JObject;
-
-		if (empty($parentId))
-		{
-			$assetName = 'com_menus';
-		}
-		else
-		{
-			$assetName = 'com_menus.item.' . (int) $parentId;
-		}
-
-		$actions = JAccess::getActions('com_menus');
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name, $user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Gets a standard form of a link for lookups.
 	 *
diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default.php b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
index c9c8a81..646dbb3 100644
--- a/administrator/components/com_menus/layouts/joomla/searchtools/default.php
+++ b/administrator/components/com_menus/layouts/joomla/searchtools/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php b/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
index f203f26..421475f 100644
--- a/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
+++ b/administrator/components/com_menus/layouts/joomla/searchtools/default/bar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/menus.php b/administrator/components/com_menus/menus.php
index f6dc819..befc984 100644
--- a/administrator/components/com_menus/menus.php
+++ b/administrator/components/com_menus/menus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/menus.xml b/administrator/components/com_menus/menus.xml
index b17d182..23aa80e 100644
--- a/administrator/components/com_menus/menus.xml
+++ b/administrator/components/com_menus/menus.xml
@@ -3,7 +3,7 @@
 	<name>com_menus</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_menus/models/fields/menuordering.php b/administrator/components/com_menus/models/fields/menuordering.php
index b6ed9e1..83899d2 100644
--- a/administrator/components/com_menus/models/fields/menuordering.php
+++ b/administrator/components/com_menus/models/fields/menuordering.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/models/fields/menuparent.php b/administrator/components/com_menus/models/fields/menuparent.php
index 0500030..a966144 100644
--- a/administrator/components/com_menus/models/fields/menuparent.php
+++ b/administrator/components/com_menus/models/fields/menuparent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/models/fields/menutype.php b/administrator/components/com_menus/models/fields/menutype.php
index 65a1c4a..163803a 100644
--- a/administrator/components/com_menus/models/fields/menutype.php
+++ b/administrator/components/com_menus/models/fields/menutype.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/models/item.php b/administrator/components/com_menus/models/item.php
index b174cbb..297ed7f 100644
--- a/administrator/components/com_menus/models/item.php
+++ b/administrator/components/com_menus/models/item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/models/items.php b/administrator/components/com_menus/models/items.php
index dcd3108..c348934 100644
--- a/administrator/components/com_menus/models/items.php
+++ b/administrator/components/com_menus/models/items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/models/menu.php b/administrator/components/com_menus/models/menu.php
index 57e36b7..76df610 100644
--- a/administrator/components/com_menus/models/menu.php
+++ b/administrator/components/com_menus/models/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/models/menus.php b/administrator/components/com_menus/models/menus.php
index e3b9a46..9cc3040 100644
--- a/administrator/components/com_menus/models/menus.php
+++ b/administrator/components/com_menus/models/menus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/models/menutypes.php b/administrator/components/com_menus/models/menutypes.php
index d34fe98..1e1499d 100644
--- a/administrator/components/com_menus/models/menutypes.php
+++ b/administrator/components/com_menus/models/menutypes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/tables/menu.php b/administrator/components/com_menus/tables/menu.php
index 4c568c9..0afac7a 100644
--- a/administrator/components/com_menus/tables/menu.php
+++ b/administrator/components/com_menus/tables/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php
index 8e22651..2789dd0 100644
--- a/administrator/components/com_menus/views/item/tmpl/edit.php
+++ b/administrator/components/com_menus/views/item/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/item/tmpl/edit_associations.php b/administrator/components/com_menus/views/item/tmpl/edit_associations.php
index 5d1c1f6..2fe81be 100644
--- a/administrator/components/com_menus/views/item/tmpl/edit_associations.php
+++ b/administrator/components/com_menus/views/item/tmpl/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/item/tmpl/edit_modules.php b/administrator/components/com_menus/views/item/tmpl/edit_modules.php
index f61db13..f6adeb3 100644
--- a/administrator/components/com_menus/views/item/tmpl/edit_modules.php
+++ b/administrator/components/com_menus/views/item/tmpl/edit_modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/item/tmpl/edit_options.php b/administrator/components/com_menus/views/item/tmpl/edit_options.php
index 250f6c7..1a6be31 100644
--- a/administrator/components/com_menus/views/item/tmpl/edit_options.php
+++ b/administrator/components/com_menus/views/item/tmpl/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/item/view.html.php b/administrator/components/com_menus/views/item/view.html.php
index 718ca8f..2c7b8d4 100644
--- a/administrator/components/com_menus/views/item/view.html.php
+++ b/administrator/components/com_menus/views/item/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -35,6 +35,7 @@ public function display($tpl = null)
 		$this->item		= $this->get('Item');
 		$this->modules	= $this->get('Modules');
 		$this->state	= $this->get('State');
+		$this->canDo	= JHelperContent::getActions('com_menus');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -60,7 +61,7 @@ protected function addToolbar()
 		$user		= JFactory::getUser();
 		$isNew		= ($this->item->id == 0);
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
-		$canDo		= MenusHelper::getActions($this->state->get('filter.parent_id'));
+		$canDo		= $this->canDo;
 
 		JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_ITEM_TITLE' : 'COM_MENUS_VIEW_EDIT_ITEM_TITLE'), 'list menu-add');
 
diff --git a/administrator/components/com_menus/views/items/tmpl/default.php b/administrator/components/com_menus/views/items/tmpl/default.php
index 6941d0b..39cefc7 100644
--- a/administrator/components/com_menus/views/items/tmpl/default.php
+++ b/administrator/components/com_menus/views/items/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/items/tmpl/default_batch.php b/administrator/components/com_menus/views/items/tmpl/default_batch.php
index 1092572..2a3d4a4 100644
--- a/administrator/components/com_menus/views/items/tmpl/default_batch.php
+++ b/administrator/components/com_menus/views/items/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,40 +18,40 @@
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_MENUS_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_MENUS_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_MENUS_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access');?>
-			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
-			</div>
-		</div>
-		<?php if ($published >= 0)
-		{
-		?>
-			<div id="batch-choose-action" class="combo control-group">
-				<label id="batch-choose-action-lbl" class="control-label" for="batch-choose-action">
-					<?php echo JText::_('COM_MENUS_BATCH_MENU_LABEL'); ?>
-				</label>
+		<div class="row-fluid">
+            <div class="control-group span6">
 				<div class="controls">
-					<select name="batch[menu_id]" class="inputbox" id="batch-menu-id">
-						<option value=""><?php echo JText::_('JSELECT') ?></option>
-						<?php echo JHtml::_('select.options', JHtml::_('menu.menuitems', array('published' => $published)));?>
-					</select>
+					<?php echo JHtml::_('batch.access'); ?>
 				</div>
 			</div>
-			<div id="batch-copy-move" class="control-group radio">
-				<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
-		<?php
-		}
-		?>
+		</div>
+		<div class="row-fluid">
+			<?php if ($published >= 0) : ?>
+				<div id="batch-choose-action" class="combo control-group">
+					<label id="batch-choose-action-lbl" class="control-label" for="batch-choose-action">
+						<?php echo JText::_('COM_MENUS_BATCH_MENU_LABEL'); ?>
+					</label>
+					<div class="controls">
+						<select name="batch[menu_id]" class="inputbox" id="batch-menu-id">
+							<option value=""><?php echo JText::_('JSELECT') ?></option>
+							<?php echo JHtml::_('select.options', JHtml::_('menu.menuitems', array('published' => $published))); ?>
+						</select>
+					</div>
+				</div>
+				<div id="batch-copy-move" class="control-group radio">
+					<?php echo JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm'); ?>
+				</div>
+			<?php endif; ?>
+		</div>
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-menu-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_menus/views/items/view.html.php b/administrator/components/com_menus/views/items/view.html.php
index 5c70c56..ee665de 100644
--- a/administrator/components/com_menus/views/items/view.html.php
+++ b/administrator/components/com_menus/views/items/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -212,9 +212,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		require_once JPATH_COMPONENT . '/helpers/menus.php';
-
-		$canDo	= MenusHelper::getActions($this->state->get('filter.parent_id'));
+		$canDo	= JHelperContent::getActions('com_menus');
 		$user  = JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_menus/views/menu/tmpl/edit.php b/administrator/components/com_menus/views/menu/tmpl/edit.php
index a015763..280196c 100644
--- a/administrator/components/com_menus/views/menu/tmpl/edit.php
+++ b/administrator/components/com_menus/views/menu/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/menu/view.html.php b/administrator/components/com_menus/views/menu/view.html.php
index d0f3cb3..5f2cbf4 100644
--- a/administrator/components/com_menus/views/menu/view.html.php
+++ b/administrator/components/com_menus/views/menu/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,7 +55,7 @@ protected function addToolbar()
 		$input->set('hidemainmenu', true);
 
 		$isNew = ($this->item->id == 0);
-		$canDo = MenusHelper::getActions($this->state->get('filter.parent_id'));
+		$canDo = JHelperContent::getActions('com_menus');
 
 		JToolbarHelper::title(JText::_($isNew ? 'COM_MENUS_VIEW_NEW_MENU_TITLE' : 'COM_MENUS_VIEW_EDIT_MENU_TITLE'), 'list menu');
 
diff --git a/administrator/components/com_menus/views/menus/tmpl/default.php b/administrator/components/com_menus/views/menus/tmpl/default.php
index 214be40..7487e6a 100644
--- a/administrator/components/com_menus/views/menus/tmpl/default.php
+++ b/administrator/components/com_menus/views/menus/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/menus/view.html.php b/administrator/components/com_menus/views/menus/view.html.php
index 71eadea..3b89d1c 100644
--- a/administrator/components/com_menus/views/menus/view.html.php
+++ b/administrator/components/com_menus/views/menus/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -57,9 +57,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		require_once JPATH_COMPONENT.'/helpers/menus.php';
-
-		$canDo	= MenusHelper::getActions($this->state->get('filter.parent_id'));
+		$canDo	= JHelperContent::getActions('com_menus');
 
 		JToolbarHelper::title(JText::_('COM_MENUS_VIEW_MENUS_TITLE'), 'list menumgr');
 
diff --git a/administrator/components/com_menus/views/menutypes/tmpl/default.php b/administrator/components/com_menus/views/menutypes/tmpl/default.php
index e1f7fa3..1551a50 100644
--- a/administrator/components/com_menus/views/menutypes/tmpl/default.php
+++ b/administrator/components/com_menus/views/menutypes/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_menus/views/menutypes/view.html.php b/administrator/components/com_menus/views/menutypes/view.html.php
index 177d8cd..8376f4d 100644
--- a/administrator/components/com_menus/views/menutypes/view.html.php
+++ b/administrator/components/com_menus/views/menutypes/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_menus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/controller.php b/administrator/components/com_messages/controller.php
index a63b9ab..7b0e3aa 100644
--- a/administrator/components/com_messages/controller.php
+++ b/administrator/components/com_messages/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/controllers/config.php b/administrator/components/com_messages/controllers/config.php
index fa43011..59deec7 100644
--- a/administrator/components/com_messages/controllers/config.php
+++ b/administrator/components/com_messages/controllers/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/controllers/message.php b/administrator/components/com_messages/controllers/message.php
index b7bc64f..8c0dc09 100644
--- a/administrator/components/com_messages/controllers/message.php
+++ b/administrator/components/com_messages/controllers/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/controllers/messages.php b/administrator/components/com_messages/controllers/messages.php
index eb5cc82..faeada0 100644
--- a/administrator/components/com_messages/controllers/messages.php
+++ b/administrator/components/com_messages/controllers/messages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/helpers/html/messages.php b/administrator/components/com_messages/helpers/html/messages.php
index eda7e93..2e78db3 100644
--- a/administrator/components/com_messages/helpers/html/messages.php
+++ b/administrator/components/com_messages/helpers/html/messages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/helpers/messages.php b/administrator/components/com_messages/helpers/messages.php
index 5a18f37..df59b74 100644
--- a/administrator/components/com_messages/helpers/messages.php
+++ b/administrator/components/com_messages/helpers/messages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -39,26 +39,6 @@ public static function addSubmenu($vName)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 */
-	public static function getActions()
-	{
-		$user	= JFactory::getUser();
-		$result	= new JObject;
-
-		$actions = JAccess::getActions('com_messages');
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name,	$user->authorise($action->name, 'com_messages'));
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the state of a module.
 	 *
diff --git a/administrator/components/com_messages/layouts/toolbar/mysettings.php b/administrator/components/com_messages/layouts/toolbar/mysettings.php
index 9899824..21540be 100644
--- a/administrator/components/com_messages/layouts/toolbar/mysettings.php
+++ b/administrator/components/com_messages/layouts/toolbar/mysettings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/messages.php b/administrator/components/com_messages/messages.php
index 559d7b0..9777d0d 100644
--- a/administrator/components/com_messages/messages.php
+++ b/administrator/components/com_messages/messages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/messages.xml b/administrator/components/com_messages/messages.xml
index 3ff9667..6930dbf 100644
--- a/administrator/components/com_messages/messages.xml
+++ b/administrator/components/com_messages/messages.xml
@@ -3,7 +3,7 @@
 	<name>com_messages</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_messages/models/config.php b/administrator/components/com_messages/models/config.php
index 5f0a42a..e7c0ecf 100644
--- a/administrator/components/com_messages/models/config.php
+++ b/administrator/components/com_messages/models/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/models/fields/usermessages.php b/administrator/components/com_messages/models/fields/usermessages.php
index 5792dcd..aaf82db 100644
--- a/administrator/components/com_messages/models/fields/usermessages.php
+++ b/administrator/components/com_messages/models/fields/usermessages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/models/message.php b/administrator/components/com_messages/models/message.php
index b594e1d..d4deb4b 100644
--- a/administrator/components/com_messages/models/message.php
+++ b/administrator/components/com_messages/models/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/models/messages.php b/administrator/components/com_messages/models/messages.php
index 551e02a..ad2ba48 100644
--- a/administrator/components/com_messages/models/messages.php
+++ b/administrator/components/com_messages/models/messages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/tables/message.php b/administrator/components/com_messages/tables/message.php
index 628410c..14b54f5 100644
--- a/administrator/components/com_messages/tables/message.php
+++ b/administrator/components/com_messages/tables/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/views/config/tmpl/default.php b/administrator/components/com_messages/views/config/tmpl/default.php
index 6432ec7..964baec 100644
--- a/administrator/components/com_messages/views/config/tmpl/default.php
+++ b/administrator/components/com_messages/views/config/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/views/config/view.html.php b/administrator/components/com_messages/views/config/view.html.php
index 8a77dda..e94a1b6 100644
--- a/administrator/components/com_messages/views/config/view.html.php
+++ b/administrator/components/com_messages/views/config/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/views/message/tmpl/default.php b/administrator/components/com_messages/views/message/tmpl/default.php
index 3f2b458..b1770b9 100644
--- a/administrator/components/com_messages/views/message/tmpl/default.php
+++ b/administrator/components/com_messages/views/message/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/views/message/tmpl/edit.php b/administrator/components/com_messages/views/message/tmpl/edit.php
index 00d4224..a722fb6 100644
--- a/administrator/components/com_messages/views/message/tmpl/edit.php
+++ b/administrator/components/com_messages/views/message/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/views/message/view.html.php b/administrator/components/com_messages/views/message/view.html.php
index 182e3c7..5b537d0 100644
--- a/administrator/components/com_messages/views/message/view.html.php
+++ b/administrator/components/com_messages/views/message/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/views/messages/tmpl/default.php b/administrator/components/com_messages/views/messages/tmpl/default.php
index 01d5e2c..9bf37fa 100644
--- a/administrator/components/com_messages/views/messages/tmpl/default.php
+++ b/administrator/components/com_messages/views/messages/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_messages/views/messages/view.html.php b/administrator/components/com_messages/views/messages/view.html.php
index bba0e94..2f01331 100644
--- a/administrator/components/com_messages/views/messages/view.html.php
+++ b/administrator/components/com_messages/views/messages/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -54,7 +54,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$state	= $this->get('State');
-		$canDo	= MessagesHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_messages');
 
 		JToolbarHelper::title(JText::_('COM_MESSAGES_MANAGER_MESSAGES'), 'envelope inbox');
 
diff --git a/administrator/components/com_modules/controller.php b/administrator/components/com_modules/controller.php
index f95a525..5412d51 100644
--- a/administrator/components/com_modules/controller.php
+++ b/administrator/components/com_modules/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/controllers/module.php b/administrator/components/com_modules/controllers/module.php
index 62e4dc2..b24a821 100644
--- a/administrator/components/com_modules/controllers/module.php
+++ b/administrator/components/com_modules/controllers/module.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/controllers/modules.php b/administrator/components/com_modules/controllers/modules.php
index edbdeaf..cf55d57 100644
--- a/administrator/components/com_modules/controllers/modules.php
+++ b/administrator/components/com_modules/controllers/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/helpers/html/modules.php b/administrator/components/com_modules/helpers/html/modules.php
index f7a3479..a165608 100644
--- a/administrator/components/com_modules/helpers/html/modules.php
+++ b/administrator/components/com_modules/helpers/html/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/helpers/modules.php b/administrator/components/com_modules/helpers/modules.php
index 9fce4f0..b00e7bf 100644
--- a/administrator/components/com_modules/helpers/modules.php
+++ b/administrator/components/com_modules/helpers/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,39 +28,6 @@ public static function addSubmenu($vName)
 		// Not used in this component.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @param   integer  The module ID.
-	 *
-	 * @return  JObject
-	 */
-	public static function getActions($moduleId = 0)
-	{
-		$user	= JFactory::getUser();
-		$result	= new JObject;
-
-		if (empty($moduleId))
-		{
-			$assetName = 'com_modules';
-		}
-		else
-		{
-			$assetName = 'com_modules.module.'.(int) $moduleId;
-		}
-
-		$actions = JAccess::getActionsFromFile(
-			JPATH_ADMINISTRATOR . '/components/com_modules/access.xml', "/access/section[@name='component']/"
-		);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name, $user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the state of a module.
 	 *
diff --git a/administrator/components/com_modules/helpers/xml.php b/administrator/components/com_modules/helpers/xml.php
index 2516698..a955fb3 100644
--- a/administrator/components/com_modules/helpers/xml.php
+++ b/administrator/components/com_modules/helpers/xml.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/layouts/toolbar/cancelselect.php b/administrator/components/com_modules/layouts/toolbar/cancelselect.php
index c38fc6c..572e95a 100644
--- a/administrator/components/com_modules/layouts/toolbar/cancelselect.php
+++ b/administrator/components/com_modules/layouts/toolbar/cancelselect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/layouts/toolbar/newmodule.php b/administrator/components/com_modules/layouts/toolbar/newmodule.php
index 0f807dd..0ace5d6 100644
--- a/administrator/components/com_modules/layouts/toolbar/newmodule.php
+++ b/administrator/components/com_modules/layouts/toolbar/newmodule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/models/module.php b/administrator/components/com_modules/models/module.php
index 959001b..3ddfbbc 100644
--- a/administrator/components/com_modules/models/module.php
+++ b/administrator/components/com_modules/models/module.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/models/modules.php b/administrator/components/com_modules/models/modules.php
index 62e8c5a..bbcfe29 100644
--- a/administrator/components/com_modules/models/modules.php
+++ b/administrator/components/com_modules/models/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/models/positions.php b/administrator/components/com_modules/models/positions.php
index cc68d83..243595e 100644
--- a/administrator/components/com_modules/models/positions.php
+++ b/administrator/components/com_modules/models/positions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/models/select.php b/administrator/components/com_modules/models/select.php
index 06df31a..00977ba 100644
--- a/administrator/components/com_modules/models/select.php
+++ b/administrator/components/com_modules/models/select.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/modules.php b/administrator/components/com_modules/modules.php
index 1d8f329..9a6e94f 100644
--- a/administrator/components/com_modules/modules.php
+++ b/administrator/components/com_modules/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/modules.xml b/administrator/components/com_modules/modules.xml
index 748d79b..1aeb0f1 100644
--- a/administrator/components/com_modules/modules.xml
+++ b/administrator/components/com_modules/modules.xml
@@ -3,7 +3,7 @@
 	<name>com_modules</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_modules/views/module/tmpl/edit.php b/administrator/components/com_modules/views/module/tmpl/edit.php
index d5ce6ac..001cc95 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php
index 4ba4ef5..847b45f 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit_assignment.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit_assignment.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/module/tmpl/edit_options.php b/administrator/components/com_modules/views/module/tmpl/edit_options.php
index 4990670..20468cc 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit_options.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/module/tmpl/edit_positions.php b/administrator/components/com_modules/views/module/tmpl/edit_positions.php
index cf36583..189f614 100644
--- a/administrator/components/com_modules/views/module/tmpl/edit_positions.php
+++ b/administrator/components/com_modules/views/module/tmpl/edit_positions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/module/tmpl/modal.php b/administrator/components/com_modules/views/module/tmpl/modal.php
index 499edd0..2f9936c 100644
--- a/administrator/components/com_modules/views/module/tmpl/modal.php
+++ b/administrator/components/com_modules/views/module/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/module/view.html.php b/administrator/components/com_modules/views/module/view.html.php
index 8d45aec..2f5bffd 100644
--- a/administrator/components/com_modules/views/module/view.html.php
+++ b/administrator/components/com_modules/views/module/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -32,7 +32,7 @@ public function display($tpl = null)
 		$this->form		= $this->get('Form');
 		$this->item		= $this->get('Item');
 		$this->state	= $this->get('State');
-		$this->canDo	= ModulesHelper::getActions($this->item->id);
+		$this->canDo	= JHelperContent::getActions('com_modules', 'module', $this->item->id);
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -57,7 +57,7 @@ protected function addToolbar()
 		$user		= JFactory::getUser();
 		$isNew		= ($this->item->id == 0);
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
-		$canDo		= ModulesHelper::getActions($this->item->id);
+		$canDo		= $this->canDo;
 
 		JToolbarHelper::title(JText::sprintf('COM_MODULES_MANAGER_MODULE', JText::_($this->item->module)), 'cube module');
 
diff --git a/administrator/components/com_modules/views/modules/tmpl/default.php b/administrator/components/com_modules/views/modules/tmpl/default.php
index 291d678..37877a0 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/modules/tmpl/default_batch.php b/administrator/components/com_modules/views/modules/tmpl/default_batch.php
index d3eb139..79976d7 100644
--- a/administrator/components/com_modules/views/modules/tmpl/default_batch.php
+++ b/administrator/components/com_modules/views/modules/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,8 +20,8 @@
 
 // Build field
 $attr = array(
-	'id'          => 'batch-position-id',
-	'list.attr'   => 'class="chzn-custom-value input-xlarge" '
+	'id'		=> 'batch-position-id',
+	'list.attr'	=> 'class="chzn-custom-value input-xlarge" '
 	. 'data-custom_group_text="' . $customGroupText . '" '
 	. 'data-no_results_text="' . JText::_('COM_MODULES_ADD_CUSTOM_POSITION') . '" '
 	. 'data-placeholder="' . JText::_('COM_MODULES_TYPE_OR_SELECT_POSITION') . '" '
@@ -31,35 +31,39 @@
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_MODULES_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_MODULES_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_MODULES_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
 		</div>
-		<?php if ($published >= 0) : ?>
-		<div class="control-group">
-			<div class="controls">
-				<label id="batch-choose-action-lbl" for="batch-choose-action">
-					<?php echo JText::_('COM_MODULES_BATCH_POSITION_LABEL'); ?>
-				</label>
-				<div id="batch-choose-action" class="control-group">
-					<?php echo JHtml::_('select.groupedlist', $positions, 'batch[position_id]', $attr) ?>
-					<div id="batch-move-copy" class="control-group radio">
-						<?php echo JHtml::_('modules.batchOptions'); ?>
+		<div class="row-fluid">
+			<?php if ($published >= 0) : ?>
+				<div class="span6">
+					<div class="controls">
+						<label id="batch-choose-action-lbl" for="batch-choose-action">
+							<?php echo JText::_('COM_MODULES_BATCH_POSITION_LABEL'); ?>
+						</label>
+						<div id="batch-choose-action" class="control-group">
+							<?php echo JHtml::_('select.groupedlist', $positions, 'batch[position_id]', $attr) ?>
+							<div id="batch-move-copy" class="control-group radio">
+								<?php echo JHtml::_('modules.batchOptions'); ?>
+							</div>
+						</div>
 					</div>
 				</div>
-			</div>
+			<?php endif; ?>
 		</div>
-		<?php endif; ?>
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-position-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_modules/views/modules/view.html.php b/administrator/components/com_modules/views/modules/view.html.php
index fd3f618..c414451 100644
--- a/administrator/components/com_modules/views/modules/view.html.php
+++ b/administrator/components/com_modules/views/modules/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -62,7 +62,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$state	= $this->get('State');
-		$canDo	= ModulesHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_modules');
 		$user  = JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_modules/views/positions/tmpl/modal.php b/administrator/components/com_modules/views/positions/tmpl/modal.php
index 7dfb0e6..f0a87da 100644
--- a/administrator/components/com_modules/views/positions/tmpl/modal.php
+++ b/administrator/components/com_modules/views/positions/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/positions/view.html.php b/administrator/components/com_modules/views/positions/view.html.php
index a013e2b..1d4ee3a 100644
--- a/administrator/components/com_modules/views/positions/view.html.php
+++ b/administrator/components/com_modules/views/positions/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/preview/tmpl/default.php b/administrator/components/com_modules/views/preview/tmpl/default.php
index c45cbb7..3d787b6 100644
--- a/administrator/components/com_modules/views/preview/tmpl/default.php
+++ b/administrator/components/com_modules/views/preview/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/preview/view.html.php b/administrator/components/com_modules/views/preview/view.html.php
index 97fa4b9..7b2e780 100644
--- a/administrator/components/com_modules/views/preview/view.html.php
+++ b/administrator/components/com_modules/views/preview/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/select/tmpl/default.php b/administrator/components/com_modules/views/select/tmpl/default.php
index 0cebee9..43db30a 100644
--- a/administrator/components/com_modules/views/select/tmpl/default.php
+++ b/administrator/components/com_modules/views/select/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_modules/views/select/view.html.php b/administrator/components/com_modules/views/select/view.html.php
index e593636..6caf98a 100644
--- a/administrator/components/com_modules/views/select/view.html.php
+++ b/administrator/components/com_modules/views/select/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/controller.php b/administrator/components/com_newsfeeds/controller.php
index 9c122ea..88a73e0 100644
--- a/administrator/components/com_newsfeeds/controller.php
+++ b/administrator/components/com_newsfeeds/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/controllers/newsfeed.php b/administrator/components/com_newsfeeds/controllers/newsfeed.php
index afff6be..e48fb1a 100644
--- a/administrator/components/com_newsfeeds/controllers/newsfeed.php
+++ b/administrator/components/com_newsfeeds/controllers/newsfeed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/controllers/newsfeeds.php b/administrator/components/com_newsfeeds/controllers/newsfeeds.php
index 6c0a35d..74ed4b4 100644
--- a/administrator/components/com_newsfeeds/controllers/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/controllers/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
index 24e120d..67c8827 100644
--- a/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
+++ b/administrator/components/com_newsfeeds/helpers/html/newsfeed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/helpers/newsfeeds.php b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
index e7d7991..630dc08 100644
--- a/administrator/components/com_newsfeeds/helpers/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/helpers/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
index a60f5ec..b3d901c 100644
--- a/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
+++ b/administrator/components/com_newsfeeds/models/fields/modal/newsfeed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
index fb7cc32..ec42832 100644
--- a/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/models/fields/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/models/newsfeed.php b/administrator/components/com_newsfeeds/models/newsfeed.php
index 3162b5b..77394a2 100644
--- a/administrator/components/com_newsfeeds/models/newsfeed.php
+++ b/administrator/components/com_newsfeeds/models/newsfeed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/models/newsfeeds.php b/administrator/components/com_newsfeeds/models/newsfeeds.php
index ac26cc9..f1bc693 100644
--- a/administrator/components/com_newsfeeds/models/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/models/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/newsfeeds.php b/administrator/components/com_newsfeeds/newsfeeds.php
index afeff23..f155194 100644
--- a/administrator/components/com_newsfeeds/newsfeeds.php
+++ b/administrator/components/com_newsfeeds/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/newsfeeds.xml b/administrator/components/com_newsfeeds/newsfeeds.xml
index e925adf..90866dd 100644
--- a/administrator/components/com_newsfeeds/newsfeeds.xml
+++ b/administrator/components/com_newsfeeds/newsfeeds.xml
@@ -3,7 +3,7 @@
 	<name>com_newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_newsfeeds/tables/newsfeed.php b/administrator/components/com_newsfeeds/tables/newsfeed.php
index b48cf0f..c249f2f 100644
--- a/administrator/components/com_newsfeeds/tables/newsfeed.php
+++ b/administrator/components/com_newsfeeds/tables/newsfeed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
index 8298b7a..2db0fd9 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php
index a0a4024..f1ee0fd 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php
index 667c345..3e5c558 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php
index e23a97a..d5373f8 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php
index 2cb51f1..1fc088e 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
index e84840e..d5748eb 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php
index a0a4024..f1ee0fd 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php
index 667c345..3e5c558 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php
index e23a97a..d5373f8 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php
index 2cb51f1..1fc088e 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/tmpl/modal_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
index 3b3576c..e256c57 100644
--- a/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/administrator/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -64,7 +64,7 @@ protected function addToolbar()
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
 
 		// Since we don't track these assets at the item level, use the category id.
-		$canDo		= JHelperContent::getActions($this->item->catid, 0, 'com_newsfeeds');
+		$canDo		= JHelperContent::getActions('com_newsfeeds', 'category', $this->item->catid);
 
 		JToolbarHelper::title(JText::_('COM_NEWSFEEDS_MANAGER_NEWSFEED'), 'feed newsfeeds');
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
index 87ab228..2f9560f 100644
--- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
+++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php
index d615937..4d6aeb8 100644
--- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php
+++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,32 +14,36 @@
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_NEWSFEEDS_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_NEWSFEEDS_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_NEWSFEEDS_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.tag'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
-			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.tag');?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
 		</div>
-		<?php if ($published >= 0) : ?>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.item', 'com_newsfeeds');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
+				</div>
 			</div>
+			<?php if ($published >= 0) : ?>
+				<div class="control-group span6">
+					<div class="controls">
+						<?php echo JHtml::_('batch.item', 'com_newsfeeds'); ?>
+					</div>
+				</div>
+			<?php endif; ?>
 		</div>
-		<?php endif; ?>
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-category-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value='';document.id('batch-tag-id)').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
index 9c480c8..a394faa 100644
--- a/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
+++ b/administrator/components/com_newsfeeds/views/newsfeeds/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
index ad6d554..5e5e03a 100644
--- a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
+++ b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,7 +55,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$state	= $this->get('State');
-		$canDo	= JHelperContent::getActions($state->get('filter.category_id'), 0, 'com_newsfeeds');
+		$canDo	= JHelperContent::getActions('com_newsfeeds', 'category', $state->get('filter.category_id'));
 		$user	= JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_plugins/controller.php b/administrator/components/com_plugins/controller.php
index 8c2fcbb..3ac7acb 100644
--- a/administrator/components/com_plugins/controller.php
+++ b/administrator/components/com_plugins/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/controllers/plugin.php b/administrator/components/com_plugins/controllers/plugin.php
index 4f71dfa..3137054 100644
--- a/administrator/components/com_plugins/controllers/plugin.php
+++ b/administrator/components/com_plugins/controllers/plugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/controllers/plugins.php b/administrator/components/com_plugins/controllers/plugins.php
index ad82867..f5e148e 100644
--- a/administrator/components/com_plugins/controllers/plugins.php
+++ b/administrator/components/com_plugins/controllers/plugins.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/helpers/plugins.php b/administrator/components/com_plugins/helpers/plugins.php
index 03e8093..680be85 100644
--- a/administrator/components/com_plugins/helpers/plugins.php
+++ b/administrator/components/com_plugins/helpers/plugins.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,27 +30,6 @@ public static function addSubmenu($vName)
 		// No submenu for this component.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 */
-	public static function getActions()
-	{
-		$user = JFactory::getUser();
-		$result = new JObject;
-		$assetName = 'com_plugins';
-
-		$actions = JAccess::getActions($assetName);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name, $user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Returns an array of standard published state filter options.
 	 *
diff --git a/administrator/components/com_plugins/models/fields/pluginordering.php b/administrator/components/com_plugins/models/fields/pluginordering.php
index a0dc069..ab02d25 100644
--- a/administrator/components/com_plugins/models/fields/pluginordering.php
+++ b/administrator/components/com_plugins/models/fields/pluginordering.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/models/plugin.php b/administrator/components/com_plugins/models/plugin.php
index dfffb8d..af5efff 100644
--- a/administrator/components/com_plugins/models/plugin.php
+++ b/administrator/components/com_plugins/models/plugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/models/plugins.php b/administrator/components/com_plugins/models/plugins.php
index ce67958..7e76a7f 100644
--- a/administrator/components/com_plugins/models/plugins.php
+++ b/administrator/components/com_plugins/models/plugins.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/plugins.php b/administrator/components/com_plugins/plugins.php
index 34314c5..46ef7f7 100644
--- a/administrator/components/com_plugins/plugins.php
+++ b/administrator/components/com_plugins/plugins.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/plugins.xml b/administrator/components/com_plugins/plugins.xml
index b9bba03..30fbf9e 100644
--- a/administrator/components/com_plugins/plugins.xml
+++ b/administrator/components/com_plugins/plugins.xml
@@ -3,7 +3,7 @@
 	<name>com_plugins</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit.php b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
index 6dea900..fa41434 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/edit.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
index 52287aa..26489fb 100644
--- a/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
+++ b/administrator/components/com_plugins/views/plugin/tmpl/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_plugins/views/plugin/view.html.php b/administrator/components/com_plugins/views/plugin/view.html.php
index 486feb1..f5aa476 100644
--- a/administrator/components/com_plugins/views/plugin/view.html.php
+++ b/administrator/components/com_plugins/views/plugin/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,7 +53,7 @@ protected function addToolbar()
 	{
 		JFactory::getApplication()->input->set('hidemainmenu', true);
 
-		$canDo = PluginsHelper::getActions();
+		$canDo = JHelperContent::getActions('com_plugins');
 
 		JToolbarHelper::title(JText::sprintf('COM_PLUGINS_MANAGER_PLUGIN', JText::_($this->item->name)), 'power-cord plugin');
 
diff --git a/administrator/components/com_plugins/views/plugins/tmpl/default.php b/administrator/components/com_plugins/views/plugins/tmpl/default.php
index 1c67d8d..eef9d0f 100644
--- a/administrator/components/com_plugins/views/plugins/tmpl/default.php
+++ b/administrator/components/com_plugins/views/plugins/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -56,7 +56,7 @@
 <?php endif;?>
 		<div id="filter-bar" class="btn-toolbar">
 			<div class="filter-search btn-group pull-left">
-				<label for="filter_search" class="element-invisible"><?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC');?></label>
+				<label for="filter_search" class="element-invisible"><?php echo JText::_('JSEARCH_FILTER');?></label>
 				<input type="text" name="filter_search" id="filter_search" placeholder="<?php echo JText::_('JSEARCH_FILTER'); ?>" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" class="hasTooltip" title="<?php echo JHtml::tooltipText('COM_PLUGINS_SEARCH_IN_TITLE'); ?>" />
 			</div>
 			<div class="btn-group pull-left">
diff --git a/administrator/components/com_plugins/views/plugins/view.html.php b/administrator/components/com_plugins/views/plugins/view.html.php
index a7fbf5b..6c3aeda 100644
--- a/administrator/components/com_plugins/views/plugins/view.html.php
+++ b/administrator/components/com_plugins/views/plugins/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_plugins
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -60,7 +60,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo = PluginsHelper::getActions();
+		$canDo = JHelperContent::getActions('com_plugins');
 
 		JToolbarHelper::title(JText::_('COM_PLUGINS_MANAGER_PLUGINS'), 'power-cord plugin');
 
@@ -118,7 +118,7 @@ protected function getSortFields()
 	{
 		return array(
 				'ordering' => JText::_('JGRID_HEADING_ORDERING'),
-				'a.state' => JText::_('JSTATUS'),
+				'enabled' => JText::_('JSTATUS'),
 				'name' => JText::_('JGLOBAL_TITLE'),
 				'folder' => JText::_('COM_PLUGINS_FOLDER_HEADING'),
 				'element' => JText::_('COM_PLUGINS_ELEMENT_HEADING'),
diff --git a/administrator/components/com_postinstall/controllers/message.php b/administrator/components/com_postinstall/controllers/message.php
index 778ab9d..c09e294 100644
--- a/administrator/components/com_postinstall/controllers/message.php
+++ b/administrator/components/com_postinstall/controllers/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/models/messages.php b/administrator/components/com_postinstall/models/messages.php
index 2dbc065..2b1183b 100644
--- a/administrator/components/com_postinstall/models/messages.php
+++ b/administrator/components/com_postinstall/models/messages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/postinstall.php b/administrator/components/com_postinstall/postinstall.php
index cb88341..e8450c4 100644
--- a/administrator/components/com_postinstall/postinstall.php
+++ b/administrator/components/com_postinstall/postinstall.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/postinstall.xml b/administrator/components/com_postinstall/postinstall.xml
index 8f37844..fd8f70b 100644
--- a/administrator/components/com_postinstall/postinstall.xml
+++ b/administrator/components/com_postinstall/postinstall.xml
@@ -3,7 +3,7 @@
 	<name>com_postinstall</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2013</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_postinstall/toolbar.php b/administrator/components/com_postinstall/toolbar.php
index ccfa5e4..5201861 100644
--- a/administrator/components/com_postinstall/toolbar.php
+++ b/administrator/components/com_postinstall/toolbar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -39,5 +39,6 @@ public function onMessages()
 
 		JToolBarHelper::title(JText::sprintf('COM_POSTINSTALL_MESSAGES_TITLE', $extension_name));
 		JToolBarHelper::preferences($this->config['option'], 550, 875);
+		JToolbarHelper::help('JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES');
 	}
 }
diff --git a/administrator/components/com_postinstall/views/messages/tmpl/default.php b/administrator/components/com_postinstall/views/messages/tmpl/default.php
index 34923c2..e99db22 100644
--- a/administrator/components/com_postinstall/views/messages/tmpl/default.php
+++ b/administrator/components/com_postinstall/views/messages/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_postinstall/views/messages/view.html.php b/administrator/components/com_postinstall/views/messages/view.html.php
index 1b42831..bebcf08 100644
--- a/administrator/components/com_postinstall/views/messages/view.html.php
+++ b/administrator/components/com_postinstall/views/messages/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/controller.php b/administrator/components/com_redirect/controller.php
index c99282c..b473953 100644
--- a/administrator/components/com_redirect/controller.php
+++ b/administrator/components/com_redirect/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/controllers/link.php b/administrator/components/com_redirect/controllers/link.php
index 7face9e..c89ebfc 100644
--- a/administrator/components/com_redirect/controllers/link.php
+++ b/administrator/components/com_redirect/controllers/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/controllers/links.php b/administrator/components/com_redirect/controllers/links.php
index a738efa..a2c7076 100644
--- a/administrator/components/com_redirect/controllers/links.php
+++ b/administrator/components/com_redirect/controllers/links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/helpers/html/redirect.php b/administrator/components/com_redirect/helpers/html/redirect.php
index fab9260..9201418 100644
--- a/administrator/components/com_redirect/helpers/html/redirect.php
+++ b/administrator/components/com_redirect/helpers/html/redirect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/helpers/redirect.php b/administrator/components/com_redirect/helpers/redirect.php
index 12729dc..df775ca 100644
--- a/administrator/components/com_redirect/helpers/redirect.php
+++ b/administrator/components/com_redirect/helpers/redirect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,27 +30,6 @@ public static function addSubmenu($vName)
 		// No submenu for this component.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 */
-	public static function getActions()
-	{
-		$user		= JFactory::getUser();
-		$result		= new JObject;
-		$assetName	= 'com_redirect';
-
-		$actions = JAccess::getActions($assetName);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name,	$user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Returns an array of standard published state filter options.
 	 *
diff --git a/administrator/components/com_redirect/models/link.php b/administrator/components/com_redirect/models/link.php
index e025a34..854c7f6 100644
--- a/administrator/components/com_redirect/models/link.php
+++ b/administrator/components/com_redirect/models/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/models/links.php b/administrator/components/com_redirect/models/links.php
index 402b0f3..a660a45 100644
--- a/administrator/components/com_redirect/models/links.php
+++ b/administrator/components/com_redirect/models/links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/redirect.php b/administrator/components/com_redirect/redirect.php
index 6db20c4..6aa593f 100644
--- a/administrator/components/com_redirect/redirect.php
+++ b/administrator/components/com_redirect/redirect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/redirect.xml b/administrator/components/com_redirect/redirect.xml
index 969d628..5bc3e10 100644
--- a/administrator/components/com_redirect/redirect.xml
+++ b/administrator/components/com_redirect/redirect.xml
@@ -3,7 +3,7 @@
 	<name>com_redirect</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_redirect/tables/link.php b/administrator/components/com_redirect/tables/link.php
index c0eeef5..49bb2a2 100644
--- a/administrator/components/com_redirect/tables/link.php
+++ b/administrator/components/com_redirect/tables/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/views/link/tmpl/edit.php b/administrator/components/com_redirect/views/link/tmpl/edit.php
index a900a56..627d7cf 100644
--- a/administrator/components/com_redirect/views/link/tmpl/edit.php
+++ b/administrator/components/com_redirect/views/link/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/views/link/view.html.php b/administrator/components/com_redirect/views/link/view.html.php
index f92f42a..af73e4a 100644
--- a/administrator/components/com_redirect/views/link/view.html.php
+++ b/administrator/components/com_redirect/views/link/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -55,7 +55,7 @@ protected function addToolbar()
 	{
 		JFactory::getApplication()->input->set('hidemainmenu', true);
 
-		$canDo		= RedirectHelper::getActions();
+		$canDo		= JHelperContent::getActions('com_redirect');
 
 		JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINK'), 'refresh redirect');
 
diff --git a/administrator/components/com_redirect/views/links/tmpl/default.php b/administrator/components/com_redirect/views/links/tmpl/default.php
index 9f2bff0..e7aff36 100644
--- a/administrator/components/com_redirect/views/links/tmpl/default.php
+++ b/administrator/components/com_redirect/views/links/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/views/links/tmpl/default_addform.php b/administrator/components/com_redirect/views/links/tmpl/default_addform.php
index c615008..0042c61 100644
--- a/administrator/components/com_redirect/views/links/tmpl/default_addform.php
+++ b/administrator/components/com_redirect/views/links/tmpl/default_addform.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_redirect/views/links/view.html.php b/administrator/components/com_redirect/views/links/view.html.php
index 657a1ae..df2de34 100644
--- a/administrator/components/com_redirect/views/links/view.html.php
+++ b/administrator/components/com_redirect/views/links/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -58,7 +58,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$state	= $this->get('State');
-		$canDo	= RedirectHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_redirect');
 
 		JToolbarHelper::title(JText::_('COM_REDIRECT_MANAGER_LINKS'), 'refresh redirect');
 		if ($canDo->get('core.create'))
diff --git a/administrator/components/com_search/controller.php b/administrator/components/com_search/controller.php
index c417e00..d1b9d8f 100644
--- a/administrator/components/com_search/controller.php
+++ b/administrator/components/com_search/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/controllers/searches.php b/administrator/components/com_search/controllers/searches.php
index cab8be0..82cfe35 100644
--- a/administrator/components/com_search/controllers/searches.php
+++ b/administrator/components/com_search/controllers/searches.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/helpers/search.php b/administrator/components/com_search/helpers/search.php
index 785f827..0a68c80 100644
--- a/administrator/components/com_search/helpers/search.php
+++ b/administrator/components/com_search/helpers/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,27 +29,6 @@ public static function addSubmenu($vName)
 		// Not required.
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 */
-	public static function getActions()
-	{
-		$user	   = JFactory::getUser();
-		$result	   = new JObject;
-		$assetName = 'com_search';
-
-		$actions = JAccess::getActions($assetName);
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name,	$user->authorise($action->name, $assetName));
-		}
-
-		return $result;
-	}
-
 	public static function santiseSearchWord(&$searchword, $searchphrase)
 	{
 		$ignored = false;
diff --git a/administrator/components/com_search/helpers/site.php b/administrator/components/com_search/helpers/site.php
index 1adefc6..71c51e4 100644
--- a/administrator/components/com_search/helpers/site.php
+++ b/administrator/components/com_search/helpers/site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/models/searches.php b/administrator/components/com_search/models/searches.php
index e642203..a9584de 100644
--- a/administrator/components/com_search/models/searches.php
+++ b/administrator/components/com_search/models/searches.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/search.php b/administrator/components/com_search/search.php
index f19a8dd..c8fe65c 100644
--- a/administrator/components/com_search/search.php
+++ b/administrator/components/com_search/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_search/search.xml b/administrator/components/com_search/search.xml
index 428efcb..b54f334 100644
--- a/administrator/components/com_search/search.xml
+++ b/administrator/components/com_search/search.xml
@@ -3,7 +3,7 @@
 	<name>com_search</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>GNU General Public License version 2 or later; see
 		LICENSE.txt</license>
diff --git a/administrator/components/com_search/views/searches/tmpl/default.php b/administrator/components/com_search/views/searches/tmpl/default.php
index 2dbaf49..731613d 100644
--- a/administrator/components/com_search/views/searches/tmpl/default.php
+++ b/administrator/components/com_search/views/searches/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,6 @@
 
 $listOrder	= $this->escape($this->state->get('list.ordering'));
 $listDirn	= $this->escape($this->state->get('list.direction'));
-$canDo		= SearchHelper::getActions();
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_search&view=searches'); ?>" method="post" name="adminForm" id="adminForm">
 	<div id="filter-bar" class="btn-toolbar">
diff --git a/administrator/components/com_search/views/searches/view.html.php b/administrator/components/com_search/views/searches/view.html.php
index 41018d7..55343b4 100644
--- a/administrator/components/com_search/views/searches/view.html.php
+++ b/administrator/components/com_search/views/searches/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -35,6 +35,7 @@ public function display($tpl = null)
 		$this->pagination	= $this->get('Pagination');
 		$this->state		= $this->get('State');
 		$this->enabled		= $this->state->params->get('enabled');
+		$this->canDo		= JHelperContent::getActions('com_search');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -54,7 +55,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo	= SearchHelper::getActions();
+		$canDo	= $this->canDo;
 
 		JToolbarHelper::title(JText::_('COM_SEARCH_MANAGER_SEARCHES'), 'search');
 
diff --git a/administrator/components/com_tags/controller.php b/administrator/components/com_tags/controller.php
index edc44b9..9b6f4bc 100644
--- a/administrator/components/com_tags/controller.php
+++ b/administrator/components/com_tags/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/controllers/tag.php b/administrator/components/com_tags/controllers/tag.php
index e7939eb..e5ba385 100644
--- a/administrator/components/com_tags/controllers/tag.php
+++ b/administrator/components/com_tags/controllers/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/controllers/tags.php b/administrator/components/com_tags/controllers/tags.php
index 12a089f..08a6b62 100644
--- a/administrator/components/com_tags/controllers/tags.php
+++ b/administrator/components/com_tags/controllers/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/helpers/tags.php b/administrator/components/com_tags/helpers/tags.php
index 5bfe1af..d34ae4e 100644
--- a/administrator/components/com_tags/helpers/tags.php
+++ b/administrator/components/com_tags/helpers/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/models/tag.php b/administrator/components/com_tags/models/tag.php
index 4616973..3aca0ba 100644
--- a/administrator/components/com_tags/models/tag.php
+++ b/administrator/components/com_tags/models/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/models/tags.php b/administrator/components/com_tags/models/tags.php
index 7e0ee9a..6781970 100644
--- a/administrator/components/com_tags/models/tags.php
+++ b/administrator/components/com_tags/models/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/tables/tag.php b/administrator/components/com_tags/tables/tag.php
index 547d097..292d2e5 100644
--- a/administrator/components/com_tags/tables/tag.php
+++ b/administrator/components/com_tags/tables/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/tags.php b/administrator/components/com_tags/tags.php
index 32ee5e3..9e11292 100644
--- a/administrator/components/com_tags/tags.php
+++ b/administrator/components/com_tags/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/tags.xml b/administrator/components/com_tags/tags.xml
index d7017ba..90b418b 100644
--- a/administrator/components/com_tags/tags.xml
+++ b/administrator/components/com_tags/tags.xml
@@ -3,7 +3,7 @@
 	<name>com_tags</name>
 		<author>Joomla! Project</author>
 	<creationDate>December 2013</creationDate>
-		<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+		<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 		<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 		<authorEmail>admin@joomla.org</authorEmail>
 		<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_tags/views/tag/tmpl/edit.php b/administrator/components/com_tags/views/tag/tmpl/edit.php
index 488f3a9..a97c777 100644
--- a/administrator/components/com_tags/views/tag/tmpl/edit.php
+++ b/administrator/components/com_tags/views/tag/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
index 1e9afd2..e56ce77 100644
--- a/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
+++ b/administrator/components/com_tags/views/tag/tmpl/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/views/tag/tmpl/edit_options.php b/administrator/components/com_tags/views/tag/tmpl/edit_options.php
index 27caccf..aa68b31 100644
--- a/administrator/components/com_tags/views/tag/tmpl/edit_options.php
+++ b/administrator/components/com_tags/views/tag/tmpl/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/views/tag/view.html.php b/administrator/components/com_tags/views/tag/view.html.php
index 2d6ecf0..bf2f568 100644
--- a/administrator/components/com_tags/views/tag/view.html.php
+++ b/administrator/components/com_tags/views/tag/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -38,7 +38,7 @@ public function display($tpl = null)
 		$this->form  = $this->get('Form');
 		$this->item  = $this->get('Item');
 		$this->state = $this->get('State');
-		$this->canDo = JHelperContent::getActions(0, 0, 'com_tags');
+		$this->canDo = JHelperContent::getActions('com_tags');
 		$this->assoc = $this->get('Assoc');
 
 		$input = JFactory::getApplication()->input;
diff --git a/administrator/components/com_tags/views/tags/tmpl/default.php b/administrator/components/com_tags/views/tags/tmpl/default.php
index 93c2611..a4a8f1f 100644
--- a/administrator/components/com_tags/views/tags/tmpl/default.php
+++ b/administrator/components/com_tags/views/tags/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_tags/views/tags/tmpl/default_batch.php b/administrator/components/com_tags/views/tags/tmpl/default_batch.php
index dba1f1c..92c728f 100644
--- a/administrator/components/com_tags/views/tags/tmpl/default_batch.php
+++ b/administrator/components/com_tags/views/tags/tmpl/default_batch.php
@@ -3,33 +3,34 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
-JHtml::_('formbehavior.chosen', 'select');
-
-$published	= $this->state->get('filter.published');
+$published = $this->state->get('filter.published');
 ?>
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_TAGS_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_TAGS_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_TAGS_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
+				</div>
 			</div>
 		</div>
+	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-tag-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value=''" data-dismiss="modal">
 			<?php echo JText::_('JCANCEL'); ?>
diff --git a/administrator/components/com_tags/views/tags/view.html.php b/administrator/components/com_tags/views/tags/view.html.php
index 13b23b8..a1f959f 100644
--- a/administrator/components/com_tags/views/tags/view.html.php
+++ b/administrator/components/com_tags/views/tags/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -74,7 +74,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		$state	= $this->get('State');
-		$canDo	= JHelperContent::getActions(null, null, 'com_tags');
+		$canDo	= JHelperContent::getActions('com_tags');
 		$user	= JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_templates/controller.php b/administrator/components/com_templates/controller.php
index eb90efd..bf77577 100644
--- a/administrator/components/com_templates/controller.php
+++ b/administrator/components/com_templates/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/controllers/style.php b/administrator/components/com_templates/controllers/style.php
index 55399fd..2188a9d 100644
--- a/administrator/components/com_templates/controllers/style.php
+++ b/administrator/components/com_templates/controllers/style.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/controllers/styles.php b/administrator/components/com_templates/controllers/styles.php
index 18a951e..57ac317 100644
--- a/administrator/components/com_templates/controllers/styles.php
+++ b/administrator/components/com_templates/controllers/styles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/controllers/template.php b/administrator/components/com_templates/controllers/template.php
index 5e87573..2096ed7 100644
--- a/administrator/components/com_templates/controllers/template.php
+++ b/administrator/components/com_templates/controllers/template.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/helpers/html/templates.php b/administrator/components/com_templates/helpers/html/templates.php
index 5c1c69a..ee6bd50 100644
--- a/administrator/components/com_templates/helpers/html/templates.php
+++ b/administrator/components/com_templates/helpers/html/templates.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/helpers/template.php b/administrator/components/com_templates/helpers/template.php
index 3741c54..f4c9330 100644
--- a/administrator/components/com_templates/helpers/template.php
+++ b/administrator/components/com_templates/helpers/template.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/helpers/templates.php b/administrator/components/com_templates/helpers/templates.php
index 1ab0057..11948d5 100644
--- a/administrator/components/com_templates/helpers/templates.php
+++ b/administrator/components/com_templates/helpers/templates.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -39,26 +39,6 @@ public static function addSubmenu($vName)
 		);
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 */
-	public static function getActions()
-	{
-		$user = JFactory::getUser();
-		$result = new JObject;
-
-		$actions = JAccess::getActions('com_templates');
-
-		foreach ($actions as $action)
-		{
-			$result->set($action->name, $user->authorise($action->name, 'com_templates'));
-		}
-
-		return $result;
-	}
-
 	/**
 	 * Get a list of filter options for the application clients.
 	 *
diff --git a/administrator/components/com_templates/models/style.php b/administrator/components/com_templates/models/style.php
index 7ae3ce6..58ae41a 100644
--- a/administrator/components/com_templates/models/style.php
+++ b/administrator/components/com_templates/models/style.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/models/styles.php b/administrator/components/com_templates/models/styles.php
index 2c415d4..73bb15e 100644
--- a/administrator/components/com_templates/models/styles.php
+++ b/administrator/components/com_templates/models/styles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/models/template.php b/administrator/components/com_templates/models/template.php
index 7fe979f..cff0cdd 100644
--- a/administrator/components/com_templates/models/template.php
+++ b/administrator/components/com_templates/models/template.php
@@ -3,7 +3,7 @@
 * @package     Joomla.Administrator
 * @subpackage  com_templates
 *
-* @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+* @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
 * @license     GNU General Public License version 2 or later; see LICENSE.txt
 */
 
diff --git a/administrator/components/com_templates/models/templates.php b/administrator/components/com_templates/models/templates.php
index 41b57d6..40077c5 100644
--- a/administrator/components/com_templates/models/templates.php
+++ b/administrator/components/com_templates/models/templates.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/tables/style.php b/administrator/components/com_templates/tables/style.php
index d62584e..c890ad6 100644
--- a/administrator/components/com_templates/tables/style.php
+++ b/administrator/components/com_templates/tables/style.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/templates.php b/administrator/components/com_templates/templates.php
index 15a01a4..e2995d7 100644
--- a/administrator/components/com_templates/templates.php
+++ b/administrator/components/com_templates/templates.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/templates.xml b/administrator/components/com_templates/templates.xml
index 35d2cb2..8a3a409 100644
--- a/administrator/components/com_templates/templates.xml
+++ b/administrator/components/com_templates/templates.xml
@@ -3,7 +3,7 @@
 	<name>com_templates</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_templates/views/style/tmpl/edit.php b/administrator/components/com_templates/views/style/tmpl/edit.php
index a8be23b..4148ad9 100644
--- a/administrator/components/com_templates/views/style/tmpl/edit.php
+++ b/administrator/components/com_templates/views/style/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('behavior.keepalive');
 $user = JFactory::getUser();
-$canDo = TemplatesHelper::getActions();
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
@@ -90,7 +89,7 @@
 		echo JLayoutHelper::render('joomla.edit.params', $this);
 		?>
 
-		<?php if ($user->authorise('core.edit', 'com_menu') && $this->item->client_id == 0 && $canDo->get('core.edit.state')) : ?>
+		<?php if ($user->authorise('core.edit', 'com_menu') && $this->item->client_id == 0 && $this->canDo->get('core.edit.state')) : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'assignment', JText::_('COM_TEMPLATES_MENUS_ASSIGNMENT', true)); ?>
 			<?php echo $this->loadTemplate('assignment'); ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
diff --git a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php
index eafa53e..634021c 100644
--- a/administrator/components/com_templates/views/style/tmpl/edit_assignment.php
+++ b/administrator/components/com_templates/views/style/tmpl/edit_assignment.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/views/style/tmpl/edit_options.php b/administrator/components/com_templates/views/style/tmpl/edit_options.php
index 90fa2f1..4a07e48 100644
--- a/administrator/components/com_templates/views/style/tmpl/edit_options.php
+++ b/administrator/components/com_templates/views/style/tmpl/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/views/style/view.html.php b/administrator/components/com_templates/views/style/view.html.php
index 52ed481..2e33b29 100644
--- a/administrator/components/com_templates/views/style/view.html.php
+++ b/administrator/components/com_templates/views/style/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -36,6 +36,7 @@ public function display($tpl = null)
 		$this->item  = $this->get('Item');
 		$this->state = $this->get('State');
 		$this->form  = $this->get('Form');
+		$this->canDo = JHelperContent::getActions('com_templates');
 
 		// Check for errors.
 		if (count($errors = $this->get('Errors')))
@@ -62,7 +63,7 @@ protected function addToolbar()
 		JFactory::getApplication()->input->set('hidemainmenu', true);
 
 		$isNew = ($this->item->id == 0);
-		$canDo = TemplatesHelper::getActions();
+		$canDo = $this->canDo;
 
 		JToolbarHelper::title(
 			$isNew ? JText::_('COM_TEMPLATES_MANAGER_ADD_STYLE')
diff --git a/administrator/components/com_templates/views/style/view.json.php b/administrator/components/com_templates/views/style/view.json.php
index b59d74f..01f7fdc 100644
--- a/administrator/components/com_templates/views/style/view.json.php
+++ b/administrator/components/com_templates/views/style/view.json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/views/styles/tmpl/default.php b/administrator/components/com_templates/views/styles/tmpl/default.php
index 5ed89ce..b582fb0 100644
--- a/administrator/components/com_templates/views/styles/tmpl/default.php
+++ b/administrator/components/com_templates/views/styles/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/views/styles/view.html.php b/administrator/components/com_templates/views/styles/view.html.php
index 538446a..981f6b1 100644
--- a/administrator/components/com_templates/views/styles/view.html.php
+++ b/administrator/components/com_templates/views/styles/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -72,7 +72,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo = TemplatesHelper::getActions();
+		$canDo = JHelperContent::getActions('com_templates');
 
 		JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_STYLES'), 'eye thememanager');
 
diff --git a/administrator/components/com_templates/views/template/tmpl/default.php b/administrator/components/com_templates/views/template/tmpl/default.php
index 3c0724e..d34861f 100644
--- a/administrator/components/com_templates/views/template/tmpl/default.php
+++ b/administrator/components/com_templates/views/template/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,7 +20,6 @@
 JHtml::_('behavior.keepalive');
 JHtml::_('behavior.tabstate');
 
-$canDo = TemplatesHelper::getActions();
 $input = JFactory::getApplication()->input;
 
 if ($this->type == 'image')
diff --git a/administrator/components/com_templates/views/template/tmpl/default_description.php b/administrator/components/com_templates/views/template/tmpl/default_description.php
index c4135a4..cc0b8fe 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_description.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_description.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/views/template/tmpl/default_folders.php b/administrator/components/com_templates/views/template/tmpl/default_folders.php
index 01d7f65..1a1470a 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_folders.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_folders.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/views/template/tmpl/default_tree.php b/administrator/components/com_templates/views/template/tmpl/default_tree.php
index 147397b..0f88498 100644
--- a/administrator/components/com_templates/views/template/tmpl/default_tree.php
+++ b/administrator/components/com_templates/views/template/tmpl/default_tree.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_templates/views/template/view.html.php b/administrator/components/com_templates/views/template/view.html.php
index f1a3115..40bc3b1 100644
--- a/administrator/components/com_templates/views/template/view.html.php
+++ b/administrator/components/com_templates/views/template/view.html.php
@@ -3,7 +3,7 @@
 * @package     Joomla.Administrator
 * @subpackage  com_templates
 *
-* @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+* @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
 * @license     GNU General Public License version 2 or later; see LICENSE.txt
 */
 
@@ -172,7 +172,7 @@ public function display($tpl = null)
 	protected function addToolbar()
 	{
 		JFactory::getApplication()->input->set('hidemainmenu', true);
-		$canDo = TemplatesHelper::getActions();
+		$canDo = JHelperContent::getActions('com_templates');
 
 		if ($canDo->get('core.edit') && $canDo->get('core.create') && $canDo->get('core.admin'))
 		{
diff --git a/administrator/components/com_templates/views/templates/tmpl/default.php b/administrator/components/com_templates/views/templates/tmpl/default.php
index b0e4da9..2c2ade4 100644
--- a/administrator/components/com_templates/views/templates/tmpl/default.php
+++ b/administrator/components/com_templates/views/templates/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -23,14 +23,10 @@
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_templates&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
-	<?php if (!empty($this->sidebar)) : ?>
-		<div id="j-sidebar-container" class="span2">
+	<div id="j-sidebar-container" class="span2">
 		<?php echo $this->sidebar; ?>
-		</div>
+	</div>
 	<div id="j-main-container" class="span10">
-	<?php else : ?>
-	<div id="j-main-container">
-	<?php endif;?>
 
 	<div id="filter-bar" class="btn-toolbar">
 		<div class="filter-search btn-group pull-left">
diff --git a/administrator/components/com_templates/views/templates/view.html.php b/administrator/components/com_templates/views/templates/view.html.php
index f747028..993ba9a 100644
--- a/administrator/components/com_templates/views/templates/view.html.php
+++ b/administrator/components/com_templates/views/templates/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -91,7 +91,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo = TemplatesHelper::getActions();
+		$canDo = JHelperContent::getActions('com_templates');
 
 		JToolbarHelper::title(JText::_('COM_TEMPLATES_MANAGER_TEMPLATES'), 'eye thememanager');
 
diff --git a/administrator/components/com_users/controller.php b/administrator/components/com_users/controller.php
index 03b2954..4fc146f 100644
--- a/administrator/components/com_users/controller.php
+++ b/administrator/components/com_users/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -28,7 +28,7 @@ class UsersController extends JControllerLegacy
 	 */
 	protected function canView($view)
 	{
-		$canDo	= UsersHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_users');
 
 		switch ($view)
 		{
diff --git a/administrator/components/com_users/controllers/group.php b/administrator/components/com_users/controllers/group.php
index a930b92..e605f30 100644
--- a/administrator/components/com_users/controllers/group.php
+++ b/administrator/components/com_users/controllers/group.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/groups.php b/administrator/components/com_users/controllers/groups.php
index 29abd2c..18d2293 100644
--- a/administrator/components/com_users/controllers/groups.php
+++ b/administrator/components/com_users/controllers/groups.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/level.php b/administrator/components/com_users/controllers/level.php
index 6e4506d..52d0168 100644
--- a/administrator/components/com_users/controllers/level.php
+++ b/administrator/components/com_users/controllers/level.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/levels.php b/administrator/components/com_users/controllers/levels.php
index 4cab165..dca2db1 100644
--- a/administrator/components/com_users/controllers/levels.php
+++ b/administrator/components/com_users/controllers/levels.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/mail.php b/administrator/components/com_users/controllers/mail.php
index 3b8978b..430df7e 100644
--- a/administrator/components/com_users/controllers/mail.php
+++ b/administrator/components/com_users/controllers/mail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/note.php b/administrator/components/com_users/controllers/note.php
index 57e87d9..670ef94 100644
--- a/administrator/components/com_users/controllers/note.php
+++ b/administrator/components/com_users/controllers/note.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/notes.php b/administrator/components/com_users/controllers/notes.php
index 49ff777..d6d671f 100644
--- a/administrator/components/com_users/controllers/notes.php
+++ b/administrator/components/com_users/controllers/notes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/user.php b/administrator/components/com_users/controllers/user.php
index ec81bb3..df13d77 100644
--- a/administrator/components/com_users/controllers/user.php
+++ b/administrator/components/com_users/controllers/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/controllers/users.php b/administrator/components/com_users/controllers/users.php
index 55126ac..d6e19df 100644
--- a/administrator/components/com_users/controllers/users.php
+++ b/administrator/components/com_users/controllers/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/helpers/debug.php b/administrator/components/com_users/helpers/debug.php
index 484039d..327714a 100644
--- a/administrator/components/com_users/helpers/debug.php
+++ b/administrator/components/com_users/helpers/debug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/helpers/html/users.php b/administrator/components/com_users/helpers/html/users.php
index 6474c11..abeb460 100644
--- a/administrator/components/com_users/helpers/html/users.php
+++ b/administrator/components/com_users/helpers/html/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php
index f1e10b3..0da7c6f 100644
--- a/administrator/components/com_users/helpers/users.php
+++ b/administrator/components/com_users/helpers/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,7 +42,7 @@ public static function addSubmenu($vName)
 		);
 
 		// Groups and Levels are restricted to core.admin
-		$canDo = self::getActions();
+		$canDo = JHelperContent::getActions('com_users');
 
 		if ($canDo->get('core.admin'))
 		{
@@ -71,32 +71,6 @@ public static function addSubmenu($vName)
 		}
 	}
 
-	/**
-	 * Gets a list of the actions that can be performed.
-	 *
-	 * @return  JObject
-	 *
-	 * @since   1.6
-	 * @todo    Refactor to work with notes
-	 */
-	public static function getActions()
-	{
-		if (empty(self::$actions))
-		{
-			$user = JFactory::getUser();
-			self::$actions = new JObject;
-
-			$actions = JAccess::getActions('com_users');
-
-			foreach ($actions as $action)
-			{
-				self::$actions->set($action->name, $user->authorise($action->name, 'com_users'));
-			}
-		}
-
-		return self::$actions;
-	}
-
 	/**
 	 * Get a list of filter options for the blocked state of a user.
 	 *
diff --git a/administrator/components/com_users/models/debuggroup.php b/administrator/components/com_users/models/debuggroup.php
index c6e434d..2b2c886 100644
--- a/administrator/components/com_users/models/debuggroup.php
+++ b/administrator/components/com_users/models/debuggroup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/debuguser.php b/administrator/components/com_users/models/debuguser.php
index 7554ffb..82f7c73 100644
--- a/administrator/components/com_users/models/debuguser.php
+++ b/administrator/components/com_users/models/debuguser.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/fields/groupparent.php b/administrator/components/com_users/models/fields/groupparent.php
index 8371aef..3956d5e 100644
--- a/administrator/components/com_users/models/fields/groupparent.php
+++ b/administrator/components/com_users/models/fields/groupparent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/group.php b/administrator/components/com_users/models/group.php
index 0cf5988..e3d4f2f 100644
--- a/administrator/components/com_users/models/group.php
+++ b/administrator/components/com_users/models/group.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/groups.php b/administrator/components/com_users/models/groups.php
index 2ec363c..1de8d5a 100644
--- a/administrator/components/com_users/models/groups.php
+++ b/administrator/components/com_users/models/groups.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/level.php b/administrator/components/com_users/models/level.php
index db26cb2..bb84c91 100644
--- a/administrator/components/com_users/models/level.php
+++ b/administrator/components/com_users/models/level.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/levels.php b/administrator/components/com_users/models/levels.php
index 85d9963..d6de27a 100644
--- a/administrator/components/com_users/models/levels.php
+++ b/administrator/components/com_users/models/levels.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/mail.php b/administrator/components/com_users/models/mail.php
index de5212d..118c239 100644
--- a/administrator/components/com_users/models/mail.php
+++ b/administrator/components/com_users/models/mail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/note.php b/administrator/components/com_users/models/note.php
index a75b1e7..d89ee4a 100644
--- a/administrator/components/com_users/models/note.php
+++ b/administrator/components/com_users/models/note.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/notes.php b/administrator/components/com_users/models/notes.php
index 7c6534c..0ff74a1 100644
--- a/administrator/components/com_users/models/notes.php
+++ b/administrator/components/com_users/models/notes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/user.php b/administrator/components/com_users/models/user.php
index 6245e0a..1aee45a 100644
--- a/administrator/components/com_users/models/user.php
+++ b/administrator/components/com_users/models/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/models/users.php b/administrator/components/com_users/models/users.php
index b97dd71..b5b2163 100644
--- a/administrator/components/com_users/models/users.php
+++ b/administrator/components/com_users/models/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/tables/note.php b/administrator/components/com_users/tables/note.php
index fd7efb4..8cc983f 100644
--- a/administrator/components/com_users/tables/note.php
+++ b/administrator/components/com_users/tables/note.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/users.php b/administrator/components/com_users/users.php
index 9b8484b..665541c 100644
--- a/administrator/components/com_users/users.php
+++ b/administrator/components/com_users/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/users.xml b/administrator/components/com_users/users.xml
index 84a442d..d5eb2e8 100644
--- a/administrator/components/com_users/users.xml
+++ b/administrator/components/com_users/users.xml
@@ -3,7 +3,7 @@
 	<name>com_users</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/components/com_users/views/debuggroup/tmpl/default.php b/administrator/components/com_users/views/debuggroup/tmpl/default.php
index 04276da..ae724ee 100644
--- a/administrator/components/com_users/views/debuggroup/tmpl/default.php
+++ b/administrator/components/com_users/views/debuggroup/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/debuggroup/view.html.php b/administrator/components/com_users/views/debuggroup/view.html.php
index 39d9caf..24bdabd 100644
--- a/administrator/components/com_users/views/debuggroup/view.html.php
+++ b/administrator/components/com_users/views/debuggroup/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/debuguser/tmpl/default.php b/administrator/components/com_users/views/debuguser/tmpl/default.php
index d8b19e3..2468a51 100644
--- a/administrator/components/com_users/views/debuguser/tmpl/default.php
+++ b/administrator/components/com_users/views/debuguser/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/debuguser/view.html.php b/administrator/components/com_users/views/debuguser/view.html.php
index 8b2a25f..38eaa23 100644
--- a/administrator/components/com_users/views/debuguser/view.html.php
+++ b/administrator/components/com_users/views/debuguser/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/group/tmpl/edit.php b/administrator/components/com_users/views/group/tmpl/edit.php
index b8fe062..1fb2656 100644
--- a/administrator/components/com_users/views/group/tmpl/edit.php
+++ b/administrator/components/com_users/views/group/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
-$canDo = UsersHelper::getActions();
 ?>
 
 <script type="text/javascript">
diff --git a/administrator/components/com_users/views/group/view.html.php b/administrator/components/com_users/views/group/view.html.php
index edbc80f..46cc6d9 100644
--- a/administrator/components/com_users/views/group/view.html.php
+++ b/administrator/components/com_users/views/group/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -54,7 +54,7 @@ protected function addToolbar()
 		JFactory::getApplication()->input->set('hidemainmenu', true);
 
 		$isNew = ($this->item->id == 0);
-		$canDo = UsersHelper::getActions();
+		$canDo = JHelperContent::getActions('com_users');
 
 		JToolbarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_GROUP_TITLE' : 'COM_USERS_VIEW_EDIT_GROUP_TITLE'), 'users groups-add');
 
diff --git a/administrator/components/com_users/views/groups/tmpl/default.php b/administrator/components/com_users/views/groups/tmpl/default.php
index d051aac..62ce09a 100644
--- a/administrator/components/com_users/views/groups/tmpl/default.php
+++ b/administrator/components/com_users/views/groups/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/groups/view.html.php b/administrator/components/com_users/views/groups/view.html.php
index 5d759ad..b06cc45 100644
--- a/administrator/components/com_users/views/groups/view.html.php
+++ b/administrator/components/com_users/views/groups/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -54,7 +54,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo	= UsersHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_users');
 
 		JToolbarHelper::title(JText::_('COM_USERS_VIEW_GROUPS_TITLE'), 'users groups');
 
diff --git a/administrator/components/com_users/views/level/tmpl/edit.php b/administrator/components/com_users/views/level/tmpl/edit.php
index 1b3d799..df018d7 100644
--- a/administrator/components/com_users/views/level/tmpl/edit.php
+++ b/administrator/components/com_users/views/level/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -13,7 +13,6 @@
 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 
 JHtml::_('behavior.formvalidation');
-$canDo = UsersHelper::getActions();
 ?>
 
 <script type="text/javascript">
diff --git a/administrator/components/com_users/views/level/view.html.php b/administrator/components/com_users/views/level/view.html.php
index 2e5ef49..fdb661f 100644
--- a/administrator/components/com_users/views/level/view.html.php
+++ b/administrator/components/com_users/views/level/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -54,7 +54,7 @@ protected function addToolbar()
 		JFactory::getApplication()->input->set('hidemainmenu', true);
 
 		$isNew	= ($this->item->id == 0);
-		$canDo  = UsersHelper::getActions();
+		$canDo  = JHelperContent::getActions('com_users');
 
 		JToolbarHelper::title(JText::_($isNew ? 'COM_USERS_VIEW_NEW_LEVEL_TITLE' : 'COM_USERS_VIEW_EDIT_LEVEL_TITLE'), 'users levels-add');
 
diff --git a/administrator/components/com_users/views/levels/tmpl/default.php b/administrator/components/com_users/views/levels/tmpl/default.php
index 6fa9c71..83999ec 100644
--- a/administrator/components/com_users/views/levels/tmpl/default.php
+++ b/administrator/components/com_users/views/levels/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -94,15 +94,12 @@
 					<th width="1%">
 						<?php echo JHtml::_('grid.checkall'); ?>
 					</th>
-					<th class="left">
+					<th>
 						<?php echo JHtml::_('grid.sort', 'COM_USERS_HEADING_LEVEL_NAME', 'a.title', $listDirn, $listOrder); ?>
 					</th>
 					<th width="5%" class="nowrap center hidden-phone">
 						<?php echo JHtml::_('grid.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>
 					</th>
-					<th width="40%">
-						&#160;
-					</th>
 				</tr>
 			</thead>
 			<tfoot>
@@ -154,9 +151,6 @@
 					<td class="center">
 						<?php echo (int) $item->id; ?>
 					</td>
-					<td>
-						&#160;
-					</td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>
diff --git a/administrator/components/com_users/views/levels/view.html.php b/administrator/components/com_users/views/levels/view.html.php
index 4d6a66a..301b468 100644
--- a/administrator/components/com_users/views/levels/view.html.php
+++ b/administrator/components/com_users/views/levels/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -54,7 +54,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo	= UsersHelper::getActions();
+		$canDo	= JHelperContent::getActions('com_users');
 
 		JToolbarHelper::title(JText::_('COM_USERS_VIEW_LEVELS_TITLE'), 'users levels');
 
diff --git a/administrator/components/com_users/views/mail/tmpl/default.php b/administrator/components/com_users/views/mail/tmpl/default.php
index 714e455..4556872 100644
--- a/administrator/components/com_users/views/mail/tmpl/default.php
+++ b/administrator/components/com_users/views/mail/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/mail/view.html.php b/administrator/components/com_users/views/mail/view.html.php
index 40972eb..5a73d6d 100644
--- a/administrator/components/com_users/views/mail/view.html.php
+++ b/administrator/components/com_users/views/mail/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/note/tmpl/edit.php b/administrator/components/com_users/views/note/tmpl/edit.php
index 195318f..cc01fea 100644
--- a/administrator/components/com_users/views/note/tmpl/edit.php
+++ b/administrator/components/com_users/views/note/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/note/view.html.php b/administrator/components/com_users/views/note/view.html.php
index 083625d..9c4f060 100644
--- a/administrator/components/com_users/views/note/view.html.php
+++ b/administrator/components/com_users/views/note/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -86,7 +86,9 @@ protected function addToolbar()
 		$user		= JFactory::getUser();
 		$isNew		= ($this->item->id == 0);
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
-		$canDo		= UsersHelper::getActions($this->state->get('filter.category_id'), $this->item->id);
+
+		// Since we don't track these assets at the item level, use the category id.
+		$canDo		= JHelperContent::getActions('com_users', 'category', $this->item->catid);
 
 		JToolbarHelper::title(JText::_('COM_USERS_NOTES'), 'users user');
 
diff --git a/administrator/components/com_users/views/notes/tmpl/default.php b/administrator/components/com_users/views/notes/tmpl/default.php
index 8e49398..22b6256 100644
--- a/administrator/components/com_users/views/notes/tmpl/default.php
+++ b/administrator/components/com_users/views/notes/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/notes/tmpl/modal.php b/administrator/components/com_users/views/notes/tmpl/modal.php
index cbf05ff..4b9da3c 100644
--- a/administrator/components/com_users/views/notes/tmpl/modal.php
+++ b/administrator/components/com_users/views/notes/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/notes/view.html.php b/administrator/components/com_users/views/notes/view.html.php
index d0fb1ca..967b6d5 100644
--- a/administrator/components/com_users/views/notes/view.html.php
+++ b/administrator/components/com_users/views/notes/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -99,7 +99,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo = UsersHelper::getActions();
+		$canDo = JHelperContent::getActions('com_users', 'category', $this->state->get('filter.category_id'));
 
 		JToolbarHelper::title(JText::_('COM_USERS_VIEW_NOTES_TITLE'), 'users user');
 
diff --git a/administrator/components/com_users/views/user/tmpl/edit.php b/administrator/components/com_users/views/user/tmpl/edit.php
index af9ec99..aa1eb4c 100644
--- a/administrator/components/com_users/views/user/tmpl/edit.php
+++ b/administrator/components/com_users/views/user/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,8 +15,6 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 
-$canDo = UsersHelper::getActions();
-
 // Get the form fieldsets.
 $fieldsets = $this->form->getFieldsets();
 ?>
diff --git a/administrator/components/com_users/views/user/tmpl/edit_groups.php b/administrator/components/com_users/views/user/tmpl/edit_groups.php
index a145ac6..b54a1d2 100644
--- a/administrator/components/com_users/views/user/tmpl/edit_groups.php
+++ b/administrator/components/com_users/views/user/tmpl/edit_groups.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/user/view.html.php b/administrator/components/com_users/views/user/view.html.php
index a03ac02..80caea3 100644
--- a/administrator/components/com_users/views/user/view.html.php
+++ b/administrator/components/com_users/views/user/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,7 +65,7 @@ protected function addToolbar()
 		JFactory::getApplication()->input->set('hidemainmenu', true);
 
 		$user  = JFactory::getUser();
-		$canDo = UsersHelper::getActions();
+		$canDo = JHelperContent::getActions('com_users');
 		$isNew	= ($this->item->id == 0);
 		$isProfile = $this->item->id == $user->id;
 
diff --git a/administrator/components/com_users/views/users/tmpl/default.php b/administrator/components/com_users/views/users/tmpl/default.php
index 68dc737..c3252bf 100644
--- a/administrator/components/com_users/views/users/tmpl/default.php
+++ b/administrator/components/com_users/views/users/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.modal', 'a.modal');
 
-$canDo = UsersHelper::getActions();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn = $this->escape($this->state->get('list.direction'));
 $loggeduser = JFactory::getUser();
@@ -94,7 +93,7 @@
 		</tfoot>
 		<tbody>
 		<?php foreach ($this->items as $i => $item) :
-			$canEdit   = $canDo->get('core.edit');
+			$canEdit   = $this->canDo->get('core.edit');
 			$canChange = $loggeduser->authorise('core.edit.state',	'com_users');
 
 			// If this group is super admin and this user is not super admin, $canEdit is false
diff --git a/administrator/components/com_users/views/users/tmpl/default_batch.php b/administrator/components/com_users/views/users/tmpl/default_batch.php
index 3f253ba..06752ea 100644
--- a/administrator/components/com_users/views/users/tmpl/default_batch.php
+++ b/administrator/components/com_users/views/users/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,24 +20,26 @@
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_USERS_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_USERS_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
-		<div id="batch-choose-action" class="combo control-group">
-			<label id="batch-choose-action-lbl" class="control-label" for="batch-choose-action">
-				<?php echo JText::_('COM_USERS_BATCH_GROUP') ?>
-			</label>
-		</div>
-		<div id="batch-choose-action" class="combo controls">
-			<div class="control-group">
-				<select name="batch[group_id]" class="inputbox" id="batch-group-id">
-					<option value=""><?php echo JText::_('JSELECT') ?></option>
-					<?php echo JHtml::_('select.options', JHtml::_('user.groups')); ?>
-				</select>
+	<div class="modal-body modal-batch">
+		<div class="row-fluid">
+			<div id="batch-choose-action" class="combo control-group">
+				<label id="batch-choose-action-lbl" class="control-label" for="batch-choose-action">
+					<?php echo JText::_('COM_USERS_BATCH_GROUP') ?>
+				</label>
+			</div>
+			<div id="batch-choose-action" class="combo controls">
+				<div class="control-group">
+					<select name="batch[group_id]" class="inputbox" id="batch-group-id">
+						<option value=""><?php echo JText::_('JSELECT') ?></option>
+						<?php echo JHtml::_('select.options', JHtml::_('user.groups')); ?>
+					</select>
+				</div>
+			</div>
+			<div class="control-group radio">
+				<?php echo JHtml::_('select.radiolist', $options, 'batch[group_action]', '', 'value', 'text', 'add') ?>
 			</div>
-		</div>
-		<div class="control-group radio">
-			<?php echo JHtml::_('select.radiolist', $options, 'batch[group_action]', '', 'value', 'text', 'add') ?>
 		</div>
 	</div>
 	<div class="modal-footer">
diff --git a/administrator/components/com_users/views/users/tmpl/modal.php b/administrator/components/com_users/views/users/tmpl/modal.php
index 2943de8..9c6930d 100644
--- a/administrator/components/com_users/views/users/tmpl/modal.php
+++ b/administrator/components/com_users/views/users/tmpl/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_users/views/users/view.html.php b/administrator/components/com_users/views/users/view.html.php
index f33c674..686ba29 100644
--- a/administrator/components/com_users/views/users/view.html.php
+++ b/administrator/components/com_users/views/users/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -38,6 +38,7 @@ public function display($tpl = null)
 		$this->state		= $this->get('State');
 		$this->filterForm    = $this->get('FilterForm');
 		$this->activeFilters = $this->get('ActiveFilters');
+		$this->canDo		= JHelperContent::getActions('com_users');
 
 		UsersHelper::addSubmenu('users');
 
@@ -66,7 +67,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		$canDo	= UsersHelper::getActions();
+		$canDo	= $this->canDo;
 		$user 	= JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_weblinks/controller.php b/administrator/components/com_weblinks/controller.php
index b7764c3..967401e 100644
--- a/administrator/components/com_weblinks/controller.php
+++ b/administrator/components/com_weblinks/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/controllers/weblink.php b/administrator/components/com_weblinks/controllers/weblink.php
index f67c16d..fe6613f 100644
--- a/administrator/components/com_weblinks/controllers/weblink.php
+++ b/administrator/components/com_weblinks/controllers/weblink.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/controllers/weblinks.php b/administrator/components/com_weblinks/controllers/weblinks.php
index 201c2e8..93a7106 100644
--- a/administrator/components/com_weblinks/controllers/weblinks.php
+++ b/administrator/components/com_weblinks/controllers/weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/helpers/weblinks.php b/administrator/components/com_weblinks/helpers/weblinks.php
index 97d4bee..09b6682 100644
--- a/administrator/components/com_weblinks/helpers/weblinks.php
+++ b/administrator/components/com_weblinks/helpers/weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/models/weblink.php b/administrator/components/com_weblinks/models/weblink.php
index 54111f0..9f2e262 100644
--- a/administrator/components/com_weblinks/models/weblink.php
+++ b/administrator/components/com_weblinks/models/weblink.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/models/weblinks.php b/administrator/components/com_weblinks/models/weblinks.php
index d5dc5e0..407caef 100644
--- a/administrator/components/com_weblinks/models/weblinks.php
+++ b/administrator/components/com_weblinks/models/weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/tables/weblink.php b/administrator/components/com_weblinks/tables/weblink.php
index a724381..809aef0 100644
--- a/administrator/components/com_weblinks/tables/weblink.php
+++ b/administrator/components/com_weblinks/tables/weblink.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/views/weblink/tmpl/edit.php b/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
index 3a2f91d..ebacfbb 100644
--- a/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
+++ b/administrator/components/com_weblinks/views/weblink/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php b/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php
index ab70839..c7444b2 100644
--- a/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php
+++ b/administrator/components/com_weblinks/views/weblink/tmpl/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php b/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php
index e41781d..c5c8203 100644
--- a/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php
+++ b/administrator/components/com_weblinks/views/weblink/tmpl/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/views/weblink/view.html.php b/administrator/components/com_weblinks/views/weblink/view.html.php
index 9bc92bd..152243d 100644
--- a/administrator/components/com_weblinks/views/weblink/view.html.php
+++ b/administrator/components/com_weblinks/views/weblink/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -58,7 +58,7 @@ protected function addToolbar()
 		$checkedOut	= !($this->item->checked_out == 0 || $this->item->checked_out == $user->get('id'));
 
 		// Since we don't track these assets at the item level, use the category id.
-		$canDo		= JHelperContent::getActions($this->item->catid, 0, 'com_weblinks');
+		$canDo		= JHelperContent::getActions('com_weblinks', 'category', $this->item->catid);
 
 		JToolbarHelper::title(JText::_('COM_WEBLINKS_MANAGER_WEBLINK'), 'link weblinks');
 
diff --git a/administrator/components/com_weblinks/views/weblinks/tmpl/default.php b/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
index e94a1d7..1b00ae8 100644
--- a/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
+++ b/administrator/components/com_weblinks/views/weblinks/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php b/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
index 6b1e587..a634a5e 100644
--- a/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
+++ b/administrator/components/com_weblinks/views/weblinks/tmpl/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,33 +14,36 @@
 <div class="modal hide fade" id="collapseModal">
 	<div class="modal-header">
 		<button type="button" role="presentation" class="close" data-dismiss="modal">&#215;</button>
-		<h3><?php echo JText::_('COM_WEBLINKS_BATCH_OPTIONS');?></h3>
+		<h3><?php echo JText::_('COM_WEBLINKS_BATCH_OPTIONS'); ?></h3>
 	</div>
-	<div class="modal-body">
+	<div class="modal-body modal-batch">
 		<p><?php echo JText::_('COM_WEBLINKS_BATCH_TIP'); ?></p>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.access');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.tag'); ?>
+				</div>
 			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.language'); ?>
-			</div>
-		</div>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.tag');?>
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.language'); ?>
+				</div>
 			</div>
 		</div>
-		<?php if ($published >= 0) : ?>
-		<div class="control-group">
-			<div class="controls">
-				<?php echo JHtml::_('batch.item', 'com_weblinks');?>
+		<div class="row-fluid">
+			<div class="control-group span6">
+				<div class="controls">
+					<?php echo JHtml::_('batch.access'); ?>
+				</div>
 			</div>
+			<?php if ($published >= 0) : ?>
+				<div class="control-group span6">
+					<div class="controls">
+						<?php echo JHtml::_('batch.item', 'com_weblinks'); ?>
+					</div>
+				</div>
+			<?php endif; ?>
 		</div>
-		<?php endif; ?>
-
 	</div>
 	<div class="modal-footer">
 		<button class="btn" type="button" onclick="document.id('batch-category-id').value='';document.id('batch-access').value='';document.id('batch-language-id').value='';document.id('batch-tag-id)').value=''" data-dismiss="modal">
diff --git a/administrator/components/com_weblinks/views/weblinks/view.html.php b/administrator/components/com_weblinks/views/weblinks/view.html.php
index a3f57e5..45abc86 100644
--- a/administrator/components/com_weblinks/views/weblinks/view.html.php
+++ b/administrator/components/com_weblinks/views/weblinks/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,7 +59,7 @@ protected function addToolbar()
 		require_once JPATH_COMPONENT . '/helpers/weblinks.php';
 
 		$state	= $this->get('State');
-		$canDo	= JHelperContent::getActions($state->get('filter.category_id'), 0, 'com_weblinks');
+		$canDo	= JHelperContent::getActions('com_weblinks', 'category', $state->get('filter.category_id'));
 		$user	= JFactory::getUser();
 
 		// Get the toolbar object instance
diff --git a/administrator/components/com_weblinks/weblinks.php b/administrator/components/com_weblinks/weblinks.php
index c77e32c..7f3832a 100644
--- a/administrator/components/com_weblinks/weblinks.php
+++ b/administrator/components/com_weblinks/weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/components/com_weblinks/weblinks.xml b/administrator/components/com_weblinks/weblinks.xml
index 56d19f9..c8c1f6a 100644
--- a/administrator/components/com_weblinks/weblinks.xml
+++ b/administrator/components/com_weblinks/weblinks.xml
@@ -3,7 +3,7 @@
 	<name>com_weblinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>GNU General Public License version 2 or later; see
 		LICENSE.txt</license>
diff --git a/administrator/help/en-GB/toc.json b/administrator/help/en-GB/toc.json
new file mode 100644
index 0000000..b072c63
--- /dev/null
+++ b/administrator/help/en-GB/toc.json
@@ -0,0 +1 @@
+{"COMPONENTS_BANNERS_BANNERS":"COMPONENTS_BANNERS_BANNERS","COMPONENTS_BANNERS_BANNERS_EDIT":"COMPONENTS_BANNERS_BANNERS_EDIT","COMPONENTS_BANNERS_CATEGORIES":"COMPONENTS_BANNERS_CATEGORIES","COMPONENTS_BANNERS_CATEGORY_EDIT":"COMPONENTS_BANNERS_CATEGORIES_EDIT","COMPONENTS_BANNERS_CLIENTS":"COMPONENTS_BANNERS_CLIENTS","COMPONENTS_BANNERS_CLIENTS_EDIT":"COMPONENTS_BANNERS_CLIENTS_EDIT","COMPONENTS_BANNERS_TRACKS":"COMPONENTS_BANNERS_TRACKS","COMPONENTS_CONTACTS_CONTACTS":"COMPONENTS_CONTACTS_CONTACTS","COMPONENTS_CONTACTS_CONTACTS_EDIT":"COMPONENTS_CONTACTS_CONTACTS_EDIT","COMPONENTS_CONTACT_CATEGORIES":"COMPONENTS_CONTACT_CATEGORIES","COMPONENTS_CONTACT_CATEGORY_EDIT":"COMPONENTS_CONTACT_CATEGORIES_EDIT","COMPONENTS_CONTENT_CATEGORIES":"COMPONENTS_CONTENT_CATEGORIES","COMPONENTS_CONTENT_CATEGORY_EDIT":"COMPONENTS_CONTENT_CATEGORIES_EDIT","COMPONENTS_FINDER_MANAGE_CONTENT_MAPS":"COMPONENTS_FINDER_MANAGE_CONTENT_MAPS","COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT":"COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT","COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS":"COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS","COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT":"COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT","COMPONENTS_JOOMLA_UPDATE":"COMPONENTS_JOOMLA_UPDATE","COMPONENTS_MESSAGING_INBOX":"COMPONENTS_MESSAGING_INBOX","COMPONENTS_MESSAGING_READ":"COMPONENTS_MESSAGING_READ","COMPONENTS_MESSAGING_WRITE":"COMPONENTS_MESSAGING_WRITE","COMPONENTS_NEWSFEEDS_CATEGORIES":"COMPONENTS_NEWSFEEDS_CATEGORIES","COMPONENTS_NEWSFEEDS_CATEGORY_EDIT":"COMPONENTS_NEWSFEEDS_CATEGORIES_EDIT","COMPONENTS_NEWSFEEDS_FEEDS":"COMPONENTS_NEWSFEEDS_FEEDS","COMPONENTS_NEWSFEEDS_FEEDS_EDIT":"COMPONENTS_NEWSFEEDS_FEEDS_EDIT","COMPONENTS_POST_INSTALLATION_MESSAGES":"COMPONENTS_POST_INSTALLATION_MESSAGES","COMPONENTS_REDIRECT_MANAGER":"COMPONENTS_REDIRECT_MANAGER","COMPONENTS_REDIRECT_MANAGER_EDIT":"COMPONENTS_REDIRECT_MANAGER_EDIT","COMPONENTS_SEARCH":"COMPONENTS_SEARCH","COMPONENTS_TAGS_MANAGER":"COMPONENTS_TAGS_MANAGER","COMPONENTS_TAGS_MANAGER_EDIT":"COMPONENTS_TAGS_MANAGER_EDIT","COMPONENTS_WEBLINKS_CATEGORIES":"COMPONENTS_WEBLINKS_CATEGORIES","COMPONENTS_WEBLINKS_CATEGORY_EDIT":"COMPONENTS_WEBLINKS_CATEGORIES_EDIT","COMPONENTS_WEBLINKS_LINKS":"COMPONENTS_WEBLINKS_LINKS","COMPONENTS_WEBLINKS_LINKS_EDIT":"COMPONENTS_WEBLINKS_LINKS_EDIT","CONTENT_ARTICLE_MANAGER":"CONTENT_ARTICLE_MANAGER","CONTENT_ARTICLE_MANAGER_EDIT":"CONTENT_ARTICLE_MANAGER_EDIT","CONTENT_FEATURED_ARTICLES":"CONTENT_FEATURED_ARTICLES","CONTENT_MEDIA_MANAGER":"CONTENT_MEDIA_MANAGER","EXTENSIONS_EXTENSION_MANAGER_DATABASE":"EXTENSIONS_EXTENSION_MANAGER_DATABASE","EXTENSIONS_EXTENSION_MANAGER_DISCOVER":"EXTENSIONS_EXTENSION_MANAGER_DISCOVER","EXTENSIONS_EXTENSION_MANAGER_INSTALL":"EXTENSIONS_EXTENSION_MANAGER_INSTALL","EXTENSIONS_EXTENSION_MANAGER_MANAGE":"EXTENSIONS_EXTENSION_MANAGER_MANAGE","EXTENSIONS_EXTENSION_MANAGER_UPDATE":"EXTENSIONS_EXTENSION_MANAGER_UPDATE","EXTENSIONS_EXTENSION_MANAGER_WARNINGS":"EXTENSIONS_EXTENSION_MANAGER_WARNINGS","EXTENSIONS_LANGUAGE_MANAGER_CONTENT":"EXTENSIONS_LANGUAGE_MANAGER_CONTENT","EXTENSIONS_LANGUAGE_MANAGER_EDIT":"EXTENSIONS_LANGUAGE_MANAGER_EDIT","EXTENSIONS_LANGUAGE_MANAGER_INSTALLED":"EXTENSIONS_LANGUAGE_MANAGER_INSTALLED","EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES":"EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES","EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT":"EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT","EXTENSIONS_MODULE_MANAGER":"EXTENSIONS_MODULE_MANAGER","EXTENSIONS_MODULE_MANAGER_EDIT":"EXTENSIONS_MODULE_MANAGER_EDIT","EXTENSIONS_PLUGIN_MANAGER":"EXTENSIONS_PLUGIN_MANAGER","EXTENSIONS_PLUGIN_MANAGER_EDIT":"EXTENSIONS_PLUGIN_MANAGER_EDIT","EXTENSIONS_TEMPLATE_MANAGER_STYLES":"EXTENSIONS_TEMPLATE_MANAGER_STYLES","EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT":"EXTENSIONS_TEMPLATE_MANAGER_STYLES_EDIT","EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES":"EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES","EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT":"EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT","EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE":"EXTENSIONS_TEMPLATE_MANAGER_TEMPLATES_EDIT_SOURCE","MENUS_MENU_ITEM_MANAGER":"MENUS_MENU_ITEM_MANAGER","MENUS_MENU_ITEM_MANAGER_EDIT":"MENUS_MENU_ITEM_MANAGER_EDIT","MENUS_MENU_MANAGER":"MENUS_MENU_MANAGER","MENUS_MENU_MANAGER_EDIT":"MENUS_MENU_MANAGER_EDIT","SITE_GLOBAL_CONFIGURATION":"SITE_GLOBAL_CONFIGURATION","SITE_MAINTENANCE_CLEAR_CACHE":"SITE_MAINTENANCE_CLEAR_CACHE","SITE_MAINTENANCE_GLOBAL_CHECK-IN":"SITE_MAINTENANCE_GLOBAL_CHECK-IN","SITE_MAINTENANCE_PURGE_EXPIRED_CACHE":"SITE_MAINTENANCE_PURGE_EXPIRED_CACHE","SITE_SYSTEM_INFORMATION":"SITE_SYSTEM_INFORMATION","START_HERE":"START_HERE","USERS_ACCESS_LEVELS":"USERS_ACCESS_LEVELS","USERS_ACCESS_LEVELS_EDIT":"USERS_ACCESS_LEVELS_EDIT","USERS_DEBUG_USERS":"USERS_DEBUG_USER","USERS_GROUPS":"USERS_GROUPS","USERS_GROUPS_EDIT":"USERS_GROUPS_EDIT","USERS_MASS_MAIL_USERS":"USERS_MASS_MAIL_USERS","USERS_USER_MANAGER":"USERS_USER_MANAGER","USERS_USER_MANAGER_EDIT":"USERS_USER_MANAGER_EDIT","USERS_USER_NOTES":"USERS_USER_NOTES","USERS_USER_NOTES_EDIT":"USERS_USER_NOTES_EDIT"}
\ No newline at end of file
diff --git a/administrator/includes/defines.php b/administrator/includes/defines.php
index 60222a8..de1bf9b 100644
--- a/administrator/includes/defines.php
+++ b/administrator/includes/defines.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/includes/framework.php b/administrator/includes/framework.php
index aab87e3..c42829e 100644
--- a/administrator/includes/framework.php
+++ b/administrator/includes/framework.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/includes/helper.php b/administrator/includes/helper.php
index f64ee18..4feac21 100644
--- a/administrator/includes/helper.php
+++ b/administrator/includes/helper.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/includes/toolbar.php b/administrator/includes/toolbar.php
index f52a312..ba2bb77 100644
--- a/administrator/includes/toolbar.php
+++ b/administrator/includes/toolbar.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/index.php b/administrator/index.php
index 9e9a711..125ee30 100644
--- a/administrator/index.php
+++ b/administrator/index.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Administrator
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/language/en-GB/en-GB.com_admin.ini b/administrator/language/en-GB/en-GB.com_admin.ini
index 00b5d55..c67e2bb 100644
--- a/administrator/language/en-GB/en-GB.com_admin.ini
+++ b/administrator/language/en-GB/en-GB.com_admin.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -31,6 +31,11 @@ COM_ADMIN_HELP_COMPONENTS_CONTACT_CATEGORIES="Contact Manager: Categories"
 COM_ADMIN_HELP_COMPONENTS_CONTACT_CATEGORIES_EDIT="Contact Manager: Categories - New/Edit"
 COM_ADMIN_HELP_COMPONENTS_CONTENT_CATEGORIES="Article Manager: Categories"
 COM_ADMIN_HELP_COMPONENTS_CONTENT_CATEGORIES_EDIT="Article Manager: Categories - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_CONTENT_MAPS="Smart Search: Manage Content Maps"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_INDEXED_CONTENT="Smart Search: Manage Indexed Content"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS_EDIT="Smart Search: Search Filters - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_FINDER_MANAGE_SEARCH_FILTERS="Smart Search: Manage Search Filters"
+COM_ADMIN_HELP_COMPONENTS_JOOMLA_UPDATE="Joomla Update"
 COM_ADMIN_HELP_COMPONENTS_MESSAGING_INBOX="Private Messages: Inbox"
 COM_ADMIN_HELP_COMPONENTS_MESSAGING_READ="Private Messages: Read"
 COM_ADMIN_HELP_COMPONENTS_MESSAGING_WRITE="Private Messages: Write"
@@ -38,9 +43,12 @@ COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_CATEGORIES="News Feeds Manager: Categories"
 COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_CATEGORIES_EDIT="News Feeds Manager: Categories - New/Edit"
 COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_FEEDS="News Feeds Manager: Feeds"
 COM_ADMIN_HELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="News Feeds Manager: Feeds - New/Edit"
+COM_ADMIN_HELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Post-Installation Messages"
 COM_ADMIN_HELP_COMPONENTS_REDIRECT_MANAGER="Redirect Manager: Links"
 COM_ADMIN_HELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Redirect Manager: Links - New/Edit"
 COM_ADMIN_HELP_COMPONENTS_SEARCH="Search Manager"
+COM_ADMIN_HELP_COMPONENTS_TAGS_MANAGER="Tags Manager: Tags"
+COM_ADMIN_HELP_COMPONENTS_TAGS_MANAGER_EDIT="Tags Manager: Tags - New/Edit"
 COM_ADMIN_HELP_COMPONENTS_WEBLINKS_CATEGORIES="Web Links Manager: Categories"
 COM_ADMIN_HELP_COMPONENTS_WEBLINKS_CATEGORIES_EDIT="Web Links Manager: Categories - New/Edit"
 COM_ADMIN_HELP_COMPONENTS_WEBLINKS_LINKS="Web Links Manager: Web Links"
@@ -49,14 +57,18 @@ COM_ADMIN_HELP_CONTENT_ARTICLE_MANAGER="Article Manager: Articles"
 COM_ADMIN_HELP_CONTENT_ARTICLE_MANAGER_EDIT="Article Manager: Articles - New/Edit"
 COM_ADMIN_HELP_CONTENT_FEATURED_ARTICLES="Article Manager: Featured Articles"
 COM_ADMIN_HELP_CONTENT_MEDIA_MANAGER="Media Manager"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_DATABASE="Extension Manager: Check Database"
 COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_DISCOVER="Extension Manager: Discover"
 COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_INSTALL="Extension Manager: Install"
+COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_LANGUAGES="Extension Manager: Install Accredited Language Translations"
 COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_MANAGE="Extension Manager: Manage"
 COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_UPDATE="Extension Manager: Update"
 COM_ADMIN_HELP_EXTENSIONS_EXTENSION_MANAGER_WARNINGS="Extension Manager: Warnings"
 COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_CONTENT="Language Manager: Content Languages"
 COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_EDIT="Language Manager - New/Edit"
 COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_INSTALLED="Language Manager: Installed Languages"
+COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES="Language Manager: Language Overrides"
+COM_ADMIN_HELP_EXTENSIONS_LANGUAGE_MANAGER_OVERRIDES_EDIT="Language Manager: Language Overrides - New/Edit"
 COM_ADMIN_HELP_EXTENSIONS_MODULE_MANAGER="Module Manager"
 COM_ADMIN_HELP_EXTENSIONS_MODULE_MANAGER_EDIT="Module Manager - Edit"
 COM_ADMIN_HELP_EXTENSIONS_PLUGIN_MANAGER="Plugin Manager: Plugins"
@@ -83,6 +95,8 @@ COM_ADMIN_HELP_USERS_DEBUG_USER="User Manager: Debug Users Permissions"
 COM_ADMIN_HELP_USERS_GROUPS="User Manager: Groups"
 COM_ADMIN_HELP_USERS_GROUPS_EDIT="User Manager: Groups - New/Edit"
 COM_ADMIN_HELP_USERS_MASS_MAIL_USERS="Mass Mail Users"
+COM_ADMIN_HELP_USERS_USER_NOTES="User Manager: User Notes"
+COM_ADMIN_HELP_USERS_USER_NOTES_EDIT="User Manager: User Notes - New/Edit"
 COM_ADMIN_HELP_USERS_USER_MANAGER="User Manager: Users"
 COM_ADMIN_HELP_USERS_USER_MANAGER_EDIT="User Manager: Users - New/Edit"
 COM_ADMIN_ICONV_AVAILABLE="Iconv Available"
diff --git a/administrator/language/en-GB/en-GB.com_admin.sys.ini b/administrator/language/en-GB/en-GB.com_admin.sys.ini
index 099204c..c2a00be 100644
--- a/administrator/language/en-GB/en-GB.com_admin.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_admin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_ajax.ini b/administrator/language/en-GB/en-GB.com_ajax.ini
index 5f7d016..f2e00f9 100644
--- a/administrator/language/en-GB/en-GB.com_ajax.ini
+++ b/administrator/language/en-GB/en-GB.com_ajax.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.com_ajax.sys.ini b/administrator/language/en-GB/en-GB.com_ajax.sys.ini
index 5f7d016..f2e00f9 100644
--- a/administrator/language/en-GB/en-GB.com_ajax.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_ajax.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.com_banners.ini b/administrator/language/en-GB/en-GB.com_banners.ini
index d8c5812..80f173d 100644
--- a/administrator/language/en-GB/en-GB.com_banners.ini
+++ b/administrator/language/en-GB/en-GB.com_banners.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_banners.sys.ini b/administrator/language/en-GB/en-GB.com_banners.sys.ini
index 1a08cdc..16c70dc 100644
--- a/administrator/language/en-GB/en-GB.com_banners.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_banners.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_cache.ini b/administrator/language/en-GB/en-GB.com_cache.ini
index 6aab278..30437ed 100644
--- a/administrator/language/en-GB/en-GB.com_cache.ini
+++ b/administrator/language/en-GB/en-GB.com_cache.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_cache.sys.ini b/administrator/language/en-GB/en-GB.com_cache.sys.ini
index c842ca9..9eb2d92 100644
--- a/administrator/language/en-GB/en-GB.com_cache.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_cache.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_categories.ini b/administrator/language/en-GB/en-GB.com_categories.ini
index 3297ab8..911b35d 100644
--- a/administrator/language/en-GB/en-GB.com_categories.ini
+++ b/administrator/language/en-GB/en-GB.com_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_categories.sys.ini b/administrator/language/en-GB/en-GB.com_categories.sys.ini
index 0581c23..3effad2 100644
--- a/administrator/language/en-GB/en-GB.com_categories.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_checkin.ini b/administrator/language/en-GB/en-GB.com_checkin.ini
index e867841..ea62e34 100644
--- a/administrator/language/en-GB/en-GB.com_checkin.ini
+++ b/administrator/language/en-GB/en-GB.com_checkin.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_checkin.sys.ini b/administrator/language/en-GB/en-GB.com_checkin.sys.ini
index ddfc962..acb9d3f 100644
--- a/administrator/language/en-GB/en-GB.com_checkin.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_checkin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini
index aa9bd5c..559fdca 100644
--- a/administrator/language/en-GB/en-GB.com_config.ini
+++ b/administrator/language/en-GB/en-GB.com_config.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -15,6 +15,7 @@ COM_CONFIG_ACTION_LOGIN_OFFLINE_DESC="Allows users in the group to access to the
 COM_CONFIG_ACTION_LOGIN_SITE_DESC="Allows users in the group to login to the frontend site."
 COM_CONFIG_ACTION_MANAGE_DESC="Allows users in the group to access all of the administration interface except Global Configuration"
 COM_CONFIG_CACHE_SETTINGS="Cache Settings"
+COM_CONFIG_CACHE_WARNING="Failed to clear cache automatically, you may need to do so manually."
 COM_CONFIG_COMPONENT_FIELDSET_LABEL="Component"
 COM_CONFIG_COOKIE_SETTINGS="Cookie Settings"
 COM_CONFIG_DATABASE_SETTINGS="Database Settings"
diff --git a/administrator/language/en-GB/en-GB.com_config.sys.ini b/administrator/language/en-GB/en-GB.com_config.sys.ini
index b53c902..4f867d9 100644
--- a/administrator/language/en-GB/en-GB.com_config.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_config.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_contact.ini b/administrator/language/en-GB/en-GB.com_contact.ini
index e5ce178..9d8ac66 100644
--- a/administrator/language/en-GB/en-GB.com_contact.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -235,6 +235,7 @@ COM_CONTACT_FILTER_LABEL="Filter field"
 COM_CONTACT_FILTER_SEARCH_DESC="Enter text to show matching contacts"
 COM_CONTACT_ICONS_SETTINGS="Icons"
 COM_CONTACT_HEADING_ASSOCIATION="Association"
+COM_CONTACT_HITS_DESC="Number of hits for this contact"
 COM_CONTACT_ID_LABEL="ID"
 COM_CONTACT_ITEM_ASSOCIATIONS_FIELDSET_LABEL="Contact Item Associations"
 COM_CONTACT_ITEM_ASSOCIATIONS_FIELDSET_DESC="Multilingual only! This choice will only display if the Language Filter parameter 'Item Associations' is set to 'Yes'. Choose a contact item for the target language. This association will let the Language Switcher module redirect to the associated contact item in another language. If used, make sure to display the Language switcher module on the concerned pages. A contact item set to language 'All' can't be associated."
diff --git a/administrator/language/en-GB/en-GB.com_contact.sys.ini b/administrator/language/en-GB/en-GB.com_contact.sys.ini
index 53c2cd6..7fdbc04 100644
--- a/administrator/language/en-GB/en-GB.com_contact.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_contact.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
index b689ea9..fe58075 100644
--- a/administrator/language/en-GB/en-GB.com_content.ini
+++ b/administrator/language/en-GB/en-GB.com_content.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_content.sys.ini b/administrator/language/en-GB/en-GB.com_content.sys.ini
index 51e5797..4f7b009 100644
--- a/administrator/language/en-GB/en-GB.com_content.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_content.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.ini b/administrator/language/en-GB/en-GB.com_contenthistory.ini
index e36c975..3859917 100644
--- a/administrator/language/en-GB/en-GB.com_contenthistory.ini
+++ b/administrator/language/en-GB/en-GB.com_contenthistory.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
index 95efd86..585d325 100644
--- a/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_contenthistory.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_cpanel.ini b/administrator/language/en-GB/en-GB.com_cpanel.ini
index 7572817..ea9962f 100644
--- a/administrator/language/en-GB/en-GB.com_cpanel.ini
+++ b/administrator/language/en-GB/en-GB.com_cpanel.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -19,6 +19,8 @@ COM_CPANEL_MESSAGES_TITLE="You have post-installation messages"
 COM_CPANEL_MSG_EACCELERATOR_BODY="eAccelerator is not compatible with Joomla!. By clicking on the Change to File Caching button below we will change the cache handler to file. If you want to use a different cache handler, please change it in the Global Configuration page."
 COM_CPANEL_MSG_EACCELERATOR_BUTTON="Change to File."
 COM_CPANEL_MSG_EACCELERATOR_TITLE="eAccelerator is not compatible with Joomla!"
+COM_CPANEL_MSG_PHPVERSION_BODY="Beginning with Joomla! 3.3, the version of PHP this site is using will no longer be supported. Joomla! 3.3 will require at least <a href="_QQ_"http://community.joomla.org/blogs/leadership/1798-raising-the-bar-on-security.html"_QQ_">PHP version 5.3.10 in order to provide enhanced security features to its users</a>."
+COM_CPANEL_MSG_PHPVERSION_TITLE="Your PHP Version Will Be Unsupported in Joomla! 3.3"
 COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users</p><ul><li><a href="_QQ_"http://docs.joomla.org/Portal:Beginners"_QQ_">Joomla! Beginners Guide</a></li><li><a href="_QQ_"http://forum.joomla.org/viewforum.php?f=706"_QQ_">New to Joomla! Forum</a></li><ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Control panel component"
diff --git a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
index 70a9fa7..d2b87e3 100644
--- a/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_cpanel.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini
index 85d597f..cc0051e 100644
--- a/administrator/language/en-GB/en-GB.com_finder.ini
+++ b/administrator/language/en-GB/en-GB.com_finder.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_finder.sys.ini b/administrator/language/en-GB/en-GB.com_finder.sys.ini
index 1e9267b..77a17e4 100644
--- a/administrator/language/en-GB/en-GB.com_finder.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_finder.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini
index 722139b..eb91a65 100644
--- a/administrator/language/en-GB/en-GB.com_installer.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_installer.sys.ini b/administrator/language/en-GB/en-GB.com_installer.sys.ini
index c5142b2..61c47e4 100644
--- a/administrator/language/en-GB/en-GB.com_installer.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_installer.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
index 31d7846..596a387 100644
--- a/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
index f27aa3f..23f7dab 100644
--- a/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_languages.ini b/administrator/language/en-GB/en-GB.com_languages.ini
index f6d2223..1d157d7 100644
--- a/administrator/language/en-GB/en-GB.com_languages.ini
+++ b/administrator/language/en-GB/en-GB.com_languages.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -55,6 +55,7 @@ COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR="Some of the contacts linked to the
 COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP="Warning! A user/author should have only one contact to which is assigned language 'All' OR one contact for each published Content Language"
 COM_LANGUAGES_MULTILANGSTATUS_CONTENT_LANGUAGE_PUBLISHED="Published Content Languages"
 COM_LANGUAGES_MULTILANGSTATUS_ERROR_CONTENT_LANGUAGE="A Default Home page is assigned to the <strong>%s</strong> Content Language although a Site Language for this Content Language is not installed or published AND/OR the Content Language is not published."
+COM_LANGUAGES_MULTILANGSTATUS_ERROR_LANGUAGE_TAG="The Content Language tag <strong>%s</strong> does not match the Site Language tag. Check that the Site Language is installed and published, and the correct language tag is used for the Content Language. Example: for English(UK) both tags should be 'en-GB'"
 COM_LANGUAGES_MULTILANGSTATUS_HOMES_MISSING="This site is set as a multilingual site. One or more of the Default Home pages for the published Content languages are missing although the Language Filter plugin is enabled OR/AND one or more Language Switcher modules are published"
 COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED="Published Default Home pages"
 COM_LANGUAGES_MULTILANGSTATUS_HOMES_PUBLISHED_ALL="1 assigned to language 'All'"
diff --git a/administrator/language/en-GB/en-GB.com_languages.sys.ini b/administrator/language/en-GB/en-GB.com_languages.sys.ini
index 134a00c..9e38265 100644
--- a/administrator/language/en-GB/en-GB.com_languages.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_languages.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_login.ini b/administrator/language/en-GB/en-GB.com_login.ini
index 6baef76..5fc2b6f 100644
--- a/administrator/language/en-GB/en-GB.com_login.ini
+++ b/administrator/language/en-GB/en-GB.com_login.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_login.sys.ini b/administrator/language/en-GB/en-GB.com_login.sys.ini
index 35cf3f0..0229c4f 100644
--- a/administrator/language/en-GB/en-GB.com_login.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_login.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_mailto.sys.ini b/administrator/language/en-GB/en-GB.com_mailto.sys.ini
index 7d25ac7..2c4ef18 100644
--- a/administrator/language/en-GB/en-GB.com_mailto.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_mailto.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_media.ini b/administrator/language/en-GB/en-GB.com_media.ini
index ab31883..f655288 100644
--- a/administrator/language/en-GB/en-GB.com_media.ini
+++ b/administrator/language/en-GB/en-GB.com_media.ini
@@ -1,14 +1,15 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 COM_MEDIA="Media Manager"
-COM_MEDIA_ALIGN="Align"
-COM_MEDIA_ALIGN_DESC="If 'Not Set', the alignment is defined by the class '.img_caption.none'. Usually to get the image centred on the page."
+COM_MEDIA_ALIGN="Image Float"
+COM_MEDIA_ALIGN_DESC="This will apply the classes 'pull-left', 'pull-center' or 'pull-right' to the '<figure>' or '<img>' element"
 COM_MEDIA_BROWSE_FILES="Browse files"
 COM_MEDIA_CAPTION="Caption"
-COM_MEDIA_CAPTION_DESC="If set to 'Yes', the Image Title will be used as caption."
+COM_MEDIA_CAPTION_CLASS_LABEL="Caption Class"
+COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the '<figcaption>' element. For example: 'text-left', 'text-right', 'text-center'"
 COM_MEDIA_CLEAR_LIST="Clear List"
 COM_MEDIA_CONFIGURATION="Media Manager Options"
 COM_MEDIA_CREATE_COMPLETE="Create Complete: %s"
diff --git a/administrator/language/en-GB/en-GB.com_media.sys.ini b/administrator/language/en-GB/en-GB.com_media.sys.ini
index 71a70cb..e39d666 100644
--- a/administrator/language/en-GB/en-GB.com_media.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_media.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini
index e4c5576..f2d9d29 100644
--- a/administrator/language/en-GB/en-GB.com_menus.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -16,6 +16,7 @@ COM_MENUS_CONFIGURATION="Menus Configuration"
 COM_MENUS_EDIT_MODULE_SETTINGS="Edit module settings"
 COM_MENUS_ERROR_ALL_LANGUAGE_ASSOCIATED="A menu item set to All languages can't be associated. Associations have not been set."
 COM_MENUS_ERROR_ALREADY_HOME="Menu item already set to home"
+COM_MENUS_ERROR_MENUTYPE="Please change the Menu type. The terms 'menu' and 'main' are reserved for backend usage."
 COM_MENUS_ERROR_ONE_HOME="Only one menu item can be a home link for each language"
 COM_MENUS_EXTENSION_PUBLISHED_DISABLED="Component disabled and menu item published"
 COM_MENUS_EXTENSION_PUBLISHED_ENABLED="Component enabled and menu item published"
diff --git a/administrator/language/en-GB/en-GB.com_menus.sys.ini b/administrator/language/en-GB/en-GB.com_menus.sys.ini
index e559674..19d946c 100644
--- a/administrator/language/en-GB/en-GB.com_menus.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_menus.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_messages.ini b/administrator/language/en-GB/en-GB.com_messages.ini
index e83ef1e..31fd928 100644
--- a/administrator/language/en-GB/en-GB.com_messages.ini
+++ b/administrator/language/en-GB/en-GB.com_messages.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_messages.sys.ini b/administrator/language/en-GB/en-GB.com_messages.sys.ini
index 2154e1a..da3dd76 100644
--- a/administrator/language/en-GB/en-GB.com_messages.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_messages.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_modules.ini b/administrator/language/en-GB/en-GB.com_modules.ini
index b259b89..617565a 100644
--- a/administrator/language/en-GB/en-GB.com_modules.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_modules.sys.ini b/administrator/language/en-GB/en-GB.com_modules.sys.ini
index 51e91f2..9dd3bc3 100644
--- a/administrator/language/en-GB/en-GB.com_modules.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_modules.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini
index 55e6e28..7a376c5 100644
--- a/administrator/language/en-GB/en-GB.com_newsfeeds.ini
+++ b/administrator/language/en-GB/en-GB.com_newsfeeds.ini
@@ -1,4 +1,4 @@
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; Joomla! Project
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
index 0bfa50f..fcb80a7 100644
--- a/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_newsfeeds.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_plugins.ini b/administrator/language/en-GB/en-GB.com_plugins.ini
index f891807..0f5c77b 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_plugins.sys.ini b/administrator/language/en-GB/en-GB.com_plugins.sys.ini
index 66f4d7c..c547b98 100644
--- a/administrator/language/en-GB/en-GB.com_plugins.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_plugins.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_postinstall.ini b/administrator/language/en-GB/en-GB.com_postinstall.ini
index 155747f..732ce95 100644
--- a/administrator/language/en-GB/en-GB.com_postinstall.ini
+++ b/administrator/language/en-GB/en-GB.com_postinstall.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
index 5fe20c7..91571b5 100644
--- a/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_postinstall.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_redirect.ini b/administrator/language/en-GB/en-GB.com_redirect.ini
index 04ba339..82f9af5 100644
--- a/administrator/language/en-GB/en-GB.com_redirect.ini
+++ b/administrator/language/en-GB/en-GB.com_redirect.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_redirect.sys.ini b/administrator/language/en-GB/en-GB.com_redirect.sys.ini
index c1531de..7736d78 100644
--- a/administrator/language/en-GB/en-GB.com_redirect.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_redirect.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_search.ini b/administrator/language/en-GB/en-GB.com_search.ini
index ea19930..97d6597 100644
--- a/administrator/language/en-GB/en-GB.com_search.ini
+++ b/administrator/language/en-GB/en-GB.com_search.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_search.sys.ini b/administrator/language/en-GB/en-GB.com_search.sys.ini
index c9e0fdd..f3e9f40 100644
--- a/administrator/language/en-GB/en-GB.com_search.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_search.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_tags.ini b/administrator/language/en-GB/en-GB.com_tags.ini
index a51877e..b4b6b50 100644
--- a/administrator/language/en-GB/en-GB.com_tags.ini
+++ b/administrator/language/en-GB/en-GB.com_tags.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_tags.sys.ini b/administrator/language/en-GB/en-GB.com_tags.sys.ini
index ff19587..94899c1 100644
--- a/administrator/language/en-GB/en-GB.com_tags.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_tags.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_templates.ini b/administrator/language/en-GB/en-GB.com_templates.ini
index 69ac5e0..38ab2f2 100644
--- a/administrator/language/en-GB/en-GB.com_templates.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_templates.sys.ini b/administrator/language/en-GB/en-GB.com_templates.sys.ini
index 32cd7b1..7827495 100644
--- a/administrator/language/en-GB/en-GB.com_templates.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_templates.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_users.ini b/administrator/language/en-GB/en-GB.com_users.ini
index 07106b6..2e8e8d7 100644
--- a/administrator/language/en-GB/en-GB.com_users.ini
+++ b/administrator/language/en-GB/en-GB.com_users.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_users.sys.ini b/administrator/language/en-GB/en-GB.com_users.sys.ini
index 9b21090..d11d2e6 100644
--- a/administrator/language/en-GB/en-GB.com_users.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_users.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_weblinks.ini b/administrator/language/en-GB/en-GB.com_weblinks.ini
index cd9e177..ebb0edb 100644
--- a/administrator/language/en-GB/en-GB.com_weblinks.ini
+++ b/administrator/language/en-GB/en-GB.com_weblinks.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_weblinks.sys.ini b/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
index f092a6b..915e886 100644
--- a/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_weblinks.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_wrapper.ini b/administrator/language/en-GB/en-GB.com_wrapper.ini
index 72941c8..1e2e950 100644
--- a/administrator/language/en-GB/en-GB.com_wrapper.ini
+++ b/administrator/language/en-GB/en-GB.com_wrapper.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
index dee516f..0395b8b 100644
--- a/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
+++ b/administrator/language/en-GB/en-GB.com_wrapper.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 1903dab..2c6304f 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -380,7 +380,7 @@ JGLOBAL_KEEP_TYPING="Keep typing..."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Language pack does not match this Joomla! version. Some strings may be missing."
 JGLOBAL_LEAST_HITS="Least Hits"
 JGLOBAL_LEFT="Left"
-JGLOBAL_LINK_AUTHOR_DESC="If set to Yes, the Name of the article's Author will be linked to its contact page. You must create a contact linked to the author's user record for this to be in effect. This is a global setting but can be changed at the Category, Menu and Article levels."
+JGLOBAL_LINK_AUTHOR_DESC="If set to Yes, the Name of the article's Author will be linked to its contact page. You must create a contact linked to the author's user record, <strong>and the &quot;Content - Contact&quot; plugin must be enabled</strong>, for this to be in effect. This is a global setting but can be changed at the Category, Menu and Article levels."
 JGLOBAL_LINK_AUTHOR_LABEL="Link Author"
 JGLOBAL_LINK_CATEGORY_DESC="If set to Yes, and if Show Category is set to 'Show', the Category Title will link to a layout showing articles in that Category."
 JGLOBAL_LINK_CATEGORY_LABEL="Link Category"
@@ -622,6 +622,7 @@ JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_ADD="Components_Newsfeeds_Categories_Edit"
 JHELP_COMPONENTS_NEWSFEEDS_CATEGORY_EDIT="Components_Newsfeeds_Categories_Edit"
 JHELP_COMPONENTS_NEWSFEEDS_FEEDS_EDIT="Components_Newsfeeds_Feeds_Edit"
 JHELP_COMPONENTS_NEWSFEEDS_FEEDS="Components_Newsfeeds_Feeds"
+JHELP_COMPONENTS_POST_INSTALLATION_MESSAGES="Components_Post_installation_Messages"
 JHELP_COMPONENTS_REDIRECT_MANAGER_EDIT="Components_Redirect_Manager_Edit"
 JHELP_COMPONENTS_REDIRECT_MANAGER="Components_Redirect_Manager"
 JHELP_COMPONENTS_SEARCH="Components_Search"
diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini
index 4e45f47..9472970 100644
--- a/administrator/language/en-GB/en-GB.lib_joomla.ini
+++ b/administrator/language/en-GB/en-GB.lib_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -487,6 +487,7 @@ JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_SETUP="Template Install: Could not copy se
 JLIB_INSTALLER_ABORT_TPL_INSTALL_FAILED_CREATE_DIRECTORY="Template Install: Failed to create directory: %s"
 JLIB_INSTALLER_ABORT_TPL_INSTALL_ROLLBACK="Template Install: %s"
 JLIB_INSTALLER_ABORT_TPL_INSTALL_UNKNOWN_CLIENT="Template Install: Unknown client type [%s]"
+JLIB_INSTALLER_AVAILABLE_UPDATE_PHP_VERSION="For the extension %1$s version %2$s is available, but it requires at least PHP version %3$s while your system only has %4$s"
 JLIB_INSTALLER_PURGED_UPDATES="Purged updates"
 JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES="Failed to purge updates"
 JLIB_INSTALLER_DEFAULT_STYLE="%s - Default"
diff --git a/administrator/language/en-GB/en-GB.localise.php b/administrator/language/en-GB/en-GB.localise.php
index 8a8a6bc..1edfe12 100644
--- a/administrator/language/en-GB/en-GB.localise.php
+++ b/administrator/language/en-GB/en-GB.localise.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Language
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/language/en-GB/en-GB.mod_custom.ini b/administrator/language/en-GB/en-GB.mod_custom.ini
index 01052fb..42fa577 100644
--- a/administrator/language/en-GB/en-GB.mod_custom.ini
+++ b/administrator/language/en-GB/en-GB.mod_custom.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_custom.sys.ini b/administrator/language/en-GB/en-GB.mod_custom.sys.ini
index c48fd97..b2be41e 100644
--- a/administrator/language/en-GB/en-GB.mod_custom.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_custom.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_feed.ini b/administrator/language/en-GB/en-GB.mod_feed.ini
index 807c3a9..6366974 100644
--- a/administrator/language/en-GB/en-GB.mod_feed.ini
+++ b/administrator/language/en-GB/en-GB.mod_feed.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_feed.sys.ini b/administrator/language/en-GB/en-GB.mod_feed.sys.ini
index c87f1f4..ef5a4b0 100644
--- a/administrator/language/en-GB/en-GB.mod_feed.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_feed.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_latest.ini b/administrator/language/en-GB/en-GB.mod_latest.ini
index 66be3a6..c61143c 100644
--- a/administrator/language/en-GB/en-GB.mod_latest.ini
+++ b/administrator/language/en-GB/en-GB.mod_latest.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_latest.sys.ini b/administrator/language/en-GB/en-GB.mod_latest.sys.ini
index baab9e9..e055312 100644
--- a/administrator/language/en-GB/en-GB.mod_latest.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_latest.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_logged.ini b/administrator/language/en-GB/en-GB.mod_logged.ini
index 767ea35..bfd1b64 100644
--- a/administrator/language/en-GB/en-GB.mod_logged.ini
+++ b/administrator/language/en-GB/en-GB.mod_logged.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_logged.sys.ini b/administrator/language/en-GB/en-GB.mod_logged.sys.ini
index edaab00..802d48e 100644
--- a/administrator/language/en-GB/en-GB.mod_logged.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_logged.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_login.ini b/administrator/language/en-GB/en-GB.mod_login.ini
index d10752c..cd733fc 100644
--- a/administrator/language/en-GB/en-GB.mod_login.ini
+++ b/administrator/language/en-GB/en-GB.mod_login.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_login.sys.ini b/administrator/language/en-GB/en-GB.mod_login.sys.ini
index f6f426e..4bb3923 100644
--- a/administrator/language/en-GB/en-GB.mod_login.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_login.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_menu.ini b/administrator/language/en-GB/en-GB.mod_menu.ini
index 39a24bd..38dbaea 100644
--- a/administrator/language/en-GB/en-GB.mod_menu.ini
+++ b/administrator/language/en-GB/en-GB.mod_menu.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_menu.sys.ini b/administrator/language/en-GB/en-GB.mod_menu.sys.ini
index e8342a3..263c806 100644
--- a/administrator/language/en-GB/en-GB.mod_menu.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_menu.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
index 605a87b..e342134 100644
--- a/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
+++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
index a0d6539..f39a7d0 100644
--- a/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_multilangstatus.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_popular.ini b/administrator/language/en-GB/en-GB.mod_popular.ini
index 21aca7f..6aa0ff5 100644
--- a/administrator/language/en-GB/en-GB.mod_popular.ini
+++ b/administrator/language/en-GB/en-GB.mod_popular.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_popular.sys.ini b/administrator/language/en-GB/en-GB.mod_popular.sys.ini
index a49092e..82ae896 100644
--- a/administrator/language/en-GB/en-GB.mod_popular.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_popular.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.ini b/administrator/language/en-GB/en-GB.mod_quickicon.ini
index ebeac72..a2e93d8 100644
--- a/administrator/language/en-GB/en-GB.mod_quickicon.ini
+++ b/administrator/language/en-GB/en-GB.mod_quickicon.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
index 26c7772..ecb3b98 100644
--- a/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_quickicon.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.ini
index 79bdd2b..b71603c 100644
--- a/administrator/language/en-GB/en-GB.mod_stats_admin.ini
+++ b/administrator/language/en-GB/en-GB.mod_stats_admin.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
index d5f58dd..0c501f0 100644
--- a/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_stats_admin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.mod_status.ini b/administrator/language/en-GB/en-GB.mod_status.ini
index 5dad27a..b3ff41e 100644
--- a/administrator/language/en-GB/en-GB.mod_status.ini
+++ b/administrator/language/en-GB/en-GB.mod_status.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_status.sys.ini b/administrator/language/en-GB/en-GB.mod_status.sys.ini
index 3e663f3..a83e4cf 100644
--- a/administrator/language/en-GB/en-GB.mod_status.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_status.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_submenu.ini b/administrator/language/en-GB/en-GB.mod_submenu.ini
index 3f887e4..a1331cc 100644
--- a/administrator/language/en-GB/en-GB.mod_submenu.ini
+++ b/administrator/language/en-GB/en-GB.mod_submenu.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_submenu.sys.ini b/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
index f7e16da..d26e875 100644
--- a/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_submenu.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_title.ini b/administrator/language/en-GB/en-GB.mod_title.ini
index e1270cd..354dbc1 100644
--- a/administrator/language/en-GB/en-GB.mod_title.ini
+++ b/administrator/language/en-GB/en-GB.mod_title.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_title.sys.ini b/administrator/language/en-GB/en-GB.mod_title.sys.ini
index 4913b66..e943ef6 100644
--- a/administrator/language/en-GB/en-GB.mod_title.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_title.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.ini b/administrator/language/en-GB/en-GB.mod_toolbar.ini
index 68f05d6..7e31184 100644
--- a/administrator/language/en-GB/en-GB.mod_toolbar.ini
+++ b/administrator/language/en-GB/en-GB.mod_toolbar.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
index 23d9bb0..5c1244f 100644
--- a/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_toolbar.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_version.ini b/administrator/language/en-GB/en-GB.mod_version.ini
index b692f5b..d39035b 100644
--- a/administrator/language/en-GB/en-GB.mod_version.ini
+++ b/administrator/language/en-GB/en-GB.mod_version.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.mod_version.sys.ini b/administrator/language/en-GB/en-GB.mod_version.sys.ini
index 0e67e5b..e88a1ef 100644
--- a/administrator/language/en-GB/en-GB.mod_version.sys.ini
+++ b/administrator/language/en-GB/en-GB.mod_version.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
index 56deaf3..3ae23c6 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
index f7804cf..794c77e 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_cookie.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
index a923640..c04b031 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_gmail.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
index 715045f..bc9daed 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_gmail.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
index 46c14cf..b8dea93 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
index 14484e2..fb82dc3 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
index 241aa72..a483fe3 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
index 98bb99f..395cb42 100644
--- a/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_authentication_ldap.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
index 3694174..6ba1823 100644
--- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
+++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
index db05033..dc20fd6 100644
--- a/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_captcha_recaptcha.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.ini b/administrator/language/en-GB/en-GB.plg_content_contact.ini
new file mode 100644
index 0000000..7dda425
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_content_contact.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_CONTACT="Content - Contact"
+PLG_CONTENT_CONTACT_XML_DESCRIPTION="Provides a link between the content author and the contact item that can be used for an Author Profile."
diff --git a/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
new file mode 100644
index 0000000..7dda425
--- /dev/null
+++ b/administrator/language/en-GB/en-GB.plg_content_contact.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_CONTENT_CONTACT="Content - Contact"
+PLG_CONTENT_CONTACT_XML_DESCRIPTION="Provides a link between the content author and the contact item that can be used for an Author Profile."
diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
index 184265b..76c5c08 100644
--- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
index 5836557..73ec934 100644
--- a/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_emailcloak.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.ini b/administrator/language/en-GB/en-GB.plg_content_finder.ini
index 84efa3d..0a3c8ec 100644
--- a/administrator/language/en-GB/en-GB.plg_content_finder.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_finder.ini
@@ -1,10 +1,10 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_FINDER="Content - Smart Search"
-PLG_CONTENT_FINDER_XML_DESCRIPTION="Enables Indexing for Smart Search"
+PLG_CONTENT_FINDER_XML_DESCRIPTION="Changes to content will not update the Smart Search index if you do not enable this plug-in."
 
 PLG_FINDER_QUERY_FILTER_BRANCH_P__="All"
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
index 0ceb82c..546d919 100644
--- a/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_finder.sys.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_CONTENT_FINDER="Content - Smart Search"
-PLG_CONTENT_FINDER_XML_DESCRIPTION="Enables Indexing for Smart Search"
+PLG_CONTENT_FINDER_XML_DESCRIPTION="Changes to content will not update the Smart Search index if you do not enable this plug-in."
diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.ini
index 8a818fd..c956b87 100644
--- a/administrator/language/en-GB/en-GB.plg_content_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
index 5bf251f..4cba392 100644
--- a/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
index c8e7101..2d550a3 100644
--- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
index 3e13bb2..c427d37 100644
--- a/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_loadmodule.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
index 72f3a30..a7cd089 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
index 6cecf00..f68c6f3 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagebreak.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
index 244ad2e..165b2fb 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
index adf1c22..85c3585 100644
--- a/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_pagenavigation.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.ini b/administrator/language/en-GB/en-GB.plg_content_vote.ini
index 9e42f3f..642441e 100644
--- a/administrator/language/en-GB/en-GB.plg_content_vote.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_vote.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
index 9d76582..f998979 100644
--- a/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_content_vote.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
index 6615207..ea4cba3 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
index b3af97b..2e98856 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_article.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
index 025043e..4aa5930 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
index 115a2d7..bb6c51f 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_image.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
index 5cf8ca4..3264154 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
index 65ad0ab..87ffe12 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_pagebreak.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
index 19a6b6f..3f81716 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
index 670a570..b91dcf8 100644
--- a/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors-xtd_readmore.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
index 010e048..232ebac 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
index 426ecfe..c50a0f9 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_codemirror.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.ini b/administrator/language/en-GB/en-GB.plg_editors_none.ini
index 16d77d6..b7c950b 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_none.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_none.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
index 16d77d6..b7c950b 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_none.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
index 9cd4b1e..2a97aa3 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
index e6321a3..0e9dd20 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
index 6beff19..d0e9387 100644
--- a/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
index 91fde24..610e6bb 100644
--- a/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_extension_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.ini
index 77211d8..982c800 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_categories.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
index 31227a9..d7c03b2 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
index 9b844d8..d63aca5 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
index 28e2b58..4aee4e8 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_contacts.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.ini b/administrator/language/en-GB/en-GB.plg_finder_content.ini
index 508e49e..491eb01 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_content.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_content.ini
@@ -1,10 +1,10 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_FINDER_CONTENT="Smart Search - Content"
-PLG_FINDER_CONTENT_XML_DESCRIPTION="This plugin indexes Joomla! Articles."
+PLG_FINDER_CONTENT_XML_DESCRIPTION="Updates the indexes of Joomla! Articles whenever an article is created, modified or deleted. NOTE the Content - Smart Search plugin must be enabled."
 
 PLG_FINDER_QUERY_FILTER_BRANCH_S_ARTICLE="Article"
 PLG_FINDER_QUERY_FILTER_BRANCH_S_AUTHOR="Author"
diff --git a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
index 5a1e77b..cf6aa98 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_content.sys.ini
@@ -1,8 +1,8 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_FINDER_CONTENT="Smart Search - Content"
 PLG_FINDER_CONTENT_ERROR_ACTIVATING_PLUGIN="Could not automatically activate the "_QQ_"Smart Search - Content"_QQ_" plugin"
-PLG_FINDER_CONTENT_XML_DESCRIPTION="This plugin indexes Joomla! Articles."
+PLG_FINDER_CONTENT_XML_DESCRIPTION="Updates the indexes of Joomla! Articles whenever an article is created, modified or deleted. NOTE the Content - Smart Search plugin must be enabled."
diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
index 9941165..5690df6 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
index 1664726..b66e16a 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_newsfeeds.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.ini
index 60790de..f556a30 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_tags.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_tags.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
index 665e072..331568d 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_tags.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini b/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
index b6084b4..d7bbe8b 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_weblinks.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini b/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
index 729f6c4..6fb6fd8 100644
--- a/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_finder_weblinks.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
index 2022446..f635e5c 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
index 7d9476f..cf4ec8f 100644
--- a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
index 2556187..2b5f0af 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
index a5b64ed..9693993 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_extensionupdate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
index 8ab0d37..0c87072 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
index 7de47cb..6f6ef33 100644
--- a/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_quickicon_joomlaupdate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.ini b/administrator/language/en-GB/en-GB.plg_search_categories.ini
index 1edb6db..5f5028c 100644
--- a/administrator/language/en-GB/en-GB.plg_search_categories.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
index 855734c..e909aab 100644
--- a/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.ini
index 6afd05a..5ca03ae 100644
--- a/administrator/language/en-GB/en-GB.plg_search_contacts.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_contacts.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
index 46c80c8..d366537 100644
--- a/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_contacts.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_content.ini b/administrator/language/en-GB/en-GB.plg_search_content.ini
index 88cee75..7e7c8eb 100644
--- a/administrator/language/en-GB/en-GB.plg_search_content.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_content.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
index 2e38efc..3a3c617 100644
--- a/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_content.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
index 2b000a0..60a73e0 100644
--- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
index f8ed0b3..fc70707 100644
--- a/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_newsfeeds.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_weblinks.ini b/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
index 7e484fe..10dafa9 100644
--- a/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_weblinks.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini b/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
index 5bf9676..081ba8f 100644
--- a/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_search_weblinks.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.ini b/administrator/language/en-GB/en-GB.plg_system_cache.ini
index 4c4267c..d69a53f 100644
--- a/administrator/language/en-GB/en-GB.plg_system_cache.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_cache.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
index 17e18e5..64cd3aa 100644
--- a/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_cache.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.ini b/administrator/language/en-GB/en-GB.plg_system_debug.ini
index 83a5f6b..b517b82 100644
--- a/administrator/language/en-GB/en-GB.plg_system_debug.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_debug.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
index 2929292..0faa990 100644
--- a/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_debug.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.ini
index ec49719..ac9ecf0 100644
--- a/administrator/language/en-GB/en-GB.plg_system_highlight.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_highlight.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
index 3ad8f0a..b4d3fad 100644
--- a/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_highlight.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
index 94db3cf..d8c39d3 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
index 32c635c..99825cf 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagecode.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
index 90dab91..a41ace1 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
index 870867e..11ab5de 100644
--- a/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_languagefilter.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_log.ini b/administrator/language/en-GB/en-GB.plg_system_log.ini
index 843fd1b..72ad956 100644
--- a/administrator/language/en-GB/en-GB.plg_system_log.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_log.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
index 8ff217c..eb53991 100644
--- a/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_log.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.ini b/administrator/language/en-GB/en-GB.plg_system_logout.ini
index d3690b4..062973a 100644
--- a/administrator/language/en-GB/en-GB.plg_system_logout.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_logout.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
index 019fa3a..d4164c4 100644
--- a/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_logout.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_p3p.ini b/administrator/language/en-GB/en-GB.plg_system_p3p.ini
index fca496e..363573d 100644
--- a/administrator/language/en-GB/en-GB.plg_system_p3p.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_p3p.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini b/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
index 24e98ee..43d1783 100644
--- a/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_p3p.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.ini
index aebe723..54df935 100644
--- a/administrator/language/en-GB/en-GB.plg_system_redirect.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_redirect.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
index aebe723..54df935 100644
--- a/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_redirect.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.ini b/administrator/language/en-GB/en-GB.plg_system_remember.ini
index b183dea..ff6313b 100644
--- a/administrator/language/en-GB/en-GB.plg_system_remember.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_remember.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
index 7f63fd5..d689482 100644
--- a/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_remember.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.ini b/administrator/language/en-GB/en-GB.plg_system_sef.ini
index ac52bcd..6e907ab 100644
--- a/administrator/language/en-GB/en-GB.plg_system_sef.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_sef.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
index 6ec2bf3..0089d48 100644
--- a/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_sef.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_system_t3.ini b/administrator/language/en-GB/en-GB.plg_system_t3.ini
index 7e4177b..a1d6cfb 100644
--- a/administrator/language/en-GB/en-GB.plg_system_t3.ini
+++ b/administrator/language/en-GB/en-GB.plg_system_t3.ini
@@ -218,7 +218,7 @@ T3_NAVIGATION_MM_POSITIONS_DESC			= "Move menu item to right or left column"
 T3_NAVIGATION_MM_EX_CLASS				= "Extra Class"
 T3_NAVIGATION_MM_EX_CLASS_DESC			= "Add extra class to style megamenu."
 T3_NAVIGATION_MM_ICON					= "Icon"
-T3_NAVIGATION_MM_ICON_DESC				= "Add Icon for Menu Item. Click Icon label to visit bootstrap icons page and get Icon Class. E.g.: icon-search"
+T3_NAVIGATION_MM_ICON_DESC				= "Add Icon for Menu Item. Click Icon label to visit bootstrap icons page and get Icon Class. E.g.: [icon-search], [fa fa-home], [glyphicon glyphicon-heart],... without square brackets. Note: [fa] and [glyphicon] icons support by Bootstrap 3 base theme only"
 T3_NAVIGATION_MM_CAPTION				= "Item caption"
 T3_NAVIGATION_MM_CAPTION_DESC			= "Item caption"
 T3_NAVIGATION_MM_WIDTH_SPAN				= "Width (1-12)"
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
index 83605b5..43ecda1 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
index 12e77dd..5418d68 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_totp.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
index d0aef0c..d28e984 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
index 3accafa..e0e60a7 100644
--- a/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_twofactorauth_yubikey.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
index 90228f5..c7bf6af 100644
--- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
index 6674130..de8c8c9 100644
--- a/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_contactcreator.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.ini
index 424681e..bcc298f 100644
--- a/administrator/language/en-GB/en-GB.plg_user_joomla.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
index ff8a0c5..8381fca 100644
--- a/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.ini b/administrator/language/en-GB/en-GB.plg_user_profile.ini
index f0836a5..6aa97cd 100644
--- a/administrator/language/en-GB/en-GB.plg_user_profile.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_profile.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
index d5b0a10..34489b8 100644
--- a/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
+++ b/administrator/language/en-GB/en-GB.plg_user_profile.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.tpl_hathor.ini b/administrator/language/en-GB/en-GB.tpl_hathor.ini
index c602334..7bec841 100644
--- a/administrator/language/en-GB/en-GB.tpl_hathor.ini
+++ b/administrator/language/en-GB/en-GB.tpl_hathor.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini b/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
index 43748b0..06ad25c 100644
--- a/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
+++ b/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/language/en-GB/en-GB.tpl_isis.ini b/administrator/language/en-GB/en-GB.tpl_isis.ini
index 2f1499c..9be3e4c 100644
--- a/administrator/language/en-GB/en-GB.tpl_isis.ini
+++ b/administrator/language/en-GB/en-GB.tpl_isis.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.tpl_isis.sys.ini b/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
index 8b2cc9b..b00561d 100644
--- a/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
+++ b/administrator/language/en-GB/en-GB.tpl_isis.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/language/en-GB/en-GB.xml b/administrator/language/en-GB/en-GB.xml
index 57651f1..6fabed1 100644
--- a/administrator/language/en-GB/en-GB.xml
+++ b/administrator/language/en-GB/en-GB.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.2" client="administrator">
 	<name>English (United Kingdom)</name>
-	<version>3.2.1</version>
+	<version>3.2.2</version>
 	<creationDate>2013-03-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-GB administrator language</description>
 	<metadata>
diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml
index 655dc60..0a9d2dd 100644
--- a/administrator/language/en-GB/install.xml
+++ b/administrator/language/en-GB/install.xml
@@ -2,12 +2,12 @@
 <extension version="3.2" client="administrator" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.2.1</version>
+	<version>3.2.2</version>
 	<creationDate>2013-03-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-GB administrator language</description>
 	<files>
@@ -116,6 +116,8 @@
 		<filename>en-GB.plg_captcha_recaptcha.ini</filename>
 		<filename>en-GB.plg_captcha_recaptcha.sys.ini</filename>
 		<filename>en-GB.plg_content_emailcloak.ini</filename>
+		<filename>en-GB.plg_content_contact.ini</filename>
+		<filename>en-GB.plg_content_contact.sys.ini</filename>
 		<filename>en-GB.plg_content_emailcloak.sys.ini</filename>
 		<filename>en-GB.plg_content_finder.ini</filename>
 		<filename>en-GB.plg_content_finder.sys.ini</filename>
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
index 189f971..18fbd12 100644
--- a/administrator/manifests/files/joomla.xml
+++ b/administrator/manifests/files/joomla.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension version="3.1" type="file" method="upgrade">
+<extension version="3.2" type="file" method="upgrade">
 	<name>files_joomla</name>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.2.1</version>
-	<creationDate>December 2013</creationDate>
+	<version>3.2.2</version>
+	<creationDate>February 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/administrator/manifests/libraries/joomla.xml b/administrator/manifests/libraries/joomla.xml
index 4dd0837..c3bd873 100644
--- a/administrator/manifests/libraries/joomla.xml
+++ b/administrator/manifests/libraries/joomla.xml
@@ -5,7 +5,7 @@
 	<version>13.1</version>
 	<description>LIB_JOOMLA_XML_DESCRIPTION</description>
 	<creationDate>2008</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
diff --git a/administrator/manifests/libraries/phpass.xml b/administrator/manifests/libraries/phpass.xml
new file mode 100644
index 0000000..05b6390
--- /dev/null
+++ b/administrator/manifests/libraries/phpass.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extension type="library" version="3.2" method="upgrade">
+	<name>PHPass</name>
+	<libraryname>phpass</libraryname>
+	<description>LIB_PHPASS_XML_DESCRIPTION</description>
+	<creationDate>2004-2006</creationDate>
+	<author>Solar Designer</author>
+	<authorEmail>solar@openwall.com</authorEmail>
+	<authorUrl>http://www.openwall.com/phpass/</authorUrl>
+	<license>PD / GWC</license>
+	<version>0.3</version>
+	<packagerurl>http://www.openwall.com/phpass/</packagerurl>
+
+	<files folder="phpass">
+		<file>PasswordHash.php</file>
+		<file>index.html</file>
+	</files>
+</extension>
diff --git a/administrator/modules/mod_custom/mod_custom.php b/administrator/modules/mod_custom/mod_custom.php
index 50e25df..30ddb89 100644
--- a/administrator/modules/mod_custom/mod_custom.php
+++ b/administrator/modules/mod_custom/mod_custom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_custom/mod_custom.xml b/administrator/modules/mod_custom/mod_custom.xml
index 0bd2055..bde6bd1 100644
--- a/administrator/modules/mod_custom/mod_custom.xml
+++ b/administrator/modules/mod_custom/mod_custom.xml
@@ -6,7 +6,7 @@
 	<name>mod_custom</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_custom/tmpl/default.php b/administrator/modules/mod_custom/tmpl/default.php
index ee4c305..7481922 100644
--- a/administrator/modules/mod_custom/tmpl/default.php
+++ b/administrator/modules/mod_custom/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_feed/helper.php b/administrator/modules/mod_feed/helper.php
index 910dbc0..2fdcdc7 100644
--- a/administrator/modules/mod_feed/helper.php
+++ b/administrator/modules/mod_feed/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_feed/mod_feed.php b/administrator/modules/mod_feed/mod_feed.php
index 05c4e52..5b0fb1f 100644
--- a/administrator/modules/mod_feed/mod_feed.php
+++ b/administrator/modules/mod_feed/mod_feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_feed/mod_feed.xml b/administrator/modules/mod_feed/mod_feed.xml
index 8db6c1c..5c98ca7 100644
--- a/administrator/modules/mod_feed/mod_feed.xml
+++ b/administrator/modules/mod_feed/mod_feed.xml
@@ -6,7 +6,7 @@
 	<name>mod_feed</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
index 432dcdc..42caf33 100644
--- a/administrator/modules/mod_feed/tmpl/default.php
+++ b/administrator/modules/mod_feed/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_latest/helper.php b/administrator/modules/mod_latest/helper.php
index 3db4d9d..bf4ed36 100644
--- a/administrator/modules/mod_latest/helper.php
+++ b/administrator/modules/mod_latest/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_latest/mod_latest.php b/administrator/modules/mod_latest/mod_latest.php
index aff2105..32c588e 100644
--- a/administrator/modules/mod_latest/mod_latest.php
+++ b/administrator/modules/mod_latest/mod_latest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_latest/mod_latest.xml b/administrator/modules/mod_latest/mod_latest.xml
index e3e6bd4..30dd9b7 100644
--- a/administrator/modules/mod_latest/mod_latest.xml
+++ b/administrator/modules/mod_latest/mod_latest.xml
@@ -6,7 +6,7 @@
 	<name>mod_latest</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_latest/tmpl/default.php b/administrator/modules/mod_latest/tmpl/default.php
index 04962cd..350b8f6 100644
--- a/administrator/modules/mod_latest/tmpl/default.php
+++ b/administrator/modules/mod_latest/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_logged/helper.php b/administrator/modules/mod_logged/helper.php
index f815e3e..3f4c0e8 100644
--- a/administrator/modules/mod_logged/helper.php
+++ b/administrator/modules/mod_logged/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_logged
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_logged/mod_logged.php b/administrator/modules/mod_logged/mod_logged.php
index f74b066..a8525a7 100644
--- a/administrator/modules/mod_logged/mod_logged.php
+++ b/administrator/modules/mod_logged/mod_logged.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_logged
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_logged/mod_logged.xml b/administrator/modules/mod_logged/mod_logged.xml
index 42e23ee..7fcf2f9 100644
--- a/administrator/modules/mod_logged/mod_logged.xml
+++ b/administrator/modules/mod_logged/mod_logged.xml
@@ -6,7 +6,7 @@
 	<name>mod_logged</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php
index 8896338..27fe612 100644
--- a/administrator/modules/mod_logged/tmpl/default.php
+++ b/administrator/modules/mod_logged/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_logged
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_login/helper.php b/administrator/modules/mod_login/helper.php
index d7e8b5c..6b7a782 100644
--- a/administrator/modules/mod_login/helper.php
+++ b/administrator/modules/mod_login/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_login/mod_login.php b/administrator/modules/mod_login/mod_login.php
index 22c6961..d780f7b 100644
--- a/administrator/modules/mod_login/mod_login.php
+++ b/administrator/modules/mod_login/mod_login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_login/mod_login.xml b/administrator/modules/mod_login/mod_login.xml
index 1538c13..1fe9df6 100644
--- a/administrator/modules/mod_login/mod_login.xml
+++ b/administrator/modules/mod_login/mod_login.xml
@@ -6,7 +6,7 @@
 	<name>mod_login</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_login/tmpl/default.php b/administrator/modules/mod_login/tmpl/default.php
index c9c5517..59bbefb 100644
--- a/administrator/modules/mod_login/tmpl/default.php
+++ b/administrator/modules/mod_login/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_menu/helper.php b/administrator/modules/mod_menu/helper.php
index d13d69d..d6ef793 100644
--- a/administrator/modules/mod_menu/helper.php
+++ b/administrator/modules/mod_menu/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_menu/menu.php b/administrator/modules/mod_menu/menu.php
index 77b554c..2908f4b 100644
--- a/administrator/modules/mod_menu/menu.php
+++ b/administrator/modules/mod_menu/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_menu/mod_menu.php b/administrator/modules/mod_menu/mod_menu.php
index 815522e..c172bc4 100644
--- a/administrator/modules/mod_menu/mod_menu.php
+++ b/administrator/modules/mod_menu/mod_menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_menu/mod_menu.xml b/administrator/modules/mod_menu/mod_menu.xml
index 7866f74..eee087b 100644
--- a/administrator/modules/mod_menu/mod_menu.xml
+++ b/administrator/modules/mod_menu/mod_menu.xml
@@ -6,7 +6,7 @@
 	<name>mod_menu</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_menu/tmpl/default.php b/administrator/modules/mod_menu/tmpl/default.php
index d080fd7..ecd044e 100644
--- a/administrator/modules/mod_menu/tmpl/default.php
+++ b/administrator/modules/mod_menu/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_menu/tmpl/default_disabled.php b/administrator/modules/mod_menu/tmpl/default_disabled.php
index 0329c03..7790b65 100644
--- a/administrator/modules/mod_menu/tmpl/default_disabled.php
+++ b/administrator/modules/mod_menu/tmpl/default_disabled.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_menu/tmpl/default_enabled.php b/administrator/modules/mod_menu/tmpl/default_enabled.php
index 5305004..77933bb 100644
--- a/administrator/modules/mod_menu/tmpl/default_enabled.php
+++ b/administrator/modules/mod_menu/tmpl/default_enabled.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
index 4066abe..0713a42 100644
--- a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
+++ b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
index 4066abe..0713a42 100644
--- a/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
+++ b/administrator/modules/mod_multilangstatus/language/en-GB/en-GB.mod_multilangstatus.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.php b/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
index d69922e..8911388 100644
--- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
+++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_multilangstatus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
index 5a0315f..097e7e7 100644
--- a/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
+++ b/administrator/modules/mod_multilangstatus/mod_multilangstatus.xml
@@ -7,7 +7,7 @@
 	<name>mod_multilangstatus</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_multilangstatus/tmpl/default.php b/administrator/modules/mod_multilangstatus/tmpl/default.php
index bf56c7d..a5a25d8 100644
--- a/administrator/modules/mod_multilangstatus/tmpl/default.php
+++ b/administrator/modules/mod_multilangstatus/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_multilangstatus
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_popular/helper.php b/administrator/modules/mod_popular/helper.php
index d10093e..8e8c68c 100644
--- a/administrator/modules/mod_popular/helper.php
+++ b/administrator/modules/mod_popular/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_popular/mod_popular.php b/administrator/modules/mod_popular/mod_popular.php
index 59876f3..75c9511 100644
--- a/administrator/modules/mod_popular/mod_popular.php
+++ b/administrator/modules/mod_popular/mod_popular.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_popular/mod_popular.xml b/administrator/modules/mod_popular/mod_popular.xml
index 2628c13..b865dd7 100644
--- a/administrator/modules/mod_popular/mod_popular.xml
+++ b/administrator/modules/mod_popular/mod_popular.xml
@@ -6,7 +6,7 @@
 	<name>mod_popular</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_popular/tmpl/default.php b/administrator/modules/mod_popular/tmpl/default.php
index c0da113..4968a11 100644
--- a/administrator/modules/mod_popular/tmpl/default.php
+++ b/administrator/modules/mod_popular/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_quickicon/helper.php b/administrator/modules/mod_quickicon/helper.php
index e572dfd..c4aa993 100644
--- a/administrator/modules/mod_quickicon/helper.php
+++ b/administrator/modules/mod_quickicon/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.php b/administrator/modules/mod_quickicon/mod_quickicon.php
index 562de2b..35a7943 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.php
+++ b/administrator/modules/mod_quickicon/mod_quickicon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
index e71b009..f329e0c 100644
--- a/administrator/modules/mod_quickicon/mod_quickicon.xml
+++ b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -6,7 +6,7 @@
 	<name>mod_quickicon</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_quickicon/tmpl/default.php b/administrator/modules/mod_quickicon/tmpl/default.php
index 97a327e..777175f 100644
--- a/administrator/modules/mod_quickicon/tmpl/default.php
+++ b/administrator/modules/mod_quickicon/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_stats_admin/helper.php b/administrator/modules/mod_stats_admin/helper.php
index 149b276..9974409 100644
--- a/administrator/modules/mod_stats_admin/helper.php
+++ b/administrator/modules/mod_stats_admin/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_stats_admin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
index 3e89135..892d476 100644
--- a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
+++ b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
index d60d80f..37ae4e6 100644
--- a/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
+++ b/administrator/modules/mod_stats_admin/language/en-GB.mod_stats_admin.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.php b/administrator/modules/mod_stats_admin/mod_stats_admin.php
index 46957e6..4b2fe9a 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.php
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_stats_admin/mod_stats_admin.xml b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
index d89f705..2f7f50f 100644
--- a/administrator/modules/mod_stats_admin/mod_stats_admin.xml
+++ b/administrator/modules/mod_stats_admin/mod_stats_admin.xml
@@ -7,7 +7,7 @@
 	<name>mod_stats_admin</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_stats_admin/tmpl/default.php b/administrator/modules/mod_stats_admin/tmpl/default.php
index e83a694..bd57466 100644
--- a/administrator/modules/mod_stats_admin/tmpl/default.php
+++ b/administrator/modules/mod_stats_admin/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_status/mod_status.php b/administrator/modules/mod_status/mod_status.php
index aa9509a..18420fa 100644
--- a/administrator/modules/mod_status/mod_status.php
+++ b/administrator/modules/mod_status/mod_status.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_status
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_status/mod_status.xml b/administrator/modules/mod_status/mod_status.xml
index fbd6fc4..aac6d9d 100644
--- a/administrator/modules/mod_status/mod_status.xml
+++ b/administrator/modules/mod_status/mod_status.xml
@@ -6,7 +6,7 @@
 	<name>mod_status</name>
 	<author>Joomla! Project</author>
 	<creationDate>Feb 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_status/tmpl/default.php b/administrator/modules/mod_status/tmpl/default.php
index 9be5185..330ad42 100644
--- a/administrator/modules/mod_status/tmpl/default.php
+++ b/administrator/modules/mod_status/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_status
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_submenu/mod_submenu.php b/administrator/modules/mod_submenu/mod_submenu.php
index 80592a5..4bce968 100644
--- a/administrator/modules/mod_submenu/mod_submenu.php
+++ b/administrator/modules/mod_submenu/mod_submenu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_submenu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_submenu/mod_submenu.xml b/administrator/modules/mod_submenu/mod_submenu.xml
index 6e9e3ee..61e0c53 100644
--- a/administrator/modules/mod_submenu/mod_submenu.xml
+++ b/administrator/modules/mod_submenu/mod_submenu.xml
@@ -6,7 +6,7 @@
 	<name>mod_submenu</name>
 	<author>Joomla! Project</author>
 	<creationDate>Feb 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_submenu/tmpl/default.php b/administrator/modules/mod_submenu/tmpl/default.php
index 18374c3..a56d6cb 100644
--- a/administrator/modules/mod_submenu/tmpl/default.php
+++ b/administrator/modules/mod_submenu/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_submenu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_title/mod_title.php b/administrator/modules/mod_title/mod_title.php
index 466f9f6..fbb198f 100644
--- a/administrator/modules/mod_title/mod_title.php
+++ b/administrator/modules/mod_title/mod_title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_title
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_title/mod_title.xml b/administrator/modules/mod_title/mod_title.xml
index 5c7b7ed..0f6cba4 100644
--- a/administrator/modules/mod_title/mod_title.xml
+++ b/administrator/modules/mod_title/mod_title.xml
@@ -6,7 +6,7 @@
 	<name>mod_title</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_title/tmpl/default.php b/administrator/modules/mod_title/tmpl/default.php
index 8a99164..643c95c 100644
--- a/administrator/modules/mod_title/tmpl/default.php
+++ b/administrator/modules/mod_title/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_title
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.php b/administrator/modules/mod_toolbar/mod_toolbar.php
index 4080c85..7bbc8ca 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.php
+++ b/administrator/modules/mod_toolbar/mod_toolbar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_toolbar/mod_toolbar.xml b/administrator/modules/mod_toolbar/mod_toolbar.xml
index f9cc8d2..703f74e 100644
--- a/administrator/modules/mod_toolbar/mod_toolbar.xml
+++ b/administrator/modules/mod_toolbar/mod_toolbar.xml
@@ -6,7 +6,7 @@
 	<name>mod_toolbar</name>
 	<author>Joomla! Project</author>
 	<creationDate>Nov 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_toolbar/tmpl/default.php b/administrator/modules/mod_toolbar/tmpl/default.php
index 079a495..f92177d 100644
--- a/administrator/modules/mod_toolbar/tmpl/default.php
+++ b/administrator/modules/mod_toolbar/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_version/helper.php b/administrator/modules/mod_version/helper.php
index e08322e..bffea76 100644
--- a/administrator/modules/mod_version/helper.php
+++ b/administrator/modules/mod_version/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_version
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini
index 55d1390..88cf669 100644
--- a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini
+++ b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini
index 0e67e5b..e88a1ef 100644
--- a/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini
+++ b/administrator/modules/mod_version/language/en-GB/en-GB.mod_version.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/modules/mod_version/mod_version.php b/administrator/modules/mod_version/mod_version.php
index 5a97f9f..a103e48 100644
--- a/administrator/modules/mod_version/mod_version.php
+++ b/administrator/modules/mod_version/mod_version.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_version
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/modules/mod_version/mod_version.xml b/administrator/modules/mod_version/mod_version.xml
index 49179d8..4804ed9 100644
--- a/administrator/modules/mod_version/mod_version.xml
+++ b/administrator/modules/mod_version/mod_version.xml
@@ -6,7 +6,7 @@
 	<name>mod_version</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2012</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/administrator/modules/mod_version/tmpl/default.php b/administrator/modules/mod_version/tmpl/default.php
index 9c604b1..88f3028 100644
--- a/administrator/modules/mod_version/tmpl/default.php
+++ b/administrator/modules/mod_version/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_version
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/component.php b/administrator/templates/hathor/component.php
index 438f923..d5a2e48 100644
--- a/administrator/templates/hathor/component.php
+++ b/administrator/templates/hathor/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/cpanel.php b/administrator/templates/hathor/cpanel.php
index 7f9ba2b..ab682a3 100644
--- a/administrator/templates/hathor/cpanel.php
+++ b/administrator/templates/hathor/cpanel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/css/boldtext.css b/administrator/templates/hathor/css/boldtext.css
index b37eec0..8bae311 100644
--- a/administrator/templates/hathor/css/boldtext.css
+++ b/administrator/templates/hathor/css/boldtext.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/colour_blue_rtl.css b/administrator/templates/hathor/css/colour_blue_rtl.css
index 8f88b12..87ceb32 100644
--- a/administrator/templates/hathor/css/colour_blue_rtl.css
+++ b/administrator/templates/hathor/css/colour_blue_rtl.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/colour_brown_rtl.css b/administrator/templates/hathor/css/colour_brown_rtl.css
index 4b4e674..e715899 100644
--- a/administrator/templates/hathor/css/colour_brown_rtl.css
+++ b/administrator/templates/hathor/css/colour_brown_rtl.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/colour_highcontrast.css b/administrator/templates/hathor/css/colour_highcontrast.css
index 15233df..7e1b5da 100644
--- a/administrator/templates/hathor/css/colour_highcontrast.css
+++ b/administrator/templates/hathor/css/colour_highcontrast.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/colour_highcontrast_rtl.css b/administrator/templates/hathor/css/colour_highcontrast_rtl.css
index 41de2df..1055bcf 100644
--- a/administrator/templates/hathor/css/colour_highcontrast_rtl.css
+++ b/administrator/templates/hathor/css/colour_highcontrast_rtl.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/colour_standard_rtl.css b/administrator/templates/hathor/css/colour_standard_rtl.css
index 80091e6..b54cd30 100644
--- a/administrator/templates/hathor/css/colour_standard_rtl.css
+++ b/administrator/templates/hathor/css/colour_standard_rtl.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/error.css b/administrator/templates/hathor/css/error.css
index 5445f63..35b044b 100644
--- a/administrator/templates/hathor/css/error.css
+++ b/administrator/templates/hathor/css/error.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/css/ie7.css b/administrator/templates/hathor/css/ie7.css
index ed203ce..bb4a78f 100644
--- a/administrator/templates/hathor/css/ie7.css
+++ b/administrator/templates/hathor/css/ie7.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/ie8.css b/administrator/templates/hathor/css/ie8.css
index b101532..34e6d27 100644
--- a/administrator/templates/hathor/css/ie8.css
+++ b/administrator/templates/hathor/css/ie8.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/template.css b/administrator/templates/hathor/css/template.css
index 18c799f..d891e94 100644
--- a/administrator/templates/hathor/css/template.css
+++ b/administrator/templates/hathor/css/template.css
@@ -3648,3 +3648,12 @@ fieldset.panelform .tooltip img {
 div.toggle-editor {
 	float: right;
 }
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
diff --git a/administrator/templates/hathor/css/template_rtl.css b/administrator/templates/hathor/css/template_rtl.css
index b9e8d57..1778610 100644
--- a/administrator/templates/hathor/css/template_rtl.css
+++ b/administrator/templates/hathor/css/template_rtl.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  *
diff --git a/administrator/templates/hathor/css/theme.css b/administrator/templates/hathor/css/theme.css
index 098b6ad..78a9e16 100644
--- a/administrator/templates/hathor/css/theme.css
+++ b/administrator/templates/hathor/css/theme.css
@@ -3,7 +3,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	templates.hathor
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  * @since		1.6
  */
diff --git a/administrator/templates/hathor/error.php b/administrator/templates/hathor/error.php
index 2a82172..e03efb7 100644
--- a/administrator/templates/hathor/error.php
+++ b/administrator/templates/hathor/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/help/default.php b/administrator/templates/hathor/html/com_admin/help/default.php
index 12766e8..ddb8566 100644
--- a/administrator/templates/hathor/html/com_admin/help/default.php
+++ b/administrator/templates/hathor/html/com_admin/help/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/profile/edit.php b/administrator/templates/hathor/html/com_admin/profile/edit.php
index 9055cd6..b5f186b 100644
--- a/administrator/templates/hathor/html/com_admin/profile/edit.php
+++ b/administrator/templates/hathor/html/com_admin/profile/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/sysinfo/default.php b/administrator/templates/hathor/html/com_admin/sysinfo/default.php
index ed173af..7615002 100644
--- a/administrator/templates/hathor/html/com_admin/sysinfo/default.php
+++ b/administrator/templates/hathor/html/com_admin/sysinfo/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php b/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php
index daae5ae..dc5c9a7 100644
--- a/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php
+++ b/administrator/templates/hathor/html/com_admin/sysinfo/default_config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php b/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php
index 8d041bd..a9e8b5a 100644
--- a/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php
+++ b/administrator/templates/hathor/html/com_admin/sysinfo/default_directory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php b/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php
index 57ed255..312d28d 100644
--- a/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php
+++ b/administrator/templates/hathor/html/com_admin/sysinfo/default_navigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php b/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php
index 8b7a51b..e06841f 100644
--- a/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php
+++ b/administrator/templates/hathor/html/com_admin/sysinfo/default_phpsettings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php b/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php
index 782f088..c45e5d2 100644
--- a/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php
+++ b/administrator/templates/hathor/html/com_admin/sysinfo/default_system.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_banners/banner/edit.php b/administrator/templates/hathor/html/com_banners/banner/edit.php
index 42053aa..925d561 100644
--- a/administrator/templates/hathor/html/com_banners/banner/edit.php
+++ b/administrator/templates/hathor/html/com_banners/banner/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_banners/banners/default.php b/administrator/templates/hathor/html/com_banners/banners/default.php
index e94ff26..fc905e8 100644
--- a/administrator/templates/hathor/html/com_banners/banners/default.php
+++ b/administrator/templates/hathor/html/com_banners/banners/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_banners/client/edit.php b/administrator/templates/hathor/html/com_banners/client/edit.php
index 00aa6a1..bbeb45b 100644
--- a/administrator/templates/hathor/html/com_banners/client/edit.php
+++ b/administrator/templates/hathor/html/com_banners/client/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,6 @@
 JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
 
 JHtml::_('behavior.formvalidation');
-$canDo	= BannersHelper::getActions();
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
diff --git a/administrator/templates/hathor/html/com_banners/clients/default.php b/administrator/templates/hathor/html/com_banners/clients/default.php
index 4bc2bd1..68543bc 100644
--- a/administrator/templates/hathor/html/com_banners/clients/default.php
+++ b/administrator/templates/hathor/html/com_banners/clients/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_banners/tracks/default.php b/administrator/templates/hathor/html/com_banners/tracks/default.php
index aaa6f10..f5c1228 100644
--- a/administrator/templates/hathor/html/com_banners/tracks/default.php
+++ b/administrator/templates/hathor/html/com_banners/tracks/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_cache/cache/default.php b/administrator/templates/hathor/html/com_cache/cache/default.php
index 66adff1..6a18038 100644
--- a/administrator/templates/hathor/html/com_cache/cache/default.php
+++ b/administrator/templates/hathor/html/com_cache/cache/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_cache/purge/default.php b/administrator/templates/hathor/html/com_cache/purge/default.php
index 7841ede..9e55bdf 100644
--- a/administrator/templates/hathor/html/com_cache/purge/default.php
+++ b/administrator/templates/hathor/html/com_cache/purge/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_categories/categories/default.php b/administrator/templates/hathor/html/com_categories/categories/default.php
index 3d246e5..f5052c0 100644
--- a/administrator/templates/hathor/html/com_categories/categories/default.php
+++ b/administrator/templates/hathor/html/com_categories/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_categories/categories/default_batch.php b/administrator/templates/hathor/html/com_categories/categories/default_batch.php
index fed5f47..21507af 100644
--- a/administrator/templates/hathor/html/com_categories/categories/default_batch.php
+++ b/administrator/templates/hathor/html/com_categories/categories/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_categories/category/edit.php b/administrator/templates/hathor/html/com_categories/category/edit.php
index c6c3c52..75b0b5c 100644
--- a/administrator/templates/hathor/html/com_categories/category/edit.php
+++ b/administrator/templates/hathor/html/com_categories/category/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_categories/category/edit_options.php b/administrator/templates/hathor/html/com_categories/category/edit_options.php
index 59e4c16..39c9e90 100644
--- a/administrator/templates/hathor/html/com_categories/category/edit_options.php
+++ b/administrator/templates/hathor/html/com_categories/category/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_checkin/checkin/default.php b/administrator/templates/hathor/html/com_checkin/checkin/default.php
index f9269ca..852c8c0 100644
--- a/administrator/templates/hathor/html/com_checkin/checkin/default.php
+++ b/administrator/templates/hathor/html/com_checkin/checkin/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_checkin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default.php b/administrator/templates/hathor/html/com_config/application/default.php
index 493196b..9799738 100644
--- a/administrator/templates/hathor/html/com_config/application/default.php
+++ b/administrator/templates/hathor/html/com_config/application/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_cache.php b/administrator/templates/hathor/html/com_config/application/default_cache.php
index b968b86..96112e2 100644
--- a/administrator/templates/hathor/html/com_config/application/default_cache.php
+++ b/administrator/templates/hathor/html/com_config/application/default_cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_cookie.php b/administrator/templates/hathor/html/com_config/application/default_cookie.php
index d5a226c..5d7ac47 100644
--- a/administrator/templates/hathor/html/com_config/application/default_cookie.php
+++ b/administrator/templates/hathor/html/com_config/application/default_cookie.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_database.php b/administrator/templates/hathor/html/com_config/application/default_database.php
index 4405445..bbd6d2b 100644
--- a/administrator/templates/hathor/html/com_config/application/default_database.php
+++ b/administrator/templates/hathor/html/com_config/application/default_database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_debug.php b/administrator/templates/hathor/html/com_config/application/default_debug.php
index 130ba68..2c41bb9 100644
--- a/administrator/templates/hathor/html/com_config/application/default_debug.php
+++ b/administrator/templates/hathor/html/com_config/application/default_debug.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_filters.php b/administrator/templates/hathor/html/com_config/application/default_filters.php
index 1e70211..222a023 100644
--- a/administrator/templates/hathor/html/com_config/application/default_filters.php
+++ b/administrator/templates/hathor/html/com_config/application/default_filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_ftp.php b/administrator/templates/hathor/html/com_config/application/default_ftp.php
index 8e9d59e..0fc59fc 100644
--- a/administrator/templates/hathor/html/com_config/application/default_ftp.php
+++ b/administrator/templates/hathor/html/com_config/application/default_ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_ftplogin.php b/administrator/templates/hathor/html/com_config/application/default_ftplogin.php
index a486239..0df0d2d 100644
--- a/administrator/templates/hathor/html/com_config/application/default_ftplogin.php
+++ b/administrator/templates/hathor/html/com_config/application/default_ftplogin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_locale.php b/administrator/templates/hathor/html/com_config/application/default_locale.php
index faf2aed..4192188 100644
--- a/administrator/templates/hathor/html/com_config/application/default_locale.php
+++ b/administrator/templates/hathor/html/com_config/application/default_locale.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_mail.php b/administrator/templates/hathor/html/com_config/application/default_mail.php
index 7f5bb03..786c882 100644
--- a/administrator/templates/hathor/html/com_config/application/default_mail.php
+++ b/administrator/templates/hathor/html/com_config/application/default_mail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_metadata.php b/administrator/templates/hathor/html/com_config/application/default_metadata.php
index 06b1092..5911df8 100644
--- a/administrator/templates/hathor/html/com_config/application/default_metadata.php
+++ b/administrator/templates/hathor/html/com_config/application/default_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_navigation.php b/administrator/templates/hathor/html/com_config/application/default_navigation.php
index 97db144..d1621f2 100644
--- a/administrator/templates/hathor/html/com_config/application/default_navigation.php
+++ b/administrator/templates/hathor/html/com_config/application/default_navigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_permissions.php b/administrator/templates/hathor/html/com_config/application/default_permissions.php
index dc29cd8..f13c7cd 100644
--- a/administrator/templates/hathor/html/com_config/application/default_permissions.php
+++ b/administrator/templates/hathor/html/com_config/application/default_permissions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_seo.php b/administrator/templates/hathor/html/com_config/application/default_seo.php
index b020ce8..1e20aac 100644
--- a/administrator/templates/hathor/html/com_config/application/default_seo.php
+++ b/administrator/templates/hathor/html/com_config/application/default_seo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_server.php b/administrator/templates/hathor/html/com_config/application/default_server.php
index e9fedfa..78a833a 100644
--- a/administrator/templates/hathor/html/com_config/application/default_server.php
+++ b/administrator/templates/hathor/html/com_config/application/default_server.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_session.php b/administrator/templates/hathor/html/com_config/application/default_session.php
index e284f36..9f8f69e 100644
--- a/administrator/templates/hathor/html/com_config/application/default_session.php
+++ b/administrator/templates/hathor/html/com_config/application/default_session.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_site.php b/administrator/templates/hathor/html/com_config/application/default_site.php
index ddc412c..2a124ff 100644
--- a/administrator/templates/hathor/html/com_config/application/default_site.php
+++ b/administrator/templates/hathor/html/com_config/application/default_site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/application/default_system.php b/administrator/templates/hathor/html/com_config/application/default_system.php
index 5ba4886..474d098 100644
--- a/administrator/templates/hathor/html/com_config/application/default_system.php
+++ b/administrator/templates/hathor/html/com_config/application/default_system.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_config/component/default.php b/administrator/templates/hathor/html/com_config/component/default.php
index 15e2eea..81d52b3 100644
--- a/administrator/templates/hathor/html/com_config/component/default.php
+++ b/administrator/templates/hathor/html/com_config/component/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_contact/contact/edit.php b/administrator/templates/hathor/html/com_contact/contact/edit.php
index 3850227..cab98ed 100644
--- a/administrator/templates/hathor/html/com_contact/contact/edit.php
+++ b/administrator/templates/hathor/html/com_contact/contact/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_contact/contact/edit_params.php b/administrator/templates/hathor/html/com_contact/contact/edit_params.php
index 4cc79f1..e723a22 100644
--- a/administrator/templates/hathor/html/com_contact/contact/edit_params.php
+++ b/administrator/templates/hathor/html/com_contact/contact/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_contact/contacts/default.php b/administrator/templates/hathor/html/com_contact/contacts/default.php
index e8ec4cd..793cadd 100644
--- a/administrator/templates/hathor/html/com_contact/contacts/default.php
+++ b/administrator/templates/hathor/html/com_contact/contacts/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_contact/contacts/modal.php b/administrator/templates/hathor/html/com_contact/contacts/modal.php
index 88f84e5..a483748 100644
--- a/administrator/templates/hathor/html/com_contact/contacts/modal.php
+++ b/administrator/templates/hathor/html/com_contact/contacts/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -20,7 +20,7 @@
 	<legend class="element-invisible"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></legend>
 		<div class="filter-search">
 			<label class="filter-search-lbl" for="filter-search"><?php echo JText::_('JSEARCH_FILTER_LABEL'); ?></label>
-			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>" />
+			<input type="text" name="filter_search" id="filter_search" value="<?php echo $this->escape($this->state->get('filter.search')); ?>" title="<?php echo JText::_('JSEARCH_FILTER'); ?>" />
 
 			<button type="submit">
 				<?php echo JText::_('JSEARCH_FILTER_SUBMIT'); ?></button>
diff --git a/administrator/templates/hathor/html/com_content/article/edit.php b/administrator/templates/hathor/html/com_content/article/edit.php
index aa98096..9dffa2c 100644
--- a/administrator/templates/hathor/html/com_content/article/edit.php
+++ b/administrator/templates/hathor/html/com_content/article/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_content/articles/default.php b/administrator/templates/hathor/html/com_content/articles/default.php
index 1b9b4e6..98d1370 100644
--- a/administrator/templates/hathor/html/com_content/articles/default.php
+++ b/administrator/templates/hathor/html/com_content/articles/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_content/articles/modal.php b/administrator/templates/hathor/html/com_content/articles/modal.php
index 2fa2a09..d1e7c87 100644
--- a/administrator/templates/hathor/html/com_content/articles/modal.php
+++ b/administrator/templates/hathor/html/com_content/articles/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_content/featured/default.php b/administrator/templates/hathor/html/com_content/featured/default.php
index b72a3eb..29bc372 100644
--- a/administrator/templates/hathor/html/com_content/featured/default.php
+++ b/administrator/templates/hathor/html/com_content/featured/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 /* add accessibility, labels on input forms */
diff --git a/administrator/templates/hathor/html/com_cpanel/cpanel/default.php b/administrator/templates/hathor/html/com_cpanel/cpanel/default.php
index 1e09c46..2e131a8 100644
--- a/administrator/templates/hathor/html/com_cpanel/cpanel/default.php
+++ b/administrator/templates/hathor/html/com_cpanel/cpanel/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_finder/filters/default.php b/administrator/templates/hathor/html/com_finder/filters/default.php
index db9b308..10887c4 100644
--- a/administrator/templates/hathor/html/com_finder/filters/default.php
+++ b/administrator/templates/hathor/html/com_finder/filters/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_finder/index/default.php b/administrator/templates/hathor/html/com_finder/index/default.php
index a9b6925..d91ae67 100644
--- a/administrator/templates/hathor/html/com_finder/index/default.php
+++ b/administrator/templates/hathor/html/com_finder/index/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_finder/maps/default.php b/administrator/templates/hathor/html/com_finder/maps/default.php
index b65692a..064c1a5 100644
--- a/administrator/templates/hathor/html/com_finder/maps/default.php
+++ b/administrator/templates/hathor/html/com_finder/maps/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/database/default.php b/administrator/templates/hathor/html/com_installer/database/default.php
index 9c1b4ef..80b959d 100644
--- a/administrator/templates/hathor/html/com_installer/database/default.php
+++ b/administrator/templates/hathor/html/com_installer/database/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/default/default_ftp.php b/administrator/templates/hathor/html/com_installer/default/default_ftp.php
index ea7ce9b..dd14267 100644
--- a/administrator/templates/hathor/html/com_installer/default/default_ftp.php
+++ b/administrator/templates/hathor/html/com_installer/default/default_ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/discover/default.php b/administrator/templates/hathor/html/com_installer/discover/default.php
index 477368e..a31cce4 100644
--- a/administrator/templates/hathor/html/com_installer/discover/default.php
+++ b/administrator/templates/hathor/html/com_installer/discover/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/install/default.php b/administrator/templates/hathor/html/com_installer/install/default.php
index 72452c1..ffda843 100644
--- a/administrator/templates/hathor/html/com_installer/install/default.php
+++ b/administrator/templates/hathor/html/com_installer/install/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/install/default_form.php b/administrator/templates/hathor/html/com_installer/install/default_form.php
index 3e206f4..37363f0 100644
--- a/administrator/templates/hathor/html/com_installer/install/default_form.php
+++ b/administrator/templates/hathor/html/com_installer/install/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/languages/default.php b/administrator/templates/hathor/html/com_installer/languages/default.php
index 8434268..f1cef95 100644
--- a/administrator/templates/hathor/html/com_installer/languages/default.php
+++ b/administrator/templates/hathor/html/com_installer/languages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/languages/default_filter.php b/administrator/templates/hathor/html/com_installer/languages/default_filter.php
index 866dd6e..e533097 100644
--- a/administrator/templates/hathor/html/com_installer/languages/default_filter.php
+++ b/administrator/templates/hathor/html/com_installer/languages/default_filter.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  com_installer
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/manage/default.php b/administrator/templates/hathor/html/com_installer/manage/default.php
index a527cb6..ab4abe2 100644
--- a/administrator/templates/hathor/html/com_installer/manage/default.php
+++ b/administrator/templates/hathor/html/com_installer/manage/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/manage/default_filter.php b/administrator/templates/hathor/html/com_installer/manage/default_filter.php
index 93ea5c0..7d359b1 100644
--- a/administrator/templates/hathor/html/com_installer/manage/default_filter.php
+++ b/administrator/templates/hathor/html/com_installer/manage/default_filter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/update/default.php b/administrator/templates/hathor/html/com_installer/update/default.php
index 13470b7..87f15cd 100644
--- a/administrator/templates/hathor/html/com_installer/update/default.php
+++ b/administrator/templates/hathor/html/com_installer/update/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_installer/warnings/default.php b/administrator/templates/hathor/html/com_installer/warnings/default.php
index 9dc8609..419b11f 100644
--- a/administrator/templates/hathor/html/com_installer/warnings/default.php
+++ b/administrator/templates/hathor/html/com_installer/warnings/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_joomlaupdate/default/default.php b/administrator/templates/hathor/html/com_joomlaupdate/default/default.php
index c7faab1..cbbf8b0 100644
--- a/administrator/templates/hathor/html/com_joomlaupdate/default/default.php
+++ b/administrator/templates/hathor/html/com_joomlaupdate/default/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_languages/installed/default.php b/administrator/templates/hathor/html/com_languages/installed/default.php
index 5aecc13..6c26596 100644
--- a/administrator/templates/hathor/html/com_languages/installed/default.php
+++ b/administrator/templates/hathor/html/com_languages/installed/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_languages/installed/default_ftp.php b/administrator/templates/hathor/html/com_languages/installed/default_ftp.php
index 4301b9e..dbae160 100644
--- a/administrator/templates/hathor/html/com_languages/installed/default_ftp.php
+++ b/administrator/templates/hathor/html/com_languages/installed/default_ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_languages/languages/default.php b/administrator/templates/hathor/html/com_languages/languages/default.php
index 117bd11..0f4eb5d 100644
--- a/administrator/templates/hathor/html/com_languages/languages/default.php
+++ b/administrator/templates/hathor/html/com_languages/languages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_languages/overrides/default.php b/administrator/templates/hathor/html/com_languages/overrides/default.php
index 758e4d1..da0beba 100644
--- a/administrator/templates/hathor/html/com_languages/overrides/default.php
+++ b/administrator/templates/hathor/html/com_languages/overrides/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_menus/item/edit.php b/administrator/templates/hathor/html/com_menus/item/edit.php
index 770ceff..b0d46f0 100644
--- a/administrator/templates/hathor/html/com_menus/item/edit.php
+++ b/administrator/templates/hathor/html/com_menus/item/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,8 +16,6 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('behavior.modal');
 
-$canDo = MenusHelper::getActions();
-
 //Ajax for parent items
 $script = "jQuery(document).ready(function ($){
 				$('#jform_menutype').change(function(){
@@ -115,7 +113,7 @@
 					<?php echo $this->form->getInput('link'); ?></li>
 				<?php endif ?>
 
-				<?php if ($canDo->get('core.edit.state')) : ?>
+				<?php if ($this->canDo->get('core.edit.state')) : ?>
 					<li><?php echo $this->form->getLabel('published'); ?>
 					<?php echo $this->form->getInput('published'); ?></li>
 				<?php endif ?>
@@ -135,7 +133,7 @@
 				<li><?php echo $this->form->getLabel('browserNav'); ?>
 				<?php echo $this->form->getInput('browserNav'); ?></li>
 
-				<?php if ($canDo->get('core.edit.state')) : ?>
+				<?php if ($this->canDo->get('core.edit.state')) : ?>
 					<?php if ($this->item->type == 'component') : ?>
 					<li><?php echo $this->form->getLabel('home'); ?>
 					<?php echo $this->form->getInput('home'); ?></li>
diff --git a/administrator/templates/hathor/html/com_menus/item/edit_options.php b/administrator/templates/hathor/html/com_menus/item/edit_options.php
index 0155b3a..c8fbf55 100644
--- a/administrator/templates/hathor/html/com_menus/item/edit_options.php
+++ b/administrator/templates/hathor/html/com_menus/item/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_menus/items/default.php b/administrator/templates/hathor/html/com_menus/items/default.php
index 762c940..b479633 100644
--- a/administrator/templates/hathor/html/com_menus/items/default.php
+++ b/administrator/templates/hathor/html/com_menus/items/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_menus/menu/edit.php b/administrator/templates/hathor/html/com_menus/menu/edit.php
index 7d4d5fa..bf3932c 100644
--- a/administrator/templates/hathor/html/com_menus/menu/edit.php
+++ b/administrator/templates/hathor/html/com_menus/menu/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_menus/menus/default.php b/administrator/templates/hathor/html/com_menus/menus/default.php
index e523996..9eadf0f 100644
--- a/administrator/templates/hathor/html/com_menus/menus/default.php
+++ b/administrator/templates/hathor/html/com_menus/menus/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_menus/menutypes/default.php b/administrator/templates/hathor/html/com_menus/menutypes/default.php
index 8e9a599..3566ee5 100644
--- a/administrator/templates/hathor/html/com_menus/menutypes/default.php
+++ b/administrator/templates/hathor/html/com_menus/menutypes/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_messages/message/edit.php b/administrator/templates/hathor/html/com_messages/message/edit.php
index 2d94027..fd55a87 100644
--- a/administrator/templates/hathor/html/com_messages/message/edit.php
+++ b/administrator/templates/hathor/html/com_messages/message/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_messages/messages/default.php b/administrator/templates/hathor/html/com_messages/messages/default.php
index 53da2fb..faa0f7b 100644
--- a/administrator/templates/hathor/html/com_messages/messages/default.php
+++ b/administrator/templates/hathor/html/com_messages/messages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_modules/module/edit.php b/administrator/templates/hathor/html/com_modules/module/edit.php
index c25c7db..7577249 100644
--- a/administrator/templates/hathor/html/com_modules/module/edit.php
+++ b/administrator/templates/hathor/html/com_modules/module/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php
index 6e8d938..e7939c0 100644
--- a/administrator/templates/hathor/html/com_modules/module/edit_assignment.php
+++ b/administrator/templates/hathor/html/com_modules/module/edit_assignment.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_modules/module/edit_options.php b/administrator/templates/hathor/html/com_modules/module/edit_options.php
index 8625282..fcc2256 100644
--- a/administrator/templates/hathor/html/com_modules/module/edit_options.php
+++ b/administrator/templates/hathor/html/com_modules/module/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_modules/modules/default.php b/administrator/templates/hathor/html/com_modules/modules/default.php
index 75bbf98..d21297b 100644
--- a/administrator/templates/hathor/html/com_modules/modules/default.php
+++ b/administrator/templates/hathor/html/com_modules/modules/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_modules/positions/modal.php b/administrator/templates/hathor/html/com_modules/positions/modal.php
index 0f024ee..87b7a03 100644
--- a/administrator/templates/hathor/html/com_modules/positions/modal.php
+++ b/administrator/templates/hathor/html/com_modules/positions/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php
index fa31097..92bb60e 100644
--- a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php
+++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php
index 7029e02..7f3b28b 100644
--- a/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php
+++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeed/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
index e8c239f..7f15786 100644
--- a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
+++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
index c9f1116..0eb71af 100644
--- a/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
+++ b/administrator/templates/hathor/html/com_newsfeeds/newsfeeds/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_plugins/plugin/edit.php b/administrator/templates/hathor/html/com_plugins/plugin/edit.php
index 2e9bbe9..9cf71de 100644
--- a/administrator/templates/hathor/html/com_plugins/plugin/edit.php
+++ b/administrator/templates/hathor/html/com_plugins/plugin/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php b/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php
index 4d71417..532010d 100644
--- a/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php
+++ b/administrator/templates/hathor/html/com_plugins/plugin/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_plugins/plugins/default.php b/administrator/templates/hathor/html/com_plugins/plugins/default.php
index 1f6708a..0b64d54 100644
--- a/administrator/templates/hathor/html/com_plugins/plugins/default.php
+++ b/administrator/templates/hathor/html/com_plugins/plugins/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_postinstall/messages/default.php b/administrator/templates/hathor/html/com_postinstall/messages/default.php
index f0df378..a7d164f 100644
--- a/administrator/templates/hathor/html/com_postinstall/messages/default.php
+++ b/administrator/templates/hathor/html/com_postinstall/messages/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_postinstall
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_redirect/links/default.php b/administrator/templates/hathor/html/com_redirect/links/default.php
index d5cf99e..4ed3131 100644
--- a/administrator/templates/hathor/html/com_redirect/links/default.php
+++ b/administrator/templates/hathor/html/com_redirect/links/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_search/searches/default.php b/administrator/templates/hathor/html/com_search/searches/default.php
index 75936a1..3f27049 100644
--- a/administrator/templates/hathor/html/com_search/searches/default.php
+++ b/administrator/templates/hathor/html/com_search/searches/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,7 +16,6 @@
 
 $listOrder	= $this->escape($this->state->get('list.ordering'));
 $listDirn	= $this->escape($this->state->get('list.direction'));
-$canDo		= SearchHelper::getActions();
 ?>
 <form action="<?php echo JRoute::_('index.php?option=com_search&view=searches'); ?>" method="post" name="adminForm" id="adminForm">
 	<fieldset id="filter-bar">
diff --git a/administrator/templates/hathor/html/com_tags/tag/edit.php b/administrator/templates/hathor/html/com_tags/tag/edit.php
index 3b69023..ff6b254 100644
--- a/administrator/templates/hathor/html/com_tags/tag/edit.php
+++ b/administrator/templates/hathor/html/com_tags/tag/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php b/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php
index e6f10ff..5908cf2 100644
--- a/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php
+++ b/administrator/templates/hathor/html/com_tags/tag/edit_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_tags/tag/edit_options.php b/administrator/templates/hathor/html/com_tags/tag/edit_options.php
index 45b42e6..4407334 100644
--- a/administrator/templates/hathor/html/com_tags/tag/edit_options.php
+++ b/administrator/templates/hathor/html/com_tags/tag/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_tags/tags/default.php b/administrator/templates/hathor/html/com_tags/tags/default.php
index 93d1543..ccb921d 100644
--- a/administrator/templates/hathor/html/com_tags/tags/default.php
+++ b/administrator/templates/hathor/html/com_tags/tags/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_tags/tags/default_batch.php b/administrator/templates/hathor/html/com_tags/tags/default_batch.php
index 811f730..2b4cf2b 100644
--- a/administrator/templates/hathor/html/com_tags/tags/default_batch.php
+++ b/administrator/templates/hathor/html/com_tags/tags/default_batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_templates/style/edit.php b/administrator/templates/hathor/html/com_templates/style/edit.php
index 9ee87d0..bbe78b4 100644
--- a/administrator/templates/hathor/html/com_templates/style/edit.php
+++ b/administrator/templates/hathor/html/com_templates/style/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('behavior.keepalive');
 $user = JFactory::getUser();
-$canDo = TemplatesHelper::getActions();
 ?>
 <script type="text/javascript">
 	Joomla.submitbutton = function(task)
@@ -76,7 +75,7 @@
 	<?php echo JHtml::_('sliders.end'); ?>
 	</div>
 	<?php if ($user->authorise('core.edit', 'com_menu') && $this->item->client_id == 0):?>
-		<?php if ($canDo->get('core.edit.state')) : ?>
+		<?php if ($this->canDo->get('core.edit.state')) : ?>
 			<div class="width-60 fltlft">
 			<?php echo $this->loadTemplate('assignment'); ?>
 			</div>
diff --git a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php
index 3711bad..03c9b1a 100644
--- a/administrator/templates/hathor/html/com_templates/style/edit_assignment.php
+++ b/administrator/templates/hathor/html/com_templates/style/edit_assignment.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_templates/style/edit_options.php b/administrator/templates/hathor/html/com_templates/style/edit_options.php
index e353527..c6d7bee 100644
--- a/administrator/templates/hathor/html/com_templates/style/edit_options.php
+++ b/administrator/templates/hathor/html/com_templates/style/edit_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_templates/styles/default.php b/administrator/templates/hathor/html/com_templates/styles/default.php
index eee6686..72a7830 100644
--- a/administrator/templates/hathor/html/com_templates/styles/default.php
+++ b/administrator/templates/hathor/html/com_templates/styles/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_templates/template/default.php b/administrator/templates/hathor/html/com_templates/template/default.php
index 3366f80..e5801d4 100644
--- a/administrator/templates/hathor/html/com_templates/template/default.php
+++ b/administrator/templates/hathor/html/com_templates/template/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,7 +15,6 @@
 JHtml::_('bootstrap.tooltip');
 JHtml::_('behavior.modal');
 
-$canDo = TemplatesHelper::getActions();
 $input = JFactory::getApplication()->input;
 if($this->type == 'image')
 {
diff --git a/administrator/templates/hathor/html/com_templates/template/default_description.php b/administrator/templates/hathor/html/com_templates/template/default_description.php
index c4135a4..cc0b8fe 100644
--- a/administrator/templates/hathor/html/com_templates/template/default_description.php
+++ b/administrator/templates/hathor/html/com_templates/template/default_description.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_templates/template/default_folders.php b/administrator/templates/hathor/html/com_templates/template/default_folders.php
index 01d7f65..1a1470a 100644
--- a/administrator/templates/hathor/html/com_templates/template/default_folders.php
+++ b/administrator/templates/hathor/html/com_templates/template/default_folders.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_templates/template/default_tree.php b/administrator/templates/hathor/html/com_templates/template/default_tree.php
index f8e061f..34e9cc7 100644
--- a/administrator/templates/hathor/html/com_templates/template/default_tree.php
+++ b/administrator/templates/hathor/html/com_templates/template/default_tree.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_templates
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -25,7 +25,7 @@
 				{
 					if ($keyArray[$i] === $fileArray[$i])
 					{
-						$count = $count + 1;
+						$count++;
 					}
 				}
 
diff --git a/administrator/templates/hathor/html/com_templates/templates/default.php b/administrator/templates/hathor/html/com_templates/templates/default.php
index d666b14..7f1da07 100644
--- a/administrator/templates/hathor/html/com_templates/templates/default.php
+++ b/administrator/templates/hathor/html/com_templates/templates/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_users/debuggroup/default.php b/administrator/templates/hathor/html/com_users/debuggroup/default.php
index acde5c9..7096238 100644
--- a/administrator/templates/hathor/html/com_users/debuggroup/default.php
+++ b/administrator/templates/hathor/html/com_users/debuggroup/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_users/debuguser/default.php b/administrator/templates/hathor/html/com_users/debuguser/default.php
index 2ce6130..7b4f3f7 100644
--- a/administrator/templates/hathor/html/com_users/debuguser/default.php
+++ b/administrator/templates/hathor/html/com_users/debuguser/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_users/groups/default.php b/administrator/templates/hathor/html/com_users/groups/default.php
index 434b868..8369918 100644
--- a/administrator/templates/hathor/html/com_users/groups/default.php
+++ b/administrator/templates/hathor/html/com_users/groups/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_users/levels/default.php b/administrator/templates/hathor/html/com_users/levels/default.php
index d058a12..4c378b5 100644
--- a/administrator/templates/hathor/html/com_users/levels/default.php
+++ b/administrator/templates/hathor/html/com_users/levels/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_users/notes/default.php b/administrator/templates/hathor/html/com_users/notes/default.php
index 14236c3..2775889 100644
--- a/administrator/templates/hathor/html/com_users/notes/default.php
+++ b/administrator/templates/hathor/html/com_users/notes/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_users/user/edit.php b/administrator/templates/hathor/html/com_users/user/edit.php
index 774b9d8..f4b1929 100644
--- a/administrator/templates/hathor/html/com_users/user/edit.php
+++ b/administrator/templates/hathor/html/com_users/user/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,7 +14,6 @@
 
 JHtml::_('behavior.formvalidation');
 JHtml::_('behavior.keepalive');
-$canDo = UsersHelper::getActions();
 
 // Get the form fieldsets.
 $fieldsets = $this->form->getFieldsets();
diff --git a/administrator/templates/hathor/html/com_users/users/default.php b/administrator/templates/hathor/html/com_users/users/default.php
index 14ec755..c6bf2cd 100644
--- a/administrator/templates/hathor/html/com_users/users/default.php
+++ b/administrator/templates/hathor/html/com_users/users/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -16,7 +16,6 @@
 JHtml::_('behavior.multiselect');
 JHtml::_('behavior.modal');
 
-$canDo = UsersHelper::getActions();
 $listOrder = $this->escape($this->state->get('list.ordering'));
 $listDirn = $this->escape($this->state->get('list.direction'));
 $loggeduser = JFactory::getUser();
@@ -119,7 +118,7 @@
 
 		<tbody>
 		<?php foreach ($this->items as $i => $item) :
-			$canEdit	= $canDo->get('core.edit');
+			$canEdit	= $this->canDo->get('core.edit');
 			$canChange	= $loggeduser->authorise('core.edit.state',	'com_users');
 			// If this group is super admin and this user is not super admin, $canEdit is false
 			if ((!$loggeduser->authorise('core.admin')) && JAccess::check($item->id, 'core.admin'))
diff --git a/administrator/templates/hathor/html/com_users/users/modal.php b/administrator/templates/hathor/html/com_users/users/modal.php
index d9d9df3..f9ee0e4 100644
--- a/administrator/templates/hathor/html/com_users/users/modal.php
+++ b/administrator/templates/hathor/html/com_users/users/modal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_weblinks/weblink/edit.php b/administrator/templates/hathor/html/com_weblinks/weblink/edit.php
index 9c2a7b1..5cc55a0 100644
--- a/administrator/templates/hathor/html/com_weblinks/weblink/edit.php
+++ b/administrator/templates/hathor/html/com_weblinks/weblink/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php b/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php
index c629deb..c37cde7 100644
--- a/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php
+++ b/administrator/templates/hathor/html/com_weblinks/weblink/edit_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
index 96266da..6931884 100644
--- a/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
+++ b/administrator/templates/hathor/html/com_weblinks/weblinks/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php b/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php
index d02e4f9..328a025 100644
--- a/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php
+++ b/administrator/templates/hathor/html/layouts/com_media/toolbar/deletemedia.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php b/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php
index 1b71ea9..e692dac 100644
--- a/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php
+++ b/administrator/templates/hathor/html/layouts/com_media/toolbar/newfolder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php b/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php
index 96e0547..661fc4a 100644
--- a/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php
+++ b/administrator/templates/hathor/html/layouts/com_media/toolbar/uploadmedia.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php b/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php
index 99a4479..d8159f2 100644
--- a/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php
+++ b/administrator/templates/hathor/html/layouts/com_messages/toolbar/mysettings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_messages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php b/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php
index a87aa6b..d61f3a6 100644
--- a/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php
+++ b/administrator/templates/hathor/html/layouts/com_modules/toolbar/cancelselect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php b/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php
index 74f34a1..0af923b 100644
--- a/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php
+++ b/administrator/templates/hathor/html/layouts/com_modules/toolbar/newmodule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  com_modules
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/edit/details.php b/administrator/templates/hathor/html/layouts/joomla/edit/details.php
index 8901e63..5b66221 100644
--- a/administrator/templates/hathor/html/layouts/joomla/edit/details.php
+++ b/administrator/templates/hathor/html/layouts/joomla/edit/details.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php b/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php
index e9ee2dc..2bf042d 100644
--- a/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php
+++ b/administrator/templates/hathor/html/layouts/joomla/edit/metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php b/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php
index e4b343c..5357a1b 100644
--- a/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php
+++ b/administrator/templates/hathor/html/layouts/joomla/quickicons/icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php b/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
index fa39b5c..8257e23 100644
--- a/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
+++ b/administrator/templates/hathor/html/layouts/joomla/sidebars/submenu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php
index 03ad002..d518270 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php
index 0ea7d52..e3dc1c4 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php
index 90baa6a..2df1384 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/confirm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php
index 9cfbdde..2fc6114 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/containerclose.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php
index 28ceae0..1624d9f 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/containeropen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php
index f7a7223..957d5a0 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/help.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php
index 830d2af..76a1057 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/iconclass.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php
index 575064b..0a9d7b2 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php
index 51adceb..fa565f3 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/popup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php
index 952662d..efa5af6 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/separator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php
index c5c5517..ba7e6f7 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/slider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php
index 5dca305..08bbfe7 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/standard.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php
index 3d14230..e1b666c 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php b/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php
index 0669b86..6579509 100644
--- a/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php
+++ b/administrator/templates/hathor/html/layouts/joomla/toolbar/versions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/mod_login/default.php b/administrator/templates/hathor/html/mod_login/default.php
index 06a2dec..6fc1ba1 100644
--- a/administrator/templates/hathor/html/mod_login/default.php
+++ b/administrator/templates/hathor/html/mod_login/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/mod_menu/default_enabled.php b/administrator/templates/hathor/html/mod_menu/default_enabled.php
index 786e4a2..9e41cc9 100644
--- a/administrator/templates/hathor/html/mod_menu/default_enabled.php
+++ b/administrator/templates/hathor/html/mod_menu/default_enabled.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/mod_quickicon/default.php b/administrator/templates/hathor/html/mod_quickicon/default.php
index 63eab0b..7e494ec 100644
--- a/administrator/templates/hathor/html/mod_quickicon/default.php
+++ b/administrator/templates/hathor/html/mod_quickicon/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_quickicon
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/modules.php b/administrator/templates/hathor/html/modules.php
index 736b124..756d4c1 100644
--- a/administrator/templates/hathor/html/modules.php
+++ b/administrator/templates/hathor/html/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/html/pagination.php b/administrator/templates/hathor/html/pagination.php
index a0f2556..ce768f2 100644
--- a/administrator/templates/hathor/html/pagination.php
+++ b/administrator/templates/hathor/html/pagination.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/index.php b/administrator/templates/hathor/index.php
index c9e948f..d5a5cd9 100644
--- a/administrator/templates/hathor/index.php
+++ b/administrator/templates/hathor/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini
index c602334..7bec841 100644
--- a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini
+++ b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini
index d790202..e397b60 100644
--- a/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini
+++ b/administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/administrator/templates/hathor/less/template.less b/administrator/templates/hathor/less/template.less
index dbea03d..7fd310c 100644
--- a/administrator/templates/hathor/less/template.less
+++ b/administrator/templates/hathor/less/template.less
@@ -3502,3 +3502,13 @@ fieldset.panelform .tooltip img {
 div.toggle-editor {
 	float: right;
 }
+
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
diff --git a/administrator/templates/hathor/login.php b/administrator/templates/hathor/login.php
index a2d6d96..6581864 100644
--- a/administrator/templates/hathor/login.php
+++ b/administrator/templates/hathor/login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.hathor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/hathor/templateDetails.xml b/administrator/templates/hathor/templateDetails.xml
index 8a8f5db..c4d9512 100644
--- a/administrator/templates/hathor/templateDetails.xml
+++ b/administrator/templates/hathor/templateDetails.xml
@@ -6,7 +6,7 @@
 	<author>Andrea Tarr</author>
 	<authorEmail>hathor@tarrconsulting.com</authorEmail>
 	<authorUrl>http://www.tarrconsulting.com</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<version>3.0.0</version>
 	<description>TPL_HATHOR_XML_DESCRIPTION</description>
diff --git a/administrator/templates/isis/component.php b/administrator/templates/isis/component.php
index fef6f61..06b8880 100644
--- a/administrator/templates/isis/component.php
+++ b/administrator/templates/isis/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.isis
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/isis/cpanel.php b/administrator/templates/isis/cpanel.php
index 2f67d69..5f102be 100644
--- a/administrator/templates/isis/cpanel.php
+++ b/administrator/templates/isis/cpanel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.isis
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/isis/css/template-rtl.css b/administrator/templates/isis/css/template-rtl.css
index 74c2298..3b8cd5b 100644
--- a/administrator/templates/isis/css/template-rtl.css
+++ b/administrator/templates/isis/css/template-rtl.css
@@ -6129,7 +6129,7 @@ div.modal {
 	top: 10%;
 	left: 50%;
 	z-index: 1050;
-	width: 560px;
+	width: 580px;
 	margin-left: -280px;
 	background-color: #fff;
 	border: 1px solid #999;
@@ -6156,6 +6156,9 @@ div.modal.fade {
 div.modal.fade.in {
 	top: 10%;
 }
+.modal-batch {
+	overflow-y: visible;
+}
 @media (max-width: 767px) {
 	div.modal {
 		position: fixed;
diff --git a/administrator/templates/isis/css/template.css b/administrator/templates/isis/css/template.css
index 12a2c86..66dad3f 100644
--- a/administrator/templates/isis/css/template.css
+++ b/administrator/templates/isis/css/template.css
@@ -6129,7 +6129,7 @@ div.modal {
 	top: 10%;
 	left: 50%;
 	z-index: 1050;
-	width: 560px;
+	width: 580px;
 	margin-left: -280px;
 	background-color: #fff;
 	border: 1px solid #999;
@@ -6156,6 +6156,9 @@ div.modal.fade {
 div.modal.fade.in {
 	top: 10%;
 }
+.modal-batch {
+	overflow-y: visible;
+}
 @media (max-width: 767px) {
 	div.modal {
 		position: fixed;
diff --git a/administrator/templates/isis/error.php b/administrator/templates/isis/error.php
index 9dabb07..c556b6c 100644
--- a/administrator/templates/isis/error.php
+++ b/administrator/templates/isis/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.isis
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -218,7 +218,9 @@
 		<div id="status" class="navbar status-top hidden-phone">
 			<div class="btn-toolbar">
 				<div class="btn-group pull-right">
-					<p>&copy; <?php echo $sitename; ?> <?php echo date('Y');?></p>
+					<p>
+						&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+					</p>
 				</div>
 				<?php
 				// Display status modules
diff --git a/administrator/templates/isis/html/message.php b/administrator/templates/isis/html/message.php
index 33b1877..ce3c346 100644
--- a/administrator/templates/isis/html/message.php
+++ b/administrator/templates/isis/html/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.Isis
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/isis/html/mod_version/default.php b/administrator/templates/isis/html/mod_version/default.php
index b101ea0..a184154 100644
--- a/administrator/templates/isis/html/mod_version/default.php
+++ b/administrator/templates/isis/html/mod_version/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  mod_version
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/isis/html/modules.php b/administrator/templates/isis/html/modules.php
index 8ab91dd..2ad1f45 100644
--- a/administrator/templates/isis/html/modules.php
+++ b/administrator/templates/isis/html/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.isis
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/isis/html/pagination.php b/administrator/templates/isis/html/pagination.php
index adff458..8811d65 100644
--- a/administrator/templates/isis/html/pagination.php
+++ b/administrator/templates/isis/html/pagination.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.Isis
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/isis/index.php b/administrator/templates/isis/index.php
index 85b25d2..a054eff 100644
--- a/administrator/templates/isis/index.php
+++ b/administrator/templates/isis/index.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  Templates.isis
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       3.0
  */
@@ -245,7 +245,8 @@
 			<div class="btn-group pull-right">
 				<p>
 					<jdoc:include type="modules" name="footer" style="no" />
-					&copy; <?php echo $sitename; ?> <?php echo date('Y'); ?></p>
+					&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+				</p>
 
 			</div>
 			<jdoc:include type="modules" name="status" style="no" />
diff --git a/administrator/templates/isis/js/template.js b/administrator/templates/isis/js/template.js
index 730a863..0ad2771 100644
--- a/administrator/templates/isis/js/template.js
+++ b/administrator/templates/isis/js/template.js
@@ -1,7 +1,7 @@
 /**
  * @package     Joomla.Administrator
  * @subpackage  Templates.isis
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       3.0
  */
diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
index 2f1499c..9be3e4c 100644
--- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
+++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
index bc6d193..f633905 100644
--- a/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
+++ b/administrator/templates/isis/language/en-GB/en-GB.tpl_isis.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/administrator/templates/isis/login.php b/administrator/templates/isis/login.php
index 7e1860f..258ee0f 100644
--- a/administrator/templates/isis/login.php
+++ b/administrator/templates/isis/login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Templates.isis
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -101,7 +101,9 @@
 		</div>
 	</div>
 	<div class="navbar navbar-fixed-bottom hidden-phone">
-		<p class="pull-right">&copy; <?php echo $sitename; ?> <?php echo date('Y');?></p>
+		<p class="pull-right">
+			&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+		</p>
 		<a class="login-joomla" href="http://www.joomla.org" target="_blank" class="hasTooltip" title="<?php echo JHtml::tooltipText('TPL_ISIS_ISFREESOFTWARE');?>">Joomla!&#174;</a>
 		<a href="<?php echo JUri::root(); ?>" target="_blank" class="pull-left"><i class="icon-share icon-white"></i> <?php echo JText::_('COM_LOGIN_RETURN_TO_SITE_HOME_PAGE') ?></a>
 	</div>
diff --git a/administrator/templates/isis/templateDetails.xml b/administrator/templates/isis/templateDetails.xml
index 995c25a..8a255e7 100644
--- a/administrator/templates/isis/templateDetails.xml
+++ b/administrator/templates/isis/templateDetails.xml
@@ -6,7 +6,7 @@
 	<creationDate>3/30/2012</creationDate>
 	<author>Kyle Ledbetter</author>
 	<authorEmail>admin@joomla.org</authorEmail>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.</copyright>
 	<description>TPL_ISIS_XML_DESCRIPTION</description>
 	<files>
 		<filename>component.php</filename>
diff --git a/administrator/templates/system/component.php b/administrator/templates/system/component.php
index f729a6a..8fbbdda 100644
--- a/administrator/templates/system/component.php
+++ b/administrator/templates/system/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/css/error.css b/administrator/templates/system/css/error.css
index b8cfc83..efd7d84 100644
--- a/administrator/templates/system/css/error.css
+++ b/administrator/templates/system/css/error.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/css/system.css b/administrator/templates/system/css/system.css
index 8eecbdc..d2f8e0c 100644
--- a/administrator/templates/system/css/system.css
+++ b/administrator/templates/system/css/system.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/error.php b/administrator/templates/system/error.php
index 1633618..5fe9dca 100644
--- a/administrator/templates/system/error.php
+++ b/administrator/templates/system/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/html/modules.php b/administrator/templates/system/html/modules.php
index 25549a7..b865ddb 100644
--- a/administrator/templates/system/html/modules.php
+++ b/administrator/templates/system/html/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/administrator/templates/system/index.php b/administrator/templates/system/index.php
index c633924..04eacb7 100644
--- a/administrator/templates/system/index.php
+++ b/administrator/templates/system/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/bin/keychain.php b/bin/keychain.php
index f504c47..5a8348e 100644
--- a/bin/keychain.php
+++ b/bin/keychain.php
@@ -3,7 +3,7 @@
 /**
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/cli/deletefiles.php b/cli/deletefiles.php
index 33c7c43..1f9b8f7 100644
--- a/cli/deletefiles.php
+++ b/cli/deletefiles.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Cli
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/cli/finder_indexer.php b/cli/finder_indexer.php
index a1c586d..029e534 100644
--- a/cli/finder_indexer.php
+++ b/cli/finder_indexer.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Cli
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/cli/garbagecron.php b/cli/garbagecron.php
index 36210e3..3ae40aa 100644
--- a/cli/garbagecron.php
+++ b/cli/garbagecron.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Cli
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/cli/update_cron.php b/cli/update_cron.php
index f5f027d..254e4e7 100644
--- a/cli/update_cron.php
+++ b/cli/update_cron.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Cli
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index fa151aa..76173a0 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_ajax
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -27,8 +27,9 @@
 // Requested format passed via URL
 $format = strtolower($input->getWord('format'));
 
-// Initialize default response
+// Initialize default response and module name
 $results = null;
+$parts = null;
 
 // Check for valid format
 if (!$format)
diff --git a/components/com_banners/banners.php b/components/com_banners/banners.php
index fea3867..31d8d97 100644
--- a/components/com_banners/banners.php
+++ b/components/com_banners/banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/controller.php b/components/com_banners/controller.php
index ed5b420..f374b78 100644
--- a/components/com_banners/controller.php
+++ b/components/com_banners/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/helpers/banner.php b/components/com_banners/helpers/banner.php
index 9b5f1f1..277e12a 100644
--- a/components/com_banners/helpers/banner.php
+++ b/components/com_banners/helpers/banner.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/helpers/category.php b/components/com_banners/helpers/category.php
index d07568a..b51dbfb 100644
--- a/components/com_banners/helpers/category.php
+++ b/components/com_banners/helpers/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/models/banner.php b/components/com_banners/models/banner.php
index a856c35..1d12ffa 100644
--- a/components/com_banners/models/banner.php
+++ b/components/com_banners/models/banner.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index d32fbee..89ef3f8 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_banners/router.php b/components/com_banners/router.php
index 8c7b959..8c05e07 100644
--- a/components/com_banners/router.php
+++ b/components/com_banners/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/config.php b/components/com_config/config.php
index 944b15d..a65e676 100644
--- a/components/com_config/config.php
+++ b/components/com_config/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/controller/cancel.php b/components/com_config/controller/cancel.php
index 7f8d83c..b37b028 100644
--- a/components/com_config/controller/cancel.php
+++ b/components/com_config/controller/cancel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_config/controller/canceladmin.php b/components/com_config/controller/canceladmin.php
index ca098de..03383e0 100644
--- a/components/com_config/controller/canceladmin.php
+++ b/components/com_config/controller/canceladmin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_config/controller/cmsbase.php b/components/com_config/controller/cmsbase.php
index 397f1ce..60acd49 100644
--- a/components/com_config/controller/cmsbase.php
+++ b/components/com_config/controller/cmsbase.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Joomla.Libraries
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/controller/config/display.php b/components/com_config/controller/config/display.php
index 9bf9a94..4d43c5a 100644
--- a/components/com_config/controller/config/display.php
+++ b/components/com_config/controller/config/display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/controller/config/save.php b/components/com_config/controller/config/save.php
index b581a68..d79c895 100644
--- a/components/com_config/controller/config/save.php
+++ b/components/com_config/controller/config/save.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
diff --git a/components/com_config/controller/display.php b/components/com_config/controller/display.php
index a163f11..604e766 100644
--- a/components/com_config/controller/display.php
+++ b/components/com_config/controller/display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Joomla.Libraries
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -80,7 +80,7 @@ public function execute()
 			$model = new $modelClass;
 
 			// Access check.
-			if (!JFactory::getUser()->authorise('core.admin', $model->getState('component.option')))
+			if (!JFactory::getUser()->authorise('core.admin', $model->getState()->get('component.option')))
 			{
 				$this->app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
 
diff --git a/components/com_config/controller/helper.php b/components/com_config/controller/helper.php
index 4bc782f..09eb972 100644
--- a/components/com_config/controller/helper.php
+++ b/components/com_config/controller/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Administrator
  * @subpackage  Joomla.Libraries
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/controller/templates/display.php b/components/com_config/controller/templates/display.php
index 34901e6..ee13ab3 100644
--- a/components/com_config/controller/templates/display.php
+++ b/components/com_config/controller/templates/display.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/controller/templates/save.php b/components/com_config/controller/templates/save.php
index d98d109..14608a6 100644
--- a/components/com_config/controller/templates/save.php
+++ b/components/com_config/controller/templates/save.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die('Restricted access');
diff --git a/components/com_config/model/cms.php b/components/com_config/model/cms.php
index 82a00ec..337008e 100644
--- a/components/com_config/model/cms.php
+++ b/components/com_config/model/cms.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_config/model/config.php b/components/com_config/model/config.php
index a84e5b3..2e8efaf 100644
--- a/components/com_config/model/config.php
+++ b/components/com_config/model/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/model/form.php b/components/com_config/model/form.php
index e45d5cc..04cb71d 100644
--- a/components/com_config/model/form.php
+++ b/components/com_config/model/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_config/model/templates.php b/components/com_config/model/templates.php
index 88205ff..490a0fc 100644
--- a/components/com_config/model/templates.php
+++ b/components/com_config/model/templates.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/cms/html.php b/components/com_config/view/cms/html.php
index e56d6fb..ce7b9bf 100644
--- a/components/com_config/view/cms/html.php
+++ b/components/com_config/view/cms/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Cms
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_config/view/cms/json.php b/components/com_config/view/cms/json.php
index 5521015..e2d81d6 100644
--- a/components/com_config/view/cms/json.php
+++ b/components/com_config/view/cms/json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Cms
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_config/view/config/html.php b/components/com_config/view/config/html.php
index 355418d..434bbcb 100644
--- a/components/com_config/view/config/html.php
+++ b/components/com_config/view/config/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/config/tmpl/default.php b/components/com_config/view/config/tmpl/default.php
index 093bb89..0049422 100644
--- a/components/com_config/view/config/tmpl/default.php
+++ b/components/com_config/view/config/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/config/tmpl/default_metadata.php b/components/com_config/view/config/tmpl/default_metadata.php
index 6e1dad6..acd661a 100644
--- a/components/com_config/view/config/tmpl/default_metadata.php
+++ b/components/com_config/view/config/tmpl/default_metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/config/tmpl/default_seo.php b/components/com_config/view/config/tmpl/default_seo.php
index c322fc7..f405c42 100644
--- a/components/com_config/view/config/tmpl/default_seo.php
+++ b/components/com_config/view/config/tmpl/default_seo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/config/tmpl/default_site.php b/components/com_config/view/config/tmpl/default_site.php
index 32c5aab..4df7fbe 100644
--- a/components/com_config/view/config/tmpl/default_site.php
+++ b/components/com_config/view/config/tmpl/default_site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/templates/html.php b/components/com_config/view/templates/html.php
index 50e80fd..d601e93 100644
--- a/components/com_config/view/templates/html.php
+++ b/components/com_config/view/templates/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/templates/tmpl/default.php b/components/com_config/view/templates/tmpl/default.php
index 16edf49..4994040 100644
--- a/components/com_config/view/templates/tmpl/default.php
+++ b/components/com_config/view/templates/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_config/view/templates/tmpl/default_options.php b/components/com_config/view/templates/tmpl/default_options.php
index 264714c..1e6a04b 100644
--- a/components/com_config/view/templates/tmpl/default_options.php
+++ b/components/com_config/view/templates/tmpl/default_options.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_config
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/contact.php b/components/com_contact/contact.php
index ac5e985..37b2c73 100644
--- a/components/com_contact/contact.php
+++ b/components/com_contact/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/controller.php b/components/com_contact/controller.php
index b18d545..35ad619 100644
--- a/components/com_contact/controller.php
+++ b/components/com_contact/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/controllers/contact.php b/components/com_contact/controllers/contact.php
index 357f866..1d96e06 100644
--- a/components/com_contact/controllers/contact.php
+++ b/components/com_contact/controllers/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/helpers/association.php b/components/com_contact/helpers/association.php
index 6e7383c..42bfe5c 100644
--- a/components/com_contact/helpers/association.php
+++ b/components/com_contact/helpers/association.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/helpers/category.php b/components/com_contact/helpers/category.php
index a0b030d..e814bca 100644
--- a/components/com_contact/helpers/category.php
+++ b/components/com_contact/helpers/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/helpers/icon.php b/components/com_contact/helpers/icon.php
index 978176d..fb35ec6 100644
--- a/components/com_contact/helpers/icon.php
+++ b/components/com_contact/helpers/icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index 80d6869..70eb1e4 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -196,13 +196,14 @@ protected static function _findItem($needles = null)
 			}
 		}
 
+		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
-		if ($active && ($active->language == '*' || !JLanguageMultilang::isEnabled()))
+		if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
 
-		// if not found, return language specific home link
+		// If not found, return language specific home link
 		$default = $menus->getDefault($language);
 		return !empty($default->id) ? $default->id : null;
 	}
diff --git a/components/com_contact/models/categories.php b/components/com_contact/models/categories.php
index 5bae14a..c894e48 100644
--- a/components/com_contact/models/categories.php
+++ b/components/com_contact/models/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/models/category.php b/components/com_contact/models/category.php
index 294c1cd..bb0cc4f 100644
--- a/components/com_contact/models/category.php
+++ b/components/com_contact/models/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/models/contact.php b/components/com_contact/models/contact.php
index 0fc3ca8..7cea49a 100644
--- a/components/com_contact/models/contact.php
+++ b/components/com_contact/models/contact.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/models/featured.php b/components/com_contact/models/featured.php
index 6d74b6c..cd07858 100644
--- a/components/com_contact/models/featured.php
+++ b/components/com_contact/models/featured.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/models/forms/contact.xml b/components/com_contact/models/forms/contact.xml
index d3b2443..59902f8 100644
--- a/components/com_contact/models/forms/contact.xml
+++ b/components/com_contact/models/forms/contact.xml
@@ -37,7 +37,7 @@
 			id="contact-message"
 			description="COM_CONTACT_CONTACT_ENTER_MESSAGE_DESC"
 			label="COM_CONTACT_CONTACT_ENTER_MESSAGE_LABEL"
-			filter="htmlsafe"
+			filter="safehtml"
 			validate="contactemailmessage"
 			required="true"
 		/>
diff --git a/components/com_contact/models/rules/contactemail.php b/components/com_contact/models/rules/contactemail.php
index 04b7789..ddc3621 100644
--- a/components/com_contact/models/rules/contactemail.php
+++ b/components/com_contact/models/rules/contactemail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/models/rules/contactemailmessage.php b/components/com_contact/models/rules/contactemailmessage.php
index 4ec235e..47fd9dc 100644
--- a/components/com_contact/models/rules/contactemailmessage.php
+++ b/components/com_contact/models/rules/contactemailmessage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/models/rules/contactemailsubject.php b/components/com_contact/models/rules/contactemailsubject.php
index 40c0ada..da20658 100644
--- a/components/com_contact/models/rules/contactemailsubject.php
+++ b/components/com_contact/models/rules/contactemailsubject.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index af3739f..00357e4 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/categories/tmpl/default.php b/components/com_contact/views/categories/tmpl/default.php
index c6a6a6e..e7f142d 100644
--- a/components/com_contact/views/categories/tmpl/default.php
+++ b/components/com_contact/views/categories/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php
index b320377..bc11235 100644
--- a/components/com_contact/views/categories/tmpl/default_items.php
+++ b/components/com_contact/views/categories/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/categories/view.html.php b/components/com_contact/views/categories/view.html.php
index b20cd5b..38dc9f6 100644
--- a/components/com_contact/views/categories/view.html.php
+++ b/components/com_contact/views/categories/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/category/tmpl/default.php b/components/com_contact/views/category/tmpl/default.php
index 2fe2015..b64d870 100644
--- a/components/com_contact/views/category/tmpl/default.php
+++ b/components/com_contact/views/category/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/category/tmpl/default_children.php b/components/com_contact/views/category/tmpl/default_children.php
index d023cde..8072049 100644
--- a/components/com_contact/views/category/tmpl/default_children.php
+++ b/components/com_contact/views/category/tmpl/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/category/tmpl/default_items.php b/components/com_contact/views/category/tmpl/default_items.php
index cf2074e..4eeceac 100644
--- a/components/com_contact/views/category/tmpl/default_items.php
+++ b/components/com_contact/views/category/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/category/view.feed.php b/components/com_contact/views/category/view.feed.php
index 0ea1fed..ea24f94 100644
--- a/components/com_contact/views/category/view.feed.php
+++ b/components/com_contact/views/category/view.feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php
index b5ad980..1a7daa2 100644
--- a/components/com_contact/views/category/view.html.php
+++ b/components/com_contact/views/category/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php
index 9ba188a..8ebb4b6 100644
--- a/components/com_contact/views/contact/tmpl/default.php
+++ b/components/com_contact/views/contact/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/tmpl/default_address.php b/components/com_contact/views/contact/tmpl/default_address.php
index 97c4346..bf211e7 100644
--- a/components/com_contact/views/contact/tmpl/default_address.php
+++ b/components/com_contact/views/contact/tmpl/default_address.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/tmpl/default_articles.php b/components/com_contact/views/contact/tmpl/default_articles.php
index 55c6000..52568fa 100644
--- a/components/com_contact/views/contact/tmpl/default_articles.php
+++ b/components/com_contact/views/contact/tmpl/default_articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index c06205a..64dcf07 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/tmpl/default_links.php b/components/com_contact/views/contact/tmpl/default_links.php
index 88e6d75..45d413d 100644
--- a/components/com_contact/views/contact/tmpl/default_links.php
+++ b/components/com_contact/views/contact/tmpl/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/tmpl/default_profile.php b/components/com_contact/views/contact/tmpl/default_profile.php
index 8a8703f..4e09e78 100644
--- a/components/com_contact/views/contact/tmpl/default_profile.php
+++ b/components/com_contact/views/contact/tmpl/default_profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
index e3012d3..24fc846 100644
--- a/components/com_contact/views/contact/view.html.php
+++ b/components/com_contact/views/contact/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/contact/view.vcf.php b/components/com_contact/views/contact/view.vcf.php
index 66024fa..3609bc6 100644
--- a/components/com_contact/views/contact/view.vcf.php
+++ b/components/com_contact/views/contact/view.vcf.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/featured/tmpl/default.php b/components/com_contact/views/featured/tmpl/default.php
index 52dd96f..941c04e 100644
--- a/components/com_contact/views/featured/tmpl/default.php
+++ b/components/com_contact/views/featured/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/featured/tmpl/default_items.php b/components/com_contact/views/featured/tmpl/default_items.php
index bdb04cf..2f29bac 100644
--- a/components/com_contact/views/featured/tmpl/default_items.php
+++ b/components/com_contact/views/featured/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contact/views/featured/view.html.php b/components/com_contact/views/featured/view.html.php
index c88a0f6..2688472 100644
--- a/components/com_contact/views/featured/view.html.php
+++ b/components/com_contact/views/featured/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/content.php b/components/com_content/content.php
index b67279a..f5aaff8 100644
--- a/components/com_content/content.php
+++ b/components/com_content/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/controller.php b/components/com_content/controller.php
index bf9066b..4ccd604 100644
--- a/components/com_content/controller.php
+++ b/components/com_content/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php
index 9c9a753..7ee3785 100644
--- a/components/com_content/controllers/article.php
+++ b/components/com_content/controllers/article.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php
index 4c6c369..9d7779b 100644
--- a/components/com_content/helpers/association.php
+++ b/components/com_content/helpers/association.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/helpers/category.php b/components/com_content/helpers/category.php
index 2c48c37..05953fd 100644
--- a/components/com_content/helpers/category.php
+++ b/components/com_content/helpers/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index 6f55f03..6508de0 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -181,11 +181,21 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal
 		if ($legacy)
 		{
 			$icon = $article->state ? 'edit.png' : 'edit_unpublished.png';
+			if (strtotime($article->publish_up) > strtotime(JFactory::getDate())
+				|| ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != '0000-00-00 00:00:00'))
+			{
+				$icon = 'edit_unpublished.png';
+			}
 			$text = JHtml::_('image', 'system/' . $icon, JText::_('JGLOBAL_EDIT'), null, true);
 		}
 		else
 		{
 			$icon = $article->state ? 'edit' : 'eye-close';
+			if (strtotime($article->publish_up) > strtotime(JFactory::getDate())
+				|| ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != '0000-00-00 00:00:00'))
+			{
+				$icon = 'eye-close';
+			}
 			$text = '<span class="hasTooltip icon-' . $icon . ' tip" title="' . JHtml::tooltipText(JText::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0) . '"></span>&#160;' . JText::_('JGLOBAL_EDIT') . '&#160;';
 		}
 
diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php
index f9d5ade..ec46403 100644
--- a/components/com_content/helpers/query.php
+++ b/components/com_content/helpers/query.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php
index af4d5a4..85dbe1c 100644
--- a/components/com_content/helpers/route.php
+++ b/components/com_content/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -209,13 +209,14 @@ protected static function _findItem($needles = null)
 			}
 		}
 
+		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
-		if ($active && $active->component == 'com_content' && ($active->language == '*' || !JLanguageMultilang::isEnabled()))
+		if ($active && $active->component == 'com_content' && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
 
-		// if not found, return language specific home link
+		// If not found, return language specific home link
 		$default = $menus->getDefault($language);
 		return !empty($default->id) ? $default->id : null;
 	}
diff --git a/components/com_content/models/archive.php b/components/com_content/models/archive.php
index 4fcd08e..e9af74d 100644
--- a/components/com_content/models/archive.php
+++ b/components/com_content/models/archive.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php
index 80eba5a..56cd571 100644
--- a/components/com_content/models/article.php
+++ b/components/com_content/models/article.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -70,6 +70,8 @@ protected function populateState()
 	 */
 	public function getItem($pk = null)
 	{
+		$user	= JFactory::getUser();
+
 		$pk = (!empty($pk)) ? $pk : (int) $this->getState('article.id');
 
 		if ($this->_item === null)
@@ -107,21 +109,6 @@ public function getItem($pk = null)
 				$query->select('u.name AS author')
 					->join('LEFT', '#__users AS u on u.id = a.created_by');
 
-				// Get contact id
-				$subQuery = $db->getQuery(true)
-					->select('MAX(contact.id) AS id')
-					->from('#__contact_details AS contact')
-					->where('contact.published = 1')
-					->where('contact.user_id = a.created_by');
-
-					// Filter by language
-					if ($this->getState('filter.language'))
-					{
-						$subQuery->where('(contact.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ') OR contact.language IS NULL)');
-					}
-
-				$query->select('(' . $subQuery . ') as contactid');
-
 				// Filter by language
 				if ($this->getState('filter.language'))
 				{
@@ -138,14 +125,16 @@ public function getItem($pk = null)
 
 					->where('a.id = ' . (int) $pk);
 
-				// Filter by start and end dates.
-				$nullDate = $db->quote($db->getNullDate());
-				$date = JFactory::getDate();
+				if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content'))) {
+					// Filter by start and end dates.
+					$nullDate = $db->quote($db->getNullDate());
+					$date = JFactory::getDate();
 
-				$nowDate = $db->quote($date->toSql());
+					$nowDate = $db->quote($date->toSql());
 
-				$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
-					->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+					$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
+						->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+				}
 
 				// Join to check for category published state in parent categories up the tree
 				// If all categories are published, badcats.id will be null, and we just use the article state
@@ -190,9 +179,6 @@ public function getItem($pk = null)
 				$registry->loadString($data->metadata);
 				$data->metadata = $registry;
 
-				// Compute selected asset permissions.
-				$user = JFactory::getUser();
-
 				// Technically guest could edit an article, but lets not check that to improve performance a little.
 				if (!$user->get('guest'))
 				{
diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
index f1e518e..27383a0 100644
--- a/components/com_content/models/articles.php
+++ b/components/com_content/models/articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -170,6 +170,9 @@ protected function getStoreId($id = '')
 	 */
 	protected function getListQuery()
 	{
+		// Get the current user for authorisation checks
+		$user	= JFactory::getUser();
+
 		// Create a new query object.
 		$db = $this->getDbo();
 		$query = $db->getQuery(true);
@@ -227,21 +230,6 @@ protected function getListQuery()
 			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
 			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
 
-		// Get contact id
-		$subQuery = $db->getQuery(true)
-			->select('MAX(contact.id) AS id')
-			->from('#__contact_details AS contact')
-			->where('contact.published = 1')
-			->where('contact.user_id = a.created_by');
-
-			// Filter by language
-			if ($this->getState('filter.language'))
-			{
-				$subQuery->where('(contact.language in (' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ') OR contact.language IS NULL)');
-			}
-
-		$query->select('(' . $subQuery . ') as contactid');
-
 		// Join over the categories to get parent category titles
 		$query->select('parent.title as parent_title, parent.id as parent_id, parent.path as parent_route, parent.alias as parent_alias')
 			->join('LEFT', '#__categories as parent ON parent.id = c.parent_id');
@@ -280,7 +268,6 @@ protected function getListQuery()
 		// Filter by access level.
 		if ($access = $this->getState('filter.access'))
 		{
-			$user = JFactory::getUser();
 			$groups = implode(',', $user->getAuthorisedViewLevels());
 			$query->where('a.access IN (' . $groups . ')')
 				->where('c.access IN (' . $groups . ')');
@@ -455,11 +442,13 @@ protected function getListQuery()
 		}
 
 		// Filter by start and end dates.
-		$nullDate = $db->quote($db->getNullDate());
-		$nowDate = $db->quote(JFactory::getDate()->toSql());
+		if ((!$user->authorise('core.edit.state', 'com_content')) && (!$user->authorise('core.edit', 'com_content'))) {
+			$nullDate	= $db->quote($db->getNullDate());
+			$nowDate	= $db->quote(JFactory::getDate()->toSql());
 
-		$query->where('(a.publish_up = ' . $nullDate . ' OR a.publish_up <= ' . $nowDate . ')')
-			->where('(a.publish_down = ' . $nullDate . ' OR a.publish_down >= ' . $nowDate . ')');
+			$query->where('(a.publish_up = '.$nullDate.' OR a.publish_up <= '.$nowDate.')')
+				->where('(a.publish_down = '.$nullDate.' OR a.publish_down >= '.$nowDate.')');
+		}
 
 		// Filter by Date Range or Relative Date
 		$dateFiltering = $this->getState('filter.date_filtering', 'off');
diff --git a/components/com_content/models/categories.php b/components/com_content/models/categories.php
index bd7909a..93bc8b9 100644
--- a/components/com_content/models/categories.php
+++ b/components/com_content/models/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index 38e39c5..b2135b2 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/models/featured.php b/components/com_content/models/featured.php
index cb28e8b..31e910d 100644
--- a/components/com_content/models/featured.php
+++ b/components/com_content/models/featured.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
index 21d5233..b98a414 100644
--- a/components/com_content/models/form.php
+++ b/components/com_content/models/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/router.php b/components/com_content/router.php
index d915118..8f248f0 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/archive/tmpl/default.php b/components/com_content/views/archive/tmpl/default.php
index 3a82b1a..08726ea 100644
--- a/components/com_content/views/archive/tmpl/default.php
+++ b/components/com_content/views/archive/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php
index 6913694..f986acf 100644
--- a/components/com_content/views/archive/tmpl/default_items.php
+++ b/components/com_content/views/archive/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,12 +29,9 @@
 					<div class="createdby">
 					<?php $author = $item->author; ?>
 					<?php $author = ($item->created_by_alias ? $item->created_by_alias : $author); ?>
-						<?php if (!empty($item->contactid ) && $params->get('link_author') == true) : ?>
-							<?php echo JText::sprintf(
-							'COM_CONTENT_WRITTEN_BY',
-							JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id='.$item->contactid), $author)
-							); ?>
-						<?php else :?>
+						<?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+						<?php else: ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 						<?php endif; ?>
 					</div>
diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index 91bf0a5..7c47c26 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index c0870db..daf2426 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -43,9 +43,6 @@
 	<?php if ($params->get('show_title') || $params->get('show_author')) : ?>
 	<div class="page-header">
 		<h2>
-			<?php if ($this->item->state == 0) : ?>
-				<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
-			<?php endif; ?>
 			<?php if ($params->get('show_title')) : ?>
 				<?php if ($params->get('link_titles') && !empty($this->item->readmore_link)) : ?>
 					<a href="<?php echo $this->item->readmore_link; ?>"> <?php echo $this->escape($this->item->title); ?></a>
@@ -54,6 +51,15 @@
 				<?php endif; ?>
 			<?php endif; ?>
 		</h2>
+		<?php if ($this->item->state == 0) : ?>
+			<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+		<?php endif; ?>
+		<?php if (strtotime($this->item->publish_up) > strtotime(JFactory::getDate())) : ?>
+			<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+		<?php endif; ?>
+		<?php if ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00') : ?>
+			<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+		<?php endif; ?>
 	</div>
 	<?php endif; ?>
 	<?php if (!$this->print) : ?>
@@ -90,14 +96,8 @@
 			<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
 				<dd class="createdby">
 					<?php $author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
-					<?php if (!empty($this->item->contactid) && $params->get('link_author') == true) : ?>
-						<?php
-						$needle = 'index.php?option=com_contact&view=contact&id=' . $this->item->contactid;
-						$menu = JFactory::getApplication()->getMenu();
-						$item = $menu->getItems('link', $needle, true);
-						$cntlink = !empty($item) ? $needle . '&Itemid=' . $item->id : $needle;
-						?>
-						<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', JRoute::_($cntlink), $author)); ?>
+					<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
+						<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
 					<?php else: ?>
 						<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 					<?php endif; ?>
@@ -195,16 +195,10 @@
 				<?php if ($params->get('show_author') && !empty($this->item->author )) : ?>
 					<dd class="createdby">
 						<?php $author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author; ?>
-						<?php if (!empty($this->item->contactid) && $params->get('link_author') == true) : ?>
-						<?php
-						$needle = 'index.php?option=com_contact&view=contact&id=' . $this->item->contactid;
-						$menu = JFactory::getApplication()->getMenu();
-						$item = $menu->getItems('link', $needle, true);
-						$cntlink = !empty($item) ? $needle . '&Itemid=' . $item->id : $needle;
-						?>
-						<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', JRoute::_($cntlink), $author)); ?>
+						<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
 						<?php else: ?>
-						<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 						<?php endif; ?>
 					</dd>
 				<?php endif; ?>
diff --git a/components/com_content/views/article/tmpl/default_links.php b/components/com_content/views/article/tmpl/default_links.php
index db15fad..bfe22f0 100644
--- a/components/com_content/views/article/tmpl/default_links.php
+++ b/components/com_content/views/article/tmpl/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php
index def6618..a5503a5 100644
--- a/components/com_content/views/article/view.html.php
+++ b/components/com_content/views/article/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/categories/metadata.xml b/components/com_content/views/categories/metadata.xml
new file mode 100644
index 0000000..684f3c9
--- /dev/null
+++ b/components/com_content/views/categories/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metadata>
+	<view
+		title="Categories">
+		<message><![CDATA[TYPECATEGLAYDESC]]></message>
+	</view>
+</metadata>
diff --git a/components/com_content/views/categories/tmpl/default.php b/components/com_content/views/categories/tmpl/default.php
index 54de2a5..7595354 100644
--- a/components/com_content/views/categories/tmpl/default.php
+++ b/components/com_content/views/categories/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php
index 40989b4..2ef5c7e 100644
--- a/components/com_content/views/categories/tmpl/default_items.php
+++ b/components/com_content/views/categories/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/categories/view.html.php b/components/com_content/views/categories/view.html.php
index f2fae2f..8c5057d 100644
--- a/components/com_content/views/categories/view.html.php
+++ b/components/com_content/views/categories/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php
index 8a34cc2..14ca350 100644
--- a/components/com_content/views/category/tmpl/blog.php
+++ b/components/com_content/views/category/tmpl/blog.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/category/tmpl/blog_children.php b/components/com_content/views/category/tmpl/blog_children.php
index 7130fda..49b36f0 100644
--- a/components/com_content/views/category/tmpl/blog_children.php
+++ b/components/com_content/views/category/tmpl/blog_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/category/tmpl/blog_item.php b/components/com_content/views/category/tmpl/blog_item.php
index 47c4d88..144160f 100644
--- a/components/com_content/views/category/tmpl/blog_item.php
+++ b/components/com_content/views/category/tmpl/blog_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -15,8 +15,9 @@
 $canEdit = $this->item->params->get('access-edit');
 JHtml::_('behavior.framework');
 ?>
-<?php if ($this->item->state == 0) : ?>
-	<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
+	<div class="system-unpublished">
 <?php endif; ?>
 
 <?php echo JLayoutHelper::render('joomla.content.blog_style_default_item_title', $this->item); ?>
@@ -76,4 +77,9 @@
 
 <?php endif; ?>
 
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
+</div>
+<?php endif; ?>
+
 <?php echo $this->item->event->afterDisplayContent; ?>
diff --git a/components/com_content/views/category/tmpl/blog_links.php b/components/com_content/views/category/tmpl/blog_links.php
index d3dcefd..d06d073 100644
--- a/components/com_content/views/category/tmpl/blog_links.php
+++ b/components/com_content/views/category/tmpl/blog_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/category/tmpl/default.php b/components/com_content/views/category/tmpl/default.php
index cab481c..21fa257 100644
--- a/components/com_content/views/category/tmpl/default.php
+++ b/components/com_content/views/category/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index 34751b8..4b69296 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -135,6 +135,16 @@
 								<?php echo JText::_('JUNPUBLISHED'); ?>
 							</span>
 						<?php endif; ?>
+						<?php if (strtotime($article->publish_up) > strtotime(JFactory::getDate())) : ?>
+							<span class="list-published label label-warning">
+								<?php echo JText::_('JNOTPUBLISHEDYET'); ?>
+							</span>
+						<?php endif; ?>
+						<?php if ((strtotime($article->publish_down) < strtotime(JFactory::getDate())) && $article->publish_down != '0000-00-00 00:00:00') : ?>
+							<span class="list-published label label-warning">
+								<?php echo JText::_('JEXPIRED'); ?>
+							</span>
+						<?php endif; ?>
 					</td>
 					<?php if ($this->params->get('list_show_date')) : ?>
 						<td headers="categorylist_header_date" class="list-date small">
@@ -150,15 +160,9 @@
 							<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
 								<?php $author = $article->author ?>
 								<?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
-
-								<?php if (!empty($article->contactid ) &&  $this->params->get('link_author') == true):?>
-									<?php echo JHtml::_(
-											'link',
-											JRoute::_('index.php?option=com_contact&view=contact&id='.$article->contactid),
-											$author
-									); ?>
-
-								<?php else :?>
+								<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true) : ?>
+									<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
+								<?php else: ?>
 									<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 								<?php endif; ?>
 							<?php endif; ?>
diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php
index 61bf769..823ea89 100644
--- a/components/com_content/views/category/tmpl/default_children.php
+++ b/components/com_content/views/category/tmpl/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php
index 0b9ecee..f10c062 100644
--- a/components/com_content/views/category/view.feed.php
+++ b/components/com_content/views/category/view.feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php
index 30e3858..43709f9 100644
--- a/components/com_content/views/category/view.html.php
+++ b/components/com_content/views/category/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -103,7 +103,7 @@ public function display($tpl = null)
 			}
 
 			JPluginHelper::importPlugin('content');
-			$dispatcher->trigger('onContentPrepare', array ('com_content.category', &$item, &$this->params, 0));
+			$dispatcher->trigger('onContentPrepare', array ('com_content.category', &$item, &$item->params, 0));
 
 			// Old plugins: Use processed text as introtext
 			$item->introtext = $item->text;
diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php
index e6f8d21..2c8cac8 100644
--- a/components/com_content/views/featured/tmpl/default.php
+++ b/components/com_content/views/featured/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/featured/tmpl/default_item.php b/components/com_content/views/featured/tmpl/default_item.php
index 3d6f921..05b443a 100644
--- a/components/com_content/views/featured/tmpl/default_item.php
+++ b/components/com_content/views/featured/tmpl/default_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,8 @@
 
 ?>
 
-<?php if ($this->item->state == 0) : ?>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
 	<div class="system-unpublished">
 <?php endif; ?>
 
@@ -34,6 +35,12 @@
 <?php if ($this->item->state == 0) : ?>
 	<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 <?php endif; ?>
+<?php if (strtotime($this->item->publish_up) > strtotime(JFactory::getDate())) : ?>
+	<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+<?php endif; ?>
+<?php if ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00') : ?>
+	<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+<?php endif; ?>
 
 <?php if ($params->get('show_print_icon') || $params->get('show_email_icon') || $canEdit) : ?>
 	<div class="btn-group pull-right"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="#" role="button"> <span class="icon-cog"></span> <span class="caret"></span> </a>
@@ -65,12 +72,9 @@
 			<dd class="createdby">
 				<?php $author = $this->item->author; ?>
 				<?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author); ?>
-				<?php if (!empty($this->item->contactid ) && $params->get('link_author') == true) : ?>
-					<?php
-					echo JText::sprintf('COM_CONTENT_WRITTEN_BY',
-						JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id='.$this->item->contactid), $author)
-					); ?>
-				<?php else :?>
+				<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
+					<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+				<?php else: ?>
 					<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 				<?php endif; ?>
 			</dd>
@@ -156,11 +160,8 @@
 				<dd class="createdby">
 					<?php $author = $this->item->author; ?>
 					<?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author); ?>
-					<?php if (!empty($this->item->contactid ) && $params->get('link_author') == true) : ?>
-						<?php
-						echo JText::sprintf('COM_CONTENT_WRITTEN_BY',
-							JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id='.$this->item->contactid), $author)
-						); ?>
+					<?php if (!empty($this->item->contact_link) && $params->get('link_author') == true) : ?>
+						<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
 					<?php else : ?>
 						<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 					<?php endif; ?>
@@ -258,7 +259,8 @@
 
 <?php endif; ?>
 
-<?php if ($this->item->state == 0) : ?>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
 </div>
 <?php endif; ?>
 
diff --git a/components/com_content/views/featured/tmpl/default_links.php b/components/com_content/views/featured/tmpl/default_links.php
index f010e4b..0241e64 100644
--- a/components/com_content/views/featured/tmpl/default_links.php
+++ b/components/com_content/views/featured/tmpl/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index f64cfcd..07dc07a 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
index dd8c6e4..eca0638 100644
--- a/components/com_content/views/featured/view.html.php
+++ b/components/com_content/views/featured/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -86,7 +86,7 @@ public function display($tpl = null)
 				$item->text = $item->introtext;
 			}
 			JPluginHelper::importPlugin('content');
-			$dispatcher->trigger('onContentPrepare', array ('com_content.featured', &$item, &$this->params, 0));
+			$dispatcher->trigger('onContentPrepare', array ('com_content.featured', &$item, &$item->params, 0));
 
 			// Old plugins: Use processed text as introtext
 			$item->introtext = $item->text;
diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php
index 1f6d8d0..d7891c9 100644
--- a/components/com_content/views/form/tmpl/edit.php
+++ b/components/com_content/views/form/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -67,7 +67,7 @@
 		</div>
 		<fieldset>
 			<ul class="nav nav-tabs">
-				<li class="active"><a href="#editor" data-toggle="tab"><?php echo JText::_('JEDITOR') ?></a></li>
+				<li class="active"><a href="#editor" data-toggle="tab"><?php echo JText::_('COM_CONTENT_ARTICLE_CONTENT') ?></a></li>
 				<?php if ($params->get('show_urls_images_frontend') ) : ?>
 				<li><a href="#images" data-toggle="tab"><?php echo JText::_('COM_CONTENT_IMAGES_AND_URLS') ?></a></li>
 				<?php endif; ?>
diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php
index 80cc617..3deac4b 100644
--- a/components/com_content/views/form/view.html.php
+++ b/components/com_content/views/form/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_contenthistory/contenthistory.php b/components/com_contenthistory/contenthistory.php
index 00bb847..7e14e1a 100644
--- a/components/com_contenthistory/contenthistory.php
+++ b/components/com_contenthistory/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contenthistory
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_finder/controller.php b/components/com_finder/controller.php
index fabae91..94de88b 100644
--- a/components/com_finder/controller.php
+++ b/components/com_finder/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/controllers/suggestions.json.php b/components/com_finder/controllers/suggestions.json.php
index dbdfb06..309a0a4 100644
--- a/components/com_finder/controllers/suggestions.json.php
+++ b/components/com_finder/controllers/suggestions.json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/finder.php b/components/com_finder/finder.php
index 0865a62..68f131e 100644
--- a/components/com_finder/finder.php
+++ b/components/com_finder/finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/helpers/html/filter.php b/components/com_finder/helpers/html/filter.php
index 9f24493..cd53557 100644
--- a/components/com_finder/helpers/html/filter.php
+++ b/components/com_finder/helpers/html/filter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/helpers/html/query.php b/components/com_finder/helpers/html/query.php
index 6a0a739..653457c 100644
--- a/components/com_finder/helpers/html/query.php
+++ b/components/com_finder/helpers/html/query.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/helpers/route.php b/components/com_finder/helpers/route.php
index e949f9d..a14243f 100644
--- a/components/com_finder/helpers/route.php
+++ b/components/com_finder/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/models/search.php b/components/com_finder/models/search.php
index 3511aa0..c74dad5 100644
--- a/components/com_finder/models/search.php
+++ b/components/com_finder/models/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/models/suggestions.php b/components/com_finder/models/suggestions.php
index d434d5a..903ad0c 100644
--- a/components/com_finder/models/suggestions.php
+++ b/components/com_finder/models/suggestions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/router.php b/components/com_finder/router.php
index cd300b7..c91fe25 100644
--- a/components/com_finder/router.php
+++ b/components/com_finder/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/views/search/tmpl/default.php b/components/com_finder/views/search/tmpl/default.php
index 982227c..d219d68 100644
--- a/components/com_finder/views/search/tmpl/default.php
+++ b/components/com_finder/views/search/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/views/search/tmpl/default_form.php b/components/com_finder/views/search/tmpl/default_form.php
index f0a42bc..1ddf501 100644
--- a/components/com_finder/views/search/tmpl/default_form.php
+++ b/components/com_finder/views/search/tmpl/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/views/search/tmpl/default_result.php b/components/com_finder/views/search/tmpl/default_result.php
index ecd94e6..da9e1ad 100644
--- a/components/com_finder/views/search/tmpl/default_result.php
+++ b/components/com_finder/views/search/tmpl/default_result.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/views/search/tmpl/default_results.php b/components/com_finder/views/search/tmpl/default_results.php
index efb62b6..42c3677 100644
--- a/components/com_finder/views/search/tmpl/default_results.php
+++ b/components/com_finder/views/search/tmpl/default_results.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/views/search/view.feed.php b/components/com_finder/views/search/view.feed.php
index 02e8165..403447e 100644
--- a/components/com_finder/views/search/view.feed.php
+++ b/components/com_finder/views/search/view.feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/views/search/view.html.php b/components/com_finder/views/search/view.html.php
index 9a81805..10631a7 100644
--- a/components/com_finder/views/search/view.html.php
+++ b/components/com_finder/views/search/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_finder/views/search/view.opensearch.php b/components/com_finder/views/search/view.opensearch.php
index 6af202e..d5f09fe 100644
--- a/components/com_finder/views/search/view.opensearch.php
+++ b/components/com_finder/views/search/view.opensearch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/components/com_mailto/controller.php b/components/com_mailto/controller.php
index bc5dd4d..63283f3 100644
--- a/components/com_mailto/controller.php
+++ b/components/com_mailto/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/helpers/mailto.php b/components/com_mailto/helpers/mailto.php
index 8c3f14e..1aa3487 100644
--- a/components/com_mailto/helpers/mailto.php
+++ b/components/com_mailto/helpers/mailto.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/mailto.php b/components/com_mailto/mailto.php
index d7f9d03..08b8c04 100644
--- a/components/com_mailto/mailto.php
+++ b/components/com_mailto/mailto.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/mailto.xml b/components/com_mailto/mailto.xml
index 3e6b334..0a70305 100644
--- a/components/com_mailto/mailto.xml
+++ b/components/com_mailto/mailto.xml
@@ -3,7 +3,7 @@
 	<name>com_mailto</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.	</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.	</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/components/com_mailto/views/mailto/tmpl/default.php b/components/com_mailto/views/mailto/tmpl/default.php
index 4f6977c..137eaac 100644
--- a/components/com_mailto/views/mailto/tmpl/default.php
+++ b/components/com_mailto/views/mailto/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/views/mailto/view.html.php b/components/com_mailto/views/mailto/view.html.php
index 61f7d27..51b9213 100644
--- a/components/com_mailto/views/mailto/view.html.php
+++ b/components/com_mailto/views/mailto/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/views/sent/metadata.xml b/components/com_mailto/views/sent/metadata.xml
index 75be4c9..f3ab0c6 100644
--- a/components/com_mailto/views/sent/metadata.xml
+++ b/components/com_mailto/views/sent/metadata.xml
@@ -3,7 +3,7 @@
 	<name>Mailto</name>
 	<author>Andrew Eddie</author>
 	<creationDate>13 Mar 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/components/com_mailto/views/sent/tmpl/default.php b/components/com_mailto/views/sent/tmpl/default.php
index 91efa8f..ded7807 100644
--- a/components/com_mailto/views/sent/tmpl/default.php
+++ b/components/com_mailto/views/sent/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_mailto/views/sent/view.html.php b/components/com_mailto/views/sent/view.html.php
index e8ea5f1..c8a5d15 100644
--- a/components/com_mailto/views/sent/view.html.php
+++ b/components/com_mailto/views/sent/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_mailto
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_media/media.php b/components/com_media/media.php
index 02491d8..b246cf3 100644
--- a/components/com_media/media.php
+++ b/components/com_media/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_media
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/controller.php b/components/com_newsfeeds/controller.php
index 1d7500d..5122bca 100644
--- a/components/com_newsfeeds/controller.php
+++ b/components/com_newsfeeds/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/helpers/association.php b/components/com_newsfeeds/helpers/association.php
index e4fc1ef..a3965ad 100644
--- a/components/com_newsfeeds/helpers/association.php
+++ b/components/com_newsfeeds/helpers/association.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/helpers/category.php b/components/com_newsfeeds/helpers/category.php
index 8f9c820..f4cb6ee 100644
--- a/components/com_newsfeeds/helpers/category.php
+++ b/components/com_newsfeeds/helpers/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
index e51f55d..e4da2cf 100644
--- a/components/com_newsfeeds/helpers/route.php
+++ b/components/com_newsfeeds/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -200,13 +200,14 @@ protected static function _findItem($needles = null)
 			}
 		}
 
+		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
-		if ($active && ($active->language == '*' || !JLanguageMultilang::isEnabled()))
+		if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
 
-		// if not found, return language specific home link
+		// If not found, return language specific home link
 		$default = $menus->getDefault($language);
 		return !empty($default->id) ? $default->id : null;
 	}
diff --git a/components/com_newsfeeds/models/categories.php b/components/com_newsfeeds/models/categories.php
index 4ebabef..605cbac 100644
--- a/components/com_newsfeeds/models/categories.php
+++ b/components/com_newsfeeds/models/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/models/category.php b/components/com_newsfeeds/models/category.php
index c5b2986..23e5a08 100644
--- a/components/com_newsfeeds/models/category.php
+++ b/components/com_newsfeeds/models/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/models/newsfeed.php b/components/com_newsfeeds/models/newsfeed.php
index f1f95e9..98812f7 100644
--- a/components/com_newsfeeds/models/newsfeed.php
+++ b/components/com_newsfeeds/models/newsfeed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/newsfeeds.php b/components/com_newsfeeds/newsfeeds.php
index 13d7c44..cb8358f 100644
--- a/components/com_newsfeeds/newsfeeds.php
+++ b/components/com_newsfeeds/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index a472cd0..5854b0e 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/categories/tmpl/default.php b/components/com_newsfeeds/views/categories/tmpl/default.php
index e72de52..d1e95b8 100644
--- a/components/com_newsfeeds/views/categories/tmpl/default.php
+++ b/components/com_newsfeeds/views/categories/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php
index f8977dc..5a0aa9c 100644
--- a/components/com_newsfeeds/views/categories/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/categories/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/categories/view.html.php b/components/com_newsfeeds/views/categories/view.html.php
index 067bd76..b617b04 100644
--- a/components/com_newsfeeds/views/categories/view.html.php
+++ b/components/com_newsfeeds/views/categories/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/category/tmpl/default.php b/components/com_newsfeeds/views/category/tmpl/default.php
index 33cdb94..aa4745f 100644
--- a/components/com_newsfeeds/views/category/tmpl/default.php
+++ b/components/com_newsfeeds/views/category/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/category/tmpl/default_children.php b/components/com_newsfeeds/views/category/tmpl/default_children.php
index 9dc847d..a8dd348 100644
--- a/components/com_newsfeeds/views/category/tmpl/default_children.php
+++ b/components/com_newsfeeds/views/category/tmpl/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/category/tmpl/default_items.php b/components/com_newsfeeds/views/category/tmpl/default_items.php
index b9e66f8..2f2f3d7 100644
--- a/components/com_newsfeeds/views/category/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/category/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/category/view.html.php b/components/com_newsfeeds/views/category/view.html.php
index 97a8a77..fa6e251 100644
--- a/components/com_newsfeeds/views/category/view.html.php
+++ b/components/com_newsfeeds/views/category/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index add3b5e..afe2de6 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
index 2864a3f..7376365 100644
--- a/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/controller.php b/components/com_search/controller.php
index 033c496..7a367f6 100644
--- a/components/com_search/controller.php
+++ b/components/com_search/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/models/search.php b/components/com_search/models/search.php
index 60c6134..f5a91e0 100644
--- a/components/com_search/models/search.php
+++ b/components/com_search/models/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/router.php b/components/com_search/router.php
index e7061a6..45c72e1 100644
--- a/components/com_search/router.php
+++ b/components/com_search/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/search.php b/components/com_search/search.php
index ee1f6d3..77c5b88 100644
--- a/components/com_search/search.php
+++ b/components/com_search/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/views/search/tmpl/default.php b/components/com_search/views/search/tmpl/default.php
index 68d0fd9..b4d309d 100644
--- a/components/com_search/views/search/tmpl/default.php
+++ b/components/com_search/views/search/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/views/search/tmpl/default_error.php b/components/com_search/views/search/tmpl/default_error.php
index 07bb880..e0e3e26 100644
--- a/components/com_search/views/search/tmpl/default_error.php
+++ b/components/com_search/views/search/tmpl/default_error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/views/search/tmpl/default_form.php b/components/com_search/views/search/tmpl/default_form.php
index 54480c8..74cd130 100644
--- a/components/com_search/views/search/tmpl/default_form.php
+++ b/components/com_search/views/search/tmpl/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/views/search/tmpl/default_results.php b/components/com_search/views/search/tmpl/default_results.php
index ccfc1fc..d3cad57 100644
--- a/components/com_search/views/search/tmpl/default_results.php
+++ b/components/com_search/views/search/tmpl/default_results.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_search/views/search/view.html.php b/components/com_search/views/search/view.html.php
index 9f17444..6d49c25 100644
--- a/components/com_search/views/search/view.html.php
+++ b/components/com_search/views/search/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -172,7 +172,8 @@ public function display($tpl = null)
 					{
 						if (($pos = mb_strpos($srow, strtolower(SearchHelper::remove_accents($hlword)))) !== false)
 						{
-							$pos += $cnt++ * mb_strlen($hl1 . $hl2);
+							$pos += $cnt * mb_strlen($hl1 . $hl2);
+							$cnt++;
 
 							// iconv transliterates '€' to 'EUR'
 							// TODO: add other expanding translations?
@@ -185,7 +186,8 @@ public function display($tpl = null)
 					{
 						if (($pos = JString::strpos($srow, strtolower(SearchHelper::remove_accents($hlword)))) !== false)
 						{
-							$pos += $cnt++ * JString::strlen($hl1 . $hl2);
+							$pos += $cnt * JString::strlen($hl1 . $hl2);
+							$cnt++;
 
 							// iconv transliterates '€' to 'EUR'
 							// TODO: add other expanding translations?
diff --git a/components/com_search/views/search/view.opensearch.php b/components/com_search/views/search/view.opensearch.php
index db1c984..00d7d86 100644
--- a/components/com_search/views/search/view.opensearch.php
+++ b/components/com_search/views/search/view.opensearch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/controller.php b/components/com_tags/controller.php
index d3eb535..9f47529 100644
--- a/components/com_tags/controller.php
+++ b/components/com_tags/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/controllers/tags.php b/components/com_tags/controllers/tags.php
index dc1ba00..92c3da5 100644
--- a/components/com_tags/controllers/tags.php
+++ b/components/com_tags/controllers/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/helpers/route.php b/components/com_tags/helpers/route.php
index 3ed0fd0..44299b1 100644
--- a/components/com_tags/helpers/route.php
+++ b/components/com_tags/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/models/tag.php b/components/com_tags/models/tag.php
index 73efffa..2d1adab 100644
--- a/components/com_tags/models/tag.php
+++ b/components/com_tags/models/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/models/tags.php b/components/com_tags/models/tags.php
index c2bfb12..e6775ac 100644
--- a/components/com_tags/models/tags.php
+++ b/components/com_tags/models/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/router.php b/components/com_tags/router.php
index 5707741..9dea5be 100644
--- a/components/com_tags/router.php
+++ b/components/com_tags/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/tags.php b/components/com_tags/tags.php
index 37d6cef..df1b7fb 100644
--- a/components/com_tags/tags.php
+++ b/components/com_tags/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tag/tmpl/default.php b/components/com_tags/views/tag/tmpl/default.php
index 45430b0..a09e8f2 100644
--- a/components/com_tags/views/tag/tmpl/default.php
+++ b/components/com_tags/views/tag/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tag/tmpl/default_items.php b/components/com_tags/views/tag/tmpl/default_items.php
index a167137..2ccbd23 100644
--- a/components/com_tags/views/tag/tmpl/default_items.php
+++ b/components/com_tags/views/tag/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tag/tmpl/list.php b/components/com_tags/views/tag/tmpl/list.php
index 15f4c65..eda8574 100644
--- a/components/com_tags/views/tag/tmpl/list.php
+++ b/components/com_tags/views/tag/tmpl/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tag/tmpl/list_items.php b/components/com_tags/views/tag/tmpl/list_items.php
index d317cb2..d8e0fbc 100644
--- a/components/com_tags/views/tag/tmpl/list_items.php
+++ b/components/com_tags/views/tag/tmpl/list_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tag/view.feed.php b/components/com_tags/views/tag/view.feed.php
index 9980f58..5b33a90 100644
--- a/components/com_tags/views/tag/view.feed.php
+++ b/components/com_tags/views/tag/view.feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php
index 86a3bde..8eb845a 100644
--- a/components/com_tags/views/tag/view.html.php
+++ b/components/com_tags/views/tag/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tags/tmpl/default.php b/components/com_tags/views/tags/tmpl/default.php
index a0f1717..d7c1f2b 100644
--- a/components/com_tags/views/tags/tmpl/default.php
+++ b/components/com_tags/views/tags/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tags/tmpl/default_items.php b/components/com_tags/views/tags/tmpl/default_items.php
index dcab28e..035cfb5 100644
--- a/components/com_tags/views/tags/tmpl/default_items.php
+++ b/components/com_tags/views/tags/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tags/view.feed.php b/components/com_tags/views/tags/view.feed.php
index 86cf0e9..0c7d035 100644
--- a/components/com_tags/views/tags/view.feed.php
+++ b/components/com_tags/views/tags/view.feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_tags/views/tags/view.html.php b/components/com_tags/views/tags/view.html.php
index 0b72437..f161df3 100644
--- a/components/com_tags/views/tags/view.html.php
+++ b/components/com_tags/views/tags/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/controller.php b/components/com_users/controller.php
index 8d54bb9..ca9bb98 100644
--- a/components/com_users/controller.php
+++ b/components/com_users/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/controllers/profile.json.php b/components/com_users/controllers/profile.json.php
index e170125..9fc2726 100644
--- a/components/com_users/controllers/profile.json.php
+++ b/components/com_users/controllers/profile.json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/controllers/profile.php b/components/com_users/controllers/profile.php
index 50621f0..aecb576 100644
--- a/components/com_users/controllers/profile.php
+++ b/components/com_users/controllers/profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/controllers/registration.php b/components/com_users/controllers/registration.php
index 09fd3ee..03cb811 100644
--- a/components/com_users/controllers/registration.php
+++ b/components/com_users/controllers/registration.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/controllers/remind.php b/components/com_users/controllers/remind.php
index a02b9cc..0885f9d 100644
--- a/components/com_users/controllers/remind.php
+++ b/components/com_users/controllers/remind.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/controllers/reset.php b/components/com_users/controllers/reset.php
index 23f2933..27c8c8b 100644
--- a/components/com_users/controllers/reset.php
+++ b/components/com_users/controllers/reset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php
index c395eea..69ea9d7 100644
--- a/components/com_users/controllers/user.php
+++ b/components/com_users/controllers/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/helpers/html/users.php b/components/com_users/helpers/html/users.php
index 8645cc1..dca1d6e 100644
--- a/components/com_users/helpers/html/users.php
+++ b/components/com_users/helpers/html/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/helpers/route.php b/components/com_users/helpers/route.php
index 4c753ff..1f2d350 100644
--- a/components/com_users/helpers/route.php
+++ b/components/com_users/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/models/login.php b/components/com_users/models/login.php
index ddf930e..682d3d2 100644
--- a/components/com_users/models/login.php
+++ b/components/com_users/models/login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php
index cb19e10..3f7bfc6 100644
--- a/components/com_users/models/profile.php
+++ b/components/com_users/models/profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php
index 6fc7325..cf5107f 100644
--- a/components/com_users/models/registration.php
+++ b/components/com_users/models/registration.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/models/remind.php b/components/com_users/models/remind.php
index 18c45e1..f60f777 100644
--- a/components/com_users/models/remind.php
+++ b/components/com_users/models/remind.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/models/reset.php b/components/com_users/models/reset.php
index c8cfb95..1d5fa37 100644
--- a/components/com_users/models/reset.php
+++ b/components/com_users/models/reset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/router.php b/components/com_users/router.php
index fda13a5..f298e10 100644
--- a/components/com_users/router.php
+++ b/components/com_users/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/users.php b/components/com_users/users.php
index 0815c0c..e562384 100644
--- a/components/com_users/users.php
+++ b/components/com_users/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/login/tmpl/default.php b/components/com_users/views/login/tmpl/default.php
index 0fe1173..72291b2 100644
--- a/components/com_users/views/login/tmpl/default.php
+++ b/components/com_users/views/login/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
index d23a7dc..86c5a24 100644
--- a/components/com_users/views/login/tmpl/default_login.php
+++ b/components/com_users/views/login/tmpl/default_login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/login/tmpl/default_logout.php b/components/com_users/views/login/tmpl/default_logout.php
index da0ef30..19caee5 100644
--- a/components/com_users/views/login/tmpl/default_logout.php
+++ b/components/com_users/views/login/tmpl/default_logout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/login/view.html.php b/components/com_users/views/login/view.html.php
index eddcd1e..7f91433 100644
--- a/components/com_users/views/login/view.html.php
+++ b/components/com_users/views/login/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/profile/tmpl/default.php b/components/com_users/views/profile/tmpl/default.php
index 687893b..06ad24d 100644
--- a/components/com_users/views/profile/tmpl/default.php
+++ b/components/com_users/views/profile/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/profile/tmpl/default_core.php b/components/com_users/views/profile/tmpl/default_core.php
index 8336195..44a4c0e 100644
--- a/components/com_users/views/profile/tmpl/default_core.php
+++ b/components/com_users/views/profile/tmpl/default_core.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/profile/tmpl/default_custom.php b/components/com_users/views/profile/tmpl/default_custom.php
index 5212deb..6f6201e 100644
--- a/components/com_users/views/profile/tmpl/default_custom.php
+++ b/components/com_users/views/profile/tmpl/default_custom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/profile/tmpl/default_params.php b/components/com_users/views/profile/tmpl/default_params.php
index 937971b..6b559ff 100644
--- a/components/com_users/views/profile/tmpl/default_params.php
+++ b/components/com_users/views/profile/tmpl/default_params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
index bb5e2cc..9502d11 100644
--- a/components/com_users/views/profile/tmpl/edit.php
+++ b/components/com_users/views/profile/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/profile/view.html.php b/components/com_users/views/profile/view.html.php
index 487f4aa..69f8bd2 100644
--- a/components/com_users/views/profile/view.html.php
+++ b/components/com_users/views/profile/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/registration/tmpl/complete.php b/components/com_users/views/registration/tmpl/complete.php
index aa3ef49..162a0d4 100644
--- a/components/com_users/views/registration/tmpl/complete.php
+++ b/components/com_users/views/registration/tmpl/complete.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php
index 924a582..75c743a 100644
--- a/components/com_users/views/registration/tmpl/default.php
+++ b/components/com_users/views/registration/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/registration/view.html.php b/components/com_users/views/registration/view.html.php
index 9b1a805..ee98fa1 100644
--- a/components/com_users/views/registration/view.html.php
+++ b/components/com_users/views/registration/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/remind/tmpl/default.php b/components/com_users/views/remind/tmpl/default.php
index baff58b..c113afe 100644
--- a/components/com_users/views/remind/tmpl/default.php
+++ b/components/com_users/views/remind/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/remind/view.html.php b/components/com_users/views/remind/view.html.php
index 05cfd51..476dc78 100644
--- a/components/com_users/views/remind/view.html.php
+++ b/components/com_users/views/remind/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/reset/tmpl/complete.php b/components/com_users/views/reset/tmpl/complete.php
index 399b486..9efdec2 100644
--- a/components/com_users/views/reset/tmpl/complete.php
+++ b/components/com_users/views/reset/tmpl/complete.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/reset/tmpl/confirm.php b/components/com_users/views/reset/tmpl/confirm.php
index b409b00..c9855a9 100644
--- a/components/com_users/views/reset/tmpl/confirm.php
+++ b/components/com_users/views/reset/tmpl/confirm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/reset/tmpl/default.php b/components/com_users/views/reset/tmpl/default.php
index 14ba875..e094fb1 100644
--- a/components/com_users/views/reset/tmpl/default.php
+++ b/components/com_users/views/reset/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_users/views/reset/view.html.php b/components/com_users/views/reset/view.html.php
index 3a12c76..80558c2 100644
--- a/components/com_users/views/reset/view.html.php
+++ b/components/com_users/views/reset/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_users
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/controller.php b/components/com_weblinks/controller.php
index 2e58231..b0d0f86 100644
--- a/components/com_weblinks/controller.php
+++ b/components/com_weblinks/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/controllers/weblink.php b/components/com_weblinks/controllers/weblink.php
index b3bcfb0..f41de16 100644
--- a/components/com_weblinks/controllers/weblink.php
+++ b/components/com_weblinks/controllers/weblink.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/helpers/association.php b/components/com_weblinks/helpers/association.php
index 0381cec..7dd8512 100644
--- a/components/com_weblinks/helpers/association.php
+++ b/components/com_weblinks/helpers/association.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/helpers/category.php b/components/com_weblinks/helpers/category.php
index 22476fe..66c1ce6 100644
--- a/components/com_weblinks/helpers/category.php
+++ b/components/com_weblinks/helpers/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/helpers/icon.php b/components/com_weblinks/helpers/icon.php
index 195e672..e8410b1 100644
--- a/components/com_weblinks/helpers/icon.php
+++ b/components/com_weblinks/helpers/icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/helpers/route.php b/components/com_weblinks/helpers/route.php
index 5a2ffce..6aecedd 100644
--- a/components/com_weblinks/helpers/route.php
+++ b/components/com_weblinks/helpers/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -227,13 +227,14 @@ protected static function _findItem($needles = null)
 			}
 		}
 
+		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
-		if ($active && ($active->language == '*' || !JLanguageMultilang::isEnabled()))
+		if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
 
-		// if not found, return language specific home link
+		// If not found, return language specific home link
 		$default = $menus->getDefault($language);
 		return !empty($default->id) ? $default->id : null;
 	}
diff --git a/components/com_weblinks/models/categories.php b/components/com_weblinks/models/categories.php
index ae944a5..34d38de 100644
--- a/components/com_weblinks/models/categories.php
+++ b/components/com_weblinks/models/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/models/category.php b/components/com_weblinks/models/category.php
index 531ff93..f26867d 100644
--- a/components/com_weblinks/models/category.php
+++ b/components/com_weblinks/models/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/models/form.php b/components/com_weblinks/models/form.php
index 016a129..52a34ed 100644
--- a/components/com_weblinks/models/form.php
+++ b/components/com_weblinks/models/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/models/weblink.php b/components/com_weblinks/models/weblink.php
index fe50411..fdc93ec 100644
--- a/components/com_weblinks/models/weblink.php
+++ b/components/com_weblinks/models/weblink.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/router.php b/components/com_weblinks/router.php
index a09a881..25c3102 100644
--- a/components/com_weblinks/router.php
+++ b/components/com_weblinks/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/categories/tmpl/default.php b/components/com_weblinks/views/categories/tmpl/default.php
index 7d9d3e5..cf56a15 100644
--- a/components/com_weblinks/views/categories/tmpl/default.php
+++ b/components/com_weblinks/views/categories/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/categories/tmpl/default_items.php b/components/com_weblinks/views/categories/tmpl/default_items.php
index ee89ffa..7cc7d6d 100644
--- a/components/com_weblinks/views/categories/tmpl/default_items.php
+++ b/components/com_weblinks/views/categories/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/categories/view.html.php b/components/com_weblinks/views/categories/view.html.php
index b821c8c..a4d52d7 100644
--- a/components/com_weblinks/views/categories/view.html.php
+++ b/components/com_weblinks/views/categories/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/category/tmpl/default.php b/components/com_weblinks/views/category/tmpl/default.php
index 373122a..972ba0b 100644
--- a/components/com_weblinks/views/category/tmpl/default.php
+++ b/components/com_weblinks/views/category/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/category/tmpl/default_children.php b/components/com_weblinks/views/category/tmpl/default_children.php
index 7178517..9a80d61 100644
--- a/components/com_weblinks/views/category/tmpl/default_children.php
+++ b/components/com_weblinks/views/category/tmpl/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/category/tmpl/default_items.php b/components/com_weblinks/views/category/tmpl/default_items.php
index 62667c3..938adcb 100644
--- a/components/com_weblinks/views/category/tmpl/default_items.php
+++ b/components/com_weblinks/views/category/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/category/view.feed.php b/components/com_weblinks/views/category/view.feed.php
index f0e243e..6a281cc 100644
--- a/components/com_weblinks/views/category/view.feed.php
+++ b/components/com_weblinks/views/category/view.feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/category/view.html.php b/components/com_weblinks/views/category/view.html.php
index ed408f0..1d01399 100644
--- a/components/com_weblinks/views/category/view.html.php
+++ b/components/com_weblinks/views/category/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/form/tmpl/edit.php b/components/com_weblinks/views/form/tmpl/edit.php
index 5fb7e2d..82670b2 100644
--- a/components/com_weblinks/views/form/tmpl/edit.php
+++ b/components/com_weblinks/views/form/tmpl/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/form/view.html.php b/components/com_weblinks/views/form/view.html.php
index 9b87e40..9689cc3 100644
--- a/components/com_weblinks/views/form/view.html.php
+++ b/components/com_weblinks/views/form/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/views/weblink/view.html.php b/components/com_weblinks/views/weblink/view.html.php
index 81fa8ff..e12bf6e 100644
--- a/components/com_weblinks/views/weblink/view.html.php
+++ b/components/com_weblinks/views/weblink/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_weblinks/weblinks.php b/components/com_weblinks/weblinks.php
index 2a51bd8..52833bb 100644
--- a/components/com_weblinks/weblinks.php
+++ b/components/com_weblinks/weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/controller.php b/components/com_wrapper/controller.php
index 495bf32..29bf538 100644
--- a/components/com_wrapper/controller.php
+++ b/components/com_wrapper/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/router.php b/components/com_wrapper/router.php
index 0d86556..fbfb14e 100644
--- a/components/com_wrapper/router.php
+++ b/components/com_wrapper/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/views/wrapper/tmpl/default.php b/components/com_wrapper/views/wrapper/tmpl/default.php
index 5636077..4e9dcf0 100644
--- a/components/com_wrapper/views/wrapper/tmpl/default.php
+++ b/components/com_wrapper/views/wrapper/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/views/wrapper/view.html.php b/components/com_wrapper/views/wrapper/view.html.php
index df115f4..0b51609 100644
--- a/components/com_wrapper/views/wrapper/view.html.php
+++ b/components/com_wrapper/views/wrapper/view.html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/wrapper.php b/components/com_wrapper/wrapper.php
index 32e0bdf..a8be77d 100644
--- a/components/com_wrapper/wrapper.php
+++ b/components/com_wrapper/wrapper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/components/com_wrapper/wrapper.xml b/components/com_wrapper/wrapper.xml
index 1eab40e..0abffa6 100644
--- a/components/com_wrapper/wrapper.xml
+++ b/components/com_wrapper/wrapper.xml
@@ -3,7 +3,7 @@
 	<name>com_wrapper</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2006</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.
 	</copyright>
 	<license>GNU General Public License version 2 or later; see
 		LICENSE.txt</license>
diff --git a/htaccess.txt b/htaccess.txt
index 1148215..48e3abd 100644
--- a/htaccess.txt
+++ b/htaccess.txt
@@ -1,6 +1,6 @@
 ##
 # @package		Joomla
-# @copyright	Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+# @copyright	Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 # @license		GNU General Public License version 2 or later; see LICENSE.txt
 ##
 
diff --git a/includes/defines.php b/includes/defines.php
index 3303a9d..a20a949 100644
--- a/includes/defines.php
+++ b/includes/defines.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Site
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/includes/framework.php b/includes/framework.php
index d6efec4..0f38dd0 100644
--- a/includes/framework.php
+++ b/includes/framework.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Site
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/index.php b/index.php
index b163fa0..e2239ca 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Site
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/CHANGELOG b/installation/CHANGELOG
index eef043c..eb1991f 100644
--- a/installation/CHANGELOG
+++ b/installation/CHANGELOG
@@ -1,6 +1,6 @@
 0. Metadata
 -----------
-Copyright:		Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+Copyright:		Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
 License:		GNU General Public License version 2 or later; see LICENSE.txt
 
 1. Copyright and disclaimer
diff --git a/installation/COPYRIGHT b/installation/COPYRIGHT
index 089c894..61f7685 100644
--- a/installation/COPYRIGHT
+++ b/installation/COPYRIGHT
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package		Joomla.Installation
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/CREDITS b/installation/CREDITS
index 6d32769..1577cd9 100644
--- a/installation/CREDITS
+++ b/installation/CREDITS
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package		Joomla.Installation
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -10,7 +10,7 @@ defined('_JEXEC') or die;
 
 -----Please save file as UTF8
 
--------------------- Joomla! 1.6/1.7/2.5 Credits ---------------------
+-------------------- Joomla! 1.6/1.7/2.5/3.x Credits ---------------------
 
 Code contributors:
 ------------------
@@ -118,14 +118,15 @@ Translation Contributors:
 -------------------------
 Afrikaans (af-ZA) - Gerrit Hoekstra
 Albanian (sq-AL) - Blendi Kraja
-Arabic Unitag (ar-AA) - Arabic Unitag Translation Team - Mahmood Alhaj Kassem
+Arabic Unitag (ar-AA) - Arabic Unitag Translation Team - Mahmood Alhaj Kassem, dr.d.ashraf
 Azeri (az-AZ) - Azeri Translation team - Guluzade Farhad
+Bahasa Indonesia (id-ID) - Hanacaraka Team - Andy Sikumbang, Dwi Rianto
 Basque (eu-ES) - Oinatz Martin
 Belarusian (be-BY) - Dennis Hermacki
 Bosnian (bs-BA) - Bosnian Translation Team - Admir Agic
-Bulgarian (bg-BG) - Stefan Ilivanov
+Bulgarian (bg-BG) - Yuriy Boev, Mihail Semerdzhiev, Stefan Ilivanov
 Brazilian Portuguese (pt-BR) - Joomla! Brasil - FaBMak
-Catalan (ca-ES) - Catalan Translation Team - Damià Verger
+Catalan (ca-ES) - Catalan Translation Team - el_libre@tradu.cat
 Chinese Traditional (zh-TW) - Traditional Chinese Translation Team - Eddy Chang
 Chinese Simplified (zh-CN) - Simplified Chinese Translation Team - Jonathan Chang
 Croatian (hr-HR) - Croatian Translation Team - Hrvoje Jerkovic
@@ -136,7 +137,7 @@ English (en-AU) - AU Australian Translation Team - Leonard Fitzgerald
 English (en-US) - US English Translation Team - Leonard Fitzgerald
 Estonian (et-EE) - Estonian Translation Team - Rivo Zängov
 Flemish (nl-BE) - Dutch (BE) Translation Team - Frank Joris
-Finnish (fi-FI) - Finnish Translation Team - Markku Suominen
+Finnish (fi-FI) - Finnish Translation Team - Joomla.fi
 French (fr-FR) - French Translation Team - joomla.fr
 Galician (gl-ES) - Galician Translation Team - damufo
 Georgian (ka-GE) - Georgian Translation Project - Manana Gedevanishvili
@@ -162,16 +163,17 @@ Persian (fa-IR) - Persian Translation Team - Mohsen Firoozmandan, Joomla Farsi T
 Polish (pl-PL) - Polskie Centrum Joomla! 
 Portuguese (pt-BR) - Joomla! Brasil
 Portuguese (pt-PT) - Comunidade Joomla! Portugal - Paulo Izidoro
-Romanian (ro-RO) - Romanian Joomla! Community - Cosmin Lebu
+Romanian (ro-RO) - Romanian Joomla! Community - Horia Negura, Lavinia Negura
 Russian (ru-RU) - Russian Translation Team (joomlaportal.ru) - Sergey Litvinov, Sergey Brovin, Alexey Brin
 Scottish Gaelic (gd-GB) - Scottish Gaelic Translation - Michael Bauer
 Serbian (sr-RS) and Serbian (sr-YU)- Joomla! Serbia team - Svetlana Zec, Nenad Antic, Marko Milenovic
 Slovak (sk-SK) - Slovak Translation Team - Peter Michnica
 Spanish (es-ES) - Spanish Translation Team - Gustavo Raúl Aragón, Rafael Gómez, Leonel Cantón.
+Swahili - East Africa (sw-KE) - Swahili Translation Team - Hassan Abdalla (Ayeko)
 Swedish (sv-SE) - Swedish Translation Team (SvenskJoomla!) - Sune Hultman, Olle Zettergren, Stefan Gagner, Christer Gerhardsson
 Syriac (sy-IQ) - East Syriac Translation Team - Pauls Dinka
-Laotian (lo-LA) - Joomlalaolao Team (LaoOpenSource) - Akarawuth Tamrareang , Viengsakhone phanthanousy , Outhai Saioudom, Chittavong Keomanyvong
 Tamil India (ta-IN) - Ilagnayeru 'MIG' Manickam, Elango Samy Manim
+Thai (th-TH) - Joomla LaiThai Team (JoomlaCorner) - Akarawuth Tamrareang , Supachai Teasakul
 Turkish (tr-TR) - Joomla! Turkiye - Ümit Kenan Gönüllü
 Ukrainian (uk-UA) - Ukrainian Translation Team - Denys Nosov
 Urdu Pakistan (ur-PK) - Basim
diff --git a/installation/INSTALL b/installation/INSTALL
index 4e94a31..b929e53 100644
--- a/installation/INSTALL
+++ b/installation/INSTALL
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package		Joomla.Installation
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/LICENSES b/installation/LICENSES
index 3b5361d..32a84ac 100644
--- a/installation/LICENSES
+++ b/installation/LICENSES
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package		Joomla.Installation
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/application/bootstrap.php b/installation/application/bootstrap.php
index 40d7aab..323b0e0 100644
--- a/installation/application/bootstrap.php
+++ b/installation/application/bootstrap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/application/defines.php b/installation/application/defines.php
index 664c85f..18238c5 100644
--- a/installation/application/defines.php
+++ b/installation/application/defines.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/application/framework.php b/installation/application/framework.php
index 3349681..4fd90bc 100644
--- a/installation/application/framework.php
+++ b/installation/application/framework.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/application/router.php b/installation/application/router.php
index 09d83cb..df4d02c 100644
--- a/installation/application/router.php
+++ b/installation/application/router.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/application/web.php b/installation/application/web.php
index 5da2f57..2b1ae2d 100644
--- a/installation/application/web.php
+++ b/installation/application/web.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/configuration.php-dist b/installation/configuration.php-dist
index 38cad1f..1bbf8b4 100644
--- a/installation/configuration.php-dist
+++ b/installation/configuration.php-dist
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package		Joomla
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  *
  * -------------------------------------------------------------------------
diff --git a/installation/controller/database.php b/installation/controller/database.php
index d2fccec..f5905a0 100644
--- a/installation/controller/database.php
+++ b/installation/controller/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/default.php b/installation/controller/default.php
index 22bc930..dd79dad 100644
--- a/installation/controller/default.php
+++ b/installation/controller/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/detectftproot.php b/installation/controller/detectftproot.php
index e6ed114..4c1c70c 100644
--- a/installation/controller/detectftproot.php
+++ b/installation/controller/detectftproot.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/ftp.php b/installation/controller/ftp.php
index a249072..8d4077b 100644
--- a/installation/controller/ftp.php
+++ b/installation/controller/ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/install/config.php b/installation/controller/install/config.php
index e947815..af094de 100644
--- a/installation/controller/install/config.php
+++ b/installation/controller/install/config.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/install/database.php b/installation/controller/install/database.php
index 72ddbb2..c463671 100644
--- a/installation/controller/install/database.php
+++ b/installation/controller/install/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/install/database_backup.php b/installation/controller/install/database_backup.php
index 48c17e3..598efb7 100644
--- a/installation/controller/install/database_backup.php
+++ b/installation/controller/install/database_backup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/install/database_remove.php b/installation/controller/install/database_remove.php
index 8791c9a..64d844c 100644
--- a/installation/controller/install/database_remove.php
+++ b/installation/controller/install/database_remove.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/install/email.php b/installation/controller/install/email.php
index e01882a..2036bdb 100644
--- a/installation/controller/install/email.php
+++ b/installation/controller/install/email.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/install/languages.php b/installation/controller/install/languages.php
index f18f6d5..2919c65 100644
--- a/installation/controller/install/languages.php
+++ b/installation/controller/install/languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,6 +65,7 @@ public function execute()
 		{
 			// Install selected languages
 			$model->install($lids);
+			$app->enqueueMessage(JText::_('INSTL_LANGUAGES_MORE_LANGUAGES'));
 		}
 
 		// Redirect to the page.
diff --git a/installation/controller/install/sample.php b/installation/controller/install/sample.php
index e344998..15646a0 100644
--- a/installation/controller/install/sample.php
+++ b/installation/controller/install/sample.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/preinstall.php b/installation/controller/preinstall.php
index 65d0268..b3485bf 100644
--- a/installation/controller/preinstall.php
+++ b/installation/controller/preinstall.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/removefolder.php b/installation/controller/removefolder.php
index 72c672d..d25eedb 100644
--- a/installation/controller/removefolder.php
+++ b/installation/controller/removefolder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/setdefaultlanguage.php b/installation/controller/setdefaultlanguage.php
index 6cf432c..b9cda49 100644
--- a/installation/controller/setdefaultlanguage.php
+++ b/installation/controller/setdefaultlanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/setlanguage.php b/installation/controller/setlanguage.php
index 0c1bb54..cb70a1b 100644
--- a/installation/controller/setlanguage.php
+++ b/installation/controller/setlanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/site.php b/installation/controller/site.php
index 8ff2c91..e5baf6d 100644
--- a/installation/controller/site.php
+++ b/installation/controller/site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/summary.php b/installation/controller/summary.php
index f672a97..ac33791 100644
--- a/installation/controller/summary.php
+++ b/installation/controller/summary.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/controller/verifyftpsettings.php b/installation/controller/verifyftpsettings.php
index 9ca456a..d6c7115 100644
--- a/installation/controller/verifyftpsettings.php
+++ b/installation/controller/verifyftpsettings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/helper/database.php b/installation/helper/database.php
index aa89cc8..63d6e69 100644
--- a/installation/helper/database.php
+++ b/installation/helper/database.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/helper/html/installation.php b/installation/helper/html/installation.php
index 981a72e..a671e61 100644
--- a/installation/helper/html/installation.php
+++ b/installation/helper/html/installation.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/index.php b/installation/index.php
index 4e70be7..88b64a5 100644
--- a/installation/index.php
+++ b/installation/index.php
@@ -2,10 +2,10 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
- 
+
 // Added by JoomlArt: no limit for php excution time when installing 
 @set_time_limit (0);
 
diff --git a/installation/language/af-ZA/af-ZA.ini b/installation/language/af-ZA/af-ZA.ini
index 3a01934..7975b60 100644
--- a/installation/language/af-ZA/af-ZA.ini
+++ b/installation/language/af-ZA/af-ZA.ini
@@ -1,17 +1,14 @@
-; $Id: af-ZA.ini 1822 2013-04-08 08:56:45Z gerrit_hoekstra $
+; $Id: af-ZA.ini 1906 2014-01-29 10:14:24Z gerrit_hoekstra $
 ; Joomla! Project
-; Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL, see LICENSE.php
 ; Let op: Alle ini lêërs moet as UTF-8 gestoor word
 
 
 ;Stepbar
-INSTL_STEPS_TITLE="Stappe"
 
 ;Language view
 INSTL_SITE_NAME_LABEL="Webwerf Naam"
-INSTL_SITE_NAME_TITLE="Webwerf Naam"
-INSTL_LANGUAGE_TITLE="Kies taal"
 INSTL_WARNJAVASCRIPT="Waarskuwing! JavaScript moet ontsper wees vir die korrekte installeer van Joomla!"
 INSTL_WARNJSON="JSON moet op jou PHP installasie ontsper wees sodat Joomla! ge&iuml;nstalleer kan word!"
 
@@ -21,7 +18,6 @@ INSTL_PRECHECK_TITLE="Voor-Installeerings Toets"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Aanbevole instellings:"
 INSTL_PRECHECK_DIRECTIVE="Riglyn"
 INSTL_PRECHECK_RECOMMENDED="Aanbeveel"
-INSTL_PRECHECK_FOR_VERSION="Voor-Installeerings toets vir %s:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Hierdie instellings is vir PHP aanbeveel om volle versoenbaarheid met Joomla! te verseker.<br />Joomla! sal nietemin nog steeds werk indien jou instellings nie heeltemal aan hierdie aanbeveelings voldoen nie."
 INSTL_PRECHECK_DESC="Indien enige van hierdie items nie ondersteun is nie (aangedui met <strong><font color=&quot;#ff0000&quot;>Nee</font></strong>), dan voldoen jou stelsel nie aan die minimum vereistes nie. Maak asb. die foute reg, anders sal jou Joomla!-installasie nie behoorlik werk nie."
 
@@ -34,7 +30,6 @@ INSTL_DATABASE_TYPE_LABEL="Databasis Tipe"
 INSTL_DATABASE_USER_LABEL="Gebruikernaam"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Rugsteun"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Verwyder"
-INSTL_DATABASE_TITLE="Verbinding Instellings"
 INSTL_DATABASE_PREFIX_LABEL="Tabel Voorvoegsel"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="L&ecirc;er %s bestaan nie"
 INSTL_DATABASE_OLD_PROCESS_LABEL="Ou Databasis Proses"
@@ -45,7 +40,6 @@ INSTL_DATABASE_FIX_TOO_LONG="Die MySQL tabel voorvoegsel mag slegs 'n maksimum o
 INSTL_DATABASE_HOST_DESC="Hierdie is gewoonlik &quot;localhost&quot;"
 INSTL_DATABASE="Databasis Konfigurasie"
 INSTL_DATABASE_COULD_NOT_CONNECT="Kon nie met die databasis verbind nie. Die verbinding gee fout nommer %s terug"
-INSTL_DATABASE_DESC="<p>Die installeering van Joomla! sodat sit op jou bediener kan loop, omvat vier eenvoudige stappies....</p>  <p>In die Databasis Konfigurasie Stap:</p><p>Kies die tipe databasis in die kieslys. In die meeste gevalle sal dit <strong>MySQL</strong> wees.</p> <p>Tik die naam van jou webwerf se bediener in.</p><p>Voer die MySQL gebruikernaam, wagwoord en databasis naam in wat jy vir Joomla! wil gebruik.</p> <p>Voer die tabel voorvoegsel vir die Joomla! installasie in.</p><p>Besluit en kies dan hoe jy die bestaande tabelle van vorige Joomla! installasies wil hanteer.</p>"
 INSTL_DATABASE_ERROR_BACKINGUP="Daar was 'n paar foute toe die databasis gerugsteun is."
 INSTL_DATABASE_ERROR_DELETE="Daar was 'n paar foute toe die databasis geskrap is."
 INSTL_DATABASE_INVALID_DB_DETAILS="Die databasis gegewens is òf foutief òf leeg."
@@ -59,9 +53,7 @@ INSTL_DATABASE_NAME_TOO_LONG="Die MySQL databasis naam mag 'n maksimum van 64 ka
 INSTL_DATABASE_OLD_PROCESS_DESC="Enige bestaande, gerugsteunde tabelle van vorige Joomla! installasies sal oorskryf word"
 INSTL_DATABASE_PASSWORD_DESC="Ter wille van jou werf se sekuriteit is 'n wagwoord vir die MySQL-rekening vereis."
 INSTL_DATABASE_PREFIX_DESC="Kies 'n databasis voorvoegsel of gebruik die <b>willekeurig-gegenereerde</b> voorvoegsel. Die ideale voorvoegsel is drie of vier karakters lank, bevat slegs alfanumeriese karakters, en MOET met 'n onderstrepie eindig. <b>Maak seker dat die gekose voervoegel nie reeds deur ander tabelle gebruik is nie</b>."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Die MySQL tabel voorvoegsel moet met 'n letter begin en mag slegs deur letters, nommers of onderstrepies gevolg word."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Kon nie die manifes-kas vervars nie vir ektensie: %s"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Fout met die oorspronklike skema se versie nommer"
 INSTL_DATABASE_PREFIX_MSG="Die tabel-voorvoegsel moet met 'n letter begin, en moet dan deur 'n optionele alfanumeriese karakter en 'n onderstrepie gevolg word"
 INSTL_DATABASE_SUPPORT="Databasis Ondersteuning:"
 
@@ -111,11 +103,9 @@ INSTL_SELECT_LANGUAGE_TITLE="Kies Taal"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Ondersteuning"
 INSTL_SITE_METADESC_LABEL="Meta Beskrywing"
 INSTL_SITE="Hoof Konfigurasie"
-INSTL_BASIC_SETTINGS="Basiese Instellings"
 INSTL_OUTPUT_BUFFERING="Afvoer Buffer"
 INSTL_REGISTER_GLOBALS="Registreer Globale Stellings"
 INSTL_SESSION_AUTO_START="Sessie Outo-Begin"
-INSTL_ADVANCED_SETTINGS="Gevorderde Instellings"
 INSTL_SITE_INSTALL_SAMPLE_LABEL="Installeer Voorbeeld-Data"
 INSTL_SITE_OFFLINE_LABEL="Werf is Geaflyn"
 INSTL_SITE_OFFLINE_TITLE_LABEL="Stel die werf voorkant van lyn af wanneer die installeering voltooi is. Die werf kan later weer aan lyn gestel word deur middel van die Globale Konfigurasie."
@@ -126,13 +116,10 @@ INSTL_VERIFY_FTP_SETTINGS="Verifi&euml;er FTP Instellings"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parseerder Ondersteuning"
 INSTL_SAMPLE_DATA_SET="Verstek English (GB) Voorbeeld-Data"
 INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib Kompressie Ondersteuning"
-INSTL_SELECT_LANGUAGE_DESC="Kies asseblief die taal om te gebruik gedurende die Joomla! installasie stappe:"
 INSTL_ADMIN_USER_LABEL="Admin Gebruikernaam"
-INSTL_LICENSE="Lisensie"
 INSTL_HEADER_ERROR="Fout"
 INSTL_GNU_GPL_LICENSE="GNU Algemene Publieke Lisensie"
 INSTL_PHP_VERSION="PHP Versie"
-INSTL_INSTALLATION="Installeering"
 INSTL_PAGE_TITLE="Joomla! Web Installeerder"
 INSTL_CONFPROBLEM="Jou konfigurasie lêer of lêergids is nie skryfbaar nie, of daar was 'n probleem met die skep van die konfigurasie lêer. Jy sal die volgende kode per hand moet oplaai. Kliek in die teks area hieronder om al die kode te kies in knip-en-plak dit in 'n nuwe lêer, genoem <code>configuration.php</code> en laai dit dan op na jou Joomla!-installasie se wortelgids."
 INSTL_COOKIES_NOT_ENABLED="Koekies is nie op jou webblaaier ontsper nie. Jy sal nie hierdie toepassing kan installeer nie."
@@ -153,12 +140,8 @@ INSTL_ZIP_SUPPORT_AVAILABLE="Oorspronklike ZIP ondersteuning"
 
 
 ;Complete view
-INSTL_COMPLETE="Voltooi"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! in jou eie taal en/of outomatiese veeltalige webwerf"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administrasie Aanteken Gegewens"
-INSTL_COMPLETE_DESC1="Kliek die Webwerf knoppie om jou Joomla! webwerf te sien, of op die Admin knoppie wat jou na die Admin Inteken sal lei."
-INSTL_COMPLETE_DESC2="Op die Joomla! Hulp-werf is daar 'n maklike gids wat vir jou stap-vir-stap sal wys hoe om die Taalpaket vir Joomla! te installeer.<br/>Jy sal daar ook skakels na anderstalige taalpakette sien."
-INSTL_COMPLETE_DESC3="Kliek die knoppie aan die regter kant om die Hulp-werf in 'n nuwe venster oop te maak."
 INSTL_COMPLETE_REMOVE_INSTALLATION="ONTHOU ASB. OM DIE <br />INSTALLASIE (nl. installation) LÊERGIDS HEELTEMAL TE VERWYDER<br />Dit is nie moontlik om by hierdie punt verby te gaan voordat jy dit gedoen het nie.<br />Dit is 'n sekuriteits-funksie van Joomla!"
 INSTL_COMPLETE_REMOVE_FOLDER="Verwyder installeerings-vouer"
 INSTL_COMPLETE_FOLDER_REMOVED="Installeerings-vouer suksesvol verwyder"
@@ -174,7 +157,6 @@ JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Hierdie Taalpaket stem nie met die weerga
 JGLOBAL_ISFREESOFTWARE="%s is Gratis Sagteware wat kragtens die <a href=&quot;http://www.gnu.org/licenses/gpl-2.0.html&quot;>GNU Algemene Publieke Lisensie</a> vrygestel is."
 JINVALID_TOKEN="Die mees-onlangse versoek is gewyer omdat dit 'n ongeldige sekuriteits-kenteken bevat. Vervars jou bladsy en probeer weer."
 JADMINISTRATOR="Administrateur"
-JADVANCED="Gevorderd"
 JERROR="Fout"
 JUSERNAME="Gebruikernaam"
 JYES="Ja"
@@ -248,9 +230,6 @@ INSTL_SITE_INSTALL_SAMPLE_NONE="Geen (<strong>Is nodig vir 'n basiese veeltalige
 INSTL_STEP_COMPLETE_LABEL="Voltooi"
 INSTL_STEP_DATABASE_LABEL="Databasis"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Taal"
-INSTL_STEP_LICENSE_LABEL="Lisensie"
-INSTL_STEP_PREINSTALL_LABEL="Voor-Installeerings Toets"
 INSTL_STEP_SITE_LABEL="Konfigurasie"
 INSTL_STEP_SUMMARY_LABEL="Oorsig"
 INSTL_SUMMARY_EMAIL_DESC="Kies om konfigurasie instellings hieronder aan %s per e-pos te stuur na installeering."
@@ -273,8 +252,6 @@ INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla het die volgende tale ge&iuml;nstall
 INSTL_DEFAULTLANGUAGE_FRONTEND="Verstek Webwerf Taal"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla kon nie hierdie as verstek taal stel nie. Engels sal as die verstek taal vir die voorkant webwerf koppelvlak gebruik word."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla het %s as jou verstek WEBWERF taal gestel."
-INSTL_DEFAULTLANGUAGE_NOTE="Let op: Nadat jy op die Volgende-knoppie gekliek het, sal jy terug na die einde van die installeer proses gely word en gevra word om die installeer vouer te skrap."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Kies jou verstek taal"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Jy sal dit later kan installeer d.m.v. die Joomla Administrateur-koppelvlak."
 INSTL_ERROR_INITIALISE_SCHEMA="Kan nie die databasis-skema instanti&euml;er nie"
 INSTL_LANGUAGES="Taal Pakette"
@@ -316,3 +293,5 @@ INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Veeltalig"
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Afrikaans"
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopieer het gefaal"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kon nie l&ecirc;er kopieer nie %1 to %2."
+INSTL_LANGUAGES_MORE_LANGUAGES="Druk die 'Vorige' knoppie as jy verdere tale wil installeer."
+JLIB_INSTALLER_NOT_ERROR="As die fout aan die installeer van TinyMCE taal l&ecirc;&euml;rs verbonde is sal dit nie installeer van tale affekteer nie. Sekere taal pakette wat voor Joomla 3.2.0 geskep is probeer om aparte TinyMCE taal l&ecirc;&euml;rs te installeer. Noudat hulle in die kern is, hoef hulle nie geinstalleer te word nie."
diff --git a/installation/language/af-ZA/af-ZA.xml b/installation/language/af-ZA/af-ZA.xml
index 9be67d6..2ab7f09 100644
--- a/installation/language/af-ZA/af-ZA.xml
+++ b/installation/language/af-ZA/af-ZA.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>09 FEB 2013</creationDate>
 	<author>Joomla4Africa Project</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<description>3.0 Joomla Afrikaanse Taalpaket</description>
 	<files>
diff --git a/installation/language/ar-AA/ar-AA.ini b/installation/language/ar-AA/ar-AA.ini
index d28636d..69554a0 100644
--- a/installation/language/ar-AA/ar-AA.ini
+++ b/installation/language/ar-AA/ar-AA.ini
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="الإنهاء"
 INSTL_STEP_DATABASE_LABEL="تهيئة قاعدة البيانات"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="اختر اللغة الإفتراضية"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="اختيار اللغة"
 INSTL_STEP_LANGUAGES_LABEL="تنصيب اللغات"
-INSTL_STEP_LICENSE_LABEL="الترخيص"
-INSTL_STEP_PREINSTALL_LABEL="فحص ما قبل التثبيت"
 INSTL_STEP_SITE_LABEL="الإعدادات الرئيسية"
 INSTL_STEP_SUMMARY_LABEL="نظرة عامة"
-INSTL_STEPS_TITLE="خطوات التنصيب"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="اختيار اللغة المفضلة"
-INSTL_SELECT_LANGUAGE_DESC="يرجى اختيار اللغة التي تود استعمالها خلال خطوات تنصيب جوملا!"
 INSTL_SELECT_LANGUAGE_TITLE="اختيار اللغة"
 INSTL_WARNJAVASCRIPT="تحذير! يجب تمكين الجافا سكريبت لكي يتم تثبيت نظتم جوملا! بشكل صحيح"
 INSTL_WARNJSON="PHP  خلال تثبيتكم JSON للتمكن من تثيت جوملا . يجب تفعيل"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="فحص ما قبل التثبيت"
-INSTL_PRECHECK_FOR_VERSION="فحص ماقبل التثبيت من أجل %s:"
 INSTL_PRECHECK_DESC="إذا كان أي من هذه المناصر غير مدعوم "_QQ_"أي غير متوفر"_QQ_" سيكون مكتوب باللون الأحمر <strong class="_QQ_"red"_QQ_">(لا)</strong> عندها يرجى القيام بالإجراءات اللازمة لتصحيحها.<br />لا يمكنك تنصيب جوملا! حتى توفير الإعدادت المطلوبة أدناه."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="الإعدادات التي ينصح بها:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="هذه إعدادات PHP التي ينصح بها من أجل ضمان التوافق التام مع نظام جوملا!. <br/> ومع ذلك سوف يعمل نظام جوملا! حتى لو كانت الإعدادات غير متطابقة مع ماينصح به."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="هذه على الأرجح &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="نوع قاعدة البيانات"
 INSTL_DATABASE_USER_DESC="أي شيء مثل "_QQ_"root"_QQ_"أو اسم مستخدم محدد من قبل سيرفر الاستضافة"
 INSTL_DATABASE_USER_LABEL="اسم المستخدم"
-INSTL_DATABASE_TITLE="إعدادات الإتصال"
-INSTL_DATABASE_DESC="<p>المواقع التي تستخدم نظام جوملا! تقوم بتخزين كافة البيانات الخاصة بالموقع في قاعدة بيانات. هذه الشاة تعطي برنامج التنصيب المعلومات اللازمة لإنشاء قاعدة البيانات هذه.</p><p> إذا كنت تقوم بتثبيت جوملا!! على خادم الويب البعيد (السيرفر الحقيقي)، ستحتاج للحصول على هذه المعلومات من قبل سيرفر الاستضافة.</p><p> بعض سيرفرات الاستضافة تتطلب إنشاء قاعدة البيانات قبل تنصيب جوملا!. إذا ظهرت لك الرسالة التالية "_QQ_" تعذر الاتصال بقاعدة البانات"_QQ_"، قم بالتحقق من أن اسم المستخدم وكلمة المرور صحيحتين، وفي حال استمرت هذه الرسالة بالظهور، قم بالتأكد من سيرفر الاستضافة الخاص بك لمعرفة ما إذا كنت بحاجة لإنشاء قاعدة البيانات قبل تنصيب جوملا!</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="إيجاد تلقائي لمسار FTP"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="مسار جذر FTP"
 INSTL_FTP_SAVE_LABEL="حفظ كلمة مرور FTP"
 INSTL_FTP_TITLE="تهيئة FTP (<strong class="_QQ_"red"_QQ_">اختياري - معظم المستخدمين يمكنهم تخطي هذه الخطوة - اضغط "_QQ_"التالي"_QQ_" للتخطي</strong>)"
 INSTL_FTP_USER_LABEL="اسم مستخدم FTP"
-INSTL_SITE_NAME_LABEL="اسم الموقع"
 INSTL_VERIFY_FTP_SETTINGS="التحقق من إعدادات بروتوكول نقل الملفات FTP"
 INSTL_FTP_SETTINGS_CORRECT="تصحيح الإعدادات"
 INSTL_FTP_USER_DESC="تحذير! من المستحسن ترك هذا فارغاً وإدخال اسم مستخدم حساب FTP في كل مرة تقوم بها بنقل الملفات."
@@ -79,11 +69,11 @@ INSTL_SITE="الإعدادات الرئيسية"
 INSTL_ADMIN_EMAIL_LABEL="البريد الإلكتروني لمدير الموقع"
 INSTL_ADMIN_EMAIL_DESC="أدخل بريدك الالكتروني. سيكون هذا البريد الالكتروني الخاص بالمدير العام."
 INSTL_ADMIN_PASSWORD_LABEL="كلمة مرور مدير الموقع"
-INSTL_ADMIN_PASSWORD_DESC="أدخل كلمة المرور لحساب 'المدير العام' وتأكيد ذلك في الحقل أدناه."
+INSTL_ADMIN_PASSWORD_DESC="أدخل كلمة المرور لحساب "المدير العام" وتأكيد ذلك في الحقل أدناه."
 INSTL_ADMIN_PASSWORD2_LABEL="تأكيد كلمة مرور مدبر الموقع"
 INSTL_ADMIN_USER_LABEL="اسم مستخدم المدير"
 INSTL_ADMIN_USER_DESC="يمكنك تغيير اسم المدير العام الافتراضي <strong>admin</strong>."
-INSTL_SITE_NAME_TITLE="اسم الموقع"
+INSTL_SITE_NAME_LABEL="اسم الموقع"
 INSTL_SITE_NAME_DESC="أدخل اسم الموقع الخاص بك المبني بجوملا!."
 INSTL_SITE_METADESC_LABEL="البيانات الوصفية"
 INSTL_SITE_METADESC_TITLE_LABEL="أدخل الوصف العام للموقع الذي سيتم استخدامه من قبل محركات البحث. بشكل عام, العدد الأمثل هو عشرون كلمة فقط."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="أدناه ستجد تفاصيل عن عملية تنصيب
 INSTL_EMAIL_NOT_SENT="تعذر إرسال البريد الإلكتروني."
 
 ;Complete view
-INSTL_COMPLETE="الإنهاء"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="تفاصيل تسجيل دخول الإدارة"
-INSTL_COMPLETE_DESC1="انقر على زر "_QQ_"الموقع"_QQ_" لمشاهدة موقعك بنظام جوملا!، أو على زر "_QQ_"الإدارة"_QQ_" للإنتقال إلى صفحة دخول الإدارة."
-INSTL_COMPLETE_DESC2="على موقع مجتمع جوملا! (Joomla! Community)، سوف تجد لائحة روابط لحزم اللغات المتوفرة وكذلك روابط للموارد المتعلقة باللغات في عائلة مواقع joomla.org."
-INSTL_COMPLETE_DESC3="اضغط على الزر الموجود على اليمين لفتح موقع مجتمع جوملا! في نافذة متصفح جديدة"
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="لقد تم حذف مجلد التنصيب مسبقاً."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="تعذر حذف مجلد التنصيب. يرجى القيام بحذفه بشكل يدوي."
 INSTL_COMPLETE_FOLDER_REMOVED="لقد تمت إزالة مجلد التنصيب بنجاح"
@@ -149,6 +135,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="اللغة"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="الإصدار"
 INSTL_LANGUAGES_DESC="واجهة جوملا متوفرة بعدة لغات. اختر اللغة التي تفضلها بتحديد صندوق الاختيار ثم قم بالنقر على زر التالي.<br/>ملاحظة: تحتاج هذه العملية الى 5 ثوان تقريبا لتحميل و تنصيب كل لغة. لطفا ً لتفادي أخطاء الاتصال من المستحسن اختيار 3 لغات كل مرة."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="هذه العملية من الممكن ان تحتاج لأكثر من 10 ثوان لتنصيب اللغة<br />لطفاً انتظر بينما يتم تحميل و تنصيب اللغات..."
+INSTL_LANGUAGES_MORE_LANGUAGES="انقر على زر 'السابق' لتنصيب المزيد من اللغات."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="لطفاً, حدد اللغة. إن لم تكن تريد تنصيب المزيد من اللغات فانقر على زر 'السابق' "
 INSTL_LANGUAGES_WARNING_NO_INTERNET="لم تتمكن جوملا! من الاتصال بسيرفر اللغات. لطفاً قم بإنهاء عملية التنصيب."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="ملاحظة: سيكون متاحاً لك تنصيب اللغات أيضا من لوحة تحكم جوملا!"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="تنصيب المحتوى ال
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="إذا فعلت هذا الخيار، فإن جوملا! ستقوم بإنشاء مجموعة للمقالات لكل لغة مثبتة. أيضاً، مقالاً مميزاً بمحتوى وهمي في كل مجموعة"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="تعدد اللغات"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="هذا الخيار يسمح لك بتفعيل ميزة تعدد اللغات تلقائيا في جوملا!"
-INSTL_DEFAULTLANGUAGE_NOTE="ملاحظة: عند النقر على زر التالي ستنتقل الى المرحلة الاخيرة من تنصيب جوملا! حيث يتم سؤالك عن حذف مجلد التنصيب."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="حدد لغتك الافتراضية"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="سيكون متاحاً لك تنصيب اللغات أيضا من لوحة تحكم جوملا!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="حدثت بعض الأخطاء أثناء النسخ الإحتياطى لقاعدة البيانات"
 INSTL_DATABASE_ERROR_CREATE="حدث خطأ أثناء محاولة إنشاء قاعدة البيانات %s. <br/>قد لا تكون للمستخدم امتيازات كافية لإنشاء قاعدة بيانات. <br />\n أو أن قاعدة البيانات المطلوبة ربما بحاجة إلى إنشاء بشكل منفصل قبل التمكن من تنصيب جوملا!."
 INSTL_DATABASE_ERROR_DELETE="حدثت بعض الأخطاء أثناء حذف قاعدة البيانات"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="حدث خطأ أثناء تهيئة مخطط رقم الإصدار"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="إزالة"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="النسخ الاحتياطي"
 INSTL_DATABASE_FIX_TOO_LONG="بادئة جداول قاعدة البيانات يجب أن لا تتجاوز 15 محرف (حرف و/أو رقم)."
@@ -208,7 +192,6 @@ INSTL_DATABASE_INVALID_DB_DETAILS = "تفاصيل قاعدة البيانات ا
 INSTL_DATABASE_INVALID_MYSQL_VERSION="أنت بحاجة إلى نسخة قاعدة بيانات (MySQL 5.0.4) أو أحدث لتتمكن من متابعة التنصيب. النسخة التي تستعملها هي: %s"
 INSTL_DATABASE_INVALID_TYPE="يرجى تحديد نوع قاعدة البيانات"
 INSTL_DATABASE_NAME_TOO_LONG="اسم قاعدة البيانات يجب أن لا يتجاوز 64 محرف  (حرف و/أو رقم )."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="بادئة جداول قاعدة البيانات MySQL يجب أن تبدأ بحرف ويليه أحرف أو أرقام أو شرطات سفلية(_) فقط."
 INSTL_DATABASE_INVALID_NAME="نسخ MySQL الأقدم من 5.1.6 قد لاتحتوي على فترات أو غيرها "_QQ_"وبخاصة"_QQ_" أحرف في الاسم. النسخة التي تستعملها هي: %s"
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="يجب أن يكون اصدار MySQL 5.0.4 أو أكثر لاستكمال عملية التنصيب. الاصدار الذي لديك هو: %s"
 INSTL_DATABASE_INVALID_SQLSRV_VERSION="يجب أن يكون اصدار SQL Server 2008 R2 (10.50.1600.1) أو أكثر لاستكمال عملية التنصيب. الاصدار الذي لديك هو: %s"
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="الوظيفة التالية "_QQ_"SYST"_QQ_" فشلت."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="غير قادر على كشف مسار المجلد الرئيسي لبروتوكول نقل الملفات."
 
 ;others
-INSTL_ADVANCED_SETTINGS="الإعدادات المتقدمة"
-INSTL_BASIC_SETTINGS="الإعدادات الأساسية"
 INSTL_CONFPROBLEM="ملف التهيئة configuration.php أو الدليل غير قابل للكتابة، أو توجد مشكلة تمنع إنشاء ملف التهيئة. يجب القيام بتحميل الكود التالي يدوياً. لعمل ذلك يجب الضغط على منطقة النص لتظليله ثم نسخه ولصقه في ملف نصي جديد تقوم بإنشائه وتسميته 'configuration.php' !ثم تحميله إلى حسابك في موقع جوملا!."
 INSTL_DATABASE_SUPPORT="قواعد البيانات المعتمدة :"
 INSTL_DISPLAY_ERRORS="عرض الأخطاء (Display Errors)"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="حدثت بعض الأخطاء أثناء توطين قاعدة
 INSTL_ERROR_INITIALISE_SCHEMA="لايمكن تهيئة مخطط قاعدة البيانات"
 INSTL_FILE_UPLOADS="رفع الملفات (File Uploads)"
 INSTL_GNU_GPL_LICENSE="رخصة جنو العمومية العامة (GNU General Public License)"
-INSTL_INSTALLATION="التثبيت"
 INSTL_JSON_SUPPORT_AVAILABLE="دعم JSON"
-INSTL_LICENSE="الترخيص"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC"
 INSTL_MAGIC_QUOTES_RUNTIME="زمن تشغيل الإقتباسات السحرية (Magic Quotes Runtime)"
 INSTL_MB_LANGUAGE_IS_DEFAULT="استخدام لغة افتراضية متعددة وحدات البايت (MB Language is Default)"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="العملية قيد الانجاز. رجاءً أنتظر.
 
 ;Global strings
 JADMINISTRATOR="المدير"
-JADVANCED="متقدم"
 JCHECK_AGAIN="إعادة الفحص"
 JERROR="خطأ"
 JEMAIL="البريد الالكتروني"
@@ -310,6 +288,7 @@ JLIB_FORM_FIELD_INVALID="حقل غير صحيح:&#160"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="حقل مطلوب: %s"
 JLIB_FORM_VALIDATE_FIELD_INVALID="حقل غير صالح: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: فشل عملية نسخ الملف %1$s إلى %2$s."
+JLIB_INSTALLER_NOT_ERROR="إذا كان الخطأ في التنصيب مرتبط في حزمة اللغة للمحرر TinyMCE فلا تقلق فليس له أي تأثير على عملية التنصيب للغات التي تريدها. بعض حزم اللغات تم إنشاؤها قبل اصدار جوملا! 3.2 و التي تحتوي على حزمة اللغة منفصلة. كما يتم تضمين هذه الآن في الأساس لهذا لم تعد تحتاج إلى تنصيبها."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: تعذر الاتصال بقاعدة البيانات <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -330,4 +309,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/ar-AA/ar-AA.xml b/installation/language/ar-AA/ar-AA.xml
index ef3929a..ba874e9 100644
--- a/installation/language/ar-AA/ar-AA.xml
+++ b/installation/language/ar-AA/ar-AA.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Joomla! Arabic Unitag Translation team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Arabic Unitag language installation files for Joomla! 3.0 ملفات اللغة العربية الموحدة لتنصيب نظام جوملا!</description>
 	<files>
diff --git a/installation/language/be-BY/be-BY.ini b/installation/language/be-BY/be-BY.ini
index 3288c5f..511911f 100644
--- a/installation/language/be-BY/be-BY.ini
+++ b/installation/language/be-BY/be-BY.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -9,25 +9,18 @@
 INSTL_STEP_COMPLETE_LABEL="Завяршэнне ўсталёўкі"
 INSTL_STEP_DATABASE_LABEL="Канфігурацыя БД"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Абярыце мову па змаўчанні"
-INSTL_STEP_FTP_LABEL="Канфігурацыя FTP"
-INSTL_STEP_LANGUAGE_LABEL="Выбар мовы"
+INSTL_STEP_FTP_LABEL="FTP"
 INSTL_STEP_LANGUAGES_LABEL="Усталёўка моў"
-INSTL_STEP_LICENSE_LABEL="Ліцэнзія"
-INSTL_STEP_PREINSTALL_LABEL="Пачатковая праверка"
-INSTL_STEP_SITE_LABEL="Канфігурацыя сайта"
+INSTL_STEP_SITE_LABEL="Канфігурацыя"
 INSTL_STEP_SUMMARY_LABEL="Агляд"
-INSTL_STEPS_TITLE="Крокі"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Выбар мовы"
-INSTL_SELECT_LANGUAGE_DESC="Вылучыце мову ўсталёўкі Joomla!"
 INSTL_SELECT_LANGUAGE_TITLE="Вылучыце Мову"
 INSTL_WARNJAVASCRIPT="Увага! JavaScript павінен быць дазволены для правільнай усталёўкі Joomla!"
 INSTL_WARNJSON="Увага! JSON павінен быць устяляваны для PHP для правільнай усталёўкі Joomla!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Пачатковая праверка"
-INSTL_PRECHECK_FOR_VERSION="Пачатковая праверка для %s:"
 INSTL_PRECHECK_DESC="Калі любы з гэтых пунктаў не падтрымліваецца (пазначаны як <strong class="_QQ_"red"_QQ_">Не</strong>), тады прыміце меры па ліквідацыі праблемы. Невыкананне гэтага патрабавання можа прывесці да няправільнай працы ўстаноўшчыка Joomla!."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Рэкамендуемыя налады:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Гэтыя налады рэкамендуецца для PHP у мэтах забеспячэння поўнай сумяшчальнасці з Joomla!.<br />Аднак, Joomla! будзе па-ранейшаму працаваць, калі вашыя налады не зусім супадаюць з рэкамендацыямі."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Гэта звычайна &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Тып Базы Дадзеных"
 INSTL_DATABASE_USER_DESC="Нешта накшталт "_QQ_"root"_QQ_", альбо імя карыстальніка, дадзенае хостынгам"
 INSTL_DATABASE_USER_LABEL="Імя Карыстальніка"
-INSTL_DATABASE_TITLE="Налады Злучэння"
-INSTL_DATABASE_DESC="<p>Joomla! захоўвае ўсе свае дадзеныя ў базу дадзеных. Гэты экран дае ўсталёўшчыку інфармацыю, неабходную для стварэння гэтай базы дадзеных.</p><p>Калі вы ўсталёўваеце Joomla! на выдаленым вэб-сэрвэры, вам неабходна атрымаць гэтую інфармацыю ад вашага хостынга.</p><p>Некаторыя хостынгі патрабуюць стварэння базы дадзеных перад усталяваннем Joomla. Калі Вы бачыце "_QQ_"Не атрымалася падлучыцца да базы дадзеных"_QQ_", праверыць, што імя карыстальніка і пароль правільныя. Калі Вы ўсё яшчэ атрымліваеце дадзенае паведамленне, звяжыцеся з хостынгам, ці патрэбна Вам стварэнне базы дадзеных перад усталяваннем Joomla!</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Знайсці папку FTP"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="Каранёвая папка FTP"
 INSTL_FTP_SAVE_LABEL="Захаваць пароль FTP"
 INSTL_FTP_TITLE="FTP Канфігурацыя (<strong class="_QQ_"red"_QQ_">Па жаданні - большасць карыстальнікаў могуць прапусціць гэты крок - націсніце Далей, каб прапусціць</strong>)"
 INSTL_FTP_USER_LABEL="Імя Карыстальніка FTP"
-INSTL_SITE_NAME_LABEL="Назва Сайта"
 INSTL_VERIFY_FTP_SETTINGS="Праверыць Налады FTP"
 INSTL_FTP_SETTINGS_CORRECT="Налады правільныя"
 INSTL_FTP_USER_DESC="Увага! Рэкамендуецца пакінуць поле пустым і ўводзіць імя карыстальніка FTP кожны раз пры перадачы файлаў."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Параметры канфігурацыі для сайт
 INSTL_EMAIL_NOT_SENT="Памылка адпраўкі e-mail."
 
 ;Complete view
-INSTL_COMPLETE="Завяршэнне ўсталёўкі"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Дадзеныя Уваходу Адміністратара"
-INSTL_COMPLETE_DESC1="Націсніце на кнопку &laquo;Сайт&raquo; для прагляду вашага Joomla! вэб-сайту або кнопку &laquo;Панэль Кіравання&raquo;, каб увайсці ў панэль кіравання."
-INSTL_COMPLETE_DESC2="На сайце супольнасці Joomla!, вы знойдзеце спіс спасылак на даступныя моўныя пакеты, а таксама спасылкі на адпаведныя рэсурсы сямейства сайтаў joomla.org."
-INSTL_COMPLETE_DESC3="Націсніце кнопку справа, каб адкрыць сайт супольнасці ў новым акне."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Папка ўсталёўкі 'installation' ўжо выдалена."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Папка ўсталёўкі 'installation' не можа быць выдаленая. Калі ласка, самастойна выдаліце папку."
 INSTL_COMPLETE_FOLDER_REMOVED="Папка ўсталёўкі 'installation' паспяхова выдалена"
@@ -149,6 +135,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Мова"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Версія"
 INSTL_LANGUAGES_DESC="Інтэрфейс Joomla даступны на некалькіх мовах. Выберыце патрэбны мову націскам на сцяжкі і ўсталюйце іх, націснуўшы на кнопку Далей.<br/>Заўвага: гэтая аперацыя зойме каля 5 секунд для запампоўкі і ўсталёўкі любой мовы. Калі ласка, абярыце не больш за 3-х мовах для ўсталёўкі, каб пазбегнуць тайм-аўтаў."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Гэтая аперацыя можа заняць да 10 секунд для кожный мовы.<br />Калі ласка, пачакайце..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Націсніце кнопку 'Назад', калі вы жадаце ўсталяваць больш моў."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Калі ласка, абярыце мову. Калі вам не трэба ўсталёўваць іншыя мовы, націсніце кнопку &laquoe;Назад&raquo;"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! не здоліла падключыцца да сервера моў. Калі ласка, завяршыць працэс усталёўкі."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Заўвага: вы зможаце ўсталяваць мовы пазней з дапамогай Панэлі Кіравання"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Усталяваць лакал
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Калі актыўна, Joomla аўтаматычна створыць адну катэгорыю кантэнту для кожнай з з усталяваных моў. Акрамя таго, для кожный катэгорыі будзе створаны адзін адмысловы артыкул."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Шматмоўнасць"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="У гэтым раздзеле можна аўтаматычна актываваць шматмоўнасць Joomla."
-INSTL_DEFAULTLANGUAGE_NOTE="Заўвага: пасля націску кнопкі &laquo;Далей&raquo; вы вернецеся ў канец працэсу ўсталёўкі, дзе вам будзе прапанавана выдаліць папку ўсталёўкі."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Абярыце мову па змаўчанні"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Вы зможаце ўсталяваць мовы пазней з дапамогай Панэлі Кіравання"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Некаторыя памылкі адбыліся пры стварэнні рэзервовай копіі базы дадзеных."
 INSTL_DATABASE_ERROR_CREATE="Адбылася памылка пры стварэнні базы дадзеных %s.<br />Карыстальнік можа не мець дастатковых прывілеяў для стварэння базы дадзеных. Магчыма, базу дадзеных спатрэбіцца стварыць асобна перад усталяваннем Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Некаторыя памылкі адбыліся пры выдаленні базы дадзеных."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Памылка ініцыялізацыі нумара версіі схемы"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Выдаліць"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Заархіваваць"
 INSTL_DATABASE_FIX_TOO_LONG="Прэфікс табліц MySQL павінен мець максімум 15 сімвалаў."
@@ -211,7 +195,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Вам патрэбна SQL Server 2008 R
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Вам патрэбна SQL Server 2008 R2 (10.50.1600.1) або вышэй, каб працягнуць устаноўку. Ваша версія: %s"
 INSTL_DATABASE_INVALID_TYPE="Калі ласка, выберыце тып базы дадзеных"
 INSTL_DATABASE_NAME_TOO_LONG="Імя базы дадзеных MySQL павінна мець максімум 64 сімвалаў."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Прэфікс табліц MySQL павінен пачынацца з літары і мець услед толькі літары, лічбы ці падкрэсліванні."
 INSTL_DATABASE_INVALID_NAME="Версіі MySQL да 5.1.6 не могуць ўтрымоўваць перыяды ці іншыя"_QQ_"спецыяльныя"_QQ_" сімвалы. Ваша версія: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Базы дадзеных MySQL і імёны табліц не могуць пачынацца ці скончвацца прабеламі."
 INSTL_DATABASE_NAME_INVALID_CHAR="Ідэнтыфікатар MySQL не можа ўтрымоўваць NUL ASCII(0x00)."
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Функцыя "_QQ_"SYST"_QQ_" не працуе."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Немагчыма аўтаматычнае вызначэнне каранёвай папкі FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Дадатковыя Налады"
-INSTL_BASIC_SETTINGS="Асноўныя Налады"
 INSTL_CONFPROBLEM="Ваш канфігурацыйны файл ці каталог не даступны для запісу або ёсць праблемы пры стварэнні файла канфігурацыі. Вы павінны будзеце загрузіць наступны код уручную. Пстрыкніце ў тэкставай вобласці, каб вылучыць усё, а затым устаўце код у новы тэкставы файл. Назавіце гэты файл 'configuration.php' і загрузіце яго ў каранёвую папку Вашага сайта."
 INSTL_DATABASE_SUPPORT="Падтрымка Базы дадзеных:"
 INSTL_DISPLAY_ERRORS="Паказаць Памылкі"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Памылкі пры запаўненні базы дадзен
 INSTL_ERROR_INITIALISE_SCHEMA="Не ўдаецца ініцыялізаваць схемы базы дадзеных"
 INSTL_FILE_UPLOADS="Загрузка Файлаў"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Усталёўка"
 INSTL_JSON_SUPPORT_AVAILABLE="Падтрымка JSON"
-INSTL_LICENSE="Ліцэнзія"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Калі ласка, пачакайце..."
 
 ;Global strings
 JADMINISTRATOR="Панэль Кіравання"
-JADVANCED="Пашыраны"
 JCHECK_AGAIN="Праверыць яшчэ раз"
 JERROR="Памылка"
 JEMAIL="Email"
@@ -310,6 +288,7 @@ JLIB_FORM_FIELD_INVALID="Нявернае поле:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Нявернае поле: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Неабходнае поле: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Не атрымалася скапіяваць файл %1$s у %2$s."
+JLIB_INSTALLER_NOT_ERROR="Калі памылка звязана з устаноўкай моўных файлаў TinyMCE - гэта не мае ніякага ўплыву на ўстаноўку мовў. Некаторыя моўныя пакеты, створаныя да Joomla! 3.2.0 могуць паспрабаваць ўсталяваць асобныя моўныя файлы TinyMCE. Але так як яны ў цяперашні час уключаны ў ядро, яны больш не павінны быць устаноўлены."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase::getInstance: Не магу падключыцца да базы дадзеных <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/be-BY/be-BY.xml b/installation/language/be-BY/be-BY.xml
index c194c55..2cab13c 100644
--- a/installation/language/be-BY/be-BY.xml
+++ b/installation/language/be-BY/be-BY.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>January 2013</creationDate>
 	<author>Dennis Hermatski</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Беларускі моўны файл для інсталятара Joomla!</description>
 	<files>
diff --git a/installation/language/bg-BG/bg-BG.ini b/installation/language/bg-BG/bg-BG.ini
index c6a751b..8d99fca 100644
--- a/installation/language/bg-BG/bg-BG.ini
+++ b/installation/language/bg-BG/bg-BG.ini
@@ -1,15 +1,11 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
 
 
 ;Stepbar
-INSTL_STEPS_TITLE="Стъпки"
-INSTL_STEP_LANGUAGE_LABEL="Език"
-INSTL_STEP_PREINSTALL_LABEL="Прединсталационна проверка"
-INSTL_STEP_LICENSE_LABEL="Лиценз"
 INSTL_STEP_DATABASE_LABEL="База данни"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Изберете език на сайта"
 INSTL_STEP_LANGUAGE_LABEL="Език"
@@ -20,15 +16,12 @@ INSTL_STEP_COMPLETE_LABEL="Край"
 INSTL_STEP_SUMMARY_LABEL="Преглед"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Изберете език"
-INSTL_SELECT_LANGUAGE_DESC="Моля изберете езика, на който да бъде процеса на инсталиране на Джумла!:"
 INSTL_SELECT_LANGUAGE_TITLE="Изберете език"
 INSTL_WARNJAVASCRIPT="Внимание! ДжаваСкрипт трябва да се поддържа от браузъра Ви, за да можете да инсталирате Джумла!"
 INSTL_WARNJSON="За да инсталирате Джумла! успешно JSON трябва да бъде активиран в РНР файла!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Проверка преди инсталация"
-INSTL_PRECHECK_FOR_VERSION="Проверка преди инсталация за %s:"
 INSTL_PRECHECK_DESC="Ако някоя от настройките не се поддържа (маркирана е с <strong class="_QQ_"red"_QQ_">Не</strong>), тогава моля коригирайте това на Вашия хостинг. Ако не го направите, Вашата Джумла! инсталация няма да работи коректно."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Препоръчителни настройки:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Това са препоръчителните настройки на PHP, за да работи Джумла! оптимално.<br />Въпреи това, Джумла! ще работи, дори някоя от препоръчителните настройки да се различава от актуалния статус."
@@ -54,8 +47,6 @@ INSTL_DATABASE_TYPE_DESC="Най-вероятно е "_QQ_"MySQLi"_QQ_""
 INSTL_DATABASE_TYPE_LABEL="Вид на базата данни"
 INSTL_DATABASE_USER_DESC="Например "_QQ_"root"_QQ_" или потребителско име дадено Ви от хостинга или потребител, който Вие сте създали."
 INSTL_DATABASE_USER_LABEL="Потребителско име"
-INSTL_DATABASE_TITLE="Настройки за свързване"
-INSTL_DATABASE_DESC="p>Сайтовете изградени с Джумла! запазват цялата информация. Този екран дава възможност да въведете информация за Вашата база данни, за да може Джумла! да я ползва.</p><p>Ако инсталирате Джумла! на отдалечен съврър, възможно е да трябва да попитате хостинг доставчика си за тази информация.</p><p>Някои хостинг доставчици изискват базата данни да е създадене преди самата инсталация на Джумла! Ако получите съобщението "_QQ_"Не може да бъде осъществена връзка с базата данни"_QQ_", проверете дали потребителското име и парола за базата данни са коректни. Ако продължавате да получавате това съобщение, проверете дали Вашият хостинг не изисква базата данни да е създадена преди инсталацията на Джумла!</p"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Автоматично намиране на FTP пътя"
@@ -84,7 +75,6 @@ INSTL_ADMIN_PASSWORD_DESC="Въведете парола на супер адм
 INSTL_ADMIN_PASSWORD2_LABEL="Потвърдете паролата"
 INSTL_ADMIN_USER_LABEL="Потребителско име на администратора"
 INSTL_ADMIN_USER_DESC="Може да смените стандартното потребителско име <strong>admin</strong>."
-INSTL_SITE_NAME_TITLE="Име на сайта"
 INSTL_SITE_NAME_DESC="Въведете името на Вашият Джумла! сайт.<br />Ако желаете може да въведете и мета описание и мета ключови думи.<br />Може да изберете и дали сайтът да бъде видим веднага или да бъде пуснат в режим за поддръжка, след като приключи инсталацията."
 INSTL_SITE_METADESC_LABEL="Мета описание"
 INSTL_SITE_METADESC_TITLE_LABEL="Въведете описание на Вашият уеб сайт, което се ползва от търсачките. В общият случай максимум 20 думи са достатъчни."
@@ -122,11 +112,7 @@ INSTL_EMAIL_HEADING="По-долу може да видите конфигура
 INSTL_EMAIL_NOT_SENT="Е-мейлът не може да бъде изпратен"
 
 ;Complete view
-INSTL_COMPLETE="Край"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Данни на администратора за вход"
-INSTL_COMPLETE_DESC1="Натиснете върху бутона "_QQ_"Сайт"_QQ_", за да видите потребителската част на сайта или върху бутона "_QQ_"Администрация"_QQ_", за да се идентифицирате в административния панел."
-INSTL_COMPLETE_DESC2="На сайта на Джумла! за помощ, можете лесно да откриете информация за инсталирането на езикови пакети в Джумла! Ще намерите и списък от наличните езикови пакети."
-INSTL_COMPLETE_DESC3="Натиснете бутона, за да отворите помощния сайт в нов прозорец."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Инсталационната папка вече е изтрита."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Инсталационната папка не може да бъде изтрита. Моля изтрийте ръчно тази папка."
 INSTL_COMPLETE_FOLDER_REMOVED="Инсталационната папка е изтрита успешно"
@@ -144,12 +130,13 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Език"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Версия"
 INSTL_LANGUAGES_DESC="Джумла е преведена на много езици. Изберете предпочитаните от Вас езици и натиснете бутона Напред.<br/>Внимание: тази операция ще отнеме около 10 секунди за инсталиране на всеки език. Моля не избирайте повече от 3 езики, за да избегнете проблеми със сървъра."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Tази операция ще отнеме около 5 секунди за инсталиране на всеки език.<br />Моля изчакайте, докато избраните езици се свалят и инсталират..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Моля изберете език. Ако не желаете да инсталирате езици на този етап, то натиснете бутона Назад"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Не са озбрани езици за инсталиране. Ако желаете да инсталирате допълнителни езици натиснете бутона Назад"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Няма връзка с езиковия сървър. Моля довършете инсталационния процес."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Внимание: Може да инсталирате езици по-късно от администрацията на сайта."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Връщане към последната стъпка на инсталацията"
 
 ;Defaultlanguage view
+INSTL_LANGUAGES_MORE_LANGUAGES="Натиснете бутона 'Назад', ако искате да инсталирате още езици"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Активирайте вградената мултиезичност"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Ако е активно, сайтът ще има пусната мултиезичност с локализируеми менюта за всеки инсталиран език."
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Включване на добавката за мултиезичност"
@@ -182,8 +169,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Инсталиране на л
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ако е активирано, автоматично ще бъде създадена по една категория статии за всеки инсталиран език. Също така ще бъде създадена и по една празна статия във всяка категория."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Мултиезичен"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Тази секция позволяваавтоматично активиране на вградената мултиезична функционалност на Джумла!"
-INSTL_DEFAULTLANGUAGE_NOTE="Внимание: след като натиснете бутна Напред, ще бъдете отведен на последна стъпка от инсталацията, където ще трябва да изтриете инсталационната папка."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Изберете език по подразбиране"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Ще имате възможност да го инсталирате по-късно чрез административната част на сайта."
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -196,7 +181,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Появиха се някои грешки при създаването на бекъп на базата данни."
 INSTL_DATABASE_ERROR_CREATE="Грешка при опита за създаване на базата данни %s.<br />Потребителят вероятно няма достатъчно права, за да създава нови бази данни. В този случай най-добрият вариант е да създадете базата данни предварително през контролния панел на хостинг доставчика."
 INSTL_DATABASE_ERROR_DELETE="Появиха се някои грешки при изтриването на базата данни."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Грешка при инсталиране номера на версия на схемата"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Изтриване"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Бекъп"
 INSTL_DATABASE_FIX_TOO_LONG="Представката на таблиците може да бъде най-много 15 символа."
@@ -207,7 +191,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Необходим е SQL Server 2008 R2
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Необходим е SQL Server 2008 R2 (10.50.1600.1) или по-нова версия, за да продължите с инсталацията. Вашата версия е: %s"
 INSTL_DATABASE_INVALID_TYPE="Моля изберете вид на базата данни."
 INSTL_DATABASE_NAME_TOO_LONG="Името на MySQL базата данни не може да бъде повече от 64 символа."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Представката на базата данни трябва да започва с буква, както и да съдържа само букви, цифри и долни тирета."
 INSTL_DATABASE_INVALID_NAME="Версии на MySQL по-малки от 5.1.6 не могат да съдържат точки или други "_QQ_"специални"_QQ_" символи в името. Вашата версия е: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Базите данни или таблиците в базите данни не могат да започват или да завършват с интервали."
 INSTL_DATABASE_NAME_INVALID_CHAR="Името на базата данни не може да съдържа нулеви като стойност символи."
@@ -242,8 +225,6 @@ INSTL_FTP_NOSYST="Функцията "_QQ_"SYST"_QQ_" даде грешка."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Не бе възможно да бъде открита основната FTP папка."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Разширени настройки"
-INSTL_BASIC_SETTINGS="Основни настройки"
 INSTL_CONFPROBLEM="Файлът с настройки или папката, в която следва да се намира не е с права за запис и не може да бъде създаден. Ще трябва да въведете кода от полето като го копирате в нов текстов файл. Преименувайте този файл на "_QQ_"configuration.php"_QQ_" и го поставете в основната папка на Джумла!"
 INSTL_DATABASE_SUPPORT="Поддръжка на база данни:"
 INSTL_DISPLAY_ERRORS="Показване на грешки"
@@ -251,9 +232,7 @@ INSTL_ERROR_DB="Някои грешки се появиха при инстал
 INSTL_ERROR_INITIALISE_SCHEMA="Не може да се инициализира схемата на базата данни"
 INSTL_FILE_UPLOADS="Качване на файлове"
 INSTL_GNU_GPL_LICENSE="ГНУ Общ публичен лиценз"
-INSTL_INSTALLATION="Инсталация"
 INSTL_JSON_SUPPORT_AVAILABLE="Поддръжка на JSON"
-INSTL_LICENSE="Лиценз"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC"
 INSTL_MAGIC_QUOTES_RUNTIME="Ползване на Magic Quotes"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language е по подразбиране"
@@ -275,7 +254,6 @@ INSTL_PROCESS_BUSY="Процесът се изпълнява. Моля изча
 
 ;Global strings
 JADMINISTRATOR="Администрация"
-JADVANCED="Разширени"
 JCHECK_AGAIN="Проверете отново"
 JERROR="Грешка"
 JEMAIL="Е-мейл"
diff --git a/installation/language/bg-BG/bg-BG.xml b/installation/language/bg-BG/bg-BG.xml
index 7ee9062..b402371 100644
--- a/installation/language/bg-BG/bg-BG.xml
+++ b/installation/language/bg-BG/bg-BG.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>August 2011</creationDate>
 	<author>Yuriy Boev</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Bulgarian language installation for Joomla</description>
 	<files>
diff --git a/installation/language/bs-BA/bs-BA.ini b/installation/language/bs-BA/bs-BA.ini
new file mode 100644
index 0000000..a1207b7
--- /dev/null
+++ b/installation/language/bs-BA/bs-BA.ini
@@ -0,0 +1,314 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+
+
+;Stepbar
+INSTL_STEP_COMPLETE_LABEL="Kraj"
+INSTL_STEP_DATABASE_LABEL="Baza"
+INSTL_STEP_DEFAULTLANGUAGE_LABEL="Odaberite podrazumijevani jezik"
+INSTL_STEP_FTP_LABEL="FTP"
+INSTL_STEP_LANGUAGES_LABEL="Instaliranje jezika"
+INSTL_STEP_SITE_LABEL="Konfiguracija"
+INSTL_STEP_SUMMARY_LABEL="Pregled"
+
+;Language view
+INSTL_SELECT_LANGUAGE_TITLE="Odabir jezika"
+INSTL_WARNJAVASCRIPT="Upozorenje! JavaScript mora biti omogućen za ispravnu Joomla! instalaciju"
+INSTL_WARNJSON="Za instalaciju Joomla-е! PHP mora imati omogućen JSON dodatak"
+
+;Preinstall view
+INSTL_PRECHECK_TITLE="Provjera prije instalacije"
+INSTL_PRECHECK_DESC="Ako bilo koja od ovih stavki nije podržana (obilježena kao <strong class="_QQ_"red"_QQ_">NE</strong>) molimo vas da ih omogućite. Ukoliko to ne napravite, nećete biti u mogućnosti instalirati Joomlu."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Preporučene postavke:"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ove PHP postavke su preporučene za potpunu kompatibilnost s Joomlom.<br />Joomla! će biti funkcionalna i ako postavke nisu baš identične preporučenim."
+INSTL_PRECHECK_DIRECTIVE="Direktiva"
+INSTL_PRECHECK_RECOMMENDED="Preporuka"
+INSTL_PRECHECK_ACTUAL="Trenutno"
+
+; Database view
+INSTL_DATABASE="Konfiguracija baze podataka"
+INSTL_DATABASE_HOST_DESC="Uobičajeno je ovdje &quot;localhost&quot;"
+INSTL_DATABASE_HOST_LABEL="Ime servera"
+INSTL_DATABASE_NAME_DESC="Neki hostinzi dozvoljavaju samo određena imena baze podataka za svaki portal. Koristite drugačiji prefiks tablice za različite Joomla! portale."
+INSTL_DATABASE_NAME_LABEL="Ime baze podataka"
+INSTL_DATABASE_NO_SCHEMA="Ne postoji šema baze za ovaj tip baze."
+INSTL_DATABASE_OLD_PROCESS_DESC="Postojeće kopije tablica prethodnih Joomla! instalacija će biti zamijenjene"
+INSTL_DATABASE_OLD_PROCESS_LABEL="Obrada stare baze"
+INSTL_DATABASE_PASSWORD_DESC="Zbog sigurnosti vašeg portala obavezno je korištenje šifre za bazu podataka."
+INSTL_DATABASE_PASSWORD_LABEL="Šifra"
+INSTL_DATABASE_PREFIX_DESC="Odaberite prefiks baze ili koristite <b>slučajno generisan</b>. Idealno je,tri ili četiri alfanumerička karaktera i MORA da se završi donjom crtom."
+INSTL_DATABASE_PREFIX_LABEL="Prefiks tablice"
+INSTL_DATABASE_PREFIX_MSG="Prefiks baze podataka mora početi slovom, za kojim slijede proizvoljni alfanumerički znakovi, a završiti donjom crtom"
+INSTL_DATABASE_TYPE_DESC="Ovo je vjerovatno &quot;MySQLi&quot;"
+INSTL_DATABASE_TYPE_LABEL="Tip baze podataka"
+INSTL_DATABASE_USER_DESC="Nešto kao "_QQ_"root"_QQ_" ili korisničko ime dobiveno od hostinga"
+INSTL_DATABASE_USER_LABEL="Korisničko ime"
+
+;FTP view
+INSTL_AUTOFIND_FTP_PATH="Automatsko traženje FTP putanje"
+INSTL_FTP="FTP Konfiguracija"
+INSTL_VERIFY_FTP_SETTINGS="Provjeri FTP postavke"
+INSTL_FTP_DESC="<p>Na nekim serverima možda ćete morati upisati FTP podatke za završetak instalacije. Ako imate problema sa završetkom instalacije provjerite kod svog hostinga, da li je to potrebno.</p><p>Iz sigurnosnih razloga, najbolje je da imate poseban FTP korisnički račun sa pristupom samo instalaciji Joomle, a ne cijelom web serveru. Vaš hoster može vam pomoći oko ovoga.</p><p><b>Napomena:</b> Ako instalirate na Windows OS serveru, FTP sloj vam <strong>nije</strong> potreban.</p>"
+INSTL_FTP_SETTINGS_CORRECT="Postavke ispravne"
+INSTL_FTP_ENABLE_LABEL="Omogući FTP Sloj"
+INSTL_FTP_USER_DESC="Upozorenje! Preporučljivo je da ovo ostavite prazno i da unesete vaše FTP korisničko ime prilikom svakog kopiranja datoteka."
+INSTL_FTP_HOST_LABEL="FTP Host"
+INSTL_FTP_PASSWORD_LABEL="FTP šifra"
+INSTL_FTP_PASSWORD_DESC="Upozorenje! Preporučljivo je da ovo ostavite prazno i da unesete vašu FTP šifru prilikom svakog kopiranja datoteka."
+INSTL_FTP_PORT_LABEL="FTP Port"
+INSTL_FTP_ROOT_LABEL="FTP Root direktorij"
+INSTL_FTP_SAVE_LABEL="Sačuvaj FTP šifru"
+INSTL_FTP_TITLE="FTP Konfiguracija (<strong class="_QQ_"red"_QQ_">Opcionalno - većina korisnika može preskočiti ovaj korak - Kliknite na "_QQ_"Dalje"_QQ_" za preskakanje ovog dijela</strong>)"
+INSTL_FTP_USER_LABEL="FTP korisničko ime"
+INSTL_SITE_NAME_LABEL="Naziv portala"
+INSTL_SITE="Osnovne postavke"
+
+;Site View
+INSTL_ADMIN_EMAIL_LABEL="E-mail adresa administratora"
+INSTL_ADMIN_EMAIL_DESC="Unesite adresu el. pošte super administratora portala."
+INSTL_ADMIN_PASSWORD_LABEL="Administratorska šifra"
+INSTL_ADMIN_PASSWORD_DESC="Unesite šifru super administratora i potvrdite je u polju ispod."
+INSTL_ADMIN_PASSWORD2_LABEL="Potvrda administratorske šifre"
+INSTL_ADMIN_USER_LABEL="Admin korisničko ime"
+INSTL_ADMIN_USER_DESC="Podesite korisničko ime za <strong>Super administratora</strong>."
+INSTL_SITE_NAME_DESC="Unesite ime vašeg Joomla! portala."
+INSTL_SITE_METADESC_LABEL="Opis"
+INSTL_SITE_METADESC_TITLE_LABEL="Unesite opis portala koji će koristiti web pretraživači. U pravilu najviše 20 riječi je optimalno."
+INSTL_SITE_OFFLINE_LABEL="Portal nije aktivan"
+INSTL_SITE_OFFLINE_TITLE_LABEL="Po završetku instalacije portal će biti neaktivan. Portal kasnije možete aktivirati u globalnoj konfiguraciji."
+INSTL_SITE_INSTALL_SAMPLE_LABEL="Instalacija primjera"
+INSTL_SITE_INSTALL_SAMPLE_DESC="Instalacija primjera je veoma korisna za početnike.<br />Ovo će instalirati primjere koji su uključeni u Joomla! instalacijski paket."
+INSTL_SITE_INSTALL_SAMPLE_NONE="Ništa"
+INSTL_SAMPLE_BLOG_SET="Engleski (GB) blog primjeri"
+INSTL_SAMPLE_BROCHURE_SET="Engleski (GB) primjeri za brošure"
+INSTL_SAMPLE_DATA_SET="Podrazumijevani Engleski (GB) Set primjera"
+INSTL_SAMPLE_LEARN_SET="Joomla Engleski (GB) Set primjera za učenje"
+INSTL_SAMPLE_TESTING_SET="Testni Engleski (GB) Set primjera"
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instalacija Joomla! sa samo jednim izbornikom i formom za prijavu, bez ikakvog sadržaja."
+INSTL_SAMPLE_BLOG_SET_DESC="Instalacija Joomla! sa nekoliko članaka i blog modulima kao Stariji postovi, Blog roll, Najčitaniji postovi."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Instalacija Joomla! sa nekoliko stranica (Izbornik sa stranicom Naslovna, O nama, Novosti, Kontaktirajte nas) i modulima kao Pretraga, Prilagođeni HTML, Forma za prijavu."
+INSTL_SAMPLE_DATA_SET_DESC="Instalacija Joomla! sa jednom stranicom (izbornik sa jednim linkom) i modulima kao Zadnji članak, Forma za prijavu."
+INSTL_SAMPLE_LEARN_SET_DESC="Instalacija Joomla! sa primjerima članaka koji opisuju kako Joomla! radi."
+INSTL_SAMPLE_TESTING_SET_DESC="Instalacija Joomla! sa svim mogućim stavkama izbornika za pomoć kod testiranja."
+
+;Summary view
+INSTL_FINALISATION="Finalizacija"
+INSTL_SUMMARY_INSTALL="Instalacija"
+INSTL_SUMMARY_EMAIL_LABEL="Konfiguracija el. pošte"
+INSTL_SUMMARY_EMAIL_DESC="Pošalji konfiguracione postavke nakon instalacije na adresu el. pošte %s."
+INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Pošalji i šifru u el. pošti"
+INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Upozorenje! Nije preporučljivo da čuvate vaše šifre u el. pošti."
+
+;Installing view
+INSTL_INSTALLING="Instalacija..."
+INSTL_INSTALLING_DATABASE_BACKUP="Rezervna kopija starih tabela baze"
+INSTL_INSTALLING_DATABASE_REMOVE="Obriši stare tabele baze"
+INSTL_INSTALLING_DATABASE="Kreiranje tabela baze"
+INSTL_INSTALLING_SAMPLE="Instaliranje primjera"
+INSTL_INSTALLING_CONFIG="Kreiranje konfiguracione datoteke"
+INSTL_INSTALLING_EMAIL="Pošalji el. poštu na adresu %s"
+
+;Email
+INSTL_EMAIL_SUBJECT="Detalji konfiguracije: %s"
+INSTL_EMAIL_HEADING="Ispod možete vidjeti novu konfiguraciju vašeg Joomla! portala:"
+INSTL_EMAIL_NOT_SENT="El. pošta ne može biti poslata."
+
+;Complete view
+INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalji administratorske prijave"
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Instalacijski direktorij je već izbrisan."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instalacijski direktorij ne može biti obrisan. Molim, obrišite ga ručno."
+INSTL_COMPLETE_FOLDER_REMOVED="Instalacijski direktorij je uspješno izbrisan"
+INSTL_COMPLETE_LANGUAGE_1="Joomla! na vašem jeziku?"
+INSTL_COMPLETE_LANGUAGE_DESC="Prije nego što obrišete instalacioni direktorij možete instalirati dodatne jezike. Ako želite da dodate jezik za vaš portal kliknite na dugme."
+INSTL_COMPLETE_LANGUAGE_DESC2="Napomena: da bi Joomla! preuzela i instalirala novi jezik, potreban vam je pristup internetu. <br/>Neke konfiguracije servera neće dozvoliti Joomla! instalaciju jezika. Ako je to i kod vas slučaj, ne brinite, kasnije možete instalirati jezik na standardni način iz administrskog dijela."
+INSTL_COMPLETE_REMOVE_FOLDER="Izbrišite instalacijski direktorij"
+INSTL_COMPLETE_REMOVE_INSTALLATION="MOLIM DA NE ZABORAVITE OBRISATI INSTALACIJSKI DIREKTORIJ<br />Nećete moći raditi dalje dok se ne ukloni instalacijski direktorij. Ovo je sigurnosna mogućnost Joomla!-e."
+INSTL_COMPLETE_TITLE="Čestitamo! Joomla! je instalirana!"
+INSTL_COMPLETE_INSTALL_LANGUAGES="Dodatni koraci: Instaliranje jezika"
+
+;Languages view
+INSTL_LANGUAGES_MORE_LANGUAGES="Pritisnite 'Prethodno' tipku ako želite da instalirate više jezika."
+INSTL_LANGUAGES="Instalacija jezičkog paketa"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jezik"
+INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzija"
+INSTL_LANGUAGES_DESC="Joomla interfejs je dostupan na nekoliko jezika. Izaberite jezik i instalirajte ga jednim klikom na dugme<br/>Napomena: ova operacija traje oko 5 sekundi za preuzimanje i instaliranje svakog jezika. Nemojte izabrati više od 3 jezika za istovremenu instalaciju, da zbog previše duge instalacije ne bi došlo do prekida programa."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ova operacija traje oko 10 sekundi po jeziku<br />Molim sačekajte da Joomla preuzme i instalira jezik..."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nijedan jezik nije odabran za instaliranje. Ako želite da instalirate više jezika kliknite na dugme 'Prethodno' i odaberite željeni jezik iz liste"
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ne može da se prijavi na server sa jezicima. Završite instalacioni proces."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="Napomena: Jezik možete instalirati iz Joomla! administracije"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Povratak na zadnji instalacioni korak"
+
+;Defaultlanguage view
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Aktivirajte višejezičnu funkciju"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Ako je aktivan, vaš Joomla portal će imati aktivnu višejezičnu osobinu sa lokalizovanim izbornicima za svaki instalirani jezik"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Omogući dodatak za jezik"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Ako je omogućen, dodatak za kod jezika će automatski promijeniti kod jezika u generisanom HTML dokumentu radi poboljšanja SEO."
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Podrazumijevani administratorski jezik"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla ne može da postavi jezik kao podrazumijevani. Engleski će se koristiti kao podrazumijevani jezik za administratorski dio."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla je postavila %s kao vaš podrazumijevani administratorski jezik."
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Odaberi"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Jezik"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Oznaka"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla nije u mogućnosti da automatski kreira sadržaj za jezik %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla ne može automatski da kreira izbornik %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla ne može automatski da kreira početnu stavku izbornika %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla ne može automatski da kreira izbornik modul %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla ne može automatski da kreira kategoriju %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla ne može automatski da kreira %s lokalizovani članak"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla ne može automatski da objavi modul za prebacivanje jezika"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla ne može automatski da omogući dodatak za kod jezika"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla ne može automatski da omogući dodatak za jezički filter"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla ne može da instalira %s jezik."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla ne može automatski da objavi modul za status jezika"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla ne može automatski da ugasi podrazumijevani izbornik"
+INSTL_DEFAULTLANGUAGE_DESC="Joomla je instalirala slijedeće jezike. Odaberite podrazumijevani jezik za administratorski dio i kliknite na slijedeće dugme."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla je instalirala slijedeće jezike. Odaberite podrazumijevani jezik za portal (frontend) i kliknite na slijedeće dugme."
+INSTL_DEFAULTLANGUAGE_FRONTEND="Podrazumijevani jezik portala"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla ne može da postavi jezik kao podrazumijevani. Engleski će se koristiti kao podrazumijevani jezik za portal."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla je postavila %s kao vaš podrazumijevani jezik portala."
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalacija lokalizovanog sadržaja"
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ako je aktivna, Joomla će automatski kreirati jednu kategoriju sadržaja za svaki instalirani jezik. Također će se kreirati i jedan vodeći članak sa primjerom sadržaja u svakoj kategoriji"
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Višejezičnost"
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ova sekcija omogućava da automatski aktivirate Joomla! višejezičnost"
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Kasnije ćete moći da ga instalirate kroz Joomla! administratorski dio"
+
+; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Bosanski (bs-BA)"
+
+;Database Model
+INSTL_DATABASE_COULD_NOT_CONNECT="Nije moguće povezati se na bazu. Povezivanje vraća grešku broj: %s"
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Nije moguće osvježiti manifest međuspremnik za dodatak: %s"
+INSTL_DATABASE_EMPTY_NAME=""
+INSTL_DATABASE_ERROR_BACKINGUP="Pojavila se greška prilikom spremanja sigurnosne kopije baze."
+INSTL_DATABASE_ERROR_CREATE="Pojavila se greška prilikom izrade baze %s.<br/> Korisnik možda nema dozvolu za kreiranje baze. Potrebna baza može biti izrađena odvojeno prije nego što nastavite sa instalacijom Joomle."
+INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze."
+INSTL_DATABASE_FIELD_VALUE_REMOVE="Izbriši"
+INSTL_DATABASE_FIELD_VALUE_BACKUP="Sigurnosna kopija"
+INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tablice smije imati najviše 15 znakova"
+INSTL_DATABASE_INVALID_DB_DETAILS="Sadržaj baze je pogrešan i/ili prazan."
+INSTL_DATABASE_INVALID_MYSQL_VERSION="Potreban je MySQL 5.0.4 ili viša verzija za nastavak instalacije. Vaša verzija je: %s"
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="Potreban je MySQL 5.0.4 ili viša verzija za nastavak instalacije. Vaša verzija je: %s"
+INSTL_DATABASE_INVALID_SQLSRV_VERSION="Potreban je SQL Server 2008 R2 (10.50.1600.1) ili viša verzija za nastavak instalacije. Vaša verzija je: %s"
+INSTL_DATABASE_INVALID_SQLZURE_VERSION="Potreban je SQL Server 2008 R2 (10.50.1600.1) ili viša verzija za nastavak instalacije. Vaša verzija je: %s"
+INSTL_DATABASE_INVALID_TYPE="Molimo odaberite tip baze"
+INSTL_DATABASE_NAME_TOO_LONG="Ime MySQL baze podataka mora imati najviše 64 znaka"
+INSTL_DATABASE_INVALID_NAME="MySQL verzija prije verzije 5.1.6 ne smije sadržavati tačke ili druge "_QQ_"posebne"_QQ_" znakove u nazivu. Vaša verzija je: %s"
+INSTL_DATABASE_NAME_INVALID_SPACES="MySQL ime baze i tablice ne može početi ili završiti se praznim mjestom (razmaci)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Niti jedan MySQL identifikator ne može sadržavati NULL ASCII(0x00)."
+INSTL_DATABASE_FILE_DOES_NOT_EXIST="Datoteka %s ne postoji"
+
+;controllers
+INSTL_COOKIES_NOT_ENABLED="Kukiji nisu dozvoljeni u vašem web pregledniku. Nećete moći instalirati aplikaciju ukoliko je ta opcija isključena."
+INSTL_HEADER_ERROR="Greška"
+
+;Helpers
+INSTL_PAGE_TITLE="Joomla! Web Instalacija"
+
+;Configuration model
+INSTL_ERROR_CONNECT_DB="Nije moguće povezati se na bazu. Povezivanje vraća grešku broj: %s"
+INSTL_STD_OFFLINE_MSG="Stranica je trenutno u izradi .<br /> Molim posjetite nas ponovo uskoro."
+
+;FTP model
+INSTL_FTP_INVALIDROOT="Uneseni FTP direktorij nije direktorij Joomla! instalacije"
+INSTL_FTP_NOCONNECT="Nije moguće povezati se na FTP server"
+INSTL_FTP_NODELE="Funkcija "_QQ_"DELE"_QQ_" nije uspjela."
+INSTL_FTP_NODIRECTORYLISTING="Nije moguće dobiti popis direktorija sa FTP servera"
+INSTL_FTP_NOLIST="Funkcija "_QQ_"LIST"_QQ_" nije uspjela."
+INSTL_FTP_NOLOGIN="Nije moguća prijava na FTP server."
+INSTL_FTP_NOMKD="Funkcija "_QQ_"MKD"_QQ_" nije uspjela."
+INSTL_FTP_NONLST="Funkcija "_QQ_"NLST"_QQ_" nije uspjela."
+INSTL_FTP_NOPWD="Funkcija "_QQ_"PWD"_QQ_" nije uspjela."
+INSTL_FTP_NORETR="Funkcija "_QQ_"RETR"_QQ_" nije uspjela."
+INSTL_FTP_NORMD="Funkcija "_QQ_"RMD"_QQ_" nije uspjela."
+INSTL_FTP_NOROOT="Nije moguće pristupiti traženom FTP direktoriju"
+INSTL_FTP_NOSTOR="Funkcija "_QQ_"STOR"_QQ_" nije uspjela."
+INSTL_FTP_NOSYST="Funkcija "_QQ_"SYST"_QQ_" nije uspjela."
+INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Nije moguće automatsko prepoznavanje osnovnog FTP direktorija"
+
+;others
+INSTL_BASIC_SETTINGS="Osnovne postavke"
+INSTL_CONFPROBLEM="Vaša konfiguracijska datoteka ili direktorij nemaju prava za zapisivanje ili je došlo do problema prilikom izrade konfiguracijske datoteke. Morati ćete ručno učitati slijedeći kod. Kliknite na prostor za tekst za odabir cijelog teksta koda, zatim ga kopirajte i dodajte u novu datoteku imena 'configuration.php', te datoteku prenesite u osnovni direktorij vašeg portala."
+INSTL_DATABASE_SUPPORT="Podrška baze:"
+INSTL_DISPLAY_ERRORS="Prikaz grešaka"
+INSTL_ERROR_DB="Postoje greške prilikom punjenja baze: %s"
+INSTL_ERROR_INITIALISE_SCHEMA="Ne može da se inicijalizira šema baze"
+INSTL_FILE_UPLOADS="Upload datoteke"
+INSTL_GNU_GPL_LICENSE="GNU Opća Javna Licenca"
+INSTL_JSON_SUPPORT_AVAILABLE="JSON podrška"
+INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC isključen"
+INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Okruženje"
+INSTL_MB_LANGUAGE_IS_DEFAULT="MB jezik je standardan"
+INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Isključen"
+INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring jezik nije neutralan. Ovo možete namjestiti lokalno unošenjem <strong>php_value mbstring.language neutral</strong> u <code>.htaccess</code>."
+INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload je uključen. Ovo može biti isključeno lokalno unošenjem <strong>php_value mbstring.func_overload 0</strong> u <code>.htaccess</code>."
+INSTL_NOTICEYOUCANSTILLINSTALL="<br />Još uvijek možete nastaviti instalaciju, konfiguracijska podešavanja će biti prikazana na kraju. Morati ćete ručno kopirati kod. Kliknite na tekst i odaberite ga, a zatim kopirajte u novu tekstualnu datoteku. Datoteku nazovite 'configuration.php' i kopirajte u osnovni direktorij portala (root direktorij)."
+INSTL_OUTPUT_BUFFERING="Izlazna međumemorija"
+INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser podrška"
+INSTL_PHP_VERSION="PHP verzija"
+INSTL_REGISTER_GLOBALS="Registar Globalnih funkcija isključen"
+INSTL_SAFE_MODE="Safe Mode funkcija"
+INSTL_SESSION_AUTO_START="Automatsko pokretanje sesija"
+INSTL_WRITABLE="%s Omogućeno zapisivanje"
+INSTL_XML_SUPPORT="XML podrška"
+INSTL_ZIP_SUPPORT_AVAILABLE="Podrška za nativni ZIP (preporučuje se)"
+INSTL_ZLIB_COMPRESSION_SUPPORT="Podrška za Zlib kompresiju"
+INSTL_PROCESS_BUSY="Proces je u toku. Molimo sačekajte..."
+
+;Global strings
+JADMINISTRATOR="Administrator"
+JCHECK_AGAIN="Provjeri ponovo"
+JERROR="Greška"
+JEMAIL="E-pošta"
+JGLOBAL_ISFREESOFTWARE="%s je slobodan softver pod %s."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Jezički paket ne odgovara ovoj Joomla! verziji. Nedostaju neki izrazi."
+JGLOBAL_SELECT_AN_OPTION="Odaberite opciju"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="Nema odgovarajućih rezultata"
+JGLOBAL_SELECT_SOME_OPTIONS="Odaberite neku opciju"
+JINVALID_TOKEN="Najnoviji zahtjev je odbijen jer sadrži pogrešan sigurnosni znak (token). Molimo vas da osvježite stranicu i pokušate ponovo."
+JNEXT="Dalje"
+JNO="Ne"
+JNOTICE="Napomena"
+JOFF="Isključeno"
+JON="Uključeno"
+JPREVIOUS="Prethodno"
+JSITE="Portal"
+JUSERNAME="Korisničko ime"
+JYES="Da"
+
+; Framework strings necessary when no lang pack is available
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="Nije moguće spajanje na MySQL."
+JLIB_DATABASE_ERROR_DATABASE="Greška u bazi podataka."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Nije moguće učitati pogonski program (driver) baze: %s"
+JLIB_ENVIRONMENT_SESSION_EXPIRED="Vaša sesija je istekla, molimo ponovo učitajte stranicu."
+JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiranje nije uspjelo"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Putanja nije direktorij. Putanja: %s"
+JLIB_FORM_FIELD_INVALID="Pogrešno polje:&#160"
+JLIB_FORM_VALIDATE_FIELD_INVALID="Pogrešno: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Obavezno: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: nije uspjelo kopiranje datoteke %1$s u %2$s."
+JLIB_INSTALLER_NOT_ERROR="Ako se greška odnosi na instalaciju TinyMCE jezičkih datoteka nema efekta na instalaciju jezika. Neki jezički paketi kreirani prije Joomla! 3.2.0 mogu pokušati da instaliraju odvojene TinyMCE jezičke datoteke. Budući da su sada uključeni u glavnu instalaciu, nije ih potrebno instalirati, "
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nije moguće spajanje na bazu podataka<br />joomla.library: %1$s - %2$s"
+
+; Strings for the language debugger
+JDEBUG_LANGUAGE_FILES_IN_ERROR="Greške u jezičkim datotekama"
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Neprevedeni izrazi"
+JNONE="Nema"
+
+; Necessary for errors
+ADMIN_EMAIL="Administratorska el. pošta"
+ADMIN_PASSWORD="Administratorska šifra"
+ADMIN_PASSWORD2="Potvrda administratorske šifre"
+SITE_NAME="Ime portala"
+
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+POSTGRESQL="PostgreSQL"
+SQLAZURE="Microsoft SQL Azure"
+SQLITE="SQLite"
+SQLSRV="Microsoft SQL Server"
+
diff --git a/installation/language/bs-BA/bs-BA.xml b/installation/language/bs-BA/bs-BA.xml
new file mode 100644
index 0000000..d188a11
--- /dev/null
+++ b/installation/language/bs-BA/bs-BA.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<metafile
+	version="3.2"
+	client="installation">
+	<name>Bosanski (BA)</name>
+	<version>3.2.2</version>
+	<creationDate>September 2012</creationDate>
+	<author>Bosnian Translation Team</author>
+ 	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<description></description>
+	<files>
+		<filename>bs-BA.ini</filename>
+	</files>
+	<metadata>
+		<name>Bosanski (Bosnia)</name>
+		<tag>bs-BA</tag>
+		<rtl>0</rtl>
+	</metadata>
+	<params />
+</metafile>
\ No newline at end of file
diff --git a/installation/language/bs-BA/index.html b/installation/language/bs-BA/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/installation/language/bs-BA/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/installation/language/ca-ES/ca-ES.ini b/installation/language/ca-ES/ca-ES.ini
index 319acff..d51f734 100644
--- a/installation/language/ca-ES/ca-ES.ini
+++ b/installation/language/ca-ES/ca-ES.ini
@@ -1,33 +1,26 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
 
 
 ;Stepbar
-INSTL_STEP_COMPLETE_LABEL="Finalitza"
+INSTL_STEP_COMPLETE_LABEL="Finalitzar"
 INSTL_STEP_DATABASE_LABEL="Base de dades"
-INSTL_STEP_DEFAULTLANGUAGE_LABEL="Tria idioma per defecte"
+INSTL_STEP_DEFAULTLANGUAGE_LABEL="Triar idioma per defecte"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Idioma"
-INSTL_STEP_LANGUAGES_LABEL="Instal·la idiomes"
-INSTL_STEP_LICENSE_LABEL="Llicència"
-INSTL_STEP_PREINSTALL_LABEL="Comprovació d'abans de la instal·lació"
+INSTL_STEP_LANGUAGES_LABEL="Instal·lar idiomes"
 INSTL_STEP_SITE_LABEL="Configuració"
-INSTL_STEP_SUMMARY_LABEL="Visió general"
-INSTL_STEPS_TITLE="Passes"
+INSTL_STEP_SUMMARY_LABEL="Informació general"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Tria idioma:"
-INSTL_SELECT_LANGUAGE_DESC="Selecciona l'idioma que vols utilitzar durant els passos de la instal·lació de Joomla! :"
-INSTL_SELECT_LANGUAGE_TITLE="Selecciona Idioma"
+INSTL_SELECT_LANGUAGE_TITLE="Triar idioma"
 INSTL_WARNJAVASCRIPT="Avís! JavaScript ha d'estar habilitat per la correcta instal·lació de Joomla!"
 INSTL_WARNJSON="La teva instal·lació de PHP necessita tenir activat JSON per Joomla per instal·lar-lo."
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Comprovació d'abans de la instal·lació"
-INSTL_PRECHECK_FOR_VERSION="Comprovació d'abans de la instal·lació per %s:"
 INSTL_PRECHECK_DESC="Si algun d'aquests elements no és compatible (marcat com <strong class="_QQ_"red"_QQ_">No</strong>), has de prendre mesures per corregir-los. <br /> No es pot instal·lar Joomla! fins que la teva configuració compleixi amb els requisits demanats."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Configuracions recomanades:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Aquesta configuració es recomana per PHP per tal de garantir la plena compatibilitat amb Joomla. <br /> Però Joomla! encara funcionarà si la configuració no s'ajusta exactament amb la configuració recomanada."
@@ -43,7 +36,7 @@ INSTL_DATABASE_NAME_DESC="Alguns hostatjaments permeten només un nom determinat
 INSTL_DATABASE_NAME_LABEL="Nom de la base de dades"
 INSTL_DATABASE_NO_SCHEMA="No hi ha esquema de base de dades per a aquest tipus de base de dades."
 INSTL_DATABASE_OLD_PROCESS_DESC="Qualsevol còpia de seguretat de les taules existents fins ara d'altres instal·lacions anteriors de Joomla seran reemplaçades"
-INSTL_DATABASE_OLD_PROCESS_LABEL="Processa l'antiga base de dades"
+INSTL_DATABASE_OLD_PROCESS_LABEL="Processar l'antiga base de dades"
 INSTL_DATABASE_PASSWORD_DESC="Per a la seguretat del lloc usar una contrasenya pel compte de base de dades és obligatori"
 INSTL_DATABASE_PASSWORD_LABEL="Contrasenya"
 INSTL_DATABASE_PREFIX_DESC="Tria un prefix de taula o usa el <b>generat aleatòriament</b>. L'ideal és tres o quatre caràcters, que contingui només caràcters alfanumèrics i ha d'acabar en un guió baix. <b> Assegura't que el prefix triat no és utilitzat per altres taules </b>."
@@ -52,64 +45,61 @@ INSTL_DATABASE_PREFIX_MSG="El prefix de taula ha de començar amb una lletra, se
 INSTL_DATABASE_TYPE_DESC="Aquesta és probablement "_QQ_"MySQLi"_QQ_""
 INSTL_DATABASE_TYPE_LABEL="Tipus de base de dades"
 INSTL_DATABASE_USER_DESC="O alguna cosa com "_QQ_"root"_QQ_" o un nom d'usuari/a donat per l'hostatjament"
-INSTL_DATABASE_USER_LABEL="Nom d'usuari/a"
-INSTL_DATABASE_TITLE="Paràmetres de connexió"
-INSTL_DATABASE_DESC="<p> Un lloc web Joomla! emmagatzema totes les seves dades en una base de dades. Aquesta pantalla ofereix al programa d'instal·lació la informació necessària per crear aquesta base de dades. </p><p>Si esteu instal·lant Joomla! en un servidor web remot, hauràs d'obtenir aquesta informació del teu hostatjament.</p><p> Alguns servidors web requereixen la creació de la base de dades abans d'instal·lar Joomla. Si reps el missatge "_QQ_"No s'ha pogut connectar a la base de dades"_QQ_", verifica que el teu nom d'usuari/a i la contrasenya són correctes. Si segueix apareixent aquest missatge, consulta amb el teu hostatjament per veure si és necessari crear la base de dades abans d'instal·lar Joomla.</p>"
+INSTL_DATABASE_USER_LABEL="Nom d'usuari"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Troba la ruta FTP automàticament"
 INSTL_FTP="Configuració de l'FTP"
 INSTL_FTP_DESC="<p> En alguns servidors pot ser que hagis de proporcionar credencials FTP per a que la instal·lació es completi. Si tens dificultats per completar la instal·lació sense aquestes credencials, consulta amb el teu hostatjament per determinar si és necessari.</p><p> Per raons de seguretat, el millor és crear un compte d'usuari FTP independent amb accés només al Joomla! i no al servidor web sencer. El teu amfitrió et pot ajudar amb això</p><p><b>Nota:</b>Si estàs instal·lant en un sistema operatiu Windows, la capa FTP <strong>no </strong> és obligatòria</p>"
-INSTL_FTP_ENABLE_LABEL="Habilita la capa FTP"
+INSTL_FTP_ENABLE_LABEL="Habilitar la capa FTP"
 INSTL_FTP_HOST_LABEL="Servidor FTP"
-INSTL_FTP_PASSWORD_LABEL="Contrasenya FTP"
-INSTL_FTP_PORT_LABEL="Port FTP"
+INSTL_FTP_PASSWORD_LABEL="Contrasenya"
+INSTL_FTP_PORT_LABEL="Port"
 INSTL_FTP_ROOT_LABEL="Ruta d'accés a l'arrel de l'FTP"
-INSTL_FTP_SAVE_LABEL="Desa contrasenya de l'FTP"
+INSTL_FTP_SAVE_LABEL="Guardar contrasenya de l'FTP"
 INSTL_FTP_TITLE="Configuració FTP (<strong class="_QQ_"red"_QQ_">Opcional - La majoria dels usuaris/es poden saltar-se aquest pas - Prem Següent per ometre'l</strong>) "
-INSTL_FTP_USER_LABEL="Nom d'usuari/a FTP"
-INSTL_SITE_NAME_LABEL="Nom del lloc"
-INSTL_VERIFY_FTP_SETTINGS="Comprova els valors de FTP"
+INSTL_FTP_USER_LABEL="Usuari/a"
+INSTL_VERIFY_FTP_SETTINGS="Comprovar els valors de FTP"
 INSTL_FTP_SETTINGS_CORRECT="Ajustaments correctes"
 INSTL_FTP_USER_DESC="Avís! Es recomana deixar aquest espai en blanc i introdueix el nom d'usuari/a FTP cada vegada que transfereixis arxius."
 INSTL_FTP_PASSWORD_DESC="Avís! Es recomana deixar aquest espai en blanc i introdueix la contrasenya FTP cada vegada que transfereixis arxius."
 
 ;Site View
 INSTL_SITE="Configuració Principal"
-INSTL_ADMIN_EMAIL_LABEL="Correu-e d'admin"
+INSTL_ADMIN_EMAIL_LABEL="Adreça de correu-e de l'admin"
 INSTL_ADMIN_EMAIL_DESC="Introdueix una adreça de correu electrònic. Aquesta serà l'adreça de correu electrònic del Súper administrador del lloc web."
 INSTL_ADMIN_PASSWORD_LABEL="Contrasenya d'administrador"
 INSTL_ADMIN_PASSWORD_DESC="Defineix la contrasenya del teu compte de superadministrador i confirma-ho al camp de sota."
-INSTL_ADMIN_PASSWORD2_LABEL="Confirma la contrasenya de l'administrador"
+INSTL_ADMIN_PASSWORD2_LABEL="Confirmar la contrasenya de l'administrador"
 INSTL_ADMIN_USER_LABEL="Nom d'administrador"
 INSTL_ADMIN_USER_DESC="Pots canviar el nom del Superadministrador per defecte."
-INSTL_SITE_NAME_TITLE="Nom del lloc"
+INSTL_SITE_NAME_LABEL="Nom del lloc"
 INSTL_SITE_NAME_DESC="Introdueix el nom del teu lloc Joomla!"
 INSTL_SITE_METADESC_LABEL="Descripció"
 INSTL_SITE_METADESC_TITLE_LABEL="Escriu una descripció del lloc web global que ha de ser utilitzada pels motors de cerca. En general, un màxim de 20 paraules és òptima."
 INSTL_SITE_OFFLINE_LABEL="Lloc fora de línia"
 INSTL_SITE_OFFLINE_TITLE_LABEL="Desconnecta la web un cop la instal·lació s'hagi completat. El lloc es pot connectar més endavant a través de la configuració global."
-INSTL_SITE_INSTALL_SAMPLE_LABEL="Instal·la dades d'exemple"
+INSTL_SITE_INSTALL_SAMPLE_LABEL="Instal·lar dades d'exemple"
 INSTL_SITE_INSTALL_SAMPLE_DESC="La instal·lació de dades de mostra es recomana per a principiants.<br/> Això instal·larà el contingut d'exemple que s'inclou al paquet d'instal·lació del projecte Joomla!"
-INSTL_SITE_INSTALL_SAMPLE_NONE="(<strong>Requerit per a la instal·lació multiidioma nadiua bàsica</strong>)"
+INSTL_SITE_INSTALL_SAMPLE_NONE="Cap"
 INSTL_SAMPLE_BLOG_SET="Dades de mostra de Blog en anglès (GB)"
 INSTL_SAMPLE_BROCHURE_SET="Dades de mostra de Publicitat en anglès (GB)"
 INSTL_SAMPLE_DATA_SET="Dades de mostra per defecte en anglès (GB)"
 INSTL_SAMPLE_LEARN_SET="Dades de mostra Aprendre Joomla en anglès (GB)"
 INSTL_SAMPLE_TESTING_SET="Dades de mostra de Prova en Anglès (GB)"
-INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instal·la Joomla amb només un menú i formulari d'entrada sense cap contingut."
-INSTL_SAMPLE_BLOG_SET_DESC="Instal·la Joomla amb alguns articles i mòduls d'estil blog tals com articles anteriors,enllaços,articles més llegits...."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Instal·la Joomla amb algunes pàgines (un menú amb pàgines tipus inici, sobre nosaltres,notícies,contacta'ns) i mòduls com cerca, codi html, formulari d'entrada."
-INSTL_SAMPLE_DATA_SET_DESC="Instal·la Joomla amb una pàgina (menú amb un enllaç) i mòduls tals com Darrer article, formulari d'entrada."
-INSTL_SAMPLE_LEARN_SET_DESC="Instal·la Joomla amb articles d'exemple que descriuen com funciona Joomla."
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instal·lar Joomla amb només un menú i formulari d'entrada sense cap contingut."
+INSTL_SAMPLE_BLOG_SET_DESC="Instal·lar Joomla amb alguns articles i mòduls d'estil blog tals com articles anteriors,enllaços,articles més llegits...."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Instal·lar Joomla amb algunes pàgines (un menú amb pàgines tipus inici, sobre nosaltres,notícies,contacta'ns) i mòduls com cerca, codi html, formulari d'entrada."
+INSTL_SAMPLE_DATA_SET_DESC="Instal·lar Joomla amb una pàgina (menú amb un enllaç) i mòduls tals com Darrer article, formulari d'entrada."
+INSTL_SAMPLE_LEARN_SET_DESC="Instal·lar Joomla amb articles d'exemple que descriuen com funciona Joomla."
 INSTL_SAMPLE_TESTING_SET_DESC="Instal·la Joomla amb tots els ítems de menú possibles per provar Joomla."
 
 ;Summary view
 INSTL_FINALISATION="Finalització"
-INSTL_SUMMARY_INSTALL="Instal·la"
+INSTL_SUMMARY_INSTALL="Instal·lar"
 INSTL_SUMMARY_EMAIL_LABEL="Configuració per correu electrònic"
-INSTL_SUMMARY_EMAIL_DESC="Envia paràmetres de configuració per a %s per correu electrònic després de la instal·lació."
-INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Inclou les contrasenyes al correu electrònic"
+INSTL_SUMMARY_EMAIL_DESC="Enviar paràmetres de configuració per a %s per correu electrònic després de la instal·lació."
+INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Incloure les contrasenyes al correu electrònic"
 INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Avís! Es recomana no enviar i emmagatzemar les contrasenyes als correus electrònics."
 
 ;Installing view
@@ -127,19 +117,15 @@ INSTL_EMAIL_HEADING="A continuació es mostren les opcions de configuració per
 INSTL_EMAIL_NOT_SENT="El correu electrònic no s'ha pogut enviar."
 
 ;Complete view
-INSTL_COMPLETE="Finalitza"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Informació sobre l'entrada a l'administració"
-INSTL_COMPLETE_DESC1="Fes clic al botó per veure el teu lloc Joomla! o al botó Admin per portar-te a la teva administració."
-INSTL_COMPLETE_DESC2="A la Comunitat Joomla! trobaràs una llista d'enllaços als paquets d'idioma disponibles, així com enllaços a recursos relacionats amb la família Joomla i l'idioma del lloc."
-INSTL_COMPLETE_DESC3="Fes clic al botó de la dreta per obrir el lloc de la comunitat en una nova finestra."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="La carpeta d'instal·lació ja s'ha eliminat."
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="La carpeta d'instal·lació no s'ha pogut eliminar. Elimina-la manualment. "
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="La carpeta d'instal·lació no s'ha pogut eliminar. Si us plau, elimina-la manualment. "
 INSTL_COMPLETE_FOLDER_REMOVED="Carpeta d'instal·lació eliminada correctament"
-INSTL_COMPLETE_LANGUAGE_1="Joomla! en el teu propi idioma i/o creació d'un lloc bàsic amb multiidioma?"
+INSTL_COMPLETE_LANGUAGE_1="Joomla! en el teu propi idioma?"
 INSTL_COMPLETE_LANGUAGE_DESC="Abans que esborris el directori d'instal·lació pots instal·lar altres idiomes a la teva web Joomla clicant el següent botó."
 INSTL_COMPLETE_LANGUAGE_DESC2="Nota: necessites connexió a internet per permetre que Joomla! descarregui i instal·li els nous idiomes. <br/>Algunes configuracions de servidors no permetran que Joomla ho faci.Si aquest és el teu cas, ho podràs fer a través de l'administració de Joomla!"
-INSTL_COMPLETE_REMOVE_FOLDER="Suprimeix la carpeta d'instal·lació"
-INSTL_COMPLETE_REMOVE_INSTALLATION="RECORDA ESBORRAR EL DIRECTORI D'INSTAL·LACIÓ. <br/> No podràs continuar fins que esborris el directori d'instal·lació. Aquesta és una característica de seguretat de Joomla."
+INSTL_COMPLETE_REMOVE_FOLDER="Esborrar la carpeta d'instal·lació"
+INSTL_COMPLETE_REMOVE_INSTALLATION="SI US PLAU RECORDA ESBORRAR EL DIRECTORI D'INSTAL·LACIÓ. <br/> No podràs continuar fins que esborris el directori d'instal·lació. Aquesta és una característica de seguretat de Joomla."
 INSTL_COMPLETE_TITLE="Felicitats! Joomla! està instal·lat."
 INSTL_COMPLETE_INSTALL_LANGUAGES="Passos Extra: Instal·la idiomes"
 
@@ -147,22 +133,23 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="Passos Extra: Instal·la idiomes"
 INSTL_LANGUAGES="Instal·lació dels paquets d'idioma "
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versió"
-INSTL_LANGUAGES_DESC="La interfície de Joomla està disponible en diversos idiomes. Tria els teus idiomes preferits marcant-los i instal·la'ls clicant al botó de Següent. <br/>Nota:Aquesta operació portarà aproximadament 10 segons per descarregar i instal·lar cada idioma.No triïs més de 3 idiomes a instal·lar."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Aquesta operació pot trigar fins a 10 segons per idioma per completar-los.<br/> Espera't mentre es descarreguen i s'instal·len..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Selecciona un idioma. Si no necessites instal·lar altres idiomes clica all botó "_QQ_"Anterior"_QQ_""
-INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no ha estat capaç de connectar amb el servidor idiomes.Finalitza el procés d'instal·lació."
+INSTL_LANGUAGES_DESC="La interfície de Joomla està disponible en diversos idiomes. Tria els teus idiomes preferits marcant-los i instal·la'ls clicant al botó de Següent. <br/>Nota:Aquesta operació portarà aproximadament 5 segons per descarregar i instal·lar cada idioma. Si us plau, no triïs més de 3 idiomes a instal·lar per evitar els temps d'espera."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Aquesta operació pot trigar fins a 10 segons per idioma per completar-los.<br/> Si us plau, espera't mentre es descarreguen i s'instal·len..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Prem el botó d'Anterior' si vols instal·lar més idiomes."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No s'han triat idiomes per instal·lar.Si necessites més idiomes, prem el botó d'Anterior' i tria els idiomes de la llista."
+INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no ha estat capaç de connectar amb el servidor idiomes. Si us plau finalitza el procés d'instal·lació."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: podràs instal·lar més idiomes més endavant des de l'administració de Joomla!"
-INSTL_LANGUAGES_WARNING_BACK_BUTTON="Torna a la darrera etapa de la instal·lació"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="Tornar a la darrera etapa de la instal·lació"
 
 ;Defaultlanguage view
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="Activar el multilingüisme"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Si és actiu el teu lloc Joomla tindrà el multilingüisme activat, amb menús localitzats per cada idioma instal·lat"
-INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Activar el complement de codi d'idioma"
-INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Si és actiu, el complement de codi d'idioma s'habilitarà afegint la capacitat de canviar el codi d'idioma al document HTML generat per tal de millorar el SEO."
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Habilitar el complement de codi d'idioma"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Si és habilitat el complement de codi d'idioma afegirà l'habilitat de canviar el codi d'idioma als documents HTML generats per tal de millorar el SEO."
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Idioma per defecte de l'administrador"
 INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla no ha estat capaç d'establir l'idioma per defecte. L'anglès s'utilitzarà com a idioma per defecte per l'administració del servidor."
 INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla ha establert %s com a idioma per defecte per a la teva administració."
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Selecciona"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Seleccionar"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Etiqueta"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla no ha pogut crear automàticament el contingut de l'idioma %s"
@@ -171,14 +158,14 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla no ha pogut crear autom
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla no ha pogut crear automàticament el menú del mòdul  %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla no ha pogut crear automàticament la categoria de contingut %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla no ha pogut crear automàticament l'article localitzat %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla no ha pogut habilitar automàticament el mòdul de canvi d'idioma"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla no ha pogut publicar automàticament el mòdul de canvi d'idioma"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla no ha pogut habilitar automàticament el complement de codi d'idioma"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla no ha pogut habilitar automàticament el complement de filtre d'idioma"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla no va poder instal·lar l'idioma %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla no ha pogut instal·lar l'idioma %s."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla no ha pogut publicar automàticament el mòdul d'estat d'idioma"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla no ha pogut despublicar automàticament el menú per defecte"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla no ha pogut despublicar automàticament el mòdul de menú per defecte"
 INSTL_DEFAULTLANGUAGE_DESC="Joomla ha instal·lat els següents idiomes. Selecciona l'idioma desitjat per defecte per a l'administració de Joomla i prem el botó Següent."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla ha instal·lat els següents idiomes.Selecciona l'idioma desitjat per defecte del lloc web fet amb Joomla."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla ha instal·lat els següents idiomes. Si us plau selecciona l'idioma desitjat per defecte del lloc web fet amb Joomla i prem el botó Següent."
 INSTL_DEFAULTLANGUAGE_FRONTEND="Idioma per defecte del lloc web"
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla no ha estat capaç d'establir l'idioma per defecte. L'anglès s'utilitzarà com a idioma per defecte del lloc web."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla ha establert %s com a idioma per defecte pel teu lloc web."
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instal·lar el contingut locali
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Si és actiu, Joomla crearà automàticament una categoria de contingut per cada idioma instal·lat. A més, també es crearà un article destacat d'exemple a cada categoria"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multiidioma"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Aquesta secció et permet activar automàticament la funció multiidioma de Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Nota: un cop que premis el botó Següent et portarem al final del procés d'instal·lació en què se't demanarà que eliminis la carpeta d'instal·lació."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Selecciona l'idioma predeterminat"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Podràs instal·lar més idiomes més endavant des de l'administració de Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,8 +185,7 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Ha hagut alguns errors en la còpia de seguretat de la base de dades."
 INSTL_DATABASE_ERROR_CREATE="S'ha produït un error en intentar crear la base de dades %s.<br/>L'usuari/a no té suficients privilegis per crear una base de dades. La base de dades requerida pot ser necessari crear-la per separat abans de poder instal·lar Joomla."
 INSTL_DATABASE_ERROR_DELETE="Ha hagut alguns errors esborrant la base de dades."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Error inicialitzant l'esquema de la versió número"
-INSTL_DATABASE_FIELD_VALUE_REMOVE="Elimina"
+INSTL_DATABASE_FIELD_VALUE_REMOVE="Eliminar"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Còpia de seguretat"
 INSTL_DATABASE_FIX_TOO_LONG="El prefix de taula MySQL ha de tenir un màxim de 15 caràcters."
 INSTL_DATABASE_INVALID_DB_DETAILS="Els detalls de la base de dades proporcionades són incorrectes o inexistents."
@@ -209,16 +193,15 @@ INSTL_DATABASE_INVALID_MYSQL_VERSION="Necessites MySQL 5.0.4 o superior per cont
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="Necessites MySQL 5.0.4 o superior per continuar la instal·lació. La teva versió és: %s"
 INSTL_DATABASE_INVALID_SQLSRV_VERSION="Necessites SQL Server 2008 R2 (10.50.1600.1) o superior per continuar la instal·lació. La teva versió és: %s"
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Necessites SQL Server 2008 R2 (10.50.1600.1) o superior per continuar la instal·lació. La teva versió és: %s"
-INSTL_DATABASE_INVALID_TYPE="Selecciona el tipus de base de dades"
+INSTL_DATABASE_INVALID_TYPE="Tria el tipus de base de dades"
 INSTL_DATABASE_NAME_TOO_LONG="El nom de base de dades MySQL ha de tenir un màxim de 64 caràcters."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="El prefix de taula MySQL ha de començar amb una lletra seguit per lletres, nombres o guions baixos."
 INSTL_DATABASE_INVALID_NAME="Les versions de MySQL anteriors a la 5.1.6 no pot contenir punts ni altres caràcters "_QQ_"especials"_QQ_" al nom. La teva versió és: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Els noms de base de dades MySQL i els noms de taules no poden començar ni acabar amb espais."
 INSTL_DATABASE_NAME_INVALID_CHAR="Cap identificador de MySQL pot contenir un ASCII NUL (0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="El fitxer %s no existeix"
 
 ;controllers
-INSTL_COOKIES_NOT_ENABLED="Les galetes no semblen estar habilitades al teu navegador. No seràs capaç d'instal·lar Joomla amb aquesta característica desactivada. Alternativament, també podria ser un problema amb <strong>session.save_path</strong> del servidor . Si és aquest el cas, consulta el teu hostatjament si no saps com comprovar-ho o reparar-ho tu."
+INSTL_COOKIES_NOT_ENABLED="Les galetes no semblen estar habilitades al teu navegador. No seràs capaç d'instal·lar Joomla amb aquesta característica desactivada. Alternativament, també podria ser un problema amb <strong>session.save_path</strong> del servidor . Si és aquest el cas, si us plau consulta el teu hostatjament si no saps com comprovar-ho o reparar-ho tu."
 INSTL_HEADER_ERROR="Error"
 
 ;Helpers
@@ -246,18 +229,14 @@ INSTL_FTP_NOSYST="La funció "_QQ_"SYST"_QQ_" ha fallat."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="No es pot detectar automàticament la carpeta arrel de l'FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Configuració avançada"
-INSTL_BASIC_SETTINGS="Configuració bàsica"
 INSTL_CONFPROBLEM="L'arxiu de configuració o directori no té permís d'escriptura o ha hagut un problema en crear el fitxer de configuració. Hauràs de pujar el següent codi a mà. Fes clic a l'àrea de text per ressaltar tot el codi i enganxa'l en un nou fitxer de text. Anomena'l 'configuration.php' i puja'l a la carpeta arrel del lloc."
 INSTL_DATABASE_SUPPORT="Base de dades de suport: "
-INSTL_DISPLAY_ERRORS="Mostra errors"
+INSTL_DISPLAY_ERRORS="Mostrar errors"
 INSTL_ERROR_DB="Van ocórrer alguns errors en omplir la base de dades: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="No es pot inicialitzar l'esquema de base de dades"
 INSTL_FILE_UPLOADS="Pujada de fitxers"
 INSTL_GNU_GPL_LICENSE="Llicència General Pública GNU"
-INSTL_INSTALLATION="Instal·lació"
 INSTL_JSON_SUPPORT_AVAILABLE="Suport JSON"
-INSTL_LICENSE="Llicència"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Deshabilitat"
 INSTL_MAGIC_QUOTES_RUNTIME="Execució Magic Quotes"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Idioma MB és l'idioma per defecte"
@@ -275,41 +254,41 @@ INSTL_WRITABLE="%s amb permís d'escriptura"
 INSTL_XML_SUPPORT="Suport XML"
 INSTL_ZIP_SUPPORT_AVAILABLE="Suport nadiu ZIP"
 INSTL_ZLIB_COMPRESSION_SUPPORT="Suport a compressió Zlib"
-INSTL_PROCESS_BUSY="Procés realitzant-se.Espera..."
+INSTL_PROCESS_BUSY="Procés realitzant-se.Si us plau espera..."
 
 ;Global strings
-JADMINISTRATOR="Administrador"
-JADVANCED="Avançat"
-JCHECK_AGAIN="Comprova-ho un altre cop"
+JADMINISTRATOR="Administrador/a"
+JCHECK_AGAIN="Comprovar-ho un altre cop"
 JERROR="Error"
 JEMAIL="Correu-e"
 JGLOBAL_ISFREESOFTWARE="%s és programari lliure sota  %s."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="Aquest paquet d'idioma no és d'aquesta versió.Algunes cadenes no es mostraran o no ho faran correctament."
-JGLOBAL_SELECT_AN_OPTION="Selecciona una opció"
-JGLOBAL_SELECT_NO_RESULTS_MATCH="No hi ha resultats que coincideixin"
-JGLOBAL_SELECT_SOME_OPTIONS="Selecciona algunes opcions"
-JINVALID_TOKEN="La petició més recent ha estat denegada perquè contenia un codi de seguretat no vàlid.Actualitza la pàgina i torna-ho a provar."
+JGLOBAL_SELECT_AN_OPTION="Tria una opció"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="No s'han trobat resultatsque coincideixin amb la teva cerca"
+JGLOBAL_SELECT_SOME_OPTIONS="Tria algunes opcions"
+JINVALID_TOKEN="La petició més recent ha estat denegada perquè contenia un codi de seguretat no vàlid.Si us plau actualitza la pàgina i torna-ho a provar."
 JNEXT="Següent"
 JNO="No"
-JNOTICE="Avís"
-JOFF="Deshabilitat"
-JON="Habilitat"
+JNOTICE="Informació"
+JOFF="Desactivat"
+JON="Activat"
 JPREVIOUS="Anterior"
-JSITE="Lloc web"
-JUSERNAME="Nom d'usuari/a"
+JSITE="Lloc"
+JUSERNAME="Nom d'usuari"
 JYES="Sí"
 
 ; Framework strings necessary when no lang pack is available
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="No s'ha pogut connectar a MySQL."
 JLIB_DATABASE_ERROR_DATABASE="Ha hagut un error a la base de dades."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="No s'ha pogut carregar el controlador de la base de dades: %s"
-JLIB_ENVIRONMENT_SESSION_EXPIRED="La teva sessió ha expirat, recarrega la pàgina."
+JLIB_ENVIRONMENT_SESSION_EXPIRED="La teva sessió ha expirat, si us plau , recarrega la pàgina."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Còpia fallida"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: La ruta no és un directori. Ruta: %s"
 JLIB_FORM_FIELD_INVALID="Camp no vàlid:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Camp no vàlid: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Camp requerit: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Instal·lació: Error en copiar el fitxer %1$s a %2$s."
+JLIB_INSTALLER_NOT_ERROR="Si l'error és relacionat amb la instal·lació dels arxius d'idioma de TinyMCE no tindrà efecte sobre la instal·lació dels arxius.Alguns paquets d'idioma creats abans de Joomla! 3.2.0 poden intentar instal·lar els arxius per separat de TinyMCE.Ara que aquests arxius estan inclosos al core ja no és necessari instal·lar-los."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: No es pot connectar a la base de dades <br/> joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -318,9 +297,9 @@ JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Cadenes sense traduir"
 JNONE="Cap"
 
 ; Necessary for errors
-ADMIN_EMAIL="Correu-e de l'administrador"
+ADMIN_EMAIL="Correu-e d'admin"
 ADMIN_PASSWORD="Contrasenya d'administrador"
-ADMIN_PASSWORD2="Confirma la contrasenya d'administrador"
+ADMIN_PASSWORD2="Confirma la contrasenya de l'administrador"
 SITE_NAME="Nom del lloc"
 
 ; Database types (allows for a more descriptive label than the internal name)
@@ -331,4 +310,3 @@ POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
 SQLSRV="Microsoft SQL Server"
-
diff --git a/installation/language/ca-ES/ca-ES.xml b/installation/language/ca-ES/ca-ES.xml
index dd45b55..6b6d5de 100644
--- a/installation/language/ca-ES/ca-ES.xml
+++ b/installation/language/ca-ES/ca-ES.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2011-12-16</creationDate>
 	<author>Catalan Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/ckb-IQ/ckb-IQ.ini b/installation/language/ckb-IQ/ckb-IQ.ini
index bce1fff..d25430b 100644
--- a/installation/language/ckb-IQ/ckb-IQ.ini
+++ b/installation/language/ckb-IQ/ckb-IQ.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/installation/language/ckb-IQ/ckb-IQ.xml b/installation/language/ckb-IQ/ckb-IQ.xml
index 977bd4b..fd8d28b 100644
--- a/installation/language/ckb-IQ/ckb-IQ.xml
+++ b/installation/language/ckb-IQ/ckb-IQ.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>January 2011</creationDate>
 	<author>Kurdish Soranî Translation team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/cs-CZ/cs-CZ.ini b/installation/language/cs-CZ/cs-CZ.ini
index 77cf9ba..47f6c96 100644
--- a/installation/language/cs-CZ/cs-CZ.ini
+++ b/installation/language/cs-CZ/cs-CZ.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Dokončení"
 INSTL_STEP_DATABASE_LABEL="Databáze"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Vyberte výchozí jazyk"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Jazyk"
 INSTL_STEP_LANGUAGES_LABEL="Instalace jazyků"
-INSTL_STEP_LICENSE_LABEL="Licence"
-INSTL_STEP_PREINSTALL_LABEL="Kontrola před instalací"
 INSTL_STEP_SITE_LABEL="Nastavení"
 INSTL_STEP_SUMMARY_LABEL="Souhrn"
-INSTL_STEPS_TITLE="Kroky"
 
 ;Language view
-INSTL_SELECT_LANGUAGE_TITLE="Zvolte jazyk"
-INSTL_SELECT_LANGUAGE_DESC="Zvolte si jazyk, použitý při instalaci Joomla!:"
 INSTL_LANGUAGE_TITLE="Vybrat jazyk"
 INSTL_WARNJAVASCRIPT="Upozornění! Ke správnému průběhu instalace Joomla! je potřeba mít povolen JavaScript!"
 INSTL_WARNJSON="Aby mohla být Joomla! nainstalována, je třeba mít v PHP povolen JSON!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Kontrola před instalací"
-INSTL_PRECHECK_FOR_VERSION="Kontrola před instalací pro %s:"
 INSTL_PRECHECK_DESC="Není-li některá z uvedených položek podporována (je označena <strong class="_QQ_"red"_QQ_">Ne</strong>), potom prosím proveďte kroky k nápravě. Pokud tak neučiníte, může to vést k tomu, že po instalaci nebude Joomla! správně fungovat."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Doporučená nastavení:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Tato nastavení PHP jsou doporučena pro zajištění plné kompatibility s Joomla!.<br />Nicméně i při drobných odchylkách od doporučeného nastavení bude Joomla! stále fungovat."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Obvykle je to &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Typ databáze"
 INSTL_DATABASE_USER_DESC="Buď něco jako "_QQ_"root"_QQ_" nebo uživatelské jméno přidělené provozovatelem hostingu"
 INSTL_DATABASE_USER_LABEL="Uživatelské jméno"
-INSTL_DATABASE_TITLE="Nastavení připojení"
-INSTL_DATABASE_DESC="<p>Web Joomla! uchovává veškerá svá data v databázi. Tato obrazovka předá instalačnímu programu potřebné informace k vytvoření této databáze.</p><p> Instalujete-li Joomla! na vzdálený webový server, budete muset tyto informace získat od svého poskytovatele hostingu.</p><p>Některé webhostingy vyžadují, abyste databázi vytvořili před instalací Joomla. Obdržíte-li chybovou hlášku "_QQ_"Nelze se připojit k databázi"_QQ_", zkontrolujte, že je správně zadáno uživatelské jméno a heslo. Pokud i přesto obdržíte toto hlášení o chybě, prověřte u svého poskytovatele hostingu, zda před instalací Joomla nebude nutné vytvořit databázi.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Automaticky najít cestu na FTP serveru"
@@ -83,7 +74,6 @@ INSTL_ADMIN_PASSWORD_DESC="Uveďte heslo pro super správce a potvrďte jej opak
 INSTL_ADMIN_PASSWORD2_LABEL="Ověření hesla správce"
 INSTL_ADMIN_USER_LABEL="Uživatelské jméno správce"
 INSTL_ADMIN_USER_DESC="Můžete změnit předvolené uživatelské jméno <strong>admin</strong>."
-INSTL_SITE_NAME_TITLE="Název webu"
 INSTL_SITE_NAME_DESC="Zadejte název svého Joomla! webu."
 INSTL_SITE_METADESC_LABEL="Popis"
 INSTL_SITE_METADESC_TITLE_LABEL="Zadejte celkový popis webu, který budou používat vyhledávače. Obecně platí, že je optimální zadat maximálně 20 slov."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Na této stránce naleznete nastavení konfigurace nových
 INSTL_EMAIL_NOT_SENT="E-mail se nepodařilo odeslat."
 
 ;Complete view
-INSTL_COMPLETE="Dokončení"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Přihlašovací údaje správce"
-INSTL_COMPLETE_DESC1="Klikněte na tlačítko Web a podívejte se na svůj Joomla! web, nebo klikněte na tlačítko Správa, které vás přenese na přihlášení správce."
-INSTL_COMPLETE_DESC2="Na webu Joomla! komunity najdete seznam odkazů na existující jazykové balíčky stejně jako odkazy na zdroje spojené s jazyky z rodiny webu joomla.org."
-INSTL_COMPLETE_DESC3="Kliknutím na tlačítko vpravo se v novém okně otevře komunitní web."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Instalační složka již byla vymazána"
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instalační složka nemohla být vymazána. Smažte složku ručně."
 INSTL_COMPLETE_FOLDER_REMOVED="Instalační složka byla úspěšně vymazána"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jazyk"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verze"
 INSTL_LANGUAGES_DESC="Rozhraní Joomla je dostupné v mnoha různých jazycích. Kliknutím na zaškrtávací políčko vyberte požadovaný jazyk a nainstalujte jej kliknutím na tlačítko 'Následující'.<br/>Poznámka: Tato činnost, stažení a instalace každého jazyku, může trvat okolo pěti vteřin. Aby se tedy zabránilo překročení časového limitu zpracování požadavku, nevybírejte pro instalaci více jak tři jazyky."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Tato činnost bude u každého jazyku trvat asi 10 vteřin<br />Počkejte prosím, než se jazyky stáhnou a nainstalují..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Vyberte prosím jazyk. Pokud nechcete další jazyky instalovat, klikněte na tlačítko 'Předchozí'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Pokud chcete nainstalovat více jazyků, klikněte na tlačítko 'Předchozí'."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nebyl naistalován žádný jazyk. Pokud potřebujete nainstalovat další jazyky, klikněte na tlačítko 'Předchozí' a se seznamu vyberte požadované jazyky"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! není schopna se připojit k serveru jazyků. Prosím, dokončete proces instalace."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Poznámka: Jazyky budete moci později nainstalovat z administrace Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Zpět k poslednímu kroku instalace"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Nainstalovat lokalizovaný obsa
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Je-li aktivní, Joomla! automaticky vytvoří jednu kategorii obsahu pro každý instalovaný jazyk. Zároveň bude v každé kategorii vytvořen jeden hlavní článek, obsahující zkušební obsahem."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Vícejazyčný"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Tato sekce umožňuje automaticky aktivovat funkce vícejazyčných Joomla! stránek"
-INSTL_DEFAULTLANGUAGE_NOTE="Poznámka: po kliknutí na tlačítko 'Další'přejdete na konec procesu instalace, kde budete vyzváni k odstranění instalační složky."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Vyberte váš výchozí jazyk"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Budete jej moci později nainstalovat z administrace Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Při zálohování databáze se vyskytly chyby."
 INSTL_DATABASE_ERROR_CREATE="Při vytváření databáze se objevila chyba %s.<br />Uživatel patrně nemá dostatečná práva k vytvoření databáze. Požadovaná databáze by měla být vytvořena zvlášť a před instalací Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Při mazání databáze se objevily chyby."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Chyba při inicializaci čísla verze schématu"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Odstranit"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Záloha"
 INSTL_DATABASE_FIX_TOO_LONG="Prefix MySQL tabulky může být dlouhý nejvýše 15 znaků."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="K instalaci potřebujete SQL Server 2008
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="K instalaci potřebujete SQL Server 2008 R2 (10.50.1600.1) nebo vyšší. Vaše verze je: %s"
 INSTL_DATABASE_INVALID_TYPE="Zvolte typ databáze"
 INSTL_DATABASE_NAME_TOO_LONG="Jméno MySQL databáze může obsahovat nejvýše 64 znaky."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Prefix MySQL tabulky musí začínat písmenem a pak může následovat znak, číslo nebo podtržítko."
 INSTL_DATABASE_INVALID_NAME="Databáze MySQL verze starší než 5.1.6 nemohou v názvu obsahovat dvojtečky nebo jiné znaky typu "_QQ_"special"_QQ_". Současná verze je: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Jméno databáze MySQL nebo jména tabulek nemohou začínat nebo končit mezerou."
-INSTL_DATABASE_NAME_INVALID_CHAR="Žádný MySQL identifikátor nemůže obsahovat NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Žádný MySQL identifikátor nemůže obsahovat NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Soubor %s neexistuje"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Funkce "_QQ_"SYST"_QQ_" selhala."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Nemohu detekovat kořenovou složku FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Pokročilé nastavení"
-INSTL_BASIC_SETTINGS="Základní nastavení"
 INSTL_CONFPROBLEM="Do souboru s konfigurací či do složky nelze zapisovat nebo se objevil problém při vytváření konfiguračního souboru. Následující kód musíte proto nahrát ručně. Klikněte do textové oblasti pro vybrání kompletního kódu, který vložte do nového textového souboru. Přejmenujte jej na 'configuration.php' a nahrajte jej do kořenové složky vašich stránek."
 INSTL_DATABASE_SUPPORT="Podpora databáze:"
 INSTL_DISPLAY_ERRORS="Zobrazit chyby"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Při práci s databází se vyskytly chyby: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Nelze inicializovat schéma databáze"
 INSTL_FILE_UPLOADS="Nahrávání souborů"
 INSTL_GNU_GPL_LICENSE="Licence GNU General Public License"
-INSTL_INSTALLATION="Instalace"
 INSTL_JSON_SUPPORT_AVAILABLE="Podpora JSON"
-INSTL_LICENSE="Licence"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC vypnuto"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes běhový čas"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language je Výchozí"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Probíhá zpracování. Počkejte prosím..."
 
 ;Global strings
 JADMINISTRATOR="Správce"
-JADVANCED="Pokročilý"
 JCHECK_AGAIN="Zkontrolovat znovu"
 JERROR="Chyba"
 JEMAIL="E-mail"
diff --git a/installation/language/cs-CZ/cs-CZ.xml b/installation/language/cs-CZ/cs-CZ.xml
index d009b5a..b7cec1d 100644
--- a/installation/language/cs-CZ/cs-CZ.xml
+++ b/installation/language/cs-CZ/cs-CZ.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>January 2013</creationDate>
 	<author>Czech Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/da-DK/da-DK.ini b/installation/language/da-DK/da-DK.ini
index 95ac70d..9a55fbc 100644
--- a/installation/language/da-DK/da-DK.ini
+++ b/installation/language/da-DK/da-DK.ini
@@ -1,5 +1,5 @@
 # Joomla! Project
-# Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+# Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 # License GNU General Public License version 2 or later; see LICENSE.txt
 # Note : All ini files need to be saved as UTF-8
 # Stepbar
@@ -8,22 +8,15 @@ INSTL_STEP_COMPLETE_LABEL="Afslutning"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Vælg standardsprog"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Sprog"
 INSTL_STEP_LANGUAGES_LABEL="Installer sprog"
-INSTL_STEP_LICENSE_LABEL="Licens"
-INSTL_STEP_PREINSTALL_LABEL="Pre-installations kontrol"
 INSTL_STEP_SITE_LABEL="Konfiguration"
 INSTL_STEP_SUMMARY_LABEL="Oversigt"
-INSTL_STEPS_TITLE="Trin"
 ; Language view
-INSTL_LANGUAGE_TITLE="Vælg sprog"
-INSTL_SELECT_LANGUAGE_DESC="Vælg venligst det sprog du ønsker at anvende under installationen af Joomla!"
 INSTL_SELECT_LANGUAGE_TITLE="Vælg sprog"
 INSTL_WARNJAVASCRIPT="Advarsel! JavaScript skal være aktiveret for korrekt installation af Joomla!"
 INSTL_WARNJSON="Din PHP installation skal have JSON aktiveret for at Joomla kan installeres!"
 ; Preinstall view
 INSTL_PRECHECK_TITLE="Pre-installation"
-INSTL_PRECHECK_FOR_VERSION="Pre-installation for %s:"
 INSTL_PRECHECK_DESC="Hvis nogle af disse elementer ikke er understøttet (markeret som <strong class="_QQ_"red"_QQ_">Nej</strong>) så tag venligst handling for at rette dem. <br />Du kan ikke installere Joomla! før dit setup opfylder kravene nedenfor."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Anbefalede indstillinger:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Disse indstillinger er anbefalet for PHP for at kunne sikre fuld kompatibilitet med Joomla.<br />Dog kan Joomla! stadig virke i tilfælde af at disse indstillinger ikke helt matcher den anbefalede konfiguration."
@@ -48,8 +41,6 @@ INSTL_DATABASE_TYPE_DESC="Dette er sandsynligvis &quot;mysqli&quot;"
 INSTL_DATABASE_TYPE_LABEL="Databasetype"
 INSTL_DATABASE_USER_DESC="Enten noget som "_QQ_"root"_QQ_" eller et brugernavn leveret af din host"
 INSTL_DATABASE_USER_LABEL="Brugernavn"
-INSTL_DATABASE_TITLE="Indstillinger for forbindelse"
-INSTL_DATABASE_DESC="<p>Et Joomla! websted gemmer alle dets data i en database. Dette skærmbillede giver installationsprogrammet de nødvendige informationer til at oprette denne database.</p><p> Hvis du installerer Joomla! på et webhotel, skal du få disse informationer fra din webudbyder.</p><p>Nogle webudbydere kræver at du opretter databasen før du installerer Joomla. Hvis du får meddelelsen "_QQ_"Kunne ikke forbinde til databasen"_QQ_", så bør du kontrollere at dit brugernavn og adgangskode er korrekte. Hvis du derefter stadig får denne meddelelse, så kontroller med din webhost om du skal oprette databasen før du installerer Joomla.</p>"
 ; FTP view
 INSTL_AUTOFIND_FTP_PATH="Find FTP-sti automatisk"
 INSTL_FTP="FTP-konfiguration"
@@ -62,7 +53,6 @@ INSTL_FTP_ROOT_LABEL="FTP-rodsti"
 INSTL_FTP_SAVE_LABEL="Gem FTP-adgangskode"
 INSTL_FTP_TITLE="FTP-konfiguration (<strong class="_QQ_"red"_QQ_">Valgfrit - De fleste brugere kan undlade dette trin - Tryk Næste for at undlade</strong>)"
 INSTL_FTP_USER_LABEL="FTP-brugernavn"
-INSTL_SITE_NAME_LABEL="Webstedets navn"
 INSTL_VERIFY_FTP_SETTINGS="Bekræft FTP-indstillinger"
 INSTL_FTP_SETTINGS_CORRECT="Indstillinger er korrekte"
 INSTL_FTP_USER_DESC="Advarsel! Det anbefales at lade dette felt være tomt og istedet indtaste dit FTP-brugernavn hver gang du overfører filer."
@@ -76,7 +66,7 @@ INSTL_ADMIN_PASSWORD_DESC="Sæt adgangskoden for din super administrator konto o
 INSTL_ADMIN_PASSWORD2_LABEL="Bekræft admin adgangskode"
 INSTL_ADMIN_USER_LABEL="Admin brugernavn"
 INSTL_ADMIN_USER_DESC="Sæt brugernavnet for din Super Administrator konto."
-INSTL_SITE_NAME_TITLE="Webstedets navn"
+INSTL_SITE_NAME_LABEL="Webstedets navn"
 INSTL_SITE_NAME_DESC="Indtast navnet på dit Joomla! websted."
 INSTL_SITE_METADESC_LABEL="Beskrivelse"
 INSTL_SITE_METADESC_TITLE_LABEL="Indtast en beskrivelse for hele webstedet som vil blive anvendt af søgemaskinerne. Generelt, vil et maksimum på 20 ord være optimalt."
@@ -116,16 +106,12 @@ INSTL_EMAIL_SUBJECT="Konfigurations detaljer: %s"
 INSTL_EMAIL_HEADING="Nedenfor finder du konfigurationsindstillingerne for et nyligt opsat Joomla! websted:"
 INSTL_EMAIL_NOT_SENT="Email kunne ikke sendes."
 ; Complete view
-INSTL_COMPLETE="Afslut"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Log ind detaljer for administration"
-INSTL_COMPLETE_DESC1="Klik på Websted knappen for at se dit Joomla! websted eller Admin knappen for at gå til dit administrator log ind."
-INSTL_COMPLETE_DESC2="På Joomla! Community webstedet, kan du finde en liste af links til de forskellige tilgængelige sprogpakker, samt links til andre sprogrelaterede ressourcer på joomla.org familien af websteder"
-INSTL_COMPLETE_DESC3="Klik på knappen til højre for at åbne Community webstedet i et nyt vindue."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installationsmappen er allerede blevet fjernet."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installationsmappen kunne ikke slettes. Slet venligst mappen manuelt."
 INSTL_COMPLETE_FOLDER_REMOVED="Installationsmappen fjernet med succes"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! på dit eget sprog og/eller automatisk grundlæggende nativ multisprogs webstedsoprettelse?"
-INSTL_COMPLETE_LANGUAGE_DESC="Inden du fjerner installationsmappen kan du installere ekstra sprog. Hvis du ønsker at tilføje ekstra sprog til din Joomla! applikation, så klik på den følgende knap."
+INSTL_COMPLETE_LANGUAGE_DESC="Inden du fjerner installationsmappen kan du installere ekstra sprog. Hvis du ønsker at tilføje ekstra sprog til din Joomla! applikation, så klik på knappen herunder."
 INSTL_COMPLETE_LANGUAGE_DESC2="Bemærk: du skal bruge internetadgang for at give Joomla! mulighed for at downloade de nye sprog. <br/>Nogle serveres konfiguration vil ikke tillade Joomla! at installere sprogene. Hvis dette er tilfældet, så kan du installere dem senere ved at anvende Joomla! administrator delen."
 INSTL_COMPLETE_REMOVE_FOLDER="Fjern installationsmappen"
 INSTL_COMPLETE_REMOVE_INSTALLATION="HUSK VENLIGST AT FJERNE INSTALLATIONSMAPPEN FULDSTÆNDIGT<br />Du kan ikke fortsætte før du har fjernet installationsmappen. Dette er en sikkerhedsfunktion i Joomla!"
@@ -137,7 +123,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Sprog"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
 INSTL_LANGUAGES_DESC="Joomla interfacet er tilgængeligt på forskellige sprog. Vælg dine foretrukne sprog ved at klikke i afkrydsningsboksene og installer dem ved at klikke på knappen Næste.<br/>Bemærk: denne handling tager omkring 10 sekunder for download og installation for hvert sprog. Vælg venligst ikke flere end 3 sprog til installation for at undgå timeout."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Denne handling vil tage op til 10 sekunder per sprog<br/>Vent venligst i mens vi downloader og installere sprogene..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Vælg venligst et sprog. Hvis du ikke har behov for, at installere andre sprog, så tryk venligst på knappen 'Forrige'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Tryk på knappen 'Forrige' hvis du ønsker at installere flere sprog."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Der er ikke valgt nogen sprog til installation. Hvis du har brug for at installere flere sprog, så tryk venligst på knappen 'Forrige' og vælg det ønskede sprog fra listen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kunne ikke forbinde til sprogserveren. Færdiggør venligst installationsprocessen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Bemærk: Du kan installere sprog senere, ved at anvende Joomla! administrator"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Returner til seneste installations skridt"
@@ -163,7 +150,7 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla kunne ikke autom
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="Joomla kunne ikke automatisk aktivere sprogfilter programudvidelsen"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla kunne ikke installere sproget %s."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="Joomla kunne ikke automatisk publicere sprogstatus modulet"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla kunne ikke automatisk afpublicere standard menuen"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla kunne ikke automatisk afpublicere standard menu modulet."
 INSTL_DEFAULTLANGUAGE_DESC="Joomla har installeret de følgende sprog. Vælg venligst dit ønskede standard sprog til Joomla administrator."
 INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla har installeret de følgende sprog. Vælg venligst dit ønskede standard sprog til Joomla frontend."
 INSTL_DEFAULTLANGUAGE_FRONTEND="Standard webstedssprog"
@@ -173,8 +160,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Installer lokaliseret indhold"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Hvis aktiv, så vil Joomla automatisk oprette en indholdskategori for hvert installeret sprog. Derudover vil der også blive oprettet en fremhævet artikel for hver kategori, der indeholder dummy indhold."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multisprog"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Denne sektion tillader dig at aktivere Joomla! multisprogsfunktionen automatisk."
-INSTL_DEFAULTLANGUAGE_NOTE="Bemærk: når du trykker på knappen Næste, vil du komme tilbage til slutningen af installationsprocessen, hvor du vil blive bedt om at slette installationsmappen."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Vælg dit standardsprog"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Du kan installere det senere, ved at anvende Joomla administrator."
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Dansk (DK)"
@@ -185,7 +170,6 @@ INSTL_DATABASE_EMPTY_NAME="Du skal angive et databasenavn!"
 INSTL_DATABASE_ERROR_BACKINGUP="Nogle fejl opstod under backup af databasen."
 INSTL_DATABASE_ERROR_CREATE="En fejl opstod under forsøget på at oprette databasen %s.<br />Brugeren har formodentlig ikke rettigheder til at oprette en databse. Den påkrævede database skal oprettes inden installationen af Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Nogle fejl opstod under sletning af databasen"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Fejl under initialisering af skemaversionsnummer"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Fjern"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup"
 INSTL_DATABASE_FIX_TOO_LONG="MySQL tabelpræfikset må maksimalt være 15 karakterer"
@@ -196,10 +180,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Du behøver SQL Server 2008 R2 (10.50.160
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Du behøver SQL Server 2008 R2 (10.50.1600.1) eller højere for at fortsætte installationen. Din version er: %s"
 INSTL_DATABASE_INVALID_TYPE="Vælg venligst databasetype"
 INSTL_DATABASE_NAME_TOO_LONG="MySQL databasenavnet må maksimalt være 64 karakterer"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL tabelpræfikset skal starte med et bogstav, og kun efterfølges af bogstaver, tal eller understregning"
 INSTL_DATABASE_INVALID_NAME="MySQL versioner tidligere end 5.1.6 må ikke indeholde punktum eller andre "_QQ_"special"_QQ_" tegn i navnet. Din version er: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL databasenavne og tabelnavne må ikke begynde med eller slutte med mellemrum."
-INSTL_DATABASE_NAME_INVALID_CHAR="Ingen MySQL identifikator kan indeholde et NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Ingen MySQL identifikator kan indeholde et NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Filen %s findes ikke"
 ; controllers
 INSTL_COOKIES_NOT_ENABLED="Cookies ser ikke ud til at være aktiveret på din klient. Du vil ikke kunne installere applikationen med denne funktion deaktiveret. Alternativt, kan der være et problem med serverens <strong>session.save_path</strong>, hvis dette er årsagen til problemet så kontakt venligst din hostingudbyder hvis du ikke selv ved hvordan du skal kontrollere eller rette dette problem."
@@ -226,8 +209,6 @@ INSTL_FTP_NOSTOR="Funktionen "_QQ_"STOR"_QQ_" fejlede."
 INSTL_FTP_NOSYST="Funktionen "_QQ_"SYST"_QQ_" fejlede."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Kunne ikke autodetekte FTP-rodmappen"
 ; others
-INSTL_ADVANCED_SETTINGS="Avancerede indstillinger"
-INSTL_BASIC_SETTINGS="Basisindstillinger"
 INSTL_CONFPROBLEM="Din konfigurationsfil eller mappe er ikke skrivbar, eller der opstod et problem med at oprette konfigurationsfilen. Du er nødt til at uploade den følgende kode manuelt. Klik i tekstfeltet for at markere hele koden, for derefter at kopiere og indsætte den i en ny fil, navngivet:configuration.php. Upload derefter filen til din rodmappe på dit websted."
 INSTL_DATABASE_SUPPORT="Database understøttelse:"
 INSTL_DISPLAY_ERRORS="Fejlvisning"
@@ -235,9 +216,7 @@ INSTL_ERROR_DB="Nogle fejl opstod under overførsel til databasen: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Kan ikke initialisere database skema"
 INSTL_FILE_UPLOADS="Upload af filer"
 INSTL_GNU_GPL_LICENSE="GNU/GPL licens"
-INSTL_INSTALLATION="Installation"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON understøttelse"
-INSTL_LICENSE="Licens"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magiske citater programkørsel"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB sprog er standard"
@@ -258,7 +237,6 @@ INSTL_ZLIB_COMPRESSION_SUPPORT="zlib kompressionsunderstøttelse"
 INSTL_PROCESS_BUSY="Processen er i gang. Vent venligst..."
 ; Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Avanceret"
 JCHECK_AGAIN="Kontroller igen"
 JERROR="Fejl"
 JEMAIL="Email"
@@ -284,10 +262,11 @@ JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Kan ikke indlæse Database driver: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Din session er udløbet, opdater venligst siden."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopiering fejlede"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :filer: Stien er ikke en mappe: Sti: %s"
-JLIB_FORM_FIELD_INVALID="Ugyldigt felt:&#160"
+JLIB_FORM_FIELD_INVALID="Ugyldigt felt:&#160\""
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ugyldigt felt: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Felt påkrævet: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Installer: Kunne ikke kopiere filen %1$s til %2$s."
+JLIB_INSTALLER_NOT_ERROR="Hvis fejlen er relateret til installationen af TinyMCE sprogfiler, så har det ingen effekt på installationen af sprog. Nogle sprogpakker, der er oprettet før Joomla! 3.2.0 kan forsøge at installere separate TinyMCE sprogfiler. Da disse nu er inkluderet i kernen behøves de ikke længere at blive installeret."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kunne ikke forbinde til database <br />joomla.library: %1$s - %2$s"
 ; Strings for the language debugger
 JDEBUG_LANGUAGE_FILES_IN_ERROR="Parser fejl i sprogfiler"
diff --git a/installation/language/da-DK/da-DK.xml b/installation/language/da-DK/da-DK.xml
index 1b15ab3..edf78cd 100644
--- a/installation/language/da-DK/da-DK.xml
+++ b/installation/language/da-DK/da-DK.xml
@@ -7,7 +7,7 @@
 	<creationDate>2012-09-15</creationDate>
 	<author>Danish Translation project</author>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/de-DE/de-DE.ini b/installation/language/de-DE/de-DE.ini
index 2899145..7f0478e 100644
--- a/installation/language/de-DE/de-DE.ini
+++ b/installation/language/de-DE/de-DE.ini
@@ -1,5 +1,5 @@
 ; Author J!German (Joomla! German Translation Team)
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -9,24 +9,17 @@ INSTL_STEP_COMPLETE_LABEL="Abschluss"
 INSTL_STEP_DATABASE_LABEL="Datenbank"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Standard-Sprache auswählen"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Sprache"
 INSTL_STEP_LANGUAGES_LABEL="Sprachen installieren"
-INSTL_STEP_LICENSE_LABEL="Lizenz"
-INSTL_STEP_PREINSTALL_LABEL="Installationsprüfung"
 INSTL_STEP_SITE_LABEL="Konfiguration"
 INSTL_STEP_SUMMARY_LABEL="Überblick"
-INSTL_STEPS_TITLE="Schritte"
 
 ; Language view
-INSTL_LANGUAGE_TITLE="Sprache auswählen"
-INSTL_SELECT_LANGUAGE_DESC="Bitte die Sprache auswählen die während der Installation von Joomla! verwendet werden soll:"
 INSTL_SELECT_LANGUAGE_TITLE="Sprachauswahl"
 INSTL_WARNJAVASCRIPT="Warnung! JavaScript muss für eine reibungslose Installation von Joomla! aktiviert sein!"
 INSTL_WARNJSON="Zur Joomla!-Installation ist ein aktives JSON in der PHP-Umgebung notwendig!"
 
 ; Preinstall view
 INSTL_PRECHECK_TITLE="Installationsprüfung"
-INSTL_PRECHECK_FOR_VERSION="Installationsprüfung für %s:"
 INSTL_PRECHECK_DESC="Sollte nur eins der Einträge rechts vom Server nicht unterstützt werden, mit einem &bdquo;<strong class="_QQ_"red"_QQ_">Nein</strong>&ldquo; gekennzeichnet, dann sollten die Einstellungen auf dem Server angepasst werden.<br />Joomla! kann nicht installiert werden, wenn die unten aufgeführten Systemvoraussetzungen nicht erfüllt sind."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Empfohlene Einstellungen:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Diese Einstellungen werden für PHP empfohlen, um eine gute Kompatibilität mit Joomla! zu gewährleisten.<br />Jedoch kann Joomla! hier mit Einschränkungen in den Empfehlungen trotzdem funktionieren."
@@ -52,8 +45,6 @@ INSTL_DATABASE_TYPE_DESC="Dies ist normalerweise &bdquo;MySQLi&ldquo;"
 INSTL_DATABASE_TYPE_LABEL="Datenbanktyp"
 INSTL_DATABASE_USER_DESC="Entweder etwas wie &bdquo;root&ldquo; oder ein Benutzername, der vom Webhoster zugewiesen wurde."
 INSTL_DATABASE_USER_LABEL="Benutzername"
-INSTL_DATABASE_TITLE="Verbindung zur Datenbank"
-INSTL_DATABASE_DESC="<p>Eine Joomla!-Website speichert all ihre Daten in einer Datenbank. Diese Seite fragt alle wichtigen Daten ab, um diese Datenbank erstellen zu können.</p><p>Wenn Joomla! auf einem Webserver installiert wird, sind die Daten beim jeweiligen Webhoster zu erfahren.</p><p>Bei einigen Webhostern ist es notwendig, dass die Datenbank vor der Installation von Joomla! erstellt werden muss. Falls die Fehlermeldung &bdquo;Es konnte keine Verbindung zur Datenbank hergestellt werden!&ldquo; angezeigt wird, sollte überprüft werden, ob der Benutzername und das Passwort korrekt sind. Sollte die Fehlermeldung anschließend immer noch angezeigt werden, sollte zusammen mit dem Webhoster überprüft werden, ob vorher eine Datenbank für Joomla! erstellt werden muss.</p>"
 
 ; FTP view
 INSTL_AUTOFIND_FTP_PATH="Automatischer FTP-Pfad"
@@ -67,7 +58,6 @@ INSTL_FTP_ROOT_LABEL="FTP-Root-Pfad"
 INSTL_FTP_SAVE_LABEL="FTP-Passwort speichern"
 INSTL_FTP_TITLE="FTP-Konfiguration (<strong class="_QQ_"red"_QQ_">Optional - Dieser Schritt kann oft übersprungen werden - auf &bdquo;Weiter&ldquo; klicken, um fortzufahren</strong>)"
 INSTL_FTP_USER_LABEL="FTP-Benutzername"
-INSTL_SITE_NAME_LABEL="Name"
 INSTL_VERIFY_FTP_SETTINGS="FTP-Einstellugen überprüfen"
 INSTL_FTP_SETTINGS_CORRECT="Einstellungen korrekt!"
 INSTL_FTP_USER_DESC="Warnung! Es ist empfohlen das Feld leer zu lassen und einen FTP-Benutzernamen nur beim Transfer von Dateien einzugeben!"
@@ -82,7 +72,7 @@ INSTL_ADMIN_PASSWORD_DESC="Das Passwort für das Super Administrator Konto einge
 INSTL_ADMIN_PASSWORD2_LABEL="Admin-Passwort bestätigen"
 INSTL_ADMIN_USER_LABEL="Admin-Benutzername"
 INSTL_ADMIN_USER_DESC="Den Benutzernamen für das Konto des Super Administrators eingeben."
-INSTL_SITE_NAME_TITLE="Site-Name"
+INSTL_SITE_NAME_LABEL="Site Name"
 INSTL_SITE_NAME_DESC="Den Namen der Joomla!-Site eingeben."
 INSTL_SITE_METADESC_LABEL="Beschreibung"
 INSTL_SITE_METADESC_TITLE_LABEL="Eine Beschreibungen der gesamte Website für Suchmaschinen eingeben. Üblicherweise ist ein Maximum von 20 Wörtern optimal."
@@ -101,6 +91,7 @@ INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! mit nur einem Menü, einem Anmeldef
 INSTL_SAMPLE_BLOG_SET_DESC="Joomla! mit ein paar Beiträgen, Blog bezogenen Modulen, wie letzte Beiträge und am häufigsten gelesene Beiträge installieren."
 INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla! mit ein paar Seiten (ein Menü mit: Home, Über uns, News, Kontakt) und Modulen, wie der Suche, eigenes HTML und einem Anmeldeformular installieren."
 INSTL_SAMPLE_DATA_SET_DESC="Joomla! mit nur einer Seite (einem Menü mit nur einem Link) und Modulen, wie letzter Beitrag und dem Anmeldeformular installieren."
+INSTL_SAMPLE_DATA_DE_SET_DESC="Joomla! mit nur einer Seite (einem Menü mit nur einem Link) und Modulen, wie letzter Beitrag und dem Anmeldeformular installieren."
 INSTL_SAMPLE_LEARN_SET_DESC="Joomla! mit Beispielbeiträgen installieren, die beschreiben, wie Joomla! funktioniert."
 INSTL_SAMPLE_TESTING_SET_DESC="Joomla! mit allen möglichen Menüeinträgen installieren, um beim Testen von Joomla! zu helfen."
 
@@ -127,11 +118,7 @@ INSTL_EMAIL_HEADING="Unten werden die Konfigurationseinstellungen der neuen Joom
 INSTL_EMAIL_NOT_SENT="Die E-Mail konnte nicht gesendet werden!"
 
 ; Complete view
-INSTL_COMPLETE="Abschluss"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Anmeldeinformation für die Administration"
-INSTL_COMPLETE_DESC1="Die Joomla!-Website kann man mit einem Klick auf &bdquo;Website&ldquo; ansehen, um sich in der Administration anzumelden klickt man auf &bdquo;Administrator&ldquo;."
-INSTL_COMPLETE_DESC2="Auf den Joomla!-Community-Seiten (engl.) wird eine Liste von Links von verfügbaren Sprachpaketen und auch Links zu sprachrelevanten Angeboten von joomla.org angeboten."
-INSTL_COMPLETE_DESC3="Um die Joomla!-Hilfeseiten (engl.) in einem neuen Fenster zu öffnen genügt ein Klick auf rechten Button."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Das Installationsverzeichnis wurde bereits gelöscht."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Das Installationsverzeichnis konnte nicht gelöscht werden. Bitte das Verzeichnis manuell löschen."
 INSTL_COMPLETE_FOLDER_REMOVED="Installationsverzeichnis gelöscht!"
@@ -149,7 +136,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Sprache"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
 INSTL_LANGUAGES_DESC="Die Oberfläche von Joomla! ist in vielen Sprachen verfügbar. Um eine Sprache zu installieren, muss nur die Checkbox vor dem gewünschten Eintrag durch einen Klick markiert werden und anschließend wird die Sprache durch einen Klick auf &bdquo;Weiter&ldquo; installiert.<br /><span style="_QQ_"text-decoration: underline; color: blue;"_QQ_"><strong>Hinweis:</strong></span> Diese Operation braucht ca. 10 Sekunden für den Download und die Installation der Sprachen.<br />Daher sollten <strong>nicht mehr als 3 Sprachen</strong> gleichzeitig ausgewählt werden, um Zeitüberschreitungen zu verhindern."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Diese Operation kann bis zu 10 Sekunden pro Sprache in Anspruch nehmen.<br />Bitte warten, bis die Sprachen heruntergeladen und installiert sind..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Bitte eine Sprache auswählen. Sollen keine weiteren Sprachen installiert werden genügt ein Klick auf &bdquo;Zurück&ldquo;."
+INSTL_LANGUAGES_MORE_LANGUAGES="Auf den &bdquo;Zurück&ldquo;-Button klicken, wenn noch weitere Sprachen installiert werden sollen."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Es wurden keine Sprachen zur Installation ausgewählt. Wenn weitere Sprachen installiert werden sollen, auf &bdquo;Zurück&ldquo; klicken und die gewünschten Sprachen aus der Liste auswählen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! war es nicht möglich eine Verbindung zum Übersetzungsserver aufzubauen. Bitte die Installation normal abschließen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="<span style="_QQ_"text-decoration: underline; color: blue;"_QQ_"><strong>Hinweis:</strong></span> Es können auch noch später Sprachen über die Administration von Joomla! installiert werden."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Zum letzten Installationsschritt zurück"
@@ -186,8 +174,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Lokalisierten Inhalt installier
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Wenn aktiviert, wird Joomla! automatisch eine Inhaltskategorie und einen Hauptbeitrag mit Blindtext pro installierter Sprache erstellen."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Mehrsprachigkeit"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Dieser Bereich erlaubt es, automatisch die Funktion der Mehrsprachigkeit in Joomla! zu aktivieren."
-INSTL_DEFAULTLANGUAGE_NOTE="<span style="_QQ_"text-decoration: underline; color: blue;"_QQ_"><strong>Hinweis:</strong></span> Nach dem Klick auf den &bdquo;Weiter&ldquo;-Button, springt die Ansicht zurück zum Ende der Installation, wo noch das Installationverzeichnis von Joomla! gelöscht werden muss."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Standard-Sprache auswählen"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Sie können auch noch später in der Administration von Joomla! installiert werden."
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +186,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Es sind einige Fehler beim Sichern der Datenbank aufgetreten!"
 INSTL_DATABASE_ERROR_CREATE="Es ist ein Fehler beim Erstellen der Datenbank &bdquo;%s&ldquo; aufgetreten!<br />Der eingetragene Datenbankbenutzer hat vermutlich nicht das Recht eine Datenbank zu erstellen. Die benötigte Datenbank muss manuell angelegt werden, bevor Joomla! installiert werden kann!"
 INSTL_DATABASE_ERROR_DELETE="Beim Löschen der Datenbank sind einige Fehler aufgetreten!"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Fehler bei der Initialisierung der Schema-Versionsnummer!"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Löschen"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Sichern"
 INSTL_DATABASE_FIX_TOO_LONG="Der MySQL-Tabellenpräfix darf maximal 15 Zeichen lang sein!"
@@ -211,10 +196,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Um die Installation fortzusetzen wird der
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Um die Installation fortzusetzen wird der SQL-Server 2008 R2 (10.50.1600.1) oder höher benötigt. Die installierte Version ist aber: %s"
 INSTL_DATABASE_INVALID_TYPE="Bitte den Datenbanktyp auswählen!"
 INSTL_DATABASE_NAME_TOO_LONG="Der MySQL-Datenbankname darf maximal 64 Zeichen lang sein!"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Das MySQL-Tabellenprefix muss mit einem Buchstaben anfangen, es dürfen danach nur Buchstaben, Zahlen oder Unterstriche folgen."
 INSTL_DATABASE_INVALID_NAME="MySQL-Versionen vor 5.1.6 enthalten eventuell keine &bdquo;Periods&ldquo; oder andere &bdquo;Sonderzeichen&ldquo; (special characters) im Namen. Die installierte Version ist: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL-Datenbanknamen und Tabellennamen sollten nicht mit Leerzeichen beginnen oder enden!"
-INSTL_DATABASE_NAME_INVALID_CHAR="Kein MySQL-Identifikator sollte ein &bdquo;NUL ASCII(0x00)&ldquo; enhalten!"
+INSTL_DATABASE_NAME_INVALID_CHAR="Kein MySQL-Identifikator sollte ein &bdquo;NULL ASCII(0x00)&ldquo; enhalten!"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Die Datei &bdquo;%s&ldquo; existiert nicht!"
 
 ; Controllers
@@ -246,8 +230,6 @@ INSTL_FTP_NOSYST="Die Funktion &bdquo;SYST&ldquo; schlug fehl!"
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Es war nicht möglich das FTP-Root-Verzeichnis zu ermitteln!"
 
 ; Others
-INSTL_ADVANCED_SETTINGS="Erweiterte Einstellungen"
-INSTL_BASIC_SETTINGS="Grundeinstellungen"
 INSTL_CONFPROBLEM="Entweder ist die Konfigurationsdatei oder das Verzeichnis schreibgeschützt oder es gab ein anderes Problem beim Speichern der Konfiguration. Der folgende PHP-Code muss daher manuell hochgeladen werden. Bitte den gesamten Text im nachfolgenden Textfeld markieren, dann in eine neue Datei mit dem Namen &bdquo;configuration.php&ldquo; kopieren und diese dann in das Hauptverzeichnis der Joomla!-Website hochladen."
 INSTL_DATABASE_SUPPORT="Datenbankunterstützung:"
 INSTL_DISPLAY_ERRORS="Fehler anzeigen"
@@ -255,9 +237,7 @@ INSTL_ERROR_DB="Einige Fehler traten beim Einspielen von Daten in die Datenbank
 INSTL_ERROR_INITIALISE_SCHEMA="Das Datenbankschema konnte nicht initialisiert werden"
 INSTL_FILE_UPLOADS="Dateien hochladen"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Installation"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-Support"
-INSTL_LICENSE="Lizenz"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Aus"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Laufzeit"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Sprache ist Standard"
@@ -279,7 +259,6 @@ INSTL_PROCESS_BUSY="Vorgang wird bearbeitet. Bitte warten..."
 
 ; Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Erweitert"
 JCHECK_AGAIN="Prüfung wiederholen"
 JERROR="Fehler"
 JEMAIL="E-Mail"
@@ -310,6 +289,7 @@ JLIB_FORM_FIELD_INVALID="Ungültiges Feld:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ungültiges Feld: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Feld benötigt: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fehler beim Kopieren der Datei &bdquo;%1$s&ldquo; nach &bdquo;%2$s&ldquo;."
+JLIB_INSTALLER_NOT_ERROR="Wenn der Fehler mit der Installation von TinyMCE-Sprachdateien in Verbindung steht, so hat er keine Auswirkungen auf die Installation der Sprache(n). Einige Sprachpakete vor Joomla! 3.2.0 haben seperate TinyMCE-Sprachdateien mitinstalliert, da diese Sprachdateien jetzt aber bereits im Joomla!-Kern enthalten sind, brauchen sie nun nicht länger seperat installiert zu werden."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Keine Verbindung mit der Datenbank!<br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/de-DE/de-DE.xml b/installation/language/de-DE/de-DE.xml
index f821729..58948f6 100644
--- a/installation/language/de-DE/de-DE.xml
+++ b/installation/language/de-DE/de-DE.xml
@@ -4,7 +4,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>J!German</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/el-GR/el-GR.ini b/installation/language/el-GR/el-GR.ini
index b3adeba..e8b6486 100644
--- a/installation/language/el-GR/el-GR.ini
+++ b/installation/language/el-GR/el-GR.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/installation/language/el-GR/el-GR.xml b/installation/language/el-GR/el-GR.xml
index a5e8539..34c716d 100644
--- a/installation/language/el-GR/el-GR.xml
+++ b/installation/language/el-GR/el-GR.xml
@@ -4,7 +4,7 @@
 	<version>3.2.0</version>
 	<creationDate>2013-06-13</creationDate>
 	<author>Greek translation team : joomla.gr</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/en-AU/en-AU.ini b/installation/language/en-AU/en-AU.ini
index 3dc7b3d..92f07cd 100644
--- a/installation/language/en-AU/en-AU.ini
+++ b/installation/language/en-AU/en-AU.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Finish"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose default language"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Language"
 INSTL_STEP_LANGUAGES_LABEL="Install Languages"
-INSTL_STEP_LICENSE_LABEL="License"
-INSTL_STEP_PREINSTALL_LABEL="Pre-Installation check"
 INSTL_STEP_SITE_LABEL="Configuration"
 INSTL_STEP_SUMMARY_LABEL="Overview"
-INSTL_STEPS_TITLE="Steps"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Choose language"
-INSTL_SELECT_LANGUAGE_DESC="Please select the language to use during the Joomla! installation steps:"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!"
 INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Pre-Installation Check"
-INSTL_PRECHECK_FOR_VERSION="Pre-installation check for %s:"
 INSTL_PRECHECK_DESC="If any of these items are not supported (marked as <strong class="_QQ_"red"_QQ_">No</strong>) then please take actions to correct them.<br />You cannot install Joomla! until your setup meets the requirements below."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.<br />However, Joomla! will still operate if your settings do not quite match the recommended configuration."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="This is probably &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Database Type"
 INSTL_DATABASE_USER_DESC="Either something as "_QQ_"root"_QQ_" or a username given by the host"
 INSTL_DATABASE_USER_LABEL="Username"
-INSTL_DATABASE_TITLE="Connection Settings"
-INSTL_DATABASE_DESC="<p>A Joomla! website stores all of its data in a database. This screen gives the installation program the information needed to create this database.</p><p> If you are installing Joomla! on a remote web server, you will need to get this information from your host.</p><p>Some web hosts require that you create the database before you install Joomla. If you get the message "_QQ_"Could not connect to the database"_QQ_", check that your user name and password are correct. If you still get this message, check with your host to see if you need to create the database before installing Joomla.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP Root Path"
 INSTL_FTP_SAVE_LABEL="Save FTP Password"
 INSTL_FTP_TITLE="FTP Configuration (<strong class="_QQ_"red"_QQ_">Optional - Most Users Can Skip This Step - Press Next to Skip</strong>)"
 INSTL_FTP_USER_LABEL="FTP Username"
-INSTL_SITE_NAME_LABEL="Site Name"
 INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings"
 INSTL_FTP_SETTINGS_CORRECT="Settings correct"
 INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super Administrator account
 INSTL_ADMIN_PASSWORD2_LABEL="Confirm Admin Password"
 INSTL_ADMIN_USER_LABEL="Admin Username"
 INSTL_ADMIN_USER_DESC="Set the username for your Super Administrator account."
-INSTL_SITE_NAME_TITLE="Site Name"
+INSTL_SITE_NAME_LABEL="Site Name"
 INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site."
 INSTL_SITE_METADESC_LABEL="Description"
 INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly s
 INSTL_EMAIL_NOT_SENT="Email could not be sent."
 
 ;Complete view
-INSTL_COMPLETE="Finish"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details"
-INSTL_COMPLETE_DESC1="Click the Site button to view your Joomla! Web site or the Admin button to take you to your administrator login."
-INSTL_COMPLETE_DESC2="On the Joomla! Community Site, you will find a list of links to available language packs as well as links to language related resources on the joomla.org family of sites."
-INSTL_COMPLETE_DESC3="Click the button on the right to open the Community Site in a new window."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder."
 INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
 INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by clicking in the checkboxes and then install them by clicking on the Next button.<br/>Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete<br />Please wait while we download and install the languages..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Please, select a language. If you don't need to install other languages press the 'Previous' button"
+INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! administrator"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature"
-INSTL_DEFAULTLANGUAGE_NOTE="Note: once you press the Next button you will get back to the end of the installation process where you will be asked to delete the installation folder."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Select your default language"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database."
 INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.<br />The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Error initialising schema version number"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup"
 INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s"
 INSTL_DATABASE_INVALID_TYPE="Please select the database type"
 INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="The MySQL table prefix must start with a letter and be followed by only letters, numbers or underscores."
 INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "_QQ_"special"_QQ_" characters in the name. Your version is: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces."
-INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="The function "_QQ_"SYST"_QQ_" failed."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Advanced Settings"
-INSTL_BASIC_SETTINGS="Basic Settings"
 INSTL_CONFPROBLEM="Your configuration file or directory is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder."
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_DISPLAY_ERRORS="Display Errors"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Some errors occurred while populating the database: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Installation"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
-INSTL_LICENSE="License"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Process is in progress. Please wait..."
 
 ;Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Advanced"
 JCHECK_AGAIN="Check Again"
 JERROR="Error"
 JEMAIL="Email"
@@ -331,4 +309,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/en-AU/en-AU.xml b/installation/language/en-AU/en-AU.xml
index 82bcc7a..8d2d3ea 100644
--- a/installation/language/en-AU/en-AU.xml
+++ b/installation/language/en-AU/en-AU.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Joomla! Project</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/en-GB/en-GB.ini b/installation/language/en-GB/en-GB.ini
index f8bf6d0..79bc787 100644
--- a/installation/language/en-GB/en-GB.ini
+++ b/installation/language/en-GB/en-GB.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Finish"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose default language"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Language"
 INSTL_STEP_LANGUAGES_LABEL="Install Languages"
-INSTL_STEP_LICENSE_LABEL="License"
-INSTL_STEP_PREINSTALL_LABEL="Pre-Installation check"
 INSTL_STEP_SITE_LABEL="Configuration"
 INSTL_STEP_SUMMARY_LABEL="Overview"
-INSTL_STEPS_TITLE="Steps"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Choose language"
-INSTL_SELECT_LANGUAGE_DESC="Please select the language to use during the Joomla! installation steps:"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!"
 INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Pre-Installation Check"
-INSTL_PRECHECK_FOR_VERSION="Pre-installation check for %s:"
 INSTL_PRECHECK_DESC="If any of these items are not supported (marked as <strong class="_QQ_"red"_QQ_">No</strong>) then please take actions to correct them.<br />You cannot install Joomla! until your setup meets the requirements below."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.<br />However, Joomla! will still operate if your settings do not quite match the recommended configuration."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="This is probably &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Database Type"
 INSTL_DATABASE_USER_DESC="Either something as "_QQ_"root"_QQ_" or a username given by the host"
 INSTL_DATABASE_USER_LABEL="Username"
-INSTL_DATABASE_TITLE="Connection Settings"
-INSTL_DATABASE_DESC="<p>A Joomla! website stores all of its data in a database. This screen gives the installation program the information needed to create this database.</p><p> If you are installing Joomla! on a remote web server, you will need to get this information from your host.</p><p>Some web hosts require that you create the database before you install Joomla. If you get the message "_QQ_"Could not connect to the database"_QQ_", check that your user name and password are correct. If you still get this message, check with your host to see if you need to create the database before installing Joomla.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP Root Path"
 INSTL_FTP_SAVE_LABEL="Save FTP Password"
 INSTL_FTP_TITLE="FTP Configuration (<strong class="_QQ_"red"_QQ_">Optional - Most Users Can Skip This Step - Press Next to Skip</strong>)"
 INSTL_FTP_USER_LABEL="FTP Username"
-INSTL_SITE_NAME_LABEL="Site Name"
 INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings"
 INSTL_FTP_SETTINGS_CORRECT="Settings correct"
 INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super Administrator account
 INSTL_ADMIN_PASSWORD2_LABEL="Confirm Admin Password"
 INSTL_ADMIN_USER_LABEL="Admin Username"
 INSTL_ADMIN_USER_DESC="Set the username for your Super Administrator account."
-INSTL_SITE_NAME_TITLE="Site Name"
+INSTL_SITE_NAME_LABEL="Site Name"
 INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site."
 INSTL_SITE_METADESC_LABEL="Description"
 INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly s
 INSTL_EMAIL_NOT_SENT="Email could not be sent."
 
 ;Complete view
-INSTL_COMPLETE="Finish"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details"
-INSTL_COMPLETE_DESC1="Click the Site button to view your Joomla! Web site or the Admin button to take you to your administrator login."
-INSTL_COMPLETE_DESC2="On the Joomla! Community Site, you will find a list of links to available language packs as well as links to language related resources on the joomla.org family of sites."
-INSTL_COMPLETE_DESC3="Click the button on the right to open the Community Site in a new window."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder."
 INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
 INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by clicking in the checkboxes and then install them by clicking on the Next button.<br/>Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete<br />Please wait while we download and install the languages..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Please, select a language. If you don't need to install other languages press the 'Previous' button"
+INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! administrator"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature"
-INSTL_DEFAULTLANGUAGE_NOTE="Note: once you press the Next button you will get back to the end of the installation process where you will be asked to delete the installation folder."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Select your default language"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database."
 INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.<br />The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Error initialising schema version number"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup"
 INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s"
 INSTL_DATABASE_INVALID_TYPE="Please select the database type"
 INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="The MySQL table prefix must start with a letter and be followed by only letters, numbers or underscores."
 INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "_QQ_"special"_QQ_" characters in the name. Your version is: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces."
-INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="The function "_QQ_"SYST"_QQ_" failed."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Advanced Settings"
-INSTL_BASIC_SETTINGS="Basic Settings"
 INSTL_CONFPROBLEM="Your configuration file or directory is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder."
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_DISPLAY_ERRORS="Display Errors"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Some errors occurred while populating the database: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Installation"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
-INSTL_LICENSE="License"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Process is in progress. Please wait..."
 
 ;Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Advanced"
 JCHECK_AGAIN="Check Again"
 JERROR="Error"
 JEMAIL="Email"
@@ -331,4 +309,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/en-GB/en-GB.xml b/installation/language/en-GB/en-GB.xml
index 4202848..b4e7515 100644
--- a/installation/language/en-GB/en-GB.xml
+++ b/installation/language/en-GB/en-GB.xml
@@ -8,7 +8,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/en-US/en-US.ini b/installation/language/en-US/en-US.ini
index 61cdae1..caff404 100644
--- a/installation/language/en-US/en-US.ini
+++ b/installation/language/en-US/en-US.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Finish"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choose default language"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Language"
 INSTL_STEP_LANGUAGES_LABEL="Install Languages"
-INSTL_STEP_LICENSE_LABEL="License"
-INSTL_STEP_PREINSTALL_LABEL="Pre-Installation check"
 INSTL_STEP_SITE_LABEL="Configuration"
 INSTL_STEP_SUMMARY_LABEL="Overview"
-INSTL_STEPS_TITLE="Steps"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Choose language"
-INSTL_SELECT_LANGUAGE_DESC="Please select the language to use during the Joomla! installation steps:"
 INSTL_SELECT_LANGUAGE_TITLE="Select Language"
 INSTL_WARNJAVASCRIPT="Warning! JavaScript must be enabled for proper installation of Joomla!"
 INSTL_WARNJSON="Your PHP installation needs to have JSON enabled for Joomla to be installed!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Pre-Installation Check"
-INSTL_PRECHECK_FOR_VERSION="Pre-installation check for %s:"
 INSTL_PRECHECK_DESC="If any of these items are not supported (marked as <strong class="_QQ_"red"_QQ_">No</strong>) then please take actions to correct them.<br />You cannot install Joomla! until your setup meets the requirements below."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Recommended settings:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="These settings are recommended for PHP in order to ensure full compatibility with Joomla.<br />However, Joomla! will still operate if your settings do not quite match the recommended configuration."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="This is probably &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Database Type"
 INSTL_DATABASE_USER_DESC="Either something as "_QQ_"root"_QQ_" or a username given by the host"
 INSTL_DATABASE_USER_LABEL="Username"
-INSTL_DATABASE_TITLE="Connection Settings"
-INSTL_DATABASE_DESC="<p>A Joomla! website stores all of its data in a database. This screen gives the installation program the information needed to create this database.</p><p> If you are installing Joomla! on a remote web server, you will need to get this information from your host.</p><p>Some web hosts require that you create the database before you install Joomla. If you get the message "_QQ_"Could not connect to the database"_QQ_", check that your user name and password are correct. If you still get this message, check with your host to see if you need to create the database before installing Joomla.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Autofind FTP Path"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP Root Path"
 INSTL_FTP_SAVE_LABEL="Save FTP Password"
 INSTL_FTP_TITLE="FTP Configuration (<strong class="_QQ_"red"_QQ_">Optional - Most Users Can Skip This Step - Press Next to Skip</strong>)"
 INSTL_FTP_USER_LABEL="FTP Username"
-INSTL_SITE_NAME_LABEL="Site Name"
 INSTL_VERIFY_FTP_SETTINGS="Verify FTP Settings"
 INSTL_FTP_SETTINGS_CORRECT="Settings correct"
 INSTL_FTP_USER_DESC="Warning! It is recommended to leave this blank and enter your FTP username each time you transfer files."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Set the password for your Super Administrator account
 INSTL_ADMIN_PASSWORD2_LABEL="Confirm Admin Password"
 INSTL_ADMIN_USER_LABEL="Admin Username"
 INSTL_ADMIN_USER_DESC="Set the username for your Super Administrator account."
-INSTL_SITE_NAME_TITLE="Site Name"
+INSTL_SITE_NAME_LABEL="Site Name"
 INSTL_SITE_NAME_DESC="Enter the name of your Joomla! site."
 INSTL_SITE_METADESC_LABEL="Description"
 INSTL_SITE_METADESC_TITLE_LABEL="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Below you can find the configuration settings for a newly s
 INSTL_EMAIL_NOT_SENT="Email could not be sent."
 
 ;Complete view
-INSTL_COMPLETE="Finish"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration Login Details"
-INSTL_COMPLETE_DESC1="Click the Site button to view your Joomla! Web site or the Admin button to take you to your administrator login."
-INSTL_COMPLETE_DESC2="On the Joomla! Community Site, you will find a list of links to available language packs as well as links to language related resources on the joomla.org family of sites."
-INSTL_COMPLETE_DESC3="Click the button on the right to open the Community Site in a new window."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation folder could not be deleted. Please manually delete the folder."
 INSTL_COMPLETE_FOLDER_REMOVED="Installation folder successfully removed"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Language"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
 INSTL_LANGUAGES_DESC="The Joomla interface is available in several languages. Choose your preferred languages by clicking in the checkboxes and then install them by clicking on the Next button.<br/>Note: this operation will take about 10 seconds to download and install every language. To avoid timeouts please select no more than 3 languages to install."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="This operation will take up to 10 seconds per language to complete<br />Please wait while we download and install the languages..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Please, select a language. If you don't need to install other languages press the 'Previous' button"
+INSTL_LANGUAGES_MORE_LANGUAGES="Press the 'Previous' button if you want to install more languages."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No languages have been selected to be installed. If you need to install more languages, press the 'Previous' button and choose the desired languages from the list."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! was not able to connect to the languages server. Please finish the installation process."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: You will be able to install languages later using the Joomla! administrator"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Return to last installation step"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Install localised content"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="If active, Joomla will automatically create one content category per each installed language. Also, one featured article containing dummy content will be created on each category"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingual"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="This section allows you to automatically activate the Joomla! multilingual feature"
-INSTL_DEFAULTLANGUAGE_NOTE="Note: once you press the Next button you will get back to the end of the installation process where you will be asked to delete the installation folder."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Select your default language"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="You will be able to install it later using the Joomla! Administrator"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Some errors occurred in backing up the database."
 INSTL_DATABASE_ERROR_CREATE="An error occurred while trying to create the database %s.<br />The user may not have enough privileges to create a database. The required database may need to be created separately before you can install Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Some errors occurred deleting the database."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Error initialising schema version number"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Remove"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup"
 INSTL_DATABASE_FIX_TOO_LONG="The MySQL table prefix must be a maximum of 15 characters."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="You need SQL Server 2008 R2 (10.50.1600.1
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="You need SQL Server 2008 R2 (10.50.1600.1) or higher to continue the installation. Your version is: %s"
 INSTL_DATABASE_INVALID_TYPE="Please select the database type"
 INSTL_DATABASE_NAME_TOO_LONG="The MySQL database name must be a maximum of 64 characters."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="The MySQL table prefix must start with a letter and be followed by only letters, numbers or underscores."
 INSTL_DATABASE_INVALID_NAME="MySQL versions previous to 5.1.6 may not contain periods or other "_QQ_"special"_QQ_" characters in the name. Your version is: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL database names and table names may not begin or end with spaces."
-INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="No MySQL identifier can contain a NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="File %s does not exist"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="The function "_QQ_"SYST"_QQ_" failed."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Unable to auto-detect the FTP root folder."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Advanced Settings"
-INSTL_BASIC_SETTINGS="Basic Settings"
 INSTL_CONFPROBLEM="Your configuration file or directory is not writable or there was a problem creating the configuration file. You will have to upload the following code by hand. Click in the text area to highlight all of the code and then paste into a new text file. Name this file 'configuration.php' and upload it to your site root folder."
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_DISPLAY_ERRORS="Display Errors"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Some errors occurred while populating the database: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Installation"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
-INSTL_LICENSE="License"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Process is in progress. Please wait..."
 
 ;Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Advanced"
 JCHECK_AGAIN="Check Again"
 JERROR="Error"
 JEMAIL="Email"
@@ -331,4 +309,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/en-US/en-US.xml b/installation/language/en-US/en-US.xml
index 012f59f..ce73875 100644
--- a/installation/language/en-US/en-US.xml
+++ b/installation/language/en-US/en-US.xml
@@ -5,7 +5,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>US Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-US installation language pack</description>
 	<files>
diff --git a/installation/language/es-ES/es-ES.ini b/installation/language/es-ES/es-ES.ini
index 0496bb8..d9e5d3a 100644
--- a/installation/language/es-ES/es-ES.ini
+++ b/installation/language/es-ES/es-ES.ini
@@ -1,7 +1,7 @@
 ; $Id: es-ES.ini $
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
-; Copyright (C) Translation 2008 - 2013 comunidadjoomla.org. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; Copyright (C) Translation 2008 - 2014 comunidadjoomla.org. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note: All the ini files need to be saved as UTF-8 - NO BOM!
 
@@ -9,24 +9,17 @@ INSTL_STEP_COMPLETE_LABEL="Finalizar"
 INSTL_STEP_DATABASE_LABEL="Base de datos"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Elija el idioma predeterminado"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Idioma"
 INSTL_STEP_LANGUAGES_LABEL="Instalar idiomas"
-INSTL_STEP_LICENSE_LABEL="Licencia"
-INSTL_STEP_PREINSTALL_LABEL="Comprobaciones previas"
 INSTL_STEP_SITE_LABEL="Configuración"
 INSTL_STEP_SUMMARY_LABEL="Visión general"
-INSTL_STEPS_TITLE="Pasos"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Elegir idioma"
-INSTL_SELECT_LANGUAGE_DESC="Por favor, seleccione el idioma a usar durante el proceso de instalación:"
 INSTL_SELECT_LANGUAGE_TITLE="Seleccionar el idioma"
 INSTL_WARNJAVASCRIPT="¡Advertencia! JavaScript debe estar habilitado para una correcta instalación de Joomla!"
 INSTL_WARNJSON="Para que se pueda instalar Joomla! su instalacción de PHP necesita tener habilitado JSON."
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Comprobaciones previas"
-INSTL_PRECHECK_FOR_VERSION="Comprobaciones previas para %s:"
 INSTL_PRECHECK_DESC="Si alguno de estos elementos no está soportado (marcado como un <strong class="_QQ_"red"_QQ_">No</strong>), por favor, emprenda las acciones necesarias para corregirlo. No podrá instalar Joomla! hasta que se cumplan con los siguientes requisitos."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Configuraciones recomendadas:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Esta configuración es la recomendada para PHP, y su objetivo es el de asegurar una compatibilidad completa con Joomla!<br />Sin embargo, Joomla! aún podrá seguir funcionado aunque sus valores actuales no coincidan con los recomendados."
@@ -52,8 +45,6 @@ INSTL_DATABASE_TYPE_DESC="Probablemente sea &quot;mysqli&quot;"
 INSTL_DATABASE_TYPE_LABEL="Tipo de base de datos"
 INSTL_DATABASE_USER_DESC="Algo como "_QQ_"root"_QQ_" o un nombre de usuario facilitado por quien le sirva el hospedaje"
 INSTL_DATABASE_USER_LABEL="Usuario"
-INSTL_DATABASE_TITLE="Configuración de la conexión"
-INSTL_DATABASE_DESC="<p>Los sitios web hechos con Joomla! almacenan todos sus datos dentro de una base de datos. Desde esta pantalla, el programa de instalación da la información necesaria para crear esa base de datos.</p><p> Si usted está instalando Joomla! en un servidor remoto, necesitará que quien le sirve el hospedaje le facilite esta información.</p><p>Algunos hospedajes requieren de que usted cree la base de datos antes de instalar Joomla! Si recibe este mensaje: "_QQ_"No se puede conectar con la base de datos"_QQ_", revise que su usuario y contraseña son los correctos. Si usted continúa recibiendo el mismo mensaje, compruebe con su hospedaje si se debe a que necesita crear primero la base de datos, antes de instalar Joomla!</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Detectar la ruta del FTP automáticamente"
@@ -67,7 +58,6 @@ INSTL_FTP_ROOT_LABEL="Ruta raíz del FTP"
 INSTL_FTP_SAVE_LABEL="Guardar la contraseña del FTP"
 INSTL_FTP_TITLE="Configuración del FTP (<strong class="_QQ_"red"_QQ_">Opcional - La mayoría de usuarios pueden saltarse este paso - Pulse 'Siguiente' para saltárselo</strong>)"
 INSTL_FTP_USER_LABEL="Usuario del FTP"
-INSTL_SITE_NAME_LABEL="Nombre del sitio"
 INSTL_VERIFY_FTP_SETTINGS="Verificar la configuración del FTP"
 INSTL_FTP_SETTINGS_CORRECT="Configuración correcta"
 INSTL_FTP_USER_DESC="¡Advertencia! Es recomendable dejar esto en blanco e introducir su usuario del FTP cada vez que necesite transferir archivos."
@@ -82,7 +72,7 @@ INSTL_ADMIN_PASSWORD_DESC="Asigne la contraseña de la cuenta del súper adminis
 INSTL_ADMIN_PASSWORD2_LABEL="Confirmar la contraseña del administrador"
 INSTL_ADMIN_USER_LABEL="Nombre de usuario del administrador"
 INSTL_ADMIN_USER_DESC="Asigna el nombre de usuario para su cuenta de súper administrador."
-INSTL_SITE_NAME_TITLE="Nombre del sitio"
+INSTL_SITE_NAME_LABEL="Nombre del sitio"
 INSTL_SITE_NAME_DESC="Introduzca el nombre de su sitio Joomla!"
 INSTL_SITE_METADESC_LABEL="Descripción"
 INSTL_SITE_METADESC_TITLE_LABEL="Introduzca la descripción general de todo el sitio, la cual será usada por los motores de búsqueda. Generalmente, un máximo de 20 palabras suele ser lo óptimo."
@@ -97,7 +87,7 @@ INSTL_SAMPLE_DATA_SET="Datos de ejemplo predeteminados en inglés (GB)"
 INSTL_SAMPLE_LEARN_SET=" Datos de ejemplo: Learn Joomla English (GB)"
 INSTL_SAMPLE_TESTING_SET=" Datos de ejemplo: Test English (GB)"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Instala Joomla solo con un menú y un formulario de acceso, sin ningún contenido."
-INSTL_SAMPLE_BLOG_SET_DESC="Instala Joomla con algunos artículos y módulos relacionados con sitios tipo blog como el de 'Temas antiguos', 'Blog en el rollo'  'Temas más leídos'."
+INSTL_SAMPLE_BLOG_SET_DESC="Instala Joomla con algunos artículos y módulos relacionados con sitios tipo blog como el de 'Temas antiguos', 'Blog en el rollo' 'Temas más leídos'."
 INSTL_SAMPLE_BROCHURE_SET_DESC="Instala Joomla con algunas páginas (un menú con las páginas 'Inicio', 'Sobre nosotros', 'Noticias de actualidad', 'Contáctenos') y algunos módulos como el de 'Buscar', 'HTML personalizado' y 'Datos de acceso'."
 INSTL_SAMPLE_DATA_SET_DESC="Instala Joomla con una página (un menú con un enlace) y módulos como el de 'Últimos artículos' y 'Datos de acceso'."
 INSTL_SAMPLE_LEARN_SET_DESC="Instala Joomla con artículos de ejemplo que describen cómo funciona Joomla."
@@ -126,11 +116,7 @@ INSTL_EMAIL_HEADING="A continuación puede encontrar los datos de configuración
 INSTL_EMAIL_NOT_SENT="No se ha podido enviar el correo electrónico."
 
 ;Complete view
-INSTL_COMPLETE="Finalizar"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalles de acceso a la administración"
-INSTL_COMPLETE_DESC1="Haga clic sobre el botón 'Sitio', para ver su sitio Joomla! o sobre el botón 'Administración', para ir a la página de acceso a la administración."
-INSTL_COMPLETE_DESC2="En el sitio comunitario de Joomla!, usted podrá encontrar un listado de enlaces hacia los paquetes del idioma disponibles, así como otros recursos relacionados con los idiomas, de la familia de sitios Joomla! que hay en joomla.org."
-INSTL_COMPLETE_DESC3="Haga clic sobre el enlace de la derecha, para abrir el sitio de ayuda en una nueva ventana."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="El directorio de instalación ya ha sido eliminado."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="No se ha podido eliminar el directorio de instalación. Por favor, elimínelo manualmente."
 INSTL_COMPLETE_FOLDER_REMOVED="La carpeta de instalación ha sido eliminada correctamente"
@@ -147,8 +133,9 @@ INSTL_LANGUAGES="Instalar paquetes del idioma"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versión"
 INSTL_LANGUAGES_DESC="La interfaz de Joomla está disponible en varios idiomas. Seleccione los idiomas que desee haciendo clic sobre su casilla de selección y luego pulse el botón 'Siguiente'.<br/>Nota: esta operación puede tardar unos diez segundos por idioma seleccionado a descargar e instalar. Por favor, no seleccione más de 3 idiomas a instalar."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Esta operación puede tomar  más de 10 segundos por idioma para completarse<br />Por favor, espera a que se descarguen e instalen los idiomas..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Por favor, seleccione un idioma. Si no necesita instalar otros idiomas pulse el botón 'Anterior'"
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Esta operación puede tomar más de 10 segundos por idioma para completarse<br />Por favor, espera a que se descarguen e instalen los idiomas..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Si necesita instalar más idiomas pulse el botón 'Anterior'."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="No se han seleccionado idiomas a instalar. Si necesita instalar más idiomas pulse el botón 'Anterior' y seleccione los idiomas que desee desde la lista"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! no se ha podido conectar al servidor de idiomas. Por favor, termine el proceso de instalación."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Después también podrá instalar otros idiomas desde la administración de Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Volver al último paso de instalación"
@@ -165,10 +152,10 @@ INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Seleccionar"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Idioma"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="Etiqueta"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="Joomla no ha podido crear automáticamente el idioma del contenido %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla no ha podido crear automáticamente el menú  para el idioma %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="Joomla no ha podido crear automáticamente el menú para el idioma %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="Joomla no ha podido crear automáticamente el elemento de menú de inicio para el idioma %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="Joomla no ha podido crear automáticamente el módulo de menú para el idioma %s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla no ha podido crear automáticamente la categoría para el  idioma del contenido %s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="Joomla no ha podido crear automáticamente la categoría para el idioma del contenido %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="Joomla no ha podido crear automáticamente el artículo con contenido del idioma %s"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="Joomla no ha podido publicar automáticamente el módulo 'Selector del idioma'"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="Joomla no ha podido habilitar automáticamente el plugin 'Código del idioma'."
@@ -185,8 +172,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalar contenido para el idio
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Si está activado, Joomla creará automáticamente una catecogía del idioma del contenido para cada idioma instalado. También se creará, en cada una de esas categorías, un artículo destacado con texto inventado."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multiidioma"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Esta sección le permite activar automáticamente las careacterísticas multiidioma de Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Nota: una vez que pulse sobre el botón 'Siguiente' volverá al final del proceso de instalación y donde se le preguntará por borrar el directorio de instalación."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Seleccione su idioma predeterminado"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="después también podrá instalarlo usando la administración de Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -199,7 +184,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Se han producido algunos errores al respaldar la base de datos."
 INSTL_DATABASE_ERROR_CREATE="Se ha producido un error cuando se intentaba crear la base de datos %s.<br />Puede que el usuario no tenga privilegios suficientes para crear una base de datos. Tal vez necesite crear la base de datos antes de intentar instalar Joomla!"
 INSTL_DATABASE_ERROR_DELETE="Se han producido algunos errores borrando la base de datos."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Error inicializando el esquema del número de versión"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Borrar"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Respaldar"
 INSTL_DATABASE_FIX_TOO_LONG="El prefijo de las tablas de MySQL debe ser como máximo de 15 caracteres."
@@ -210,10 +194,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Necesita de SQL Server 2008 R2 (10.50.160
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Necesita de SQL Server 2008 R2 (10.50.1600.1) o superior para poder continuar con la instalación. Su versión es la: %s"
 INSTL_DATABASE_INVALID_TYPE="Por favor, seleccione el tipo de base de datos"
 INSTL_DATABASE_NAME_TOO_LONG="El nombre de a base de datos de MySQL debe ser como máximo de 64 caracteres."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="El prefijo de las tablas de MySQL debe empezar con una letra, y se debe seguir solo con letras, números, o guiones bajos."
 INSTL_DATABASE_INVALID_NAME="Las versiones de MySQL anteriores a la 5.1.6 no pueden contener períodos u otros caracteres "_QQ_"especiales"_QQ_" en el nombre. Su versión es la: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Los nombres de las bases de datos y de las tablas de MySQL no pueden empezar o acabar con espacios."
-INSTL_DATABASE_NAME_INVALID_CHAR="Ningún identificador de MySQL puede contener un valor NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Ningún identificador de MySQL puede contener un valor NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="El archivo %s no existe"
 
 ;controllers
@@ -245,8 +228,6 @@ INSTL_FTP_NOSYST="La función "_QQ_"SYST"_QQ_" ha fallado."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="No se puede detectar automáticamente la carpeta raíz del FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Configuración avanzada"
-INSTL_BASIC_SETTINGS="Configuración básica"
 INSTL_CONFPROBLEM="Su archivo de configuración o su directorio no es escribible (o se produjo un error creando el archivo de configuración). Deberá subir este código manualmente. Haga clic en el área de texto para seleccionar todo el código y luego péguelo en un nuevo archivo de texto. El nombre de este archivo debe ser 'configuration.php', luego súbalo al directorio raíz de su sitio."
 INSTL_DATABASE_SUPPORT="Soporte para la base de datos:"
 INSTL_DISPLAY_ERRORS="Mostrar errores"
@@ -254,9 +235,7 @@ INSTL_ERROR_DB="Se ha producido algún error mientras se cumplimentaba la base d
 INSTL_ERROR_INITIALISE_SCHEMA="No se ha podido inicializar el esquema de la base de datos"
 INSTL_FILE_UPLOADS="Subida de archivos"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Instalación"
 INSTL_JSON_SUPPORT_AVAILABLE="Soporte JSON"
-INSTL_LICENSE="Licencia"
 INSTL_MAGIC_QUOTES_GPC="Comillas mágicas GPC desactivadas"
 INSTL_MAGIC_QUOTES_RUNTIME="Comillas mágicas en tiempo de ejecución"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Mbstring language predeterminado"
@@ -278,7 +257,6 @@ INSTL_PROCESS_BUSY="El proceso está en progreso. Por favor, espere..."
 
 ;Global strings
 JADMINISTRATOR="Administración"
-JADVANCED="Advanzado"
 JCHECK_AGAIN="Comprobar nuevamente"
 JERROR="Error"
 JEMAIL="Correo electrónico"
@@ -309,6 +287,7 @@ JLIB_FORM_FIELD_INVALID="Campo inválido:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Campo inválido: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Campo obligatorio: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Fallo al copiar el archivo file %1$s a %2$s."
+JLIB_INSTALLER_NOT_ERROR="Si el error está relacionado con la instalación de archivos del idioma del editor TinyMCE, no tendráningún efecto en la instalación del idioma o idiomas. Algunos paquetes del idioma anteriores a Joomla! 3.2.0 podrían estar intentando instalar los archivo del idioma del editor por separado. Como ahora esos archivos del editor se incluyen desde el núcleo de Joomla, no es necesario que sean instalados."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: No se puede conectar con la base de datos<br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -330,7 +309,6 @@ POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
 SQLSRV="Microsoft SQL Server"
-
 ;The next ones are extra strings in this language (commented keys in source, extra plural cases, etc)
 INSTL_SAMPLE_BLOG_ES_SET="Datos de ejemplo tipo blog en español (ES)."
 INSTL_SAMPLE_BROCHURE_ES_SET="Datos de ejemplo tipo folleto en español (ES)."
diff --git a/installation/language/es-ES/es-ES.xml b/installation/language/es-ES/es-ES.xml
index a8765ca..d7f9c4b 100644
--- a/installation/language/es-ES/es-ES.xml
+++ b/installation/language/es-ES/es-ES.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2011-01-05</creationDate>
 	<author>Spanish Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/et-EE/et-EE.ini b/installation/language/et-EE/et-EE.ini
index c3dfd1d..04e1eba 100644
--- a/installation/language/et-EE/et-EE.ini
+++ b/installation/language/et-EE/et-EE.ini
@@ -4,29 +4,21 @@
 ; Note : All ini files need to be saved as UTF-8
 
 ;Stepbar
-
 INSTL_STEP_COMPLETE_LABEL="Lõpetamine"
 INSTL_STEP_DATABASE_LABEL="Andmebaas"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Vali vaikimisi keel"
-INSTL_STEP_FTP_LABEL="FTP seaded"
-INSTL_STEP_LANGUAGE_LABEL="Keel"
+INSTL_STEP_FTP_LABEL="FTP"
 INSTL_STEP_LANGUAGES_LABEL="Paigalda keeli"
-INSTL_STEP_LICENSE_LABEL="Litsents"
-INSTL_STEP_PREINSTALL_LABEL="Paigaldamis-eelne kontroll"
 INSTL_STEP_SITE_LABEL="Seadistamine"
 INSTL_STEP_SUMMARY_LABEL="Ülevaade"
-INSTL_STEPS_TITLE="Etapid"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Vali keel"
-INSTL_SELECT_LANGUAGE_DESC="Palun vali Joomla! paigaldamisprogrammi keel:"
 INSTL_SELECT_LANGUAGE_TITLE="Vali keel"
 INSTL_WARNJAVASCRIPT="Hoiatus! Joomla! paigaldamiseks peab veebilehitsejas olema JavaSkript sisse lülitatud."
 INSTL_WARNJSON="Et Joomlat saaks installida, peab sinu PHP-s olema JSON sisse lülitatud!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Paigaldamis-eelne kontroll"
-INSTL_PRECHECK_FOR_VERSION="Paigaldamis-eelne kontroll versioonile %s:"
 INSTL_PRECHECK_DESC="Kui mõni siin loetletud kirjetest pole toetatud (märgitud kui <strong class="_QQ_"red"_QQ_">Ei</strong>), siis palun võtta ette samme, et need puudused kõrvaldada. Sa ei saa Joomlat paigaldada, kui sinu serveri seaded ei vasta nõuetele."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Soovitatud seaded:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Need PHP seaded on soovituslikud, et Joomla töötaks täies mahus.<br />Joomla! töötab aga ka siis, kui siin mainitud seaded ei ühildu etteantud seadetega."
@@ -46,14 +38,12 @@ INSTL_DATABASE_OLD_PROCESS_LABEL="Vana andmebaasi töötlemine"
 INSTL_DATABASE_PASSWORD_DESC="Saidi turvalisuse tagamiseks on andmebaasi kasutajakonto parooli kasutamine kohustuslik"
 INSTL_DATABASE_PASSWORD_LABEL="Parool"
 INSTL_DATABASE_PREFIX_DESC="Vali andmebaasi eelliide või kasuta <b>juhuslikult loodud</b> eesliidet. Ideaalolukorras võiks see olla kolm või neli märki pikk ning sisaldada ainult numbreid ja tähti ja see PEAB lõppema allkriipsuga. <b>Veendu, et valitud eesliide poleks teiste tabelite juures kasutusel</b>."
-INSTL_DATABASE_PREFIX_LABEL="Tabeli eel-liide"
-INSTL_DATABASE_PREFIX_MSG="Andmebaasi eel-loode peab algama tähega ning selle järel tuleb valikuline täht või number ja allkriips"
+INSTL_DATABASE_PREFIX_LABEL="Tabeli eesliide"
+INSTL_DATABASE_PREFIX_MSG="Andmebaasi eesliide peab algama tähega ning selle järel tuleb valikuline täht või number ja allkriips"
 INSTL_DATABASE_TYPE_DESC="See on tõenäoliselt &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Andmebaasi tüüp"
-INSTL_DATABASE_USER_DESC="kas midagi sellist nagu "_QQ_"root"_QQ_" või siis teenusepakkuja poolt antud kasutajanimi"
+INSTL_DATABASE_USER_DESC="Kas midagi sellist nagu "_QQ_"root"_QQ_" või siis teenusepakkuja poolt antud kasutajanimi"
 INSTL_DATABASE_USER_LABEL="Kasutajanimi"
-INSTL_DATABASE_TITLE="Ühenduse seaded"
-INSTL_DATABASE_DESC="<p>Joomla! veebisaidi infot hoitakse andmebaasis. Sellel lehel saad sisestada selle andmebaasi loomise jaoks vajaliku info.</p><p> Kui sa paigaldad Joomlat veebimajutuse upakkuja serverisse, siis saad sa selle info oma teenusepakkuja käest.</p><p>Mõningates serverites on vaja andmebaas luua enne Joomla paigaldamist. Kui sulle näidatakse veateadet "_QQ_"Ühendumine andmebaasiga ebaõnnestus."_QQ_", siis veendu, et kasutajanimi ja parool oleksid õiged. Kui sulle siiski näidatakse seda sõnumit, siis kontrolli teenusepakkuja käest, kas sa  pead eelnevalt andmebaasi looma või mitte.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Leia FTP kaust automaatselt"
@@ -67,7 +57,6 @@ INSTL_FTP_ROOT_LABEL="FTP peakaust"
 INSTL_FTP_SAVE_LABEL="Salvesta FTP parool"
 INSTL_FTP_TITLE="FTP seaded (<strong class="_QQ_"red"_QQ_">Valikuline - Enamikud kasutajad võivad selle sammu vahele jätta - Vahelejätmiseks kliki nuppu Edasi</strong>)"
 INSTL_FTP_USER_LABEL="FTP kasutajanimi"
-INSTL_SITE_NAME_LABEL="Saidi nimi"
 INSTL_VERIFY_FTP_SETTINGS="Kontrolli FTP seadeid"
 INSTL_FTP_SETTINGS_CORRECT="Seaded on korrektsed"
 INSTL_FTP_USER_DESC="Hoiatus! Soovituslik on see lahter tühjaks jätta ja sisestada oma FTP kasutajanimi igakord faile serverisse laadides."
@@ -82,7 +71,7 @@ INSTL_ADMIN_PASSWORD_DESC="Määra oma super administraatori kasutajakonto paroo
 INSTL_ADMIN_PASSWORD2_LABEL="Admini parool uuesti"
 INSTL_ADMIN_USER_LABEL="Admini kasutajanimi"
 INSTL_ADMIN_USER_DESC="Määra oma Super Administraatori konto kasutajanimi."
-INSTL_SITE_NAME_TITLE="Saidi nimi"
+INSTL_SITE_NAME_LABEL="Saidi nimi"
 INSTL_SITE_NAME_DESC="Sisesta oma Joomla! saidi nimi."
 INSTL_SITE_METADESC_LABEL="Kirjeldus"
 INSTL_SITE_METADESC_TITLE_LABEL="Sisesta üldine kirjeldus oma saidile, mida kasutatakse otsingumootorite poolt. Üldiselt on optimaalne pikkus maksimaalselt 20 sõna."
@@ -91,12 +80,6 @@ INSTL_SITE_OFFLINE_TITLE_LABEL="Lülita saidipoolne osa välja kohe, kui paigald
 INSTL_SITE_INSTALL_SAMPLE_LABEL="Paigalda näidisinfo"
 INSTL_SITE_INSTALL_SAMPLE_DESC="Näidisinfo paigaldamine on algajate kasutajate jaoks tungivalt soovitatud. See paigaldab Joomla! paigalduspaketiga kaasasoleva näidisinfo."
 INSTL_SITE_INSTALL_SAMPLE_NONE="Pole (<strong>Vajalik lihtsa mitmekeelse saidi loomiseks</strong>)"
-INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Paigalda Joomla lihtsalt koos ühe menüü ja sisselogimisvormiga, ilma mingisuguse sisuta."
-INSTL_SAMPLE_BLOG_SET_DESC="Paigalda Joomla koos mõningate artiklitega ja bloga seotud moodulitega nagu Vanemad postitused, Blogi lingid, Enimloetud postitused."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Paigalda Joomla koos mõningate lehtedega (Menüü linkidega Avaleht, Meist, Uudised, Kontakt) ja moodulitega nagu Otsing, Omaloodud HTML, Sisselogimisvorm."
-INSTL_SAMPLE_DATA_SET_DESC="Paigalda Joomla koos ühe lehega (ühe lingiga menüü) ja moodulitega nagu Viimased artiklid, Sisselogimisvorm."
-INSTL_SAMPLE_LEARN_SET_DESC="Paigalda Joomla koos näidisartiklitega, mis kirjeldavad, kuidas Joomla töötab."
-INSTL_SAMPLE_TESTING_SET_DESC="Paigalda Joomla koos kõigi võimalike menüülinkidega, et aidata testida Joomla erinevaid võimalusi."
 INSTL_SAMPLE_BLOG_SET="Blogi inglisekeelne (GB) näidisinfo"
 INSTL_SAMPLE_BROCHURE_SET="Brošüüri inglisekeelne (GB) näidisinfo"
 INSTL_SAMPLE_DATA_SET="Vaikimisi inglisekeelne näidisinfo"
@@ -107,13 +90,18 @@ INSTL_SAMPLE_BROCHURE_EE_SET="Brošüüri inglisekeelne (GB) näidisinfo"
 INSTL_SAMPLE_DATA_EE_SET="Vaikimisi inglisekeelne (GB) näidisinfo"
 INSTL_SAMPLE_LEARN_EE_SET="Joomla õppimise inglisekeelne (GB) näidisinfo"
 INSTL_SAMPLE_TESTING_EE_SET="Test inglisekeelne (GB) näidisinfo"
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Paigalda Joomla lihtsalt koos ühe menüü ja sisselogimisvormiga, ilma mingisuguse sisuta."
+INSTL_SAMPLE_BLOG_SET_DESC="Paigalda Joomla koos mõningate artiklitega ja bloga seotud moodulitega nagu Vanemad postitused, Blogi lingid, Enimloetud postitused."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Paigalda Joomla koos mõningate lehtedega (Menüü linkidega Avaleht, Meist, Uudised, Kontakt) ja moodulitega nagu Otsing, Omaloodud HTML, Sisselogimisvorm."
+INSTL_SAMPLE_DATA_SET_DESC="Paigalda Joomla koos ühe lehega (ühe lingiga menüü) ja moodulitega nagu Viimased artiklid, Sisselogimisvorm."
+INSTL_SAMPLE_LEARN_SET_DESC="Paigalda Joomla koos näidisartiklitega, mis kirjeldavad, kuidas Joomla töötab."
+INSTL_SAMPLE_TESTING_SET_DESC="Paigalda Joomla koos kõigi võimalike menüülinkidega, et aidata testida Joomla erinevaid võimalusi."
 
 ;Summary view
 INSTL_FINALISATION="Lõpetamine"
 INSTL_SUMMARY_INSTALL="Paigalda"
 INSTL_SUMMARY_EMAIL_LABEL="E-posti seaded"
 INSTL_SUMMARY_EMAIL_DESC="Vali kas saata seaded pärast paigaldamist e-posti aadressile %s."
-; Needs to be reviewed in context
 INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="Kaasa paroolid e-postiga"
 INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="Hoiatus! Paroolide saatmine või salvestamine e-postis pole soovitatav."
 
@@ -130,13 +118,9 @@ INSTL_INSTALLING_EMAIL="E-posti saatmine aadressile %s"
 INSTL_EMAIL_SUBJECT="Seadete üksikasjad: %s"
 INSTL_EMAIL_HEADING="Altpoolt leiad seadete üksikasjad oma äsja üles seatud Joomla! veebisaidile:"
 INSTL_EMAIL_NOT_SENT="E-posti saatmine ebaõnnestus."
- 
+
 ;Complete view
-INSTL_COMPLETE="Lõpetamine"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administreerimisliidesesse sisenemise info"
-INSTL_COMPLETE_DESC1="Kliki saidi nupul, et vaadata oma kodulehte või Administraatoriliidese nupul, et minna administraatoriliidesesse."
-INSTL_COMPLETE_DESC2="Joomla! kogukonna lehelt leiad lingid saadaolevatele keeltepakkidele ning lingid keeltega seotud ressurssidele joomla.org saitidel."
-INSTL_COMPLETE_DESC3="Kogukonna saidi avamiseks uues aknas klikkige paremal olevale nupule."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Paigaldusfailide kaust on juba eemaldatud."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Paigaldusfailide kausta kustutamine ebaõnnestus. Palun kustuta see kaust käsitsi."
 INSTL_COMPLETE_FOLDER_REMOVED="Paigaldusfailide kaust on eemaldatud"
@@ -146,16 +130,16 @@ INSTL_COMPLETE_LANGUAGE_DESC2="Märkus: Joomla! uute keelte allalaadimiseks ja p
 INSTL_COMPLETE_REMOVE_FOLDER="Eemalda paigaldusfailide kaust (installation)"
 INSTL_COMPLETE_REMOVE_INSTALLATION="PALUN EEMALDA TÄIELIKULT PAIGALDAMISFAILIDE KAUST.<br />Sa ei saa jätkata enne, kui paigaldamisfailide kaust (installation) on kustutatud. See on mõeldud Joomla! turvalisuse tagamiseks."
 INSTL_COMPLETE_TITLE="Õnnitlused! Joomla! on nüüd paigaldatud."
-
 INSTL_COMPLETE_INSTALL_LANGUAGES="Lisasammud: Paigalda keeli"
 
 ;Languages view
-INSTL_LANGUAGES="Keelepakid"
+INSTL_LANGUAGES="Paigalda keelepakke"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Keel"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versioon"
 INSTL_LANGUAGES_DESC="Joomla! kasutajaliides on saadaval mitmetes keeltes. Vali oma eelistatud keel tehes valikud ja seejärel paigaldades keeled klikkides nupule Edasi.<br/>Märkus: see tegevus võtab iga keele allalaadimiseks ja paigaldamiseks aega umbes 10 sekundit. Serveri aegumiste vältimiseks vali maksimaalselt 3 keelt."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="See tegevus võtab aega kuni 10 sekundit keele kohta<br />Palun oota, kuni me laeme alla ja paigaldame keeled..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Palun vali keel. Kui sa ei pea muid keeli paigaldama, siis vajuta nuppu 'Eelmine'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Kui sa tahad veel keeli paigaldada, siis vajuta nupule 'Eelmine'."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Ühtegi keelt pole valitud või paigaldatud. Kui sa soovid paigaldada muid keeli, siis vajuta nuppu 'Eelmine'"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ei suutnud keelte serveriga ühendust luua. Palun lõpeta paigaldamine."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Märkus: Sa saad keeled hiljem Joomla! adminiliidesest paigaldada"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Mine tagasi paigalduse viimase sammu juurde"
@@ -192,8 +176,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Paigalda tõlgitud sisu"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Kui see on aktiivne, siis loob Joomla automaatselt iga paigaldatud keele kohta ühe sisukategooria. Samuti luuakse igasse kategooriasse üks esiletõstetud artikkel, milles on täitetekst"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Mitmekeelsus"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="See osa võimaldab sul aktiveerida automaatselt Joomla! mitmekeelsuse toe"
-INSTL_DEFAULTLANGUAGE_NOTE="Märkus: klikkides nuppu Edasi viiakse sind tagasi paigaldusprotsessi juurde, kus sul palutakse paigaldusfailide kaust kustutada."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Vali oma vaikimisi keel"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Sa saad selle hiljem Joomla! adminiliidest paigaldada"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -206,7 +188,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Andmebaasist varukoopiat tehes tekkisid mõned vead."
 INSTL_DATABASE_ERROR_CREATE="Andmebaasi %s luues tekkis viga.<br />Võimalik, et kasutajal pole andmebaasi loomiseks piisavalt õigusi. Andmebaas tuleb luua eraldi enne Joomla! paigaldamist."
 INSTL_DATABASE_ERROR_DELETE="Andmebaasi kustutamisel tekkisid mõned vead."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Skeemi versiooni tuvastamine ebaõnnestus"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Eemalda"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Varukoopia"
 INSTL_DATABASE_FIX_TOO_LONG="MySQL tabeli eelliite maksimaalne pikkus on 15 märki."
@@ -217,10 +198,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Paigaldamise jätkamiseks peab sinu veebi
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Paigaldamise jätkamiseks peab sinu veebiserveris olema SQL Server 2008 R2 (10.50.1600.1) või mõni uuem versioon. Sinu serverisse on paigaldatud versioon: %s"
 INSTL_DATABASE_INVALID_TYPE="Palun vali andmebaasi tüüp"
 INSTL_DATABASE_NAME_TOO_LONG="MySQL andmebaasi nime maksimaalne pikkus 64 märki."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL tabeli eelliide peab algama tähega ja selle järel võivad olla ainult tähed, numbrid ja allkriipsud."
 INSTL_DATABASE_INVALID_NAME="MySQL versioonide puhul enne versiooni 5.1.6 ei tohi andmebaasi nimes olla punkte või teisi "_QQ_"eri"_QQ_"-märke. Sinu versioon on: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL andmebaaside nimed ei või alata või lõppeda tühikuga."
-INSTL_DATABASE_NAME_INVALID_CHAR="MySQL identifitseerija ei tohi olla  NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="MySQL identifitseerija ei tohi olla  NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Faili %s pole olemas"
 
 ;controllers
@@ -250,20 +230,17 @@ INSTL_FTP_NOROOT="Ühendumine sisestatud FTP-kausta ebaõnnestus."
 INSTL_FTP_NOSTOR="Funktsiooni "_QQ_"STOR"_QQ_" kasutamine ebaõnnestus."
 INSTL_FTP_NOSYST="Funktsiooni "_QQ_"SYST"_QQ_" kasutamine ebaõnnestus."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTP peakausta automaatne tuvastamine ebaõnnestus."
-INSTL_DATABASE_SUPPORT="Andmebaasi tugi:"
 
 ;others
-INSTL_ADVANCED_SETTINGS="Spetsialistile"
-INSTL_BASIC_SETTINGS="Peamised seaded"
 INSTL_CONFPROBLEM="Sinu seadetefail pole kirjutatav või seadetefaili loomine ebaõnnestus. Sa pead alljärgneva koodi ise käsitsi seadetefaili panema. Kliki kogu koodi valimiseks tekstialale ja kopeeri see siis uude tekstifaili. Pane sellele failile nimi 'configuration.php' ja lae see üles oma saidi peakausta."
-INSTL_JSON_SUPPORT_AVAILABLE="JSON tugi"
+INSTL_DATABASE_SUPPORT="Andmebaasi tugi:"
 INSTL_DISPLAY_ERRORS="Veateadete näitamine"
-INSTL_LICENSE="Litsents"
 INSTL_ERROR_DB="Andmebaasi täitmisel tekkis viga: %s"
-INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC väljas"
+INSTL_ERROR_INITIALISE_SCHEMA="Andmebaasi skeemi tuvastamine ebaõnnestus"
 INSTL_FILE_UPLOADS="Failide üleslaadimine"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Paigaldamine"
+INSTL_JSON_SUPPORT_AVAILABLE="JSON tugi"
+INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC väljas"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language on vaikeväärtus"
 INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload on välja lülitatud"
@@ -272,20 +249,18 @@ INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring overload funktsioon on sisse lülitat
 INSTL_NOTICEYOUCANSTILLINSTALL="<br />Sa saad paigaldamist siiski jätkata, kuna seadetefaili sisu näidatakse paigaldamise lõpus ja sa saad vajaliku koodi käsitsi serverisse laadida. Kliki kogu koodi valimiseks tekstialale ja kopeeri see siis uude tekstifaili. Pane sellele failile nimi 'configuration.php' ja lae see üles oma saidi peakausta."
 INSTL_OUTPUT_BUFFERING="Väljundi puhverdamine"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI parseri tugi"
-INSTL_ZIP_SUPPORT_AVAILABLE="Sissehitatud ZIP tugi"
 INSTL_PHP_VERSION="PHP versioon"
-INSTL_PROCESS_BUSY="Töötlemine. Palun oota..."
 INSTL_REGISTER_GLOBALS="Register Globals väljas"
 INSTL_SAFE_MODE="Safe Mode"
 INSTL_SESSION_AUTO_START="Sessiooni automaatne alustamine"
 INSTL_WRITABLE="%s kirjutatav"
 INSTL_XML_SUPPORT="XML-i tugi"
+INSTL_ZIP_SUPPORT_AVAILABLE="Sissehitatud ZIP tugi"
 INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib pakkimise tugi"
+INSTL_PROCESS_BUSY="Töötlemine. Palun oota..."
 
 ;Global strings
-INSTL_ZIP_SUPPORT_AVAILABLE="Sisseehitatud ZIP tugi (soovitatav)"
 JADMINISTRATOR="Administraator"
-JADVANCED="Spetsialistile"
 JCHECK_AGAIN="Kontrolli uuesti"
 JERROR="Viga"
 JEMAIL="E-post"
@@ -306,15 +281,17 @@ JUSERNAME="Kasutajanimi"
 JYES="Jah"
 
 ; Framework strings necessary when no lang pack is available
-JLIB_DATABASE_ERROR_DATABASE="Tekkis andmebaasi viga."
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL-iga ühendumine ebaõnnestus."
+JLIB_DATABASE_ERROR_DATABASE="Tekkis andmebaasi viga."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Andmebaasi draiveri laadimine ebaõnnestus: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Sinu sessioon on aegunud. Palun värskenda lehte."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Kopeerimine ebaõnnestus"
-JLIB_FORM_VALIDATE_FIELD_REQUIRED="Väli on kohustuslik: %s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Asukoht pole kaust. Asukoht: %s"
 JLIB_FORM_FIELD_INVALID="Vigane väli:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Vigane väli: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Väli on kohustuslik: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Paigalda: Faili kopeerimine %1$s kausta %2$s ebaõnnestus."
+JLIB_INSTALLER_NOT_ERROR="Kui see veateade on seotud TinyMCE keelefailide paigaldamisega, siis sellel pole mitte mingit mõju keele (keelte) paigaldamisele. Mõned enne Joomla! 3.2.0 jaoks loodud keelepakkidest võivad proovida paigaldada eraldi TinyMCE keelefaile. Kuna need on nüüd tuumaga kaasatud, siis pole nende eraldi paigaldamine enam vajalik."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Andmebaasiga ühendumine ebaõnnestus <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/et-EE/et-EE.xml b/installation/language/et-EE/et-EE.xml
index 70cc1d9..2f81bcf 100644
--- a/installation/language/et-EE/et-EE.xml
+++ b/installation/language/et-EE/et-EE.xml
@@ -7,7 +7,7 @@
 	<creationDate>2012-09-22</creationDate>
 	<author>Joomla! Project</author>
 	<authorUrl>eraser.ee</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Joomla! 3.0 paigaldusprotsessi eesti keele tõlge</description>
 	<files>
diff --git a/installation/language/fa-IR/fa-IR.ini b/installation/language/fa-IR/fa-IR.ini
index 19f3cb6..37cfb9e 100644
--- a/installation/language/fa-IR/fa-IR.ini
+++ b/installation/language/fa-IR/fa-IR.ini
@@ -1,34 +1,25 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
-; Copyright (C) Translation 2011 - 2013 Joomla Farsi www.JoomlaFarsi.com. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
 
-
 ;Stepbar
 INSTL_STEP_COMPLETE_LABEL="پایان"
 INSTL_STEP_DATABASE_LABEL="پایگاه داده"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="انتخاب زبان پیش فرض"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="زبان"
 INSTL_STEP_LANGUAGES_LABEL="نصب زبان ها"
-INSTL_STEP_LICENSE_LABEL="مجوز"
-INSTL_STEP_PREINSTALL_LABEL="کنترل قبل از نصب"
 INSTL_STEP_SITE_LABEL="تنظیمات"
 INSTL_STEP_SUMMARY_LABEL="چکیده"
-INSTL_STEPS_TITLE="مراحل"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="انتخاب زبان"
-INSTL_SELECT_LANGUAGE_DESC="لطفا زبان مورد نظر خود را انتخاب کرده و سپس بر روی دکمه ادامه کلیک کنید"
 INSTL_SELECT_LANGUAGE_TITLE="انتخاب زبان"
 INSTL_WARNJAVASCRIPT="اخطار! برای نصب كامل جوملا، فعال بودن جاوا اسكریپت الزامیست !"
 INSTL_WARNJSON="برای نصب جوملا نیاز است JSON روی پی اچ پی فعال باشد"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="کنترل مراحل نصب "
-INSTL_PRECHECK_FOR_VERSION="کنترل مرحله نصب برای %s:"
 INSTL_PRECHECK_DESC="برای نصب باید تمام گزینه های روبرو پشتیبانی شوند. در صورتی که هر یک از گزینه ها با <strong class="_QQ_"red"_QQ_">خیر</strong> نمایش داده شوند، ممکن است برای نصب و استفاده از جوملا به مشکل روبرو شوید."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="تنظیمات سفارشی:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="این تنظیمات تعیین می کند که آیا PHP شما تطابق کامل با جوملا دارد یا خیر .<br />هرچند، جوملا! بر این عملیات ناظر بوده و تنظیمات مورد نیاز برای تطابق را انجام می دهد."
@@ -54,8 +45,6 @@ INSTL_DATABASE_TYPE_DESC="معمولا &quot;MySQLi&quot; است"
 INSTL_DATABASE_TYPE_LABEL="نوع پایگاه داده"
 INSTL_DATABASE_USER_DESC="در هر دو صورت چیزی به عنوان "_QQ_"root"_QQ_" یا یک نام کاربری توسط هاست داده"
 INSTL_DATABASE_USER_LABEL="نام کاربری"
-INSTL_DATABASE_TITLE="تنظیمات اتصال"
-INSTL_DATABASE_DESC="<p>جوملا! مدیریت محتوایی است که تمامی داده هایش را در بانک اطلاعاتی ذخیره می کند. این صفحه، اطلاعات مورد نیاز برای ایجاد این پایگاه داده را نمایش می دهد .</p><p>اگر شما در حال نصب جوملا در یک وب سرور راه دور هستید! این اطلاعات را از هاست خود بگیرید.</p><p>بسیاری از میزبان های وب نیاز به ایجاد پایگاه داده قبل از نصب جوملا دارند. اگر شما پیام "_QQ_"Could not connect to the database"_QQ_" را دریافت کردید، بررسی کنید آیا نام کاربری و رمز عبور صحیح هستند. اگر شما هنوز این پیام را دریافت می کنید، هاستتان را بررسی کنید ممکن هست بانک اطلاعاتی را ایجاد نکرده باشید.<br /><br /><strong class="_QQ_"red"_QQ_">در صورت بروز هر گونه مشکل، می توانید در انجمن جوملــا فارسـی دات کام مطرح و مشکل را رفع کنید.</strong></p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="یافتن خودکار مسیر FTP"
@@ -64,19 +53,19 @@ INSTL_FTP_DESC="<p>این بخش مربوط به تنظیمات لایه FTP م
 INSTL_FTP_ENABLE_LABEL="فعال سازی لایه FTP"
 INSTL_FTP_HOST_LABEL="هاست FTP"
 INSTL_FTP_PASSWORD_LABEL="رمز عبور FTP"
+INSTL_FTP_PASSWORD_DESC="اخطار! توصیه می شود اینجا را خالی بگذارید و در هر بار انتقال فایلهایتان رمز عبور ftpرا وارد کنید."
 INSTL_FTP_PORT_LABEL="پورت FTP"
 INSTL_FTP_ROOT_LABEL="مسیر اصلی FTP"
 INSTL_FTP_SAVE_LABEL="ذخیره ی رمز عبور FTP"
+INSTL_FTP_SETTINGS_CORRECT="تنظیمات صحیح است"
 INSTL_FTP_TITLE="تنظیمات FTP (<strong class="_QQ_"red"_QQ_">اختیاری - اکثر کاربران از این مرحله رد می شوند - برای رد شدن روی بعدی کلیک کنید</strong>)"
 INSTL_FTP_USER_LABEL="نام کاربری FTP"
-INSTL_SITE_NAME_LABEL="نام سایت"
-INSTL_VERIFY_FTP_SETTINGS="تایید تنظیمات FTP"
-INSTL_FTP_SETTINGS_CORRECT="تنظیمات صحیح است"
 INSTL_FTP_USER_DESC="اخطار! پیشنهاد می گردد که این را خالی بگذارید و نام کاربری FTP خود را در هر بار انتقال فایل ها وارد کنید."
-INSTL_FTP_PASSWORD_DESC="اخطار! توصیه می شود اینجا را خالی بگذارید و در هر بار انتقال فایلهایتان رمز عبور ftpرا وارد کنید."
+INSTL_VERIFY_FTP_SETTINGS="تایید تنظیمات FTP"
 
 ;Site View
 INSTL_SITE="تنظیمات اصلی "
+INSTL_SITE_NAME_LABEL="نام سایت"
 INSTL_ADMIN_EMAIL_LABEL="ایمیل مدیر"
 INSTL_ADMIN_EMAIL_DESC="آدرس ایمیل خود را وارد نمایید ، این ایمیل به عنوان ایمیل مدیر می باشد."
 INSTL_ADMIN_PASSWORD_LABEL="رمز عبور مدیر"
@@ -84,7 +73,6 @@ INSTL_ADMIN_PASSWORD_DESC="رمز عبور مدیر را وارد نمایید."
 INSTL_ADMIN_PASSWORD2_LABEL="تکرار رمز عبور مدیر"
 INSTL_ADMIN_USER_LABEL="نام کاربری مدیر"
 INSTL_ADMIN_USER_DESC="نام کاربری مدیر ارشد را وارد کنید."
-INSTL_SITE_NAME_TITLE="نام سایت"
 INSTL_SITE_NAME_DESC="لطفا نام سایت جوملایی خود را وارد نمایید."
 INSTL_SITE_METADESC_LABEL="توضیحات متا"
 INSTL_SITE_METADESC_TITLE_LABEL="توضیحاتی را که توسط همه موتورهای جستجو مورد استفاده قرار خواهند گرفت وارد کنید ."
@@ -139,11 +127,7 @@ INSTL_EMAIL_HEADING="جزئیات پیکربندی وب سایت شما:"
 INSTL_EMAIL_NOT_SENT="ایمیل ارسال نشد."
 
 ;Complete view
-INSTL_COMPLETE="پایان"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="اطلاعات ورود مدیر "
-INSTL_COMPLETE_DESC1="جهت ورود به سایت بر روی دکمه سایت کلیک نمایید و جهت ورود به بخش مدیریت بر روی دکمه مدیریت کلیک نمایید."
-INSTL_COMPLETE_DESC2="شما در وبسایت راهنمای جوملا، می توانید آموزش نصب گام به گام جوملا را به زبان خود بیابید."
-INSTL_COMPLETE_DESC3="بر روی دکمه سمت راست کلیک کرده تا سایت راهنما در پنجره جدید باز شود  ."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="پوشه ی نصب پیش از این حذف شده است."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="پوشه ی installation قابل حذف کردن نیست. لطفا به صورت دستی این پوشه را حذف کنید."
 INSTL_COMPLETE_FOLDER_REMOVED="حذف پوشه نصب جوملا بدرستی انجام گردید."
@@ -161,7 +145,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="زبان"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="نسخه"
 INSTL_LANGUAGES_DESC="رابط جوملا برای چندین زبان در دسترس است. زبان های مورد نظر خود را با تیک زدن در چک باکس انتخاب کنید و برای نصب روی دکمه بعدی کلیک کنید.<br/>توجه: این عملیات به مدت 10 ثانیه برای دانلود و نصب هر بسته زبان طول خواهد کشید. به منظور جلوگیری از وقفه لطفا بیش از 3 زبان برای نصب انتخاب نکنید."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="این عملیات برای هر زبان به مدت 10 ثانیه طول خواهد کشید<br />لطفا برای دانلود و نصب زبان ها منتظر بمانید..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="لطفا یک زبان را انتخاب کنید. اگر شما به زبان دیگری نیاز ندارید روی دکمه'قبلی' کلیک کنید"
+INSTL_LANGUAGES_MORE_LANGUAGES="اگر می خواهید زبان های بیشتری نصب کنید روی دکمه 'قبلی' کلیک کنید."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="هیچ زبانی برای نصب انتخاب نشده است. اگر شما به زبان های بیشتری برای نصب نیاز دارید روی دکمه 'قبلی' کلیک کنید و زبان های مورد نظر را از لیست انتخاب نمایید."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="جوملا1 قادر به اتصال به سرور زبان ها نیست. لطفا برای پایان عملیات نصب دکمه پایان را کلیک کنید."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="توجه: شما می توانید برای نصب زبان ها بعدا از طریق مدیریت جوملا اقدام کنید"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="بازگشت به آخرین مرحله نصب"
@@ -198,8 +183,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="نصب محتوای محلی"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="در صورت فعال بودن، جوملا به طور خودکار یک مجموعه محتوا برای هر یک از زبان ها ایجاد می کند. همچنین یکی از مقاله های برجسته را برای هر یک از مجموعه ها ایجاد می کند"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="چند زبانه"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="این بخش به شما اجازه می دهد به طور خودکار قابلیت چند زبانه بودن را در جوملا فعال کنید"
-INSTL_DEFAULTLANGUAGE_NOTE="توجه: وقتی شما روی دکمه بعدی کلیک کنید شما به مرحله پایانی عملیات نصب باز خواهید گشت و از شما می خواهد که پوشه نصب را حذف نمایید."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="زبان پیش فرض خود را انتخاب نمایید"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="شما می توانید زبان را بعدا از طریق مدیریت جوملا نصب نمایید"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -212,7 +195,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="برخی از خطاهای رخ داده در پشتیبان گیری از پایگاه داده."
 INSTL_DATABASE_ERROR_CREATE="خطای رخ داده در زمان ایجاد پایگاه داده %s.<br />کاربر ممکن است دسترسی کافی برای ایجاد یک پایگاه داده را نداشته باشد . قبل از نصب جوملا می بایست پایگاه داده مورد نظر ایجاد کرده باشید !."
 INSTL_DATABASE_ERROR_DELETE="برخی از خطاهای رخ داده در هنگام پاک کردن پایگاه داده."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="مشکل در ورژن استفاده شده"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="حذف"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="پشتیبان"
 INSTL_DATABASE_FIX_TOO_LONG="خروجی پیشوند جدول mysql حداکثر 15 کاراکتر باشد."
@@ -223,10 +205,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="شما برای ادامه نصب به SQ
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="شما برای ادامه نصب به SQL Server 2008 R2 (10.50.1600.1) یا بالاتر نیاز دارید. نسخه ی شما است: %s"
 INSTL_DATABASE_INVALID_TYPE="لطفا نوع پایگاه داده را انتخاب کنید"
 INSTL_DATABASE_NAME_TOO_LONG="نام پایگاه داده mysqlحداکثر64 کارکتر باید باشد."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="پیشوند جدول mysql تنها باید با یک حرف شروع و بعد از آن اعداد یا خط بیاید."
 INSTL_DATABASE_INVALID_NAME="نسخه های قبلی mysql 5.1.6 ممکن است دوره ها یا کارکتر های دیگر را شامل نشود  "_QQ_"special"_QQ_" . نسخه شما هست: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="نام های پایگاه داده mysql و جداول با فاصله شروع نمی شود ."
-INSTL_DATABASE_NAME_INVALID_CHAR="شناسه ی MySQL نمی تواند شامل یک کاراکتر NUL ASCII(0x00) باشد."
+INSTL_DATABASE_NAME_INVALID_CHAR="شناسه ی MySQL نمی تواند شامل یک کاراکتر NULL ASCII(0x00) باشد."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="فایل %s وجود ندارد"
 
 ;controllers
@@ -258,8 +239,6 @@ INSTL_FTP_NOSYST="تابع "_QQ_"SYST"_QQ_" با شکست مواجه شد."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="قادر به شناسایی خودکار پوشه ی اصلی FTP نیست."
 
 ;others
-INSTL_ADVANCED_SETTINGS="تنظیمات پیشرفته"
-INSTL_BASIC_SETTINGS="تنظیمات اولیه"
 INSTL_CONFPROBLEM="نمی تواند فایل configuration.php را برای نوشتن باز کندیا یک مشکل در ایجاد فایل configuration وجود دارد.  شما بایستی بصورت دستی کد های داده شده در مرحله نهایی را آپلود کنید. شما بایستی یک فایل configuration.php در انتهای مرحله نصب ایجاد کرده و کد هایی که در انتهای نصب به شما داده می شود را درون آن قرار داده و سپس در پوشه ای که جوملا در ان نصب است، آپلود کنید."
 INSTL_DATABASE_SUPPORT="پشتیبانی پایگاه داده :"
 INSTL_DISPLAY_ERRORS="نمایش پیام های خطا"
@@ -267,9 +246,7 @@ INSTL_ERROR_DB="برخی از خطاهای رخ داده زمان جمع شدن
 INSTL_ERROR_INITIALISE_SCHEMA="شمای اولیه پایگاه داده نیست"
 INSTL_FILE_UPLOADS="آپلود فایل ها"
 INSTL_GNU_GPL_LICENSE="مجوز GNU/GPL"
-INSTL_INSTALLATION="نصب"
 INSTL_JSON_SUPPORT_AVAILABLE="پشتیبانی از JSON"
-INSTL_LICENSE="مجوز"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC"
 INSTL_MAGIC_QUOTES_RUNTIME="زمان اجرا"
 INSTL_MB_LANGUAGE_IS_DEFAULT="زبان اصلی موجود می باشد"
@@ -291,7 +268,6 @@ INSTL_PROCESS_BUSY="پردازش در حال پیشرفت است. لطفا صب
 
 ;Global strings
 JADMINISTRATOR="مدیر"
-JADVANCED="پیشرفته"
 JCHECK_AGAIN="بررسی مجدد"
 JERROR="خطا"
 JEMAIL="ایمیل"
diff --git a/installation/language/fa-IR/fa-IR.xml b/installation/language/fa-IR/fa-IR.xml
index 199b96f..2d96a42 100644
--- a/installation/language/fa-IR/fa-IR.xml
+++ b/installation/language/fa-IR/fa-IR.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012-09-24</creationDate>
 	<author>Joomla Farsi Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/fi-FI/fi-FI.ini b/installation/language/fi-FI/fi-FI.ini
index bf817e6..6dd6431 100644
--- a/installation/language/fi-FI/fi-FI.ini
+++ b/installation/language/fi-FI/fi-FI.ini
@@ -1,6 +1,6 @@
 ; $Id: fi_FI.ini
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -11,24 +11,17 @@ INSTL_STEP_COMPLETE_LABEL="Valmis"
 INSTL_STEP_DATABASE_LABEL="Tietokanta"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Valitse oletuskieli"
 INSTL_STEP_FTP_LABEL="FTP-asetukset"
-INSTL_STEP_LANGUAGE_LABEL="Kieli"
 INSTL_STEP_LANGUAGES_LABEL="Asenna kieliä"
-INSTL_STEP_LICENSE_LABEL="Lisenssi"
-INSTL_STEP_PREINSTALL_LABEL="Järjestelmän tarkistus"
 INSTL_STEP_SITE_LABEL="Asetukset"
 INSTL_STEP_SUMMARY_LABEL="Yhteenveto"
-INSTL_STEPS_TITLE="Vaiheet"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Valitse kieli"
-INSTL_SELECT_LANGUAGE_DESC="Valitse Joomla!n asennuksen eri vaiheissa käytettävä kieli:"
 INSTL_SELECT_LANGUAGE_TITLE="Valitse kieli"
 INSTL_WARNJAVASCRIPT="Varoitus! JavaScriptin käyttö tulee sallia Joomla!n asentamiseksi!"
 INSTL_WARNJSON="PHP-asennuksessasi tulee olla JSON käytössä, jotta Joomla! asentuu!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Järjestelmän tarkistus"
-INSTL_PRECHECK_FOR_VERSION="Ennen asennusta tehtävä järjestelmän tarkistus kohteelle %s:"
 INSTL_PRECHECK_DESC="Jos joitakin asetuksia ei tueta (merkitty <strong class="_QQ_"red"_QQ_">Ei</strong>), tee tarvittavat toimenpiteet tilanteen korjaamiseksi. Jos et korjaa tilannetta, et voi asentaa Joomla!a ennen kuin alla olevat ehdot täyttyvät."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Suositusasetukset:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Nämä ovat suositellut PHP-asetukset Joomla!n toiminnan varmistamiseksi.<br />Joomla! kuitenkin toimii, vaikka asetukset eivät täysin vastaa suositusasetuksia."
@@ -54,8 +47,6 @@ INSTL_DATABASE_TYPE_DESC="Tämä on luultavasti &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Tietokannan tyyppi"
 INSTL_DATABASE_USER_DESC="Esimerkiksi "_QQ_"root"_QQ_" tai palveluntarjoajan antama käyttäjätunnus"
 INSTL_DATABASE_USER_LABEL="Käyttäjätunnus"
-INSTL_DATABASE_TITLE="Yhteysasetukset"
-INSTL_DATABASE_DESC="<p>Joomla! -sivusto tallentaa kaikki tiedot tietokantaan. Tällä näytöllä annetaan asennusohjelmalle tarvittavat tiedot tietokannan luomiseksi.</p><p> Jos olet asentamassa Joomla!a palvelimelle, tulee palveluntarjoajan antaa nämä tiedot.</p><p>Osa palveluntarjoajista edellyttää, että luot tietokannan ennen kuin asennat Joomla!n. Jos näet viestin "_QQ_"Tietokantaan ei saada yhteyttä"_QQ_", tarkista, että käyttäjätunnus ja salasana ovat oikein. Jos vielä tämän jälkeen saat saman viestin, ota yhteyttä palveluntarjoajaan ja kysy pitääkö tietokanta luoda ennen kuin Joomla! asennetaan.</p>" 
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Etsi FTP-polku automaattisesti"
@@ -69,7 +60,6 @@ INSTL_FTP_ROOT_LABEL="FTP-juurihakemisto"
 INSTL_FTP_SAVE_LABEL="Tallenna FTP-salasana"
 INSTL_FTP_TITLE="FTP-asetukset (<strong class="_QQ_"red"_QQ_">Valinnainen - useimmat käyttäjät voivat ohittaa tämän vaiheen - napsauta Seuraava ohittaaksesi</strong>)"
 INSTL_FTP_USER_LABEL="FTP-käyttäjätunnus"
-INSTL_SITE_NAME_LABEL="Sivuston nimi"
 INSTL_VERIFY_FTP_SETTINGS="Vahvista FTP-asetukset"
 INSTL_FTP_SETTINGS_CORRECT="Asetukset oikein"
 INSTL_FTP_USER_DESC="Varoitus! On suositeltavaa jättää tämä tyhjäksi ja syöttää FTP-käyttäjätunnus aina kun siirrät tiedostoja."
@@ -84,7 +74,7 @@ INSTL_ADMIN_PASSWORD_DESC="Aseta salasana pääkäyttäjä tilillesi ja varmista
 INSTL_ADMIN_PASSWORD2_LABEL="Vahvista ylläpitäjän salasana"
 INSTL_ADMIN_USER_LABEL="Ylläpitäjän käyttäjätunnus"
 INSTL_ADMIN_USER_DESC="Aseta käyttäjätunnus pääkäyttäjätilillesi."
-INSTL_SITE_NAME_TITLE="Sivuston nimi"
+INSTL_SITE_NAME_LABEL="Sivuston nimi"
 INSTL_SITE_NAME_DESC="Anna Joomla!-sivuston nimi."
 INSTL_SITE_METADESC_LABEL="Kuvaus"
 INSTL_SITE_METADESC_TITLE_LABEL="Anna sivuston yleinen kuvaus, jota hakukoneet käyttävät. Yleensä enintään 20 sanaa antaa parhaimman tuloksen."
@@ -128,11 +118,7 @@ INSTL_EMAIL_HEADING="Alla olevasta näet kokoonpanoasetukset juuri asentamallesi
 INSTL_EMAIL_NOT_SENT="Sähköpostia ei voitu lähettää."
 
 ;Complete view
-INSTL_COMPLETE="Valmis"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Ylläpitoliittymän kirjautumistiedot"
-INSTL_COMPLETE_DESC1="Napsauta Sivusto-painiketta siirtyäksesi Joomla!-sivustolle tai Ylläpito-painiketta siirtyäksesi ylläpitoliittymän kirjautumisnäyttöön."
-INSTL_COMPLETE_DESC2="Joomla! yhteisösivustolta löydät listan asennettavista kielipaketeista sekä linkkejä käännösasioihin liittyviin resursseihin."
-INSTL_COMPLETE_DESC3="Napsauta oikealla olevaa painiketta avataksesi yhteisösivusto uudessa ikkunassa."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Asennushakemisto on jo poistettu."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Asennushakemistoa ei voitu poistaa. Poista kansio käsin."
 INSTL_COMPLETE_FOLDER_REMOVED="Asennushakemisto poistettu"
@@ -150,7 +136,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Kieli"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versio"
 INSTL_LANGUAGES_DESC="Joomla!-käyttöliittymä on saatavilla useille kielille. Valitse haluamasi kielet napsauttamalla valintaruutuja ja asenna ne napsauttamalla 'Seuraava' painiketta.<br/>Huom: lataus- ja asennustoimenpide kestää jokaiselle kielelle noin 10 sekuntia. Valitse asennettavaksi enintään 3 kieltä välttääksesi aikakatkaisun asennuksessa."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Tämä toimenpide tulee kestämään jopa yli 10 sekuntia per kieli valmistuakseen<br />Odota kielien latauksen ja asennuksen ajan..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Valitse kieli. Jos et halua asentaa muita kieliä paina 'Edellinen' painiketta"
+INSTL_LANGUAGES_MORE_LANGUAGES="Paina 'Edellinen' painiketta, jos haluat asentaa lisää kieliä."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Kieliä ei ole valittu asennettavaksi. Jos haluat asentaa lisää kieliä, paina 'Edellinen' painiketta ja valitse listalta haluamasi kielet."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ei voinut yhdistää kielipalvelimelle. Lopeta asennus toimenpide."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Huom: Voit asentaa kieliä käyttäen Joomla! ylläpitoliittymää"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Palaa asennuksen viimeiseen vaiheeseen"
@@ -187,8 +174,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Asenna paikallinen sisältö"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Jos aktiivinen, Joomla! luo yhden kategorian kullekin asennetulle kielelle. Se luo myös yhden nostetun 'dummy' -artikkelin jokaiseen kategoriaan."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Monikielisyys"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Tämä osio mahdollistaa sinun aktivoida automaattisen Joomla!n monikielisyys -ominaisuuden"
-INSTL_DEFAULTLANGUAGE_NOTE="Huom: kun painat 'Seuraava' painiketta, pääset takaisin asennustoimenpiteen loppuun, jossa sinua pyydetään poistamaan asennushakemisto."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Valitse oletuskieli"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Voit asentaa sen myöhemmin Joomla!n ylläpitoliittymästä."
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -201,7 +186,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Tietokantaa varmuuskopioitaessa havaittiin virheitä."
 INSTL_DATABASE_ERROR_CREATE="Havaittiin virhe luotaessa tietokantaa %s.<br />Käyttäjälle ei mahdollisesti ole riittäviä oikeuksia tietokannan luontiin. Tietokanta tulee luoda käsin ennen kuin voit asentaa Joomla!n."
 INSTL_DATABASE_ERROR_DELETE="Tietokantaa poistettaessa havaittiin joitakin virheitä."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Virhe alustettaessa mallin versionumeroa"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Poista"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Tee varmuuskopio"
 INSTL_DATABASE_FIX_TOO_LONG="MySQL-taulun etuliite voi olla enintään 15 merkkiä pitkä."
@@ -212,10 +196,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Tarvitset SQL Server 2008 R2 (10.50.1600.
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Tarvitset SQL Server 2008 R2 (10.50.1600.1) tai uudemman jatkaaksesi asennusta. Versiosi on: %s"
 INSTL_DATABASE_INVALID_TYPE="Valitse tietokannan tyyppi"
 INSTL_DATABASE_NAME_TOO_LONG="MySQL-tietokannan nimi voi olla enintään 64 merkkiä pitkä."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL-taulun etuliitteen tulee alkaa kirjaimella ja sen jälkeen voi olla vain kirjaimia, numeroita tai alaviivoja."
 INSTL_DATABASE_INVALID_NAME="MySQL-versiota 5.1.6 vanhemmat versiot eivät voi sisältää pisteitä tai muita "_QQ_"erikois"_QQ_" merkkejä nimessä. Versiosi on: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL-tietokannan tai taulun nimi ei voi alkaa tai loppua välilyönnillä."
-INSTL_DATABASE_NAME_INVALID_CHAR="Mikään MySQL identifier ei voi sisältää NUL ASCII(0x00) -arvoa."
+INSTL_DATABASE_NAME_INVALID_CHAR="Mikään MySQL identifier ei voi sisältää NULL ASCII(0x00) -arvoa."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Tiedostoa %s ei ole"
 
 ;controllers
@@ -247,8 +230,6 @@ INSTL_FTP_NOSYST="Funktio "_QQ_"SYST"_QQ_" epäonnistui."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Automaattinen FTP-juurihakemiston havaitseminen ei onnistunut."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Edistyneet asetukset"
-INSTL_BASIC_SETTINGS="Perusasetukset"
 INSTL_CONFPROBLEM="Asetustiedosto tai hakemisto ei ole kirjoitettavissa tai asetustiedoston luonnissa oli ongelmia. Lataa seuraava koodi palvelimelle käsin. Valitse koodi napsauttamalla tekstialuetta, kopioi se ja liitä uuteen tekstitiedostoon. Tallenna tiedosto nimellä 'configuration.php' ja vie se palvelimelle Joomla!n juurihakemistoon."
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_DISPLAY_ERRORS="Display Errors"
@@ -256,9 +237,7 @@ INSTL_ERROR_DB="Havaittiin virheitä tietokannan tauluja luotaessa: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Asennus"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-tuki"
-INSTL_LICENSE="Lisenssi"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language on oletus"
@@ -280,7 +259,6 @@ INSTL_PROCESS_BUSY="Prosessi käynnissä. Odota hetki..."
 
 ;Global strings
 JADMINISTRATOR="Ylläpito"
-JADVANCED="Edistyneet"
 JCHECK_AGAIN="Tarkista uudelleen"
 JERROR="Virhe"
 JEMAIL="Sähköposti"
@@ -311,6 +289,7 @@ JLIB_FORM_FIELD_INVALID="Virheellinen kenttä:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Virheellinen kenttä: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Kenttä vaaditaan: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Tiedoston %1$s kopionti epäonnistui kohteeseen %2$s."
+JLIB_INSTALLER_NOT_ERROR="Jos virhe liittyy TinyMCE kielitiedostojen asennukseen, sillä ei ole vaikutusta kiel(i)en asennukseen. Jotkin kielipaketit, mitkä on luotu ennen Joomla! 3.2.0, voivat yrittää asentaa erillisiä TinyMCE kielitiedostoja. Koska ne ovat nyt mukana Joomlassa, niitä ei tarvitse asentaa."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Ei saada yhteyttä tietokantaan <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -331,4 +310,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/fi-FI/fi-FI.xml b/installation/language/fi-FI/fi-FI.xml
index c159e9f..47be1ef 100644
--- a/installation/language/fi-FI/fi-FI.xml
+++ b/installation/language/fi-FI/fi-FI.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Sami Haaranen</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Asennusohjelman kielitiedosto / Finnish language file for installation to Joomla 3.0 version.</description>
 	<files>
diff --git a/installation/language/fr-FR/fr-FR.ini b/installation/language/fr-FR/fr-FR.ini
index 64006b2..f1f5fea 100644
--- a/installation/language/fr-FR/fr-FR.ini
+++ b/installation/language/fr-FR/fr-FR.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Fin"
 INSTL_STEP_DATABASE_LABEL="Base de données"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Choisissez la langue par défaut"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Langue"
 INSTL_STEP_LANGUAGES_LABEL="Installer des langues"
-INSTL_STEP_LICENSE_LABEL="Licence"
-INSTL_STEP_PREINSTALL_LABEL="Pré-installation"
 INSTL_STEP_SITE_LABEL="Configuration"
 INSTL_STEP_SUMMARY_LABEL="Vue d'ensemble"
-INSTL_STEPS_TITLE="Étapes"
 
 ;Language view
 INSTL_LANGUAGE_TITLE="Choix de la langue"
-INSTL_SELECT_LANGUAGE_DESC="Veuillez sélectionner la langue à utiliser au cours de l'installation de Joomla!"
-INSTL_SELECT_LANGUAGE_TITLE="Sélectionnez la langue d'installation"
 INSTL_WARNJAVASCRIPT="Attention ! JavaScript doit être activé dans le navigateur pour une installation correcte de Joomla!"
 INSTL_WARNJSON="JSON doit être activé dans votre installation de PHP pour pouvoir installer Joomla!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Pré-installation"
-INSTL_PRECHECK_FOR_VERSION="Vérification de la pré-installation pour %s"
 INSTL_PRECHECK_DESC="Si certains de ces éléments ne sont pas conformes (marqués <strong class="_QQ_"red"_QQ_">Non</strong>) veuillez faire en sorte de les corriger en contactant votre hébergeur.<br />Si vous tentez de poursuivre, vous risquez de rencontrer des problèmes durant l'installation ou des dysfonctionnements lors de l'utilisation de Joomla!<br /><br />Si vous ne possédez pas le droit d'écriture sur le dossier racine de votre site et ne pouvez l'attribuer, le fichier de configuration ne pourra pas être créé durant le processus d'installation. Vous devez alors le créer manuellement sur votre ordinateur à l'aide d'un simple éditeur de texte, le laisser vide et l'enregistrer sous le nom de configuration.php puis, le placer à la racine du site et lui attribuer les droits d'écriture le temps de l'installation et de la configuration de Joomla. Pour des raisons de sécurité, il est prudent de verouiller ce fichier par la suite ; notez que si ce fichier est verouillé, vous ne pourrez pas modifier la configuration de Joomla.<br />Vous pouvez également poursuivre l'installation et copier, en fin de procédure, le contenu affiché pour créer ce fichier."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Paramètres recommandés :"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ces paramètres PHP sont recommandés pour une compatibilité optimale avec Joomla.<br />S'ils ne sont pas tous en vert, Joomla! pourra tout de même fonctionner mais des extensions risquent de ne pas être utilisables."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Généralement "_QQ_"<strong>MySQLi</strong>"_QQ_" sau
 INSTL_DATABASE_TYPE_LABEL="Type de la base de données"
 INSTL_DATABASE_USER_DESC="Nom d'utilisateur créé par vous même ou fourni par l'hébergeur.<br />Généralement "_QQ_"<strong>root</strong>"_QQ_" <strong>sur serveur local</strong> de développement."
 INSTL_DATABASE_USER_LABEL="Nom d'utilisateur"
-INSTL_DATABASE_TITLE="Paramètres de connexion "
-INSTL_DATABASE_DESC="<p>Vous devez paramétrer l'accès à la base de données pour que le processus d'installation puisse créer les tables et y insérer des données.</p><ul><li>Sauf information contraire de votre hébergeur, laissez 'MySQLi' comme type de base de données.</li></ul><ul><li>Saisissez le nom du serveur de base de données, habituellement 'localhost' (peut être différent selon l'hébergeur).</li></ul><ul><li>Saisissez le nom d'utilisateur et le mot de passe d'accès à la base de données (si ce n'est pas vous qui avez créé cet utilisateur, ces données vous sont fournies par votre hébergeur).</li></ul><ul><li>Saisissez le nom de la base de données à utiliser pour Joomla!. Si votre hébergeur ne vous permet qu'une seule base de données, vous pouvez installer plusieurs Joomla! en modifiant le préfixe des tables.</li></ul><ul><li>Choisissez le préfixe des tables de Joomla!, trois ou quatre caractères, uniquement alphanumériques et se terminant OBLIGATOIREMENT par un trait de soulignement. N'utilisez pas "_QQ_"bak_"_QQ_" qui est réservé aux sauvegardes des tables.</li></ul><ul><li>Si vous effectuez la mise à jour d'un ancien site Joomla!, vous pouvez sauver les anciennes tables pour pouvoir récupérer les données.<br />S'il s'agit d'une nouvelle installation, supprimez les anciennes tables.</li></ul>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Recherche automatique du chemin FTP"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="Chemin de la racine FTP"
 INSTL_FTP_SAVE_LABEL="Sauvegarder le mot de passe FTP"
 INSTL_FTP_TITLE="Configuration FTP (<strong class="_QQ_"red"_QQ_">Optionnel - La plupart des utilisateurs peuvent passer cette étape - Appuyez sur "_QQ_"Suivant"_QQ_" pour continuer</strong>)"
 INSTL_FTP_USER_LABEL="Nom d'utilisateur FTP"
-INSTL_SITE_NAME_LABEL="Nom du site"
 INSTL_VERIFY_FTP_SETTINGS="Vérifier les paramètres FTP"
 INSTL_FTP_SETTINGS_CORRECT="Les paramètres sont corrects"
 INSTL_FTP_USER_DESC="Il est vivement conseillé de laisser cette zone vide et de n'entrer votre identifiant que si nécessaire."
@@ -82,8 +72,8 @@ INSTL_ADMIN_PASSWORD_LABEL="Mot de passe"
 INSTL_ADMIN_PASSWORD_DESC="Définissez le mot de passe de ce compte et confirmez-le ci-dessous."
 INSTL_ADMIN_PASSWORD2_LABEL="Confirmer le mot de passe"
 INSTL_ADMIN_USER_LABEL="Identifiant"
-INSTL_ADMIN_USER_DESC="Chosissez un nom d'utilisateur pour le compte Super Utilisateur."
-INSTL_SITE_NAME_TITLE="Nom du site"
+INSTL_ADMIN_USER_DESC="Choisissez un nom d'utilisateur pour le compte Super Utilisateur."
+INSTL_SITE_NAME_LABEL="Nom du site"
 INSTL_SITE_NAME_DESC="Saisissez le nom du site, utilisé notamment pour son indexation par les moteurs de recherche."
 INSTL_SITE_METADESC_LABEL="Description"
 INSTL_SITE_METADESC_TITLE_LABEL="Saisissez une description générale du site, utilisée notamment par les moteurs de recherche. En général, un maximum de 20 mots est optimal."
@@ -137,11 +127,7 @@ INSTL_EMAIL_HEADING="Paramètres de configuration de votre nouveau site Joomla!
 INSTL_EMAIL_NOT_SENT="L'e-mail n'a pas pu être envoyé."
 
 ;Complete view
-INSTL_COMPLETE="Terminer"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Détails de connexion à l'administration"
-INSTL_COMPLETE_DESC1="<p><strong>Avant d'aller plus loin, pour des raisons de sécurité, vous devez supprimer le répertoire d'installation de Joomla!</strong></p>Cliquez ensuite sur le bouton "_QQ_"Site"_QQ_" pour accéder à l'interface frontale du site ou, sur le bouton "_QQ_"Administration"_QQ_" pour vous connecter à l'interface d'administration."
-INSTL_COMPLETE_DESC2="Vous pouvez télécharger des packs de langue et découvrir leur procédure d'installation sur le site d'aide officiel de Joomla!"
-INSTL_COMPLETE_DESC3="Cliquez sur le lien situé à droite pour accéder au site d'aide officiel de Joomla!"
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="The installation folder has already been deleted."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Le répertoire d'installation ne peut pas être supprimé, veuillez le supprimer manuellement."
 INSTL_COMPLETE_FOLDER_REMOVED="Le répertoire d'installation a correctement été supprimé"
@@ -159,7 +145,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Langue"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
 INSTL_LANGUAGES_DESC="Joomla! est disponible en plusieurs langues. Choisissez les langues que vous souhaitez ajouter en cochant leur case à cocher, puis cliquez sur le bouton 'Suivant' pour les installer.<br/> Note : ne sélectionnez pas plus de 3 langues à installer pour éviter les interruptions de transfert. Le téléchargement et l'installation d'une langue prend environ 10 secondes."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Le téléchargement et l'installation d'une langue peut durer jusqu'à 10 secondes.<br />Veuillez patienter pendant ce processus..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Veuillez sélectionner une langue. Si vous n'e souhaitez pas installer d'autres langues, cliquez sur le bouton 'Pécédant'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Cliquez sur le bouton 'Précédent' si vous voulez installer d'autres langues."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Aucune langue n'a été sélectionnée. Si vous souhaitez installer d'autres langues, cliquez sur le bouton 'Précédent'"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Le système d'installation ne peut pas se connecter au serveur de langues. Veuillez achever le processus d'installation de Joomla!"
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Note: vous pourrez installer des langues complémentaires plus tard depuis l'administration de Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Revenir à la dernière étape d'installation"
@@ -196,8 +183,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Installer des contenus localis
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Si activé, Joomla! créera automatiquement une catégorie d'articles par langue installée. De même, un article mis en vedette et contenant un contenu factice sera créé dans chaque catégorie."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingue"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Cette section vous permet d'activer automatiquement la fonctionnalité multilingue native de Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Note : lorsque vous appuyez sur le bouton 'Suivant', vous êtes redirigé sur la page de fin du processus d'installation de Joomla! où il vous sera demandé de supprimer le répertoire d'installation. Supprimez-le et vous pourrez accéder à l'interface souhaitée de Joomla! dans la langue choisie."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Sélectionner la langue par défaut"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Vous pourrez l'installer plus tard depuis l'administration de Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -210,7 +195,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Plusieurs erreurs se sont produites au cours de la sauvegarde de la base de données."
 INSTL_DATABASE_ERROR_CREATE="Une erreur s'est produite lors de la création de la base de données %s.<br/>L'utilisateur peut ne pas avoir les privilèges requis pour créer une base de données. La base de données doit être créée séparément avant de pouvoir installer Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Des erreurs sont apparues lors de la suppression de la base de données"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Erreur dans l'initialisation du numéro de version du schema"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Sauvegarder"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Supprimer"
 INSTL_DATABASE_FIX_TOO_LONG="Le préfixe des tables MySQL ne peut pas dépasser 15 caractères"
@@ -221,7 +205,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Votre version de SQL Server doit être 20
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Votre version de SQL Server doit être 2008 R2 (10.50.1600.1) ou supérieure pour que l'installation puisse se poursuivre. Votre version est : %s"
 INSTL_DATABASE_INVALID_TYPE="Veuillez sélectionner le type de base de données"
 INSTL_DATABASE_NAME_TOO_LONG="Le nom d'une base de données MySQL ne peut pas contenir plus de 64 caractères."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Le préfixe des tables MySQL doit débuter avec une lettre, et se terminer par une lettre, un chiffre ou un trait de soulignement.."
 INSTL_DATABASE_INVALID_NAME="Les versions MySQL antérieures à 5.1.6 n'autorisent pas la présence dans le nom de points ou autres caractères "_QQ_"spéciaux"_QQ_". Votre version est : %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Les noms de bases et de tables MySQL ne peuvent conmmencer ni se terminer par des espaces."
 INSTL_DATABASE_NAME_INVALID_CHAR="Aucun identifiant MySQL ne peut contenir de caractère NUL ASCII(0x00)."
@@ -256,8 +239,6 @@ INSTL_FTP_NOSYST="La fonction "_QQ_"SYST"_QQ_" a échoué."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Impossible de détecter automatiquement le répertoire racine FTP"
 
 ;others
-INSTL_ADVANCED_SETTINGS="Paramètres avancés"
-INSTL_BASIC_SETTINGS="Paramètres de base"
 INSTL_CONFPROBLEM="Votre fichier de configuration n'est pas modifiable ou il y a eu un problème durant sa création, par exemple le répertoire de Joomla! n'est pas ouvert en écriture. Vous devez créer le fichier de configuration manuellement avec le contenu indiqué ci-dessous.<strong>Procédure</strong><br />Cliquez dans la zone de texte pour sélectionner et copier tout le code ;<br />Collez ce code dans un fichier créé au nom de 'configuration.php' ;<br />Transférez ce fichier à la racine du répertoire de Joomla!."
 INSTL_DATABASE_SUPPORT="Bases de données supportées :"
 INSTL_DISPLAY_ERRORS="Afficher les erreurs"
@@ -265,9 +246,7 @@ INSTL_ERROR_DB="Des erreurs sont survenues lors du remplissage la base de donné
 INSTL_ERROR_INITIALISE_SCHEMA="Impossible d'initialiser le schema de la base de données."
 INSTL_FILE_UPLOADS="Transfert de fichiers"
 INSTL_GNU_GPL_LICENSE="Licence Publique Générale GNU (<a href='http://www.gnu.org/licenses/licenses.fr.html' target='_blank'>consulter la présentation en français...</a>)"
-INSTL_INSTALLATION="Installation"
 INSTL_JSON_SUPPORT_AVAILABLE="Support JSON"
-INSTL_LICENSE="Licence"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Directive Mbstring langage par défaut"
@@ -289,7 +268,6 @@ INSTL_PROCESS_BUSY="Processus en cours. Veuillez patienter..."
 
 ;Global strings
 JADMINISTRATOR="Administration"
-JADVANCED="Avancé"
 JCHECK_AGAIN="Vérifier à nouveau"
 JERROR="Erreur"
 JEMAIL="E-mail"
@@ -310,16 +288,17 @@ JUSERNAME="Identifiant"
 JYES="Oui"
 
 ; Framework strings necessary when no lang pack is available
-JLIB_DATABASE_ERROR_DATABASE="Une erreur de base de données s'est produite."
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Impossible de se connecter à MySQL."
+JLIB_DATABASE_ERROR_DATABASE="Une erreur de base de données s'est produite."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Impossible de charger le driver de base de données: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Votre session a expiré, veuillez recharger la page."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Echec de la copie"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: Le chemin n'est pas un dossier. Chemin: %s"
 JLIB_FORM_FIELD_INVALID="Champ invalide :&#160;"
-JLIB_FORM_VALIDATE_FIELD_REQUIRED="Champ requis : %s"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Champ invalide : %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="Champ requis : %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Erreur de copie du fichier %1$s vers %2$s."
+JLIB_INSTALLER_NOT_ERROR="Si l'erreur ci-dessus concerne l'installation de fichiers de langue pour TinyMce, elle n'a pas d'effet sur l'installation de(s) langue(s). Certains paquets de langue créés avant la version 3.2.0 de Joomla! peuvent aussi tenter d'installer des fichiers de langue TinyMce. Comme ceux-ci sont dorévanant inclus dans le noyau, ils n'ont plus besoin d'être installés."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Impossible de se connecter à a base de données <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/fr-FR/fr-FR.xml b/installation/language/fr-FR/fr-FR.xml
index b8eca10..f3cdc4d 100644
--- a/installation/language/fr-FR/fr-FR.xml
+++ b/installation/language/fr-FR/fr-FR.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>Septembre 2012</creationDate>
 	<author>Joomla.fr</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/he-IL/he-IL.ini b/installation/language/he-IL/he-IL.ini
index 64076e5..7762c17 100644
--- a/installation/language/he-IL/he-IL.ini
+++ b/installation/language/he-IL/he-IL.ini
@@ -1,333 +1,312 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
-
-
-
-;Stepbar
-INSTL_STEP_COMPLETE_LABEL="סיום"
-INSTL_STEP_DATABASE_LABEL="בסיס הנתונים"
-INSTL_STEP_DEFAULTLANGUAGE_LABEL="בחירת שפה ברירת מחדל"
-INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="שפה"
-INSTL_STEP_LANGUAGES_LABEL="התקנת שפות"
-INSTL_STEP_LICENSE_LABEL="רישיון"
-INSTL_STEP_PREINSTALL_LABEL="בדיקה טרם התקנה"
-INSTL_STEP_SITE_LABEL="הגדרות"
-INSTL_STEP_SUMMARY_LABEL="סקירה"
-INSTL_STEPS_TITLE="שלבים"
-
-;Language view
-INSTL_LANGUAGE_TITLE="בחירת שפה"
-INSTL_SELECT_LANGUAGE_DESC="אנא, בחרו בשפה שתשמש אתכם בתהליך השלבים של התקנת ג'ומלה:"
-INSTL_SELECT_LANGUAGE_TITLE="בחירת שפה"
-INSTL_WARNJAVASCRIPT="אזהרה! חייבים לאפשר הרצת JavaScript  להתקנה תקינה"
-INSTL_WARNJSON="נדרשת התקנה תמיכת JSON עבור PHP על מנת שיהיה ניתן להתקין את ג'ומלה"
-
-;Preinstall view
-INSTL_PRECHECK_TITLE="בדיקה טרם התקנה"
-INSTL_PRECHECK_FOR_VERSION="בדיקה טרם התקנה של %s:"
-INSTL_PRECHECK_DESC="אם אחד מפריטים אלו לא נתמך (maמסומן כ-<strong class="_QQ_"red"_QQ_">לא</strong>) אז, אנא, טפלו בבעיות ותקנו אותם. כישלון התיקון (או התעלמות מהבעיה) יכולים ליגרום להתקנה בעייתית ולפעולה לא תקינה של מערכת ג'ומלה."
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="הגדרות מומלצות:"
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="הגדרות אלו מומלצות ל-PHP בכדי להבטיח תאימות מלאה עם ג'ומלה.<br />ולמרות זאת, ג'ומלה תפעל גם אם לא תתאימו את ההגדרות אלו להגדרות המומלצות."
-INSTL_PRECHECK_DIRECTIVE="הנחיה"
-INSTL_PRECHECK_RECOMMENDED="מומלץ"
-INSTL_PRECHECK_ACTUAL="בפועל"
-
-; Database view
-INSTL_DATABASE="הגדרת בסיס הנתונים"
-INSTL_DATABASE_HOST_DESC="זה בדרך כלל &quot;localhost&quot;"
-INSTL_DATABASE_HOST_LABEL="שם השרת"
-INSTL_DATABASE_NAME_DESC="ישנם שרתים המאפשרים יצירת בסיס נתונים אחד לאתר. השתמשו במקדם הטבלאות במקרה כזה בכדי להבדיל בין אתרים שונים של ג'ומלה."
-INSTL_DATABASE_NAME_LABEL="שם בסיס הנתונים"
-INSTL_DATABASE_NO_SCHEMA="סכימת בסיס נתונים אינה קיימת עבור בסיס נתונים מסוג זה."
-INSTL_DATABASE_OLD_PROCESS_DESC="כל טבלאות גיבוי הקיימות מהתקנות קודמות של ג'ומלה יוחלפו"
-INSTL_DATABASE_OLD_PROCESS_LABEL="תהליך בסיס נתונים ישן"
-INSTL_DATABASE_PASSWORD_DESC="לאתר מוגן שימוש בסיסמה לחשבון ה-mysql הינו חובה!"
-INSTL_DATABASE_PASSWORD_LABEL="סיסמה"
-INSTL_DATABASE_PREFIX_DESC="בחר תחילית לטבלאות הנתונים או השתמש ב<b>יצירה אוטומטית</b>. מומלץ להזין שלושה או ארבעה תווים, המכילים תווים לטיניים או מספרים וחייב להסתיים בקו תחתון.<b>ודאו שהתווים שבחרתם אינם משמשים אתר אחר שמשתמש באותו בסיס נתנונים"
-INSTL_DATABASE_PREFIX_LABEL="תחילית טבלאות נתונים"
-INSTL_DATABASE_PREFIX_MSG="תחילית טבלאות נתונים חייבת להתחיל באות. אפשרי להוסיף תווים אלפא-נומריים ולבסוף קו תחתון Database Model"
-INSTL_DATABASE_TYPE_DESC="סביר להניח שזה &quot;MySQLi&quot;"
-INSTL_DATABASE_TYPE_LABEL="סוג בסיס הנתונים"
-INSTL_DATABASE_USER_DESC="או משהו כמו "_QQ_"root"_QQ_" או סיסמה שניתנה על ידי המארח"
-INSTL_DATABASE_USER_LABEL="שם משתמש"
-INSTL_DATABASE_TITLE="הגדרות התחברות"
-INSTL_DATABASE_DESC="<p>הגדרת ג'ומלה לפעולה באתר שלכם מערבת 4 שלבים פשוטים...</p><p>אנא, הכניסו את שם השרת עליו מערכת ג'ומלה תותקן.</p><p>הכניסו את שם המשתמש של בסיס הנתונים, הסיסמה ואת שם בסיס הנתנוים אשר ישמשו את ג'ומלה.</p><p>הכניסו את קידומת שתשמש את הטבלאות בהתקנת ג'ומלה. ביחרו כיצד לנהוג עם טבלאות קיימות מהתקנות קודמות.</p>"
-
-;FTP view
-INSTL_AUTOFIND_FTP_PATH="מציאה אוטומטית של מסלול ל-FTP"
-INSTL_FTP="הגדרות FTP"
-INSTL_FTP_DESC="<p>במספר שרתים יתכן ותדרשו להשתמש ב-FTP להשלמת התתקנה. אם יש לכם בעיות בהשלמת התקנה מבלי שספקתם את הנתונים האלו, בידקו אם מנהלי השרת שלכם בכדי להבין אם הדבר (ההגדרות) נדרש. </p><p>מסיבות של הבטחה, מומלץ להגדיר חשבון FTP נפרד להתקנת ג'ומלה בלבד ולא לכל השרת. מנהלי השרת יכולים לעזור לכם עם זה.</p><p><b>הערה:</b> אם אתם עובדים על שרת מבוסס Windows כמערכת ההפעלה, <strong>איןt</strong>  צורך בשכבת ה-FTP.</p>"
-INSTL_FTP_ENABLE_LABEL="הפעלת שכבת FTP"
-INSTL_FTP_HOST_LABEL="שרת FTP"
-INSTL_FTP_PASSWORD_LABEL="סיסמת FTP"
-INSTL_FTP_PORT_LABEL="פורט FTP"
-INSTL_FTP_ROOT_LABEL="מסלול השורש ל-FTP"
-INSTL_FTP_SAVE_LABEL="שמירת סיסמת FTP"
-INSTL_FTP_TITLE="הגדרות FTP (<strong class="_QQ_"red"_QQ_">רשות - רוב המשתמשים יכולים לדלג על שלב זה - הקליקו על הבא לדילוג</strong>)"
-INSTL_FTP_USER_LABEL="שם משתמש FTP"
-INSTL_SITE_NAME_LABEL="שם האתר"
-INSTL_VERIFY_FTP_SETTINGS="בדיקת הגדרות FTP"
-INSTL_FTP_SETTINGS_CORRECT="הגדרות תקינות"
-INSTL_FTP_USER_DESC="אזהרה! מומלץ להשאיר שדה זה ריק, ולהכניס את הנתונים כאשר את מעברים קבצים לשרת."
-INSTL_FTP_PASSWORD_DESC="אזהרה! מומלץ להשאיר שדה זה ריק ולהכניס את סיסמת ה-FTP שלכם רק כאשר אתם מעבירים קבצים לאתר."
-
-;Site View
-INSTL_SITE="הגדרות ראשיות"
-INSTL_ADMIN_EMAIL_LABEL="כתובת הדוא"_QQ_"ל של מנהל האתר"
-INSTL_ADMIN_EMAIL_DESC="אנא הזינו כתובת דוא "_QQ_"ל, שתהיה כתובת הדוא"_QQ_"ל של מנהל האתר"
-INSTL_ADMIN_PASSWORD_LABEL="סיסמת מנהל"
-INSTL_ADMIN_PASSWORD_DESC="הגדירו את הסיסמא של חשבון מנהל האתר ואשרו זאת בשדה להלן."
-INSTL_ADMIN_PASSWORD2_LABEL="אימות סיסמת מנהל"
-INSTL_ADMIN_USER_LABEL="שם משתמש של המנהל"
-INSTL_ADMIN_USER_DESC="מומלץ לשנות את שם המשתמש ברירת מחדל <strong>admin</strong>."
-INSTL_SITE_NAME_TITLE="שם האתר"
-INSTL_SITE_NAME_DESC="הזינו את שם אתר הג'ומלה שלכם."
-INSTL_SITE_METADESC_LABEL="תיאור"
-INSTL_SITE_METADESC_TITLE_LABEL="הזינו תיאור של האתר בשביל מנועי חיפוש. באופן אופטימלי, 20 מילים מספקים."
-INSTL_SITE_OFFLINE_LABEL="אתר לא מקוון"
-INSTL_SITE_OFFLINE_TITLE_LABEL="הגדרת האתר כלא מכוון כאשר תושלם ההתקנה. ניתן להחזיר את האתר למצב מקוון יותר מאוחר דרך ההגדרות הכלליות."
-INSTL_SITE_INSTALL_SAMPLE_LABEL="התקנת מידע דוגמא"
-INSTL_SITE_INSTALL_SAMPLE_DESC="התקנת מידע דוגמא מומלץ במיוחד למתחילים.<br />אפשרות זו מתקינה תוכן דוגמא שנכלל בחבילת ההתקנה של ג'ומלה."
-INSTL_SITE_INSTALL_SAMPLE_NONE="ללא! (<strong>נדרש לתמיכה באתר רב לשוני</strong>)"
-INSTL_SAMPLE_BLOG_SET="מידע דוגמא עבור בלוג באנגלית (GB)"
-INSTL_SAMPLE_BROCHURE_SET="מידע דוגמא עבור אתר תדמית באנגלית (GB)"
-INSTL_SAMPLE_DATA_SET="מידע דוגמא ברירת מחדל  באנגלית (GB)"
-INSTL_SAMPLE_LEARN_SET="מידע דוגמא עבור לימוד ג'ומלה באנגלית (GB)"
-INSTL_SAMPLE_TESTING_SET="מידע דוגמא לבדיקות באנגלית (GB)"
-INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content."
-INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form."
-INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form."
-INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works."
-INSTL_SAMPLE_TESTING_SET="מידע דוגמא עבור בדיקות באנגלית (GB)"
-
-;Summary view
-INSTL_FINALISATION="סיום"
-INSTL_SUMMARY_INSTALL="התקנה"
-INSTL_SUMMARY_EMAIL_LABEL="הגדרת דוא"_QQ_"ל"
-INSTL_SUMMARY_EMAIL_DESC="בחרו כדי לשלוח את הקונפיגורציה מטה אל %s לאחר סיום."
-INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="כלול סיסמאות בהודעה"
-INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="אזהרה! מומלץ לא לשלוח ולשמור סיסמאות בדוא"_QQ_"ל"
-
-;Installing view
-INSTL_INSTALLING="מתקין..."
-INSTL_INSTALLING_DATABASE_BACKUP="גיבוי טבלאות ישנות"
-INSTL_INSTALLING_DATABASE_REMOVE="הסרת טבלאות ישנות"
-INSTL_INSTALLING_DATABASE="יצירת טבלאות"
-INSTL_INSTALLING_SAMPLE="התקנת מידע דוגמא"
-INSTL_INSTALLING_CONFIG="יצירת קובץ תצורה"
-INSTL_INSTALLING_EMAIL="שולח הודעה אל %s"
-
-;Email
-INSTL_EMAIL_SUBJECT="פרטי תצורה: %s"
-INSTL_EMAIL_HEADING="להלן הגדרות תצורה עבור התקנת אתר ג'ומלה:"
-INSTL_EMAIL_NOT_SENT="לא ניתן לשלוח דוא"_QQ_"ל."
-
-;Complete view
-INSTL_COMPLETE="סיום"
-INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="נתוני כניסה למערכת הניהול"
-INSTL_COMPLETE_DESC1="הקליקו על כפתור האתר להצגת אתר ג'ומלה שלכם או על כפתור המנהל שיקח אתכם לטופס הכניסה למערכת הניהול של האתר."
-INSTL_COMPLETE_DESC2="באתר העזרה של ג'ומלה, תוכלו למצוא מדריך קל, המסביר צעד אחר צעד את התקנת חבילת השפה שלכם. כמו כן תמצאו רשימת קישורים לחבילות השפה הזמינות."
-INSTL_COMPLETE_DESC3="לחיצה על הכפתור שמשמאל פותחת את אתר העזרה בחלון חדש."
-INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="ספריית ההתקנה נמחקה בעבר."
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="ספריית ההתקנה לא יכולה להימחק. עליך למחוק אותה ידנית."
-INSTL_COMPLETE_FOLDER_REMOVED="ספריית ההתקנה הוסרה בהצלחה"
-INSTL_COMPLETE_LANGUAGE_1="ג'ומלה בשפה שלכם או ליצירת אתר רב לשוני?"
-INSTL_COMPLETE_LANGUAGE_DESC="לפני הסרת תיקיית ההתקנה תוכל להתקין שפות נוספות. אם הנכם מעוניינים להוסיף שפות נוספות לאפליקציית ג'ומלה, לחצו על הכפתור הבא"
-INSTL_COMPLETE_LANGUAGE_DESC2="שימו לב: תצטרכו גישה לאינטרנט כדי לאפשר לג'ומלה להוריד ולהתקין שפות נוספות. <br />הגדרות שרתים מסויימים לא מאפשרים להתקין שפות נוספות. אם זה המקרה שלכם, תוכלו להתקין אותם בהמשך ישירות מפאנל הניהול."
-INSTL_COMPLETE_REMOVE_FOLDER="הסר ספריית התקנה"
-INSTL_COMPLETE_REMOVE_INSTALLATION="אנא, זכרו למחוק <br />באופן מוחלט את תיקיית ההתקנה.<br />לא תוכלו להמשיך מעבר לנקודה זאת אלא לאחר שתיקית ההתקנה תוסר. זוהי תכונת אבטחה של ג'ומלה!."
-INSTL_COMPLETE_TITLE="ברכות! ג'ומלה הותקנה."
-INSTL_COMPLETE_INSTALL_LANGUAGES="שלבים נוספים: התקנת שפות"
-
-;Languages view
-INSTL_LANGUAGES="התקנת חבילות שפה"
-INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="שפה"
-INSTL_LANGUAGES_COLUMN_HEADER_VERSION="גירסה"
-INSTL_LANGUAGES_DESC="ממשק ג'ומלה זמינה במספר שפות. בחרו את השפות המועדפות עליכם על-ידי לחיצה על תיבות הסימון והתקינו אותם באמצעות על-ידי לחיצה על כפתור הבא.<br />שימו לב: פעולה זו עלולה לארוך כ-5 שניות עבור הורדה והתקנה של כל שפה. אנא אל תבחרו יותר מ-3 שפות להתקנה כדי למנוע בעיות."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="פעולה זו עלולה לקחת עד 10 שניות עבור כל שפה<br /> אנא התאזר בסבלנות בזמן ההורדה והתקנת השפות..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="אנא, בחר שפה. אם לא נדרשת התקנת שפות נוספות לחצו כפתור 'הקודם'"
-INSTL_LANGUAGES_WARNING_NO_INTERNET="ג'ומלה לא יכולה להתחבר לשרת השפות. אנא השלם את תהליך ההתקנה."
-INSTL_LANGUAGES_WARNING_NO_INTERNET2="שימו לב: תוכלו להתקין שפות לאחר מכן ישירות מפאנל הניהול של ג'ומלה"
-INSTL_LANGUAGES_WARNING_BACK_BUTTON="חזרה לשלב ההתקנה הסופי"
-
-;Defaultlanguage view
-INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="הפעלת התמיכה הרב-לשונית"
-INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language"
-INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Activate the language code plugin"
-INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If active, the language code plugin will be enabled adding the ability to change the language code in the generated HTML document to improve SEO."
-INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="שפת ברירת מחדל של פאנל הניהול"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="ג'ומלה לא יכולה להגדיר את השפה ברירת מחדל עבור פאנל הניהול. אנגלית תוגדר כשפה ברירת מחדל עבור פאנל הניהול."
-INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="ג'ומלה הגדירה %s כשפה ברירת מחדל של פאנל הניהול."
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="בחירה"
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="שפה"
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="תג"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="ג'ומלה אינה יכולה ליצור באופן אוטומטי את תוכן השפה ה-%s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="ג'ומלה לא הצליחה ליצור באופן אוטומטי את התפריט ב-%s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="ג'ומלה לא הצליחה ליצור באופן אוטומטי את פריט עמוד הבית ב-%s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="ג'ומלה לא הצליחה ליצור באופן אוטומטי את מודול התפריט ב-%s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="ג'ומלה לא הצליחה ליצור באופן אוטומטי י את קטגורית התוכן ב-%s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="ג'ומלה לא הצליחה ליצור באופן אוטומטי את מאמרי השפה ב-%s"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="ג'ומלה לא הצליחה לאפשר באופן אוטומטי את מודול החלפת השפות"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="ג'ומלה לא הצליחה לאפשר בצורה אוטמטית את ההתקן של קוד השפה"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="ג'ומלה לא הצליחה לאפשר את ההתקן של מסנו השפה"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="ג'ומלה לא יכלה להתקין את השפה %s."
-INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="ג'ומלה לא הצליחה לפרסם באופן אוטומטי את מודול מצב השפה"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="ג'ומלה לא הצליחה להסיר מפרסום את תפריט ברירת המחדל"
-INSTL_DEFAULTLANGUAGE_DESC="ג'ומלה התקינה את השפות להלן. אנא בחרו את השפה ברירת מחדל עבור פאנל הניהול ולאחר מכן לחצו על כפתור הבא."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="ג'ומלה התקינה את השפות להלן. אנא בחרו את השפה ברירת מחדל עבור פאנל הניהול ולאחר מכן לחצו על כפתור הבא."
-INSTL_DEFAULTLANGUAGE_FRONTEND="שפה ברירת מחדל לאתר"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="ג'ומלה לא יכולה להגדיר את השפה ברירת מחדל עבור האתר. אנגלית תוגדר כשפה ברירת מחדל עבור האתר."
-INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="ג'ומלה הגדירה את השפה %s  כברירת מחדל עבור שפת האתר."
-INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="התקנת תוכן מקומי"
-INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="אם פעיל, ג'ומלה תיצור אוטומטית קטגטרית תוכן אחת עבור כל שפה מותקנת. כמו כן, מאמר שיפורסם בעמוד הראשי עם תוכן סתמי עבוד כל קטגוריה"
-INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="ריבוי שפות"
-INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="פעולה זאת מאפשרת לכם להפעיל באופן אוטומטי את האפשרות לריבוי שפות באתר הג'ומלה"
-INSTL_DEFAULTLANGUAGE_NOTE="שימו לב: ברגע שתלחצו על כפתור הבא, תחזרו לסיום תהליך ההתקנה ותתבקשו למחוק את תיקיית ההתקנה."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="בחירת השפה ברירת מחדל"
-INSTL_DEFAULTLANGUAGE_TRY_LATER="תוכלו להתקין זאת בהמשך מפאנל הניהול של ג'ומלה"
-
-; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="עברית"
-
-;Database Model
-INSTL_DATABASE_COULD_NOT_CONNECT="נכשל ניסיון להתחבר לבסיס הנתונים. החיבור החזיר מספר: %s"
-INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="בלתי אפשרי לרענן מטמון רישום עבור הרכיב: %s"
-INSTL_DATABASE_EMPTY_NAME=""
-INSTL_DATABASE_ERROR_BACKINGUP="שגיאות התרחשו בזמן גיבוי בסיס הנתונים."
-INSTL_DATABASE_ERROR_CREATE="שגיאה התרחשה בזמן ניסיון יצירת בסיס הנתנונים %s.<br />ייתכן ואין לכם מספיק הרשאות לייצירת בסיס נתונים. ייתכן ונידרש ליצור את בסיס הנתנוים בנפרד לפני התקנת ג'ומלה."
-INSTL_DATABASE_ERROR_DELETE="מספר שגיאות התרחשו בזמן מחיקת בסיס הנתנוים."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="שגיאה באתחול סכימת מספר הגירסה"
-INSTL_DATABASE_FIELD_VALUE_REMOVE="הסרה"
-INSTL_DATABASE_FIELD_VALUE_BACKUP="גיבוי"
-INSTL_DATABASE_FIX_TOO_LONG="קידומת טבלאות MySQL חייבת להיות קצרה מ-15 תווים."
-INSTL_DATABASE_INVALID_DB_DETAILS="נתוני בסיס הנתונים שגויים או חסרים."
-INSTL_DATABASE_INVALID_MYSQL_VERSION="אתם צריכים גירסת MySQL 5.0.4  או גירסה חדשה יותר כדי להמשיך בהתקנה. מספר הגירסה הוא: %s"
-INSTL_DATABASE_INVALID_MYSQLI_VERSION="אתם צריכים גירסת MySQL 5.0.4  או גירסה חדשה יותר כדי להמשיך בהתקנה. מספר הגירסה הוא: %s"
-INSTL_DATABASE_INVALID_SQLSRV_VERSION="תצטרכו SQL Server 2008 R2 (10.50.1600.1) או גירסה חדשה יותר כדי להמשיך בהתקנה. הגירסה שלכם הינה: %s"
-INSTL_DATABASE_INVALID_SQLZURE_VERSION="תצטרכו SQL Server 2008 R2 (10.50.1600.1) או גירסה חדשה יותר כדי להמשיך בהתקנה. הגירסה שלכם הינה: %s"
-INSTL_DATABASE_INVALID_TYPE="אנא, בחרו בסוג בסיס הנתנוים"
-INSTL_DATABASE_NAME_TOO_LONG="שם בסיס הנתנוים (מסוג MySQL) לא יהיה ארוך מ-64 תווים."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="קידומת טבלאות MySQL חייב להתחיל באות (אנגלית) וחייב להמשיך עם אותיות, מספרים וקו תחתון בלבד."
-INSTL_DATABASE_INVALID_NAME="MySQL בגירסה קודמת ל-5.1.6 לא יכיל פסיקים או תווים "_QQ_"מיוחדים"_QQ_" אחרים בשם. הגירסה שלכם היא: %s"
-INSTL_DATABASE_NAME_INVALID_SPACES="שמות בסיס הנתונים MySQL  ושמות הטבלאות לא יתחילו או ייסתיימו עם רווחים."
-INSTL_DATABASE_NAME_INVALID_CHAR="אסור שמזהה MySQL  יכיל את התו NUL ASCII(0x00)."
-INSTL_DATABASE_FILE_DOES_NOT_EXIST="הקובץ %s אינו קיים"
-
-;controllers
-INSTL_COOKIES_NOT_ENABLED="עוגיות לא מאופשרות בדפדפן שלכם. לא תוכלו להתקין את האפליקציה עם תכונה זאת כבויה. לחליפין, יכולים להיות בעיות עם  יכולת השרת הבקשר ל-<strong>session.save_path</strong>. אם זה המקרה אנא, צרו קשר עם ספק האיחסון שלכם אם אינכם יודעים כיצד לפתור את הבעיה בעצמכם."
-INSTL_HEADER_ERROR="שגיאה"
-
-;Helpers
-INSTL_PAGE_TITLE="התקנת אתר ג'ומלה"
-
-;Configuration model
-INSTL_ERROR_CONNECT_DB="לא מצליח להתחבר לבסיס הנתונים.החיבור החזיר מספר: %s"
-INSTL_STD_OFFLINE_MSG="אתר זה הורד לצורכי תחזוקה.<br /> אנא, בדקו שוב בקרוב."
-
-;FTP model
-INSTL_FTP_INVALIDROOT="התיקייה המוגדר ב-FTP אינה התיקייה בה מותקנת ג'ומלה של התקנה זאת"
-INSTL_FTP_NOCONNECT="לא מצליח להתחבר לשרת ה-FTP"
-INSTL_FTP_NODELE="פעולת "_QQ_"מחיקה"_QQ_" נכשלה."
-INSTL_FTP_NODIRECTORYLISTING="לא מצליח ליצור רשימת תיקייה משרת ה-FTP."
-INSTL_FTP_NOLIST="The function "_QQ_"רשימה"_QQ_" failed."
-INSTL_FTP_NOLOGIN="לא מצליח להכנס לחשבון ה-FTP."
-INSTL_FTP_NOMKD="הפעולה "_QQ_"MKD"_QQ_" נכשלה."
-INSTL_FTP_NONLST="הפעולה "_QQ_"NLST"_QQ_" נכשלה."
-INSTL_FTP_NOPWD="הפעולה "_QQ_"PWD"_QQ_" נכשלה."
-INSTL_FTP_NORETR="הפעולה "_QQ_"RETR"_QQ_" נכשלה."
-INSTL_FTP_NORMD="הפעולה "_QQ_"RMD"_QQ_" נכשלה."
-INSTL_FTP_NOROOT="לא מצליח לגשת לתיקייה המוגדרת עבור ה-FTP."
-INSTL_FTP_NOSTOR="הפעולה "_QQ_"STOR"_QQ_" נכשלה."
-INSTL_FTP_NOSYST="הפעולה "_QQ_"SYST"_QQ_" נכשלה."
-INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="לא מצליח לזהות באופן אוטומטי את תקיית השורש בשרת ה-FTP."
-
-;others
-INSTL_ADVANCED_SETTINGS="הגדרות מתקדמות"
-INSTL_BASIC_SETTINGS="הגדרות בסיסיות"
-INSTL_CONFPROBLEM="קובץ ההגדרות שלכם חסום לכתיבה או שיש בעיה ביצירת הקובץ. אתם נדרשים לטעון את תוכן הבא לאתרכם ידנית. הקליקו על הטקסט בכדי לסמן את כל התוכן שלו והעתקה והדבקתו לקובץ חדש. שם הקובץ צריך להיות 'configuration.php' ולאחר מכן טענו אותו לתקיית השורש של אתרכם."
-INSTL_DATABASE_SUPPORT="תמיכה בבסיסי נתונים:"
-INSTL_DISPLAY_ERRORS="הצגת שגיאות"
-INSTL_ERROR_DB="מספר שגיאות התרחשו בזמן איכלוס בסיס הנתונים: %s"
-INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema"
-INSTL_FILE_UPLOADS="טעינת קובץ"
-INSTL_GNU_GPL_LICENSE="רשיון ציבורי כללי GNU"
-INSTL_INSTALLATION="התקנה"
-INSTL_JSON_SUPPORT_AVAILABLE="תמיכת JSON"
-INSTL_LICENSE="רישיון"
-INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC"
-INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
-INSTL_MB_LANGUAGE_IS_DEFAULT="שפת (קידוד) מרובת בתים היא ברירת המחדל"
-INSTL_MB_STRING_OVERLOAD_OFF="העמסת מחרוזת בשפת (קידוד) מרובת בתים כבויה"
-INSTL_NOTICEMBLANGNOTDEFAULT="PHP שפת (קידוד) מרובת בתים אינה מוגדרת למצב טבעי.ניתן להגדיר זאת על ידי הכנסת <strong>php_value mbstring.language neutral</strong> בקובץ <code>.htaccess</code> שלכם."
-INSTL_NOTICEMBSTRINGOVERLOAD="PHP שפת (קידוד) מרובת בתים - פונקציית טעינת יתר מוגדרת. ניתן לבטל את ההגדרה בעזרת הכנסת <strong>php_value mbstring.func_overload 0</strong> בקובץ <code>.htaccess</code> שלכם."
-INSTL_NOTICEYOUCANSTILLINSTALL="<br />אתם עדיין יכולים להמשיך בהתקנה מכיוון שהגדרות הקונפיגורציה יוצגו בסיום ההתקנה. תדרשו לטעון את הקוד בצורה ידנית.הקליקו על איזור הטקסט לסימון כל הקוד והעתיקו אותו לקובץ חדש. שם הקובץ הזה צריך להיות 'configuration.php'  וטענו אות לתיקיית השורש של האתר שלכם."
-INSTL_OUTPUT_BUFFERING="חציצת פלט"
-INSTL_PARSE_INI_FILE_AVAILABLE="תמיכת מנתח INI"
-INSTL_PHP_VERSION="גירסת PHP"
-INSTL_REGISTER_GLOBALS="אוגר גלובלי"
-INSTL_SAFE_MODE="מוד מאובטח"
-INSTL_SESSION_AUTO_START="איתחול אוטומטי של פעילות (session)"
-INSTL_WRITABLE="ניתן לכתיבה"
-INSTL_XML_SUPPORT="תמיכת XML"
-INSTL_ZIP_SUPPORT_AVAILABLE="תמיכה מקומית ב-ZIP"
-INSTL_ZLIB_COMPRESSION_SUPPORT="תמיכת דחיסת Zlib"
-INSTL_PROCESS_BUSY="תהליך בהתקדמות. אנא המתן..."
-
-;Global strings
-JADMINISTRATOR="מנהל"
-JADVANCED="מתקדם"
-JCHECK_AGAIN="בדיקה חוזרת"
-JERROR="שגיאה"
-JEMAIL="דוא"_QQ_"ל"
-JGLOBAL_ISFREESOFTWARE="%s היא תוכנה חופשית המשוחררת תחת <a href="_QQ_"http://www.gnu.org/licenses/gpl-2.0.html"_QQ_">רישיון ציבורי כלליGNU</a>."
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="חבילת תרגום לא מתאימה לגירסה הג'ומלה. חלק מהמחרוזות חסרות"
-JGLOBAL_SELECT_AN_OPTION="בחירת אפשרות"
-JGLOBAL_SELECT_NO_RESULTS_MATCH="אין תוצאות תואמות"
-JGLOBAL_SELECT_SOME_OPTIONS="בחירת אפשרויות שונות"
-JINVALID_TOKEN="הבקשה האחרונה נדחתה בגלל שהיא כוללת אסימון לא תקין. אנא, רעננו את העמוד ונסו שנית."
-JNEXT="הבא"
-JNO="לא"
-JNOTICE="התראה"
-JOFF="כבוי"
-JON="מופעל"
-JPREVIOUS="הקודם"
-JSITE="אתר"
-JUSERNAME="שם משתמש"
-JYES="כן"
-
-; Framework strings necessary when no lang pack is available
-JLIB_DATABASE_ERROR_DATABASE="שגיאת בסיס נתונים התרחשה."
-JLIB_DATABASE_ERROR_CONNECT_MYSQL="אינו יכול להתחבר ל-MySQL."
-JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="אין אפשרות לטעות את הדרייבר של הבסיס נתונים: %s"
-JLIB_ENVIRONMENT_SESSION_EXPIRED="פג תוקפו של ה-session שלך, אנא טען מחדש את העמוד."
-JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed"
-JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :קבצים: המסלול אינו תיקיה. מסלול: %s"
-JLIB_FORM_FIELD_INVALID="שדה אינו תקין:&#160;"
-JLIB_FORM_VALIDATE_FIELD_INVALID="שדה אינו תקין: %s"
-JLIB_FORM_VALIDATE_FIELD_REQUIRED="שדה נדרש: %s"
-JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :התקנה: נכשלה העתקת קובץ מ-%1$s אל %2$s."
-JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: אינו יכול להתחבר לבסיס הנתונים <br />joomla.library: %1$s - %2$s"
-
-; Strings for the language debugger
-JDEBUG_LANGUAGE_FILES_IN_ERROR="תקלות ניתוח בקבצי התרגום"
-JDEBUG_LANGUAGE_UNTRANSLATED_STRING="מחרוזות לא מתורגמות"
-JNONE="אין"
-
-;Necessary for errors
-ADMIN_EMAIL="כתובת הדוא"_QQ_"ל שלכם"
-ADMIN_PASSWORD="סיסמת מנהל"
-ADMIN_PASSWORD2="אימות סיסמת מנהל"
-SITE_NAME="שם האתר"
-
-; Database types (allows for a more descriptive label than the internal name)
-MYSQL="MySQL"
-MYSQLI="MySQLi"
-ORACLE="Oracle"
-POSTGRESQL="PostgreSQL"
-SQLAZURE="Microsoft SQL Azure"
-SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+; Joomla! Project
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
+
+
+
+;Stepbar
+INSTL_STEP_COMPLETE_LABEL="סיום"
+INSTL_STEP_DATABASE_LABEL="בסיס הנתונים"
+INSTL_STEP_DEFAULTLANGUAGE_LABEL="בחירת שפה ברירת מחדל"
+INSTL_STEP_FTP_LABEL="FTP"
+INSTL_STEP_LANGUAGES_LABEL="התקנת שפות"
+INSTL_STEP_SITE_LABEL="הגדרות"
+INSTL_STEP_SUMMARY_LABEL="סקירה"
+
+;Language view
+INSTL_SELECT_LANGUAGE_TITLE="בחירת שפה"
+INSTL_WARNJAVASCRIPT="אזהרה! חייבים לאפשר הרצת JavaScript  להתקנה תקינה"
+INSTL_WARNJSON="נדרשת התקנה תמיכת JSON עבור PHP על מנת שיהיה ניתן להתקין את ג'ומלה"
+
+;Preinstall view
+INSTL_PRECHECK_TITLE="בדיקה טרם התקנה"
+INSTL_PRECHECK_DESC="אם אחד מפריטים אלו לא נתמך (maמסומן כ-<strong class="_QQ_"red"_QQ_">לא</strong>) אז, אנא, טפלו בבעיות ותקנו אותם. כישלון התיקון (או התעלמות מהבעיה) יכולים ליגרום להתקנה בעייתית ולפעולה לא תקינה של מערכת ג'ומלה."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="הגדרות מומלצות:"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="הגדרות אלו מומלצות ל-PHP בכדי להבטיח תאימות מלאה עם ג'ומלה.<br />ולמרות זאת, ג'ומלה תפעל גם אם לא תתאימו את ההגדרות אלו להגדרות המומלצות."
+INSTL_PRECHECK_DIRECTIVE="הנחיה"
+INSTL_PRECHECK_RECOMMENDED="מומלץ"
+INSTL_PRECHECK_ACTUAL="בפועל"
+
+; Database view
+INSTL_DATABASE="הגדרת בסיס הנתונים"
+INSTL_DATABASE_HOST_DESC="זה בדרך כלל &quot;localhost&quot;"
+INSTL_DATABASE_HOST_LABEL="שם השרת"
+INSTL_DATABASE_NAME_DESC="ישנם שרתים המאפשרים יצירת בסיס נתונים אחד לאתר. השתמשו במקדם הטבלאות במקרה כזה בכדי להבדיל בין אתרים שונים של ג'ומלה."
+INSTL_DATABASE_NAME_LABEL="שם בסיס הנתונים"
+INSTL_DATABASE_NO_SCHEMA="סכימת בסיס נתונים אינה קיימת עבור בסיס נתונים מסוג זה."
+INSTL_DATABASE_OLD_PROCESS_DESC="כל טבלאות גיבוי הקיימות מהתקנות קודמות של ג'ומלה יוחלפו"
+INSTL_DATABASE_OLD_PROCESS_LABEL="תהליך בסיס נתונים ישן"
+INSTL_DATABASE_PASSWORD_DESC="לאתר מוגן שימוש בסיסמה לחשבון ה-mysql הינו חובה!"
+INSTL_DATABASE_PASSWORD_LABEL="סיסמה"
+INSTL_DATABASE_PREFIX_DESC="בחר תחילית לטבלאות הנתונים או השתמש ב<b>יצירה אוטומטית</b>. מומלץ להזין שלושה או ארבעה תווים, המכילים תווים לטיניים או מספרים וחייב להסתיים בקו תחתון.<b>ודאו שהתווים שבחרתם אינם משמשים אתר אחר שמשתמש באותו בסיס נתנונים"
+INSTL_DATABASE_PREFIX_LABEL="תחילית טבלאות נתונים"
+INSTL_DATABASE_PREFIX_MSG="תחילית טבלאות נתונים חייבת להתחיל באות. אפשרי להוסיף תווים אלפא-נומריים ולבסוף קו תחתון Database Model"
+INSTL_DATABASE_TYPE_DESC="סביר להניח שזה &quot;MySQLi&quot;"
+INSTL_DATABASE_TYPE_LABEL="סוג בסיס הנתונים"
+INSTL_DATABASE_USER_DESC="או משהו כמו "_QQ_"root"_QQ_" או סיסמה שניתנה על ידי המארח"
+INSTL_DATABASE_USER_LABEL="שם משתמש"
+
+;FTP view
+INSTL_AUTOFIND_FTP_PATH="מציאה אוטומטית של מסלול ל-FTP"
+INSTL_FTP="הגדרות FTP"
+INSTL_FTP_DESC="<p>במספר שרתים יתכן ותדרשו להשתמש ב-FTP להשלמת התתקנה. אם יש לכם בעיות בהשלמת התקנה מבלי שספקתם את הנתונים האלו, בידקו אם מנהלי השרת שלכם בכדי להבין אם הדבר (ההגדרות) נדרש. </p><p>מסיבות של הבטחה, מומלץ להגדיר חשבון FTP נפרד להתקנת ג'ומלה בלבד ולא לכל השרת. מנהלי השרת יכולים לעזור לכם עם זה.</p><p><b>הערה:</b> אם אתם עובדים על שרת מבוסס Windows כמערכת ההפעלה, <strong>איןt</strong>  צורך בשכבת ה-FTP.</p>"
+INSTL_FTP_ENABLE_LABEL="הפעלת שכבת FTP"
+INSTL_FTP_HOST_LABEL="שרת FTP"
+INSTL_FTP_PASSWORD_LABEL="סיסמת FTP"
+INSTL_FTP_PORT_LABEL="פורט FTP"
+INSTL_FTP_ROOT_LABEL="מסלול השורש ל-FTP"
+INSTL_FTP_SAVE_LABEL="שמירת סיסמת FTP"
+INSTL_FTP_TITLE="הגדרות FTP (<strong class="_QQ_"red"_QQ_">רשות - רוב המשתמשים יכולים לדלג על שלב זה - הקליקו על הבא לדילוג</strong>)"
+INSTL_FTP_USER_LABEL="שם משתמש FTP"
+INSTL_VERIFY_FTP_SETTINGS="בדיקת הגדרות FTP"
+INSTL_FTP_SETTINGS_CORRECT="הגדרות תקינות"
+INSTL_FTP_USER_DESC="אזהרה! מומלץ להשאיר שדה זה ריק, ולהכניס את הנתונים כאשר את מעברים קבצים לשרת."
+INSTL_FTP_PASSWORD_DESC="אזהרה! מומלץ להשאיר שדה זה ריק ולהכניס את סיסמת ה-FTP שלכם רק כאשר אתם מעבירים קבצים לאתר."
+
+;Site View
+INSTL_SITE="הגדרות ראשיות"
+INSTL_ADMIN_EMAIL_LABEL="כתובת הדוא"_QQ_"ל של מנהל האתר"
+INSTL_ADMIN_EMAIL_DESC="אנא הזינו כתובת דוא "_QQ_"ל, שתהיה כתובת הדוא"_QQ_"ל של מנהל האתר"
+INSTL_ADMIN_PASSWORD_LABEL="סיסמת מנהל"
+INSTL_ADMIN_PASSWORD_DESC="הגדירו את הסיסמא של חשבון מנהל האתר ואשרו זאת בשדה להלן."
+INSTL_ADMIN_PASSWORD2_LABEL="אימות סיסמת מנהל"
+INSTL_ADMIN_USER_LABEL="שם משתמש של המנהל"
+INSTL_ADMIN_USER_DESC="מומלץ לשנות את שם המשתמש ברירת מחדל <strong>admin</strong>."
+INSTL_SITE_NAME_LABEL="שם האתר"
+INSTL_SITE_NAME_DESC="הזינו את שם אתר הג'ומלה שלכם."
+INSTL_SITE_METADESC_LABEL="תיאור"
+INSTL_SITE_METADESC_TITLE_LABEL="הזינו תיאור של האתר בשביל מנועי חיפוש. באופן אופטימלי, 20 מילים מספקים."
+INSTL_SITE_OFFLINE_LABEL="אתר לא מקוון"
+INSTL_SITE_OFFLINE_TITLE_LABEL="הגדרת האתר כלא מכוון כאשר תושלם ההתקנה. ניתן להחזיר את האתר למצב מקוון יותר מאוחר דרך ההגדרות הכלליות."
+INSTL_SITE_INSTALL_SAMPLE_LABEL="התקנת מידע דוגמא"
+INSTL_SITE_INSTALL_SAMPLE_DESC="התקנת מידע דוגמא מומלץ במיוחד למתחילים.<br />אפשרות זו מתקינה תוכן דוגמא שנכלל בחבילת ההתקנה של ג'ומלה."
+INSTL_SITE_INSTALL_SAMPLE_NONE="ללא! (<strong>נדרש לתמיכה באתר רב לשוני</strong>)"
+INSTL_SAMPLE_BLOG_SET="מידע דוגמא עבור בלוג באנגלית (GB)"
+INSTL_SAMPLE_BROCHURE_SET="מידע דוגמא עבור אתר תדמית באנגלית (GB)"
+INSTL_SAMPLE_DATA_SET="מידע דוגמא ברירת מחדל  באנגלית (GB)"
+INSTL_SAMPLE_LEARN_SET="מידע דוגמא עבור לימוד ג'ומלה באנגלית (GB)"
+INSTL_SAMPLE_TESTING_SET="מידע דוגמא לבדיקות באנגלית (GB)"
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Install Joomla with just one menu and a login form, without any content."
+INSTL_SAMPLE_BLOG_SET_DESC="Install Joomla with a few articles and blog related modules like Older Posts, Blog Roll, Most Read Posts."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Install Joomla with a few pages (a menu with pages Home, About Us, News, Contact Us) and modules like Search, Custom HTML, Login Form."
+INSTL_SAMPLE_DATA_SET_DESC="Install Joomla with one page (a menu with one link) and modules like Latest Article, Login Form."
+INSTL_SAMPLE_LEARN_SET_DESC="Install Joomla with example articles that describe how Joomla works."
+INSTL_SAMPLE_TESTING_SET="מידע דוגמא עבור בדיקות באנגלית (GB)"
+
+;Summary view
+INSTL_FINALISATION="סיום"
+INSTL_SUMMARY_INSTALL="התקנה"
+INSTL_SUMMARY_EMAIL_LABEL="הגדרת דוא"_QQ_"ל"
+INSTL_SUMMARY_EMAIL_DESC="בחרו כדי לשלוח את הקונפיגורציה מטה אל %s לאחר סיום."
+INSTL_SUMMARY_EMAIL_PASSWORDS_LABEL="כלול סיסמאות בהודעה"
+INSTL_SUMMARY_EMAIL_PASSWORDS_DESC="אזהרה! מומלץ לא לשלוח ולשמור סיסמאות בדוא"_QQ_"ל"
+
+;Installing view
+INSTL_INSTALLING="מתקין..."
+INSTL_INSTALLING_DATABASE_BACKUP="גיבוי טבלאות ישנות"
+INSTL_INSTALLING_DATABASE_REMOVE="הסרת טבלאות ישנות"
+INSTL_INSTALLING_DATABASE="יצירת טבלאות"
+INSTL_INSTALLING_SAMPLE="התקנת מידע דוגמא"
+INSTL_INSTALLING_CONFIG="יצירת קובץ תצורה"
+INSTL_INSTALLING_EMAIL="שולח הודעה אל %s"
+
+;Email
+INSTL_EMAIL_SUBJECT="פרטי תצורה: %s"
+INSTL_EMAIL_HEADING="להלן הגדרות תצורה עבור התקנת אתר ג'ומלה:"
+INSTL_EMAIL_NOT_SENT="לא ניתן לשלוח דוא"_QQ_"ל."
+
+;Complete view
+INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="נתוני כניסה למערכת הניהול"
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="ספריית ההתקנה נמחקה בעבר."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="ספריית ההתקנה לא יכולה להימחק. עליך למחוק אותה ידנית."
+INSTL_COMPLETE_FOLDER_REMOVED="ספריית ההתקנה הוסרה בהצלחה"
+INSTL_COMPLETE_LANGUAGE_1="ג'ומלה בשפה שלכם או ליצירת אתר רב לשוני?"
+INSTL_COMPLETE_LANGUAGE_DESC="לפני הסרת תיקיית ההתקנה תוכל להתקין שפות נוספות. אם הנכם מעוניינים להוסיף שפות נוספות לאפליקציית ג'ומלה, לחצו על הכפתור הבא"
+INSTL_COMPLETE_LANGUAGE_DESC2="שימו לב: תצטרכו גישה לאינטרנט כדי לאפשר לג'ומלה להוריד ולהתקין שפות נוספות. <br />הגדרות שרתים מסויימים לא מאפשרים להתקין שפות נוספות. אם זה המקרה שלכם, תוכלו להתקין אותם בהמשך ישירות מפאנל הניהול."
+INSTL_COMPLETE_REMOVE_FOLDER="הסר ספריית התקנה"
+INSTL_COMPLETE_REMOVE_INSTALLATION="אנא, זכרו למחוק <br />באופן מוחלט את תיקיית ההתקנה.<br />לא תוכלו להמשיך מעבר לנקודה זאת אלא לאחר שתיקית ההתקנה תוסר. זוהי תכונת אבטחה של ג'ומלה!."
+INSTL_COMPLETE_TITLE="ברכות! ג'ומלה הותקנה."
+INSTL_COMPLETE_INSTALL_LANGUAGES="שלבים נוספים: התקנת שפות"
+
+;Languages view
+INSTL_LANGUAGES="התקנת חבילות שפה"
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="שפה"
+INSTL_LANGUAGES_COLUMN_HEADER_VERSION="גירסה"
+INSTL_LANGUAGES_DESC="ממשק ג'ומלה זמינה במספר שפות. בחרו את השפות המועדפות עליכם על-ידי לחיצה על תיבות הסימון והתקינו אותם באמצעות על-ידי לחיצה על כפתור הבא.<br />שימו לב: פעולה זו עלולה לארוך כ-5 שניות עבור הורדה והתקנה של כל שפה. אנא אל תבחרו יותר מ-3 שפות להתקנה כדי למנוע בעיות."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="פעולה זו עלולה לקחת עד 10 שניות עבור כל שפה<br /> אנא התאזר בסבלנות בזמן ההורדה והתקנת השפות..."
+INSTL_LANGUAGES_MORE_LANGUAGES="הקליקו על כפתור 'קודם' אם ברצונכם להתקין שפות נוספות."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="אנא, בחר שפה. אם לא נדרשת התקנת שפות נוספות לחצו כפתור 'הקודם'"
+INSTL_LANGUAGES_WARNING_NO_INTERNET="ג'ומלה לא יכולה להתחבר לשרת השפות. אנא השלם את תהליך ההתקנה."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="שימו לב: תוכלו להתקין שפות לאחר מכן ישירות מפאנל הניהול של ג'ומלה"
+INSTL_LANGUAGES_WARNING_BACK_BUTTON="חזרה לשלב ההתקנה הסופי"
+
+;Defaultlanguage view
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="הפעלת התמיכה הרב-לשונית"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="If active, your Joomla site will have the multilingual feature active with localised menus for each installed language"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Activate the language code plugin"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="If active, the language code plugin will be enabled adding the ability to change the language code in the generated HTML document to improve SEO."
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="שפת ברירת מחדל של פאנל הניהול"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="ג'ומלה לא יכולה להגדיר את השפה ברירת מחדל עבור פאנל הניהול. אנגלית תוגדר כשפה ברירת מחדל עבור פאנל הניהול."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="ג'ומלה הגדירה %s כשפה ברירת מחדל של פאנל הניהול."
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="בחירה"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="שפה"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="תג"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="ג'ומלה אינה יכולה ליצור באופן אוטומטי את תוכן השפה ה-%s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="ג'ומלה לא הצליחה ליצור באופן אוטומטי את התפריט ב-%s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="ג'ומלה לא הצליחה ליצור באופן אוטומטי את פריט עמוד הבית ב-%s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_MODULE="ג'ומלה לא הצליחה ליצור באופן אוטומטי את מודול התפריט ב-%s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CATEGORY="ג'ומלה לא הצליחה ליצור באופן אוטומטי י את קטגורית התוכן ב-%s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="ג'ומלה לא הצליחה ליצור באופן אוטומטי את מאמרי השפה ב-%s"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="ג'ומלה לא הצליחה לאפשר באופן אוטומטי את מודול החלפת השפות"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="ג'ומלה לא הצליחה לאפשר בצורה אוטמטית את ההתקן של קוד השפה"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="ג'ומלה לא הצליחה לאפשר את ההתקן של מסנו השפה"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="ג'ומלה לא יכלה להתקין את השפה %s."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="ג'ומלה לא הצליחה לפרסם באופן אוטומטי את מודול מצב השפה"
+INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="ג'ומלה לא הצליחה להסיר מפרסום את תפריט ברירת המחדל"
+INSTL_DEFAULTLANGUAGE_DESC="ג'ומלה התקינה את השפות להלן. אנא בחרו את השפה ברירת מחדל עבור פאנל הניהול ולאחר מכן לחצו על כפתור הבא."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="ג'ומלה התקינה את השפות להלן. אנא בחרו את השפה ברירת מחדל עבור פאנל הניהול ולאחר מכן לחצו על כפתור הבא."
+INSTL_DEFAULTLANGUAGE_FRONTEND="שפה ברירת מחדל לאתר"
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="ג'ומלה לא יכולה להגדיר את השפה ברירת מחדל עבור האתר. אנגלית תוגדר כשפה ברירת מחדל עבור האתר."
+INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="ג'ומלה הגדירה את השפה %s  כברירת מחדל עבור שפת האתר."
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="התקנת תוכן מקומי"
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="אם פעיל, ג'ומלה תיצור אוטומטית קטגטרית תוכן אחת עבור כל שפה מותקנת. כמו כן, מאמר שיפורסם בעמוד הראשי עם תוכן סתמי עבוד כל קטגוריה"
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="ריבוי שפות"
+INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="פעולה זאת מאפשרת לכם להפעיל באופן אוטומטי את האפשרות לריבוי שפות באתר הג'ומלה"
+INSTL_DEFAULTLANGUAGE_TRY_LATER="תוכלו להתקין זאת בהמשך מפאנל הניהול של ג'ומלה"
+
+; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="עברית"
+
+;Database Model
+INSTL_DATABASE_COULD_NOT_CONNECT="נכשל ניסיון להתחבר לבסיס הנתונים. החיבור החזיר מספר: %s"
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="בלתי אפשרי לרענן מטמון רישום עבור הרכיב: %s"
+INSTL_DATABASE_EMPTY_NAME=""
+INSTL_DATABASE_ERROR_BACKINGUP="שגיאות התרחשו בזמן גיבוי בסיס הנתונים."
+INSTL_DATABASE_ERROR_CREATE="שגיאה התרחשה בזמן ניסיון יצירת בסיס הנתנונים %s.<br />ייתכן ואין לכם מספיק הרשאות לייצירת בסיס נתונים. ייתכן ונידרש ליצור את בסיס הנתנוים בנפרד לפני התקנת ג'ומלה."
+INSTL_DATABASE_ERROR_DELETE="מספר שגיאות התרחשו בזמן מחיקת בסיס הנתנוים."
+INSTL_DATABASE_FIELD_VALUE_REMOVE="הסרה"
+INSTL_DATABASE_FIELD_VALUE_BACKUP="גיבוי"
+INSTL_DATABASE_FIX_TOO_LONG="קידומת טבלאות MySQL חייבת להיות קצרה מ-15 תווים."
+INSTL_DATABASE_INVALID_DB_DETAILS="נתוני בסיס הנתונים שגויים או חסרים."
+INSTL_DATABASE_INVALID_MYSQL_VERSION="אתם צריכים גירסת MySQL 5.0.4  או גירסה חדשה יותר כדי להמשיך בהתקנה. מספר הגירסה הוא: %s"
+INSTL_DATABASE_INVALID_MYSQLI_VERSION="אתם צריכים גירסת MySQL 5.0.4  או גירסה חדשה יותר כדי להמשיך בהתקנה. מספר הגירסה הוא: %s"
+INSTL_DATABASE_INVALID_SQLSRV_VERSION="תצטרכו SQL Server 2008 R2 (10.50.1600.1) או גירסה חדשה יותר כדי להמשיך בהתקנה. הגירסה שלכם הינה: %s"
+INSTL_DATABASE_INVALID_SQLZURE_VERSION="תצטרכו SQL Server 2008 R2 (10.50.1600.1) או גירסה חדשה יותר כדי להמשיך בהתקנה. הגירסה שלכם הינה: %s"
+INSTL_DATABASE_INVALID_TYPE="אנא, בחרו בסוג בסיס הנתנוים"
+INSTL_DATABASE_NAME_TOO_LONG="שם בסיס הנתנוים (מסוג MySQL) לא יהיה ארוך מ-64 תווים."
+INSTL_DATABASE_INVALID_NAME="MySQL בגירסה קודמת ל-5.1.6 לא יכיל פסיקים או תווים "_QQ_"מיוחדים"_QQ_" אחרים בשם. הגירסה שלכם היא: %s"
+INSTL_DATABASE_NAME_INVALID_SPACES="שמות בסיס הנתונים MySQL  ושמות הטבלאות לא יתחילו או ייסתיימו עם רווחים."
+INSTL_DATABASE_NAME_INVALID_CHAR="אסור שמזהה MySQL  יכיל את התו NUL ASCII(0x00)."
+INSTL_DATABASE_FILE_DOES_NOT_EXIST="הקובץ %s אינו קיים"
+
+;controllers
+INSTL_COOKIES_NOT_ENABLED="עוגיות לא מאופשרות בדפדפן שלכם. לא תוכלו להתקין את האפליקציה עם תכונה זאת כבויה. לחליפין, יכולים להיות בעיות עם  יכולת השרת הבקשר ל-<strong>session.save_path</strong>. אם זה המקרה אנא, צרו קשר עם ספק האיחסון שלכם אם אינכם יודעים כיצד לפתור את הבעיה בעצמכם."
+INSTL_HEADER_ERROR="שגיאה"
+
+;Helpers
+INSTL_PAGE_TITLE="התקנת אתר ג'ומלה"
+
+;Configuration model
+INSTL_ERROR_CONNECT_DB="לא מצליח להתחבר לבסיס הנתונים.החיבור החזיר מספר: %s"
+INSTL_STD_OFFLINE_MSG="אתר זה הורד לצורכי תחזוקה.<br /> אנא, בדקו שוב בקרוב."
+
+;FTP model
+INSTL_FTP_INVALIDROOT="התיקייה המוגדר ב-FTP אינה התיקייה בה מותקנת ג'ומלה של התקנה זאת"
+INSTL_FTP_NOCONNECT="לא מצליח להתחבר לשרת ה-FTP"
+INSTL_FTP_NODELE="פעולת "_QQ_"מחיקה"_QQ_" נכשלה."
+INSTL_FTP_NODIRECTORYLISTING="לא מצליח ליצור רשימת תיקייה משרת ה-FTP."
+INSTL_FTP_NOLIST="The function "_QQ_"רשימה"_QQ_" failed."
+INSTL_FTP_NOLOGIN="לא מצליח להכנס לחשבון ה-FTP."
+INSTL_FTP_NOMKD="הפעולה "_QQ_"MKD"_QQ_" נכשלה."
+INSTL_FTP_NONLST="הפעולה "_QQ_"NLST"_QQ_" נכשלה."
+INSTL_FTP_NOPWD="הפעולה "_QQ_"PWD"_QQ_" נכשלה."
+INSTL_FTP_NORETR="הפעולה "_QQ_"RETR"_QQ_" נכשלה."
+INSTL_FTP_NORMD="הפעולה "_QQ_"RMD"_QQ_" נכשלה."
+INSTL_FTP_NOROOT="לא מצליח לגשת לתיקייה המוגדרת עבור ה-FTP."
+INSTL_FTP_NOSTOR="הפעולה "_QQ_"STOR"_QQ_" נכשלה."
+INSTL_FTP_NOSYST="הפעולה "_QQ_"SYST"_QQ_" נכשלה."
+INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="לא מצליח לזהות באופן אוטומטי את תקיית השורש בשרת ה-FTP."
+
+;others
+INSTL_CONFPROBLEM="קובץ ההגדרות שלכם חסום לכתיבה או שיש בעיה ביצירת הקובץ. אתם נדרשים לטעון את תוכן הבא לאתרכם ידנית. הקליקו על הטקסט בכדי לסמן את כל התוכן שלו והעתקה והדבקתו לקובץ חדש. שם הקובץ צריך להיות 'configuration.php' ולאחר מכן טענו אותו לתקיית השורש של אתרכם."
+INSTL_DATABASE_SUPPORT="תמיכה בבסיסי נתונים:"
+INSTL_DISPLAY_ERRORS="הצגת שגיאות"
+INSTL_ERROR_DB="מספר שגיאות התרחשו בזמן איכלוס בסיס הנתונים: %s"
+INSTL_ERROR_INITIALISE_SCHEMA="Can't initialise database schema"
+INSTL_FILE_UPLOADS="טעינת קובץ"
+INSTL_GNU_GPL_LICENSE="רשיון ציבורי כללי GNU"
+INSTL_JSON_SUPPORT_AVAILABLE="תמיכת JSON"
+INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC"
+INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
+INSTL_MB_LANGUAGE_IS_DEFAULT="שפת (קידוד) מרובת בתים היא ברירת המחדל"
+INSTL_MB_STRING_OVERLOAD_OFF="העמסת מחרוזת בשפת (קידוד) מרובת בתים כבויה"
+INSTL_NOTICEMBLANGNOTDEFAULT="PHP שפת (קידוד) מרובת בתים אינה מוגדרת למצב טבעי.ניתן להגדיר זאת על ידי הכנסת <strong>php_value mbstring.language neutral</strong> בקובץ <code>.htaccess</code> שלכם."
+INSTL_NOTICEMBSTRINGOVERLOAD="PHP שפת (קידוד) מרובת בתים - פונקציית טעינת יתר מוגדרת. ניתן לבטל את ההגדרה בעזרת הכנסת <strong>php_value mbstring.func_overload 0</strong> בקובץ <code>.htaccess</code> שלכם."
+INSTL_NOTICEYOUCANSTILLINSTALL="<br />אתם עדיין יכולים להמשיך בהתקנה מכיוון שהגדרות הקונפיגורציה יוצגו בסיום ההתקנה. תדרשו לטעון את הקוד בצורה ידנית.הקליקו על איזור הטקסט לסימון כל הקוד והעתיקו אותו לקובץ חדש. שם הקובץ הזה צריך להיות 'configuration.php'  וטענו אות לתיקיית השורש של האתר שלכם."
+INSTL_OUTPUT_BUFFERING="חציצת פלט"
+INSTL_PARSE_INI_FILE_AVAILABLE="תמיכת מנתח INI"
+INSTL_PHP_VERSION="גירסת PHP"
+INSTL_REGISTER_GLOBALS="אוגר גלובלי"
+INSTL_SAFE_MODE="מוד מאובטח"
+INSTL_SESSION_AUTO_START="איתחול אוטומטי של פעילות (session)"
+INSTL_WRITABLE="ניתן לכתיבה"
+INSTL_XML_SUPPORT="תמיכת XML"
+INSTL_ZIP_SUPPORT_AVAILABLE="תמיכה מקומית ב-ZIP"
+INSTL_ZLIB_COMPRESSION_SUPPORT="תמיכת דחיסת Zlib"
+INSTL_PROCESS_BUSY="תהליך בהתקדמות. אנא המתן..."
+
+;Global strings
+JADMINISTRATOR="מנהל"
+JCHECK_AGAIN="בדיקה חוזרת"
+JERROR="שגיאה"
+JEMAIL="דוא"_QQ_"ל"
+JGLOBAL_ISFREESOFTWARE="%s היא תוכנה חופשית המשוחררת תחת <a href="_QQ_"http://www.gnu.org/licenses/gpl-2.0.html"_QQ_">רישיון ציבורי כלליGNU</a>."
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="חבילת תרגום לא מתאימה לגירסה הג'ומלה. חלק מהמחרוזות חסרות"
+JGLOBAL_SELECT_AN_OPTION="בחירת אפשרות"
+JGLOBAL_SELECT_NO_RESULTS_MATCH="אין תוצאות תואמות"
+JGLOBAL_SELECT_SOME_OPTIONS="בחירת אפשרויות שונות"
+JINVALID_TOKEN="הבקשה האחרונה נדחתה בגלל שהיא כוללת אסימון לא תקין. אנא, רעננו את העמוד ונסו שנית."
+JNEXT="הבא"
+JNO="לא"
+JNOTICE="התראה"
+JOFF="כבוי"
+JON="מופעל"
+JPREVIOUS="הקודם"
+JSITE="אתר"
+JUSERNAME="שם משתמש"
+JYES="כן"
+
+; Framework strings necessary when no lang pack is available
+JLIB_DATABASE_ERROR_DATABASE="שגיאת בסיס נתונים התרחשה."
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="אינו יכול להתחבר ל-MySQL."
+JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="אין אפשרות לטעות את הדרייבר של הבסיס נתונים: %s"
+JLIB_ENVIRONMENT_SESSION_EXPIRED="פג תוקפו של ה-session שלך, אנא טען מחדש את העמוד."
+JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copy failed"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :קבצים: המסלול אינו תיקיה. מסלול: %s"
+JLIB_FORM_FIELD_INVALID="שדה אינו תקין:&#160;"
+JLIB_FORM_VALIDATE_FIELD_INVALID="שדה אינו תקין: %s"
+JLIB_FORM_VALIDATE_FIELD_REQUIRED="שדה נדרש: %s"
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :התקנה: נכשלה העתקת קובץ מ-%1$s אל %2$s."
+JLIB_INSTALLER_NOT_ERROR="אם השגיאה מתיכסת להתקנת השפה ב-TinyMCE לא תהיה לכך השפעה על התקנת השפות. חלק מקיבצי השפות נוצרו לפני גירסת ג'ומלה  אתם יכולים לנסות להתקין את קיבצי השפה של TinyMCE בניפרד. מאחר שמעתה הם כלולים בלב המערכת אין צורך בהתקנה מיוחדת."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: אינו יכול להתחבר לבסיס הנתונים <br />joomla.library: %1$s - %2$s"
+
+; Strings for the language debugger
+JDEBUG_LANGUAGE_FILES_IN_ERROR="תקלות ניתוח בקבצי התרגום"
+JDEBUG_LANGUAGE_UNTRANSLATED_STRING="מחרוזות לא מתורגמות"
+JNONE="אין"
+
+;Necessary for errors
+ADMIN_EMAIL="כתובת הדוא"_QQ_"ל שלכם"
+ADMIN_PASSWORD="סיסמת מנהל"
+ADMIN_PASSWORD2="אימות סיסמת מנהל"
+SITE_NAME="שם האתר"
+
+; Database types (allows for a more descriptive label than the internal name)
+MYSQL="MySQL"
+MYSQLI="MySQLi"
+ORACLE="Oracle"
+POSTGRESQL="PostgreSQL"
+SQLAZURE="Microsoft SQL Azure"
+SQLITE="SQLite"
+SQLSRV="Microsoft SQL Server"
diff --git a/installation/language/he-IL/he-IL.xml b/installation/language/he-IL/he-IL.xml
index e09a092..bb26216 100644
--- a/installation/language/he-IL/he-IL.xml
+++ b/installation/language/he-IL/he-IL.xml
@@ -7,7 +7,7 @@
 	<creationDate>September 2010</creationDate>
 	<author>Joomla Israeli Community</author>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Hebrew language pack for Joomla! 3.0 Installation</description>
 	<files>
diff --git a/installation/language/hr-HR/hr-HR.ini b/installation/language/hr-HR/hr-HR.ini
index 8a85767..506940a 100644
--- a/installation/language/hr-HR/hr-HR.ini
+++ b/installation/language/hr-HR/hr-HR.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Kraj"
 INSTL_STEP_DATABASE_LABEL="Baza"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Odaberite osnovni jezik"
 INSTL_STEP_FTP_LABEL="FTP Konfiguracija"
-INSTL_STEP_LANGUAGE_LABEL="Jezik"
 INSTL_STEP_LANGUAGES_LABEL="Instalacija jezika"
-INSTL_STEP_LICENSE_LABEL="Licenca"
-INSTL_STEP_PREINSTALL_LABEL="Provjera prije instalacije"
 INSTL_STEP_SITE_LABEL="Konfiguracija"
 INSTL_STEP_SUMMARY_LABEL="Pregled"
-INSTL_STEPS_TITLE="Koraci"
 
 ;Language view
 INSTL_SELECT_LANGUAGE_TITLE="Odaberite jezik"
-INSTL_SELECT_LANGUAGE_DESC="Molim odaberite jezik koji ćete koristiti tijekom Joomla! instalacijskih koraka."
-INSTL_LANGUAGE_TITLE="Odaberite jezik"
 INSTL_WARNJAVASCRIPT="Upozorenje! JavaScript mora biti omogućen za ispravnu Joomla! instalaciju"
 INSTL_WARNJSON="Vaša PHP instalacija treba imati podršku za JSON da bi se Joomla! mogla instalirati!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Provjera prije instalacije"
-INSTL_PRECHECK_FOR_VERSION="Provjera prije instalacije %s:"
 INSTL_PRECHECK_DESC="Ako bilo koja od ovih stavki nije podržana (obilježena kao <strong class="_QQ_"red"_QQ_">NE</strong>) tada vas molimo da ih omogućite.<br />Ne možete instalirati Joomlu tako dugo dok vaša instalacija ne zadovolji ove zahtjeve."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Preporučene postavke:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ove PHP postavke su preporučene za potpunu kompatibilnost s Joomlom.<br />Ipak, Joomla! će biti funkcionalna i ako postavke nisu identične preporučenima."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Ovo je vjerojatno &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Tip baze podataka"
 INSTL_DATABASE_USER_DESC="Nešto kao "_QQ_"root"_QQ_" ili korisničko ime dobiveno od hostera"
 INSTL_DATABASE_USER_LABEL="Korisničko ime"
-INSTL_DATABASE_TITLE="Postavke povezivanja"
-INSTL_DATABASE_DESC="<p>Joomla! web site sprema sve svoje podatke u bazu podataka. Ovaj prozor instalacijskom programu daje informacije potrebne za izradu te baze podataka.</p><p> Ako Joomlu instalirate na udaljeni server, trebat ćete dobiti te informacije od vašeg hostera.</p><p>Neki hosteri zahtijevaju da bazu izradite prije instalacije Joomle. Ako dobijete poruku "_QQ_"Nije moguće spajanje na bazu podataka"_QQ_", provjerite da li su vaše korisničko ime i lozinka ispravni. Ako i dalje dobivate tu pogrešku, provjerite sa svojim hosterom trebate li izraditi bazu podataka prije same instalacije Joomle.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Automatsko traženje FTP putanje"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP Root direktorij"
 INSTL_FTP_SAVE_LABEL="Sačuvaj FTP lozinku"
 INSTL_FTP_TITLE="FTP Konfiguracija (<strong class="_QQ_"red"_QQ_">Opcionalno - većina korisnika može preskočiti ovaj korak - Kliknite na "_QQ_"Dalje"_QQ_" za preskakanje ovog dijela</strong>)"
 INSTL_FTP_USER_LABEL="FTP korisničko ime"
-INSTL_SITE_NAME_LABEL="Naziv stranice"
 INSTL_VERIFY_FTP_SETTINGS="Provjeri FTP postavke"
 INSTL_FTP_SETTINGS_CORRECT="Postavke ispravne"
 INSTL_FTP_USER_DESC="Upozorenje! Preporučljivo je da ovo ostavite prazno i da unesete vaše FTP korisničko ime prilikom svakog kopiranja datoteka."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Postavite lozinku za vaš Super administratorski rač
 INSTL_ADMIN_PASSWORD2_LABEL="Potvrda Admin lozinke"
 INSTL_ADMIN_USER_LABEL="Admin korisničko ime"
 INSTL_ADMIN_USER_DESC="Postavite korisničko ime za vaš <strong>Super Administrator</strong> korisnički račun."
-INSTL_SITE_NAME_TITLE="Naziv stranice"
+INSTL_SITE_NAME_LABEL="Naziv stranice"
 INSTL_SITE_NAME_DESC="Unesite naziv vaše Joomla! stranice."
 INSTL_SITE_METADESC_LABEL="Opis"
 INSTL_SITE_METADESC_TITLE_LABEL="Unesite opis cjelokupnog web sitea koji će koristiti web pretraživači. Općenito je optimalno upisati do najviše 20 riječi."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Ovdje možete naći konfiguracijske postavke za novo instal
 INSTL_EMAIL_NOT_SENT="Email se nije mogao poslati."
 
 ;Complete view
-INSTL_COMPLETE="Kraj"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalji administratorske prijave"
-INSTL_COMPLETE_DESC1="Kliknite na gumb Stranica da vidite vašu Joomla! web stranicu ili gumb Admin da biste se prijavili kao administrator."
-INSTL_COMPLETE_DESC2="Na Joomla! stranici za pomoć, pronaći ćete korak-po-korak vodič za instalaciju vašeg jezičnog paketa za Joomla! Naći ćete listu linkova sa raspoloživim jezičnim paketima."
-INSTL_COMPLETE_DESC3="Kliknite gumb na desnoj strani da biste otvorili stranicu za pomoć u novom prozoru."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Instalacijski direktorij je već izbrisan."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instalacijski direktorij ne može biti obrisan. Molim, obrišite ga ručno."
 INSTL_COMPLETE_FOLDER_REMOVED="Instalacijski direktorij je uspješno izbrisan"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jezik"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzija"
 INSTL_LANGUAGES_DESC="Joomla sučelje dostupno je na više jezika. Odaberite jezik po želji klikom na kućice i instalirajte ih klikom na tipku Dalje.<br />Opaska: ova operacija trajati će oko 5 sekundi za preuzimanje i instalaciju svakog jezika. Molimo da ne odabirete više od 3 jezika za instalaciju kako bi izbjegli vremenska ograničenja."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ova operacija trajati će do 10 sekundi po jeziku<br />Molimo pričekajte dok preuzmemo i instaliramo jezike..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Molimo, odaberite jezike. Ako ne trebate instalirati druge jezike, odaberite tipku 'Prethodno'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Pritisnite gumb 'Prethodno' ako želite instalirati više jezika."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nije odabran niti jedan jezik za instalaciju. Ako trebate instalirati još jezika, odaberite tipku 'Prethodno' i željene jezike s popisa."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! se nije mogla spojiti na server za jezike. Molimo završite proces instalacije."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Opaska: Moći ćete i kasnije instalirati jezike koristeći Joomla! administratorsko sučelje"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Povratak na posljednji korak instalacije"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instaliraj lokalizirani sadrža
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ako je uključeno, Joomla će autimatski kreirati jednu kategoriju za svaki instalirani jezik. Također će biti kreiran po jedan istaknuti članak s nekim tekstom u svakoj kategoriji."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Višejezičnost"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ovo omogućuje automatsko uključivanje opcije Joomla! višejezičnosti"
-INSTL_DEFAULTLANGUAGE_NOTE="Opaska: jednom kad kliknete tipku Dalje doći ćete natrag na kraj instalacijskog procesa gdje će se pojaviti upit s porukom za brisanje instalacijskog direktorija."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Odaberite vaš osnovni jezik"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Moći ćete to instalirati kasnije koristeći Joomla! Administrator - backend."
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Pojavila se greška prilikom spremanja sigurnosne kopije baze."
 INSTL_DATABASE_ERROR_CREATE="Pojavila se greška prilikom izrade baze %s.<br/> Korisnik možda nema dozvolu za kreiranje baze. Potrebna baza može biti izrađena odvojeno prije nego što nastavite sa instalacijom Joomle."
 INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Greška kod inicijalizacije broja verzije sheme"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Izbriši"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Sigurnosna kopija"
 INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tablice smije imati najviše 15 znaka"
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Potreban je SQL Server 2008 R2 (10.50.160
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Potreban je SQL Server 2008 R2 (10.50.1600.1) ili više za nastavak instalacije. Vaša verzija je: %s"
 INSTL_DATABASE_INVALID_TYPE="Molim odaberite tip baze"
 INSTL_DATABASE_NAME_TOO_LONG="Ime MySQL baze podataka mora imati najviše 64 znaka"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL prefiks tablice mora početi slovom"
 INSTL_DATABASE_INVALID_NAME="MySQL verzija prije verzije 5.1.6 ne smije sadržavati točke ili druge "_QQ_"posebne"_QQ_" znakove u imenu. Vaša verzija je: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL ime baze i tablice ne može početi ili završiti se praznim mjestom (razmaci)."
-INSTL_DATABASE_NAME_INVALID_CHAR="Niti jedan MySQL identifikator ne može sadržavati NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Niti jedan MySQL identifikator ne može sadržavati NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Datoteka %s ne postoji"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Funkcija "_QQ_"SYST"_QQ_" nije uspjela."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Nije moguće automatsko prepoznavanje osnovnog  FTP direktorija"
 
 ;others
-INSTL_ADVANCED_SETTINGS="Napredne postavke"
-INSTL_BASIC_SETTINGS="Osnovne postavke"
 INSTL_CONFPROBLEM="Vaša konfiguracijska datoteka ili direktorij nemaju prava za zapisivanje ili je došlo do problema prilikom izrade konfiguracijske datoteke. Morati ćete ručno učitati slijedeći kod. Kliknite na prostor za tekst za odabir cijelog teksta kôda, zatim ga kopirajte i dodajte u novu datoteku imena 'configuration.php', te datoteku prenesite u osnovni direktorij vaše stranice."
 INSTL_DATABASE_SUPPORT="Podrška baze podataka:"
 INSTL_DISPLAY_ERRORS="Prikaz grešaka"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Postoje greške prilikom punjenja baze: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Nemoguće inicijalizirati shemu baze podataka"
 INSTL_FILE_UPLOADS="Upload datoteke"
 INSTL_GNU_GPL_LICENSE="GNU općom javnom licencom"
-INSTL_INSTALLATION="Instalacija"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON podrška"
-INSTL_LICENSE="Licenca"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC isključeno"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes okruženje"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB jezik je osnovni"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Postupak je u tijeku. Molimo pričekajte..."
 
 ;Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Napredno"
 JCHECK_AGAIN="Provjeri ponovo"
 JERROR="Greška"
 JEMAIL="E-mail"
diff --git a/installation/language/hr-HR/hr-HR.xml b/installation/language/hr-HR/hr-HR.xml
index f8d4d95..ad25699 100644
--- a/installation/language/hr-HR/hr-HR.xml
+++ b/installation/language/hr-HR/hr-HR.xml
@@ -5,7 +5,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012-09-18</creationDate>
 	<author>Joomla! Hrvatska team</author>
- 	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+ 	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/hu-HU/hu-HU.ini b/installation/language/hu-HU/hu-HU.ini
index 65500f1..e5f2485 100644
--- a/installation/language/hu-HU/hu-HU.ini
+++ b/installation/language/hu-HU/hu-HU.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,56 +10,47 @@ INSTL_STEP_COMPLETE_LABEL="Befejezés"
 INSTL_STEP_DATABASE_LABEL="Adatbázis"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Alapértelmezett nyelv kiválasztása"
 INSTL_STEP_FTP_LABEL="FTP konfigurálása"
-INSTL_STEP_LANGUAGE_LABEL="Nyelv"
-INSTL_STEP_LANGUAGES_LABEL="Nyelvek telepítése"
-INSTL_STEP_LICENSE_LABEL="Licenc"
-INSTL_STEP_PREINSTALL_LABEL="Telepítés előtti ellenőrzés"
+INSTL_STEP_LANGUAGES_LABEL="Nyelv"
 INSTL_STEP_SITE_LABEL="Konfiguráció"
 INSTL_STEP_SUMMARY_LABEL="Áttekintés"
-INSTL_STEPS_TITLE="Lépések"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Nyelv kiválasztása"
-INSTL_SELECT_LANGUAGE_DESC="Válassza ki a Joomla! telepítési lépései során használandó nyelvet:"
 INSTL_SELECT_LANGUAGE_TITLE="Válasszon nyelvet"
 INSTL_WARNJAVASCRIPT="Figyelem! A Joomla! megfelelő telepítéséhez engedélyeznie kell a JavaScript használatát."
 INSTL_WARNJSON="A PHP-telepítés a JSON engedélyezését igényli a Joomla telepítéséhez!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Telepítés előtti ellenőrzés"
-INSTL_PRECHECK_FOR_VERSION="A(z) %s telepítés előtti ellenőrzése:"
-INSTL_PRECHECK_DESC="Ha ezen elemek bármelyike nem támogatott (<strong class="_QQ_"red"_QQ_">Nem</strong>mel jelölt), akkor javításuk végett tegye meg a lépéseket. Elmulasztása a Joomla! telepítés nem megfelelő működéséhez vezethet."
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Ajánlott beállítások:"
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Ezek a PHP-beállítások ajánlottak a Joomlával történő teljes kompatibilitás biztosítása végett.<br />Ha ezek a beállítások nem teljesen egyeznek az ajánlottakkal, attól a Joomla! még működni fog."
+INSTL_PRECHECK_DESC="Ha ezen elemek bármelyike nem támogatott (<strong class="_QQ_"red"_QQ_">Nem</strong>mel jelölt), akkor tegye meg a lépéseket a javításukhoz.<br />A Joomla! nem telepíthető, amíg nem felel meg az alábbi követelményeknek."
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Ajánlott beállítások"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Az alábbi PHP-beállítások ajánlottak a Joomlával történő teljes kompatibilitás biztosítása végett.<br />A Joomla! azért még működni fog, ha a beállítások nem teljesen egyeznek az ajánlott konfigurációval."
 INSTL_PRECHECK_DIRECTIVE="Utasítás"
 INSTL_PRECHECK_RECOMMENDED="Ajánlott"
 INSTL_PRECHECK_ACTUAL="Jelenlegi"
 
 ; Database view
-INSTL_DATABASE="Adatbázis konfigurációja"
+INSTL_DATABASE="Adatbázis konfigurálása"
 INSTL_DATABASE_HOST_DESC="Ez általában &quot;localhost&quot;"
 INSTL_DATABASE_HOST_LABEL="Állomás neve"
-INSTL_DATABASE_NAME_DESC="Némely állomás webhelyenként csak bizonyos adatbázisnevet engedélyez. Különböztesse meg táblanév előtaggal a Joomla! webhelyeket."
+INSTL_DATABASE_NAME_DESC="Némely állomás csak bizonyos adatbázisnevet engedélyez webhelyenként. Ebben az esetben táblanév előtaggal különböztesse meg a Joomla! webhelyeket."
 INSTL_DATABASE_NAME_LABEL="Adatbázisnév"
-INSTL_DATABASE_NO_SCHEMA="Nem létezik adatbázis séma ehhez az adatbázis típushoz."
-INSTL_DATABASE_OLD_PROCESS_DESC="Régebbi Joomla! telepítésből meglévő bármilyen tábla lecserélésre kerül"
+INSTL_DATABASE_NO_SCHEMA="Nem létezik adatbázisséma ehhez az adatbázistípushoz."
+INSTL_DATABASE_OLD_PROCESS_DESC="Régebbi Joomla! telepítésekből létező bármely biztonsági másolat tábla lecserélésre fog kerülni"
 INSTL_DATABASE_OLD_PROCESS_LABEL="Régi adatbázis feldolgozása"
-INSTL_DATABASE_PASSWORD_DESC="A webhely biztonsága végett a MySQL-fiók jelszavának használata kötelező"
+INSTL_DATABASE_PASSWORD_DESC="A hely biztonsága végett kötelező az adatbázisfiók jelszavának használata"
 INSTL_DATABASE_PASSWORD_LABEL="Jelszó"
-INSTL_DATABASE_PREFIX_DESC="Válasszon egy táblanév előtagot, vagy használja a <b>véletlenszerűen generáltat</b>. Legjobb, ha hossza három vagy négy karakter, csak alfanumerikus karaktereket tartalmaz, és aláhúzásjellel KELL végződnie. <b>Győződjön meg róla, hogy más táblák nem használják a választott előtagot</b>."
+INSTL_DATABASE_PREFIX_DESC="Válasszon egy táblanév előtagot, vagy használja a <b>véletlenszerűen generáltat</b>. Legjobb, ha hossza három vagy négy karakter, csak alfanumerikus karaktereket tartalmaz, és aláhúzásjellel KELL végződnie. <b>Győződjön meg róla, hogy más táblák nem használják-e a választott előtagot</b>."
 INSTL_DATABASE_PREFIX_LABEL="Táblanév előtag"
 INSTL_DATABASE_PREFIX_MSG="A táblanév előtagnak betűvel kell kezdődnie, melyet tetszés szerinti alfanumerikus karakterek és egy aláhúzásjel követ"
 INSTL_DATABASE_TYPE_DESC="Ez valószínűleg &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Adatbázis típusa"
-INSTL_DATABASE_USER_DESC="Olyasmi, mint a "_QQ_"root"_QQ_", vagy a szolgáltató által adott felhasználónév"
+INSTL_DATABASE_USER_DESC="Olyasféle, mint a "_QQ_"root"_QQ_", vagy a szolgáltató által adott felhasználónév"
 INSTL_DATABASE_USER_LABEL="Felhasználónév"
-INSTL_DATABASE_TITLE="Kapcsolat beállításai"
-INSTL_DATABASE_DESC="<p>A Joomla!-webhelyek adatbázisban tárolják az összes adatot. Ez a képernyő adja meg a telepítőprogramnak az adatbázis létrehozásához szükséges információkat.</p><p> Ha Ön távoli webkiszolgálóra telepíti a Joomlát, akkor ezeket az adatokat a szolgáltatójától fogja megkapni.</p><p>Némely webállomáson a Joomla telepítése előtt kell létrehozni az adatbázist. Ha a "_QQ_"Nem lehetett kapcsolódni az adatbázishoz"_QQ_" üzenet jelenik meg, akkor ellenőrizze, hogy megfelelő-e a felhasználónév és a jelszó. Ha még mindig megjelenik ez az üzenet, akkor ellenőrizze az állomáson, hogy a Joomla telepítése előtt kell-e létrehoznia az adatbázist.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="FTP elérési út automatikus megkeresése"
 INSTL_FTP="FTP konfigurálása"
-INSTL_FTP_DESC="<p>Némely kiszolgálón lehet, hogy a telepítés befejezéséhez meg kell adnia az FTP hitelesítési adatait. Ha nehézségek lépnek föl a telepítés e hitelesítési adatok nélküli befejezésében, akkor állapítsa meg az állomáson, hogy ez szükségszerű-e. </p><p>Biztonsági okokból a legjobb külön FTP felhasználói fiókot készíteni a Joomla! telepítéshez való hozzáféréssel, nem pedig a teljes webkiszolgálóhoz. Szolgáltatója tud Önnek segíteni ebben.</p><p><b>MEGJEGYZÉS:</b> Windows operációs rendszerre való telepítéskor <strong>nincs</strong> szükség az FTP-rétegre.</p>"
+INSTL_FTP_DESC="<p>Lehet, hogy némely kiszolgálón meg kell adnia az FTP hitelesítési adatait a telepítés befejezéséhez. Ha nehézségek lépnek föl a telepítés e hitelesítési adatok nélküli befejezésében, akkor állapítsa meg az állomáson, hogy ez szükségszerű-e. </p><p>Biztonsági okokból a legjobb külön FTP felhasználói fiókot készíteni a Joomla! telepítéshez való hozzáféréssel, nem pedig a teljes webkiszolgálóhoz. Szolgáltatója tud Önnek segíteni ebben.</p><p><b>MEGJEGYZÉS:</b> Windows operációs rendszerre való telepítéskor <strong>nincs</strong> szükség az FTP-rétegre.</p>"
 INSTL_FTP_ENABLE_LABEL="Az FTP-réteg engedélyezése"
 INSTL_FTP_HOST_LABEL="FTP-állomás"
 INSTL_FTP_PASSWORD_LABEL="FTP-jelszó"
@@ -68,29 +59,28 @@ INSTL_FTP_ROOT_LABEL="FTP-gyökérkönyvtár elérési útja"
 INSTL_FTP_SAVE_LABEL="FTP-jelszó mentése"
 INSTL_FTP_TITLE="FTP konfigurálása (<strong class="_QQ_"red"_QQ_">Elhagyható - A legtöbben kihagyhatják ezt a lépést - Nyomja meg a Tovább gombot</strong>)"
 INSTL_FTP_USER_LABEL="FTP-felhasználónév"
-INSTL_SITE_NAME_LABEL="A webhely neve"
 INSTL_VERIFY_FTP_SETTINGS="FTP-beállítások ellenőrzése"
 INSTL_FTP_SETTINGS_CORRECT="A beállítások megfelelőek"
-INSTL_FTP_USER_DESC="Figyelem! Ajánljuk, hogy hagyja üresen ezt a mezőt, és FTP-felhasználónevét minden fájlátvitelkor írja be."
-INSTL_FTP_PASSWORD_DESC="Figyelem! Ajánljuk, hogy hagyja üresen ezt a mezőt, és FTP-jelszavát minden fájlátvitelkor írja be."
+INSTL_FTP_USER_DESC="Figyelem! Ajánljuk, hogy hagyja üresen ezt a mezőt, és minden fájlátvitelkor írja be FTP-felhasználónevét."
+INSTL_FTP_PASSWORD_DESC="Figyelem! Ajánljuk, hogy hagyja üresen ezt a mezőt, és minden fájlátvitelkor írja be FTP-jelszavát."
 
 ;Site View
 INSTL_SITE="Főbeállítások"
 INSTL_ADMIN_EMAIL_LABEL="Adminisztrátor e-mail címe"
 INSTL_ADMIN_EMAIL_DESC="Adjon meg egy e-mail címet. Ez lesz a webhely főadminisztrátorának e-mail címe."
 INSTL_ADMIN_PASSWORD_LABEL="Adminisztrátor jelszava"
-INSTL_ADMIN_PASSWORD_DESC="Adja meg az Ön főadminisztrátori jelszavát, és erősítse meg azt az alábbi mezőben."
-INSTL_ADMIN_PASSWORD2_LABEL="Az adminisztrátor jelszavának megerősítése"
+INSTL_ADMIN_PASSWORD_DESC="Adja meg a főadminisztrátori fiók jelszavát, és erősítse azt meg az alábbi mezőben."
+INSTL_ADMIN_PASSWORD2_LABEL="Adminisztrátor jelszavának megerősítése"
 INSTL_ADMIN_USER_LABEL="Adminisztrátor felhasználóneve"
 INSTL_ADMIN_USER_DESC="Adja meg a főadminisztrátori fiók felhasználónevét."
-INSTL_SITE_NAME_TITLE="Webhely neve"
+INSTL_SITE_NAME_LABEL="Webhely neve"
 INSTL_SITE_NAME_DESC="Írja be Joomla!-webhelye nevét."
 INSTL_SITE_METADESC_LABEL="Leírás"
 INSTL_SITE_METADESC_TITLE_LABEL="Írja be a webhelynek a keresőprogramok által használandó általános leírását. Általában legfeljebb 20 szó optimális."
 INSTL_SITE_OFFLINE_LABEL="A webhely üzemen kívül"
 INSTL_SITE_OFFLINE_TITLE_LABEL="A webhely felhasználói oldalának nem elérhetőre állítása a telepítés befejezése után. A Globális konfigurációban később elérhetővé tehető a webhely."
 INSTL_SITE_INSTALL_SAMPLE_LABEL="Mintaadatok telepítése"
-INSTL_SITE_INSTALL_SAMPLE_DESC="A mintaadatok telepítése nagyon ajánlott kezdők számára.<br />Ez a beállítás a Joomla! telepítőcsomagban lévő mintatartalmat fogja telepíteni."
+INSTL_SITE_INSTALL_SAMPLE_DESC="A mintaadatok telepítése kezdők számára ajánlott nagyon.<br />Ez a beállítás a Joomla! telepítőcsomagban lévő mintatartalmat fogja telepíteni."
 INSTL_SITE_INSTALL_SAMPLE_NONE="Nincs (<strong>Alapszintű natív többnyelvű hely létrehozásához szükséges</strong>)"
 INSTL_SAMPLE_BLOG_SET="Blog angol (GB) mintaadatok"
 INSTL_SAMPLE_BROCHURE_SET="Brosúra angol (GB) mintaadatok"
@@ -102,7 +92,7 @@ INSTL_SAMPLE_BLOG_SET_DESC="A Joomla telepítése néhány cikkel és a bloggal
 INSTL_SAMPLE_BROCHURE_SET_DESC="A Joomla telepítése néhány oldallal (menü Főlap, Rólunk, Hírek, Kapcsolat oldallal) és modulokkal, mint a Keresés, Egyéni HTML, Bejelentkezés űrlap."
 INSTL_SAMPLE_DATA_SET_DESC="A Joomla telepítése egy oldallal (menü egy hivatkozással) és modulokkal, mint a Legújabb cikkek, Bejelentkezés űrlap."
 INSTL_SAMPLE_LEARN_SET_DESC="A Joomla telepítése a Joomla működését bemutató példacikkekkel."
-INSTL_SAMPLE_TESTING_SET_DESC="A Joomla telepítése az összes lehetséges menüponttal a Joomla tesztelésének elősegítése végett."
+INSTL_SAMPLE_TESTING_SET_DESC="A Joomla telepítése az összes lehetséges menüponttal a Joomla tesztelésének elősegítése céljából."
 
 ;Summary view
 INSTL_FINALISATION="Véglegesítés"
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Az alábbiakban megtaláható az újonnan telepített Jooml
 INSTL_EMAIL_NOT_SENT="Nem lehetett elküldeni az e-mailt."
 
 ;Complete view
-INSTL_COMPLETE="Befejezés"
-INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Adminisztrációs bejelentkezési adatok"
-INSTL_COMPLETE_DESC1="Kattintson a Webhely gombra a Joomla! webhely megtekintéséhez, vagy az Adminisztráció gombra, mellyel az adminisztrációba való bejelentkezéshez jut."
-INSTL_COMPLETE_DESC2="A Joomla! közösségi portálon megtalálható az elérhető nyelvi csomagok hivatkozásainak listája, valamint a nyelvi vonatkozású források hivatkozásai a joomla.org lapcsaládon."
-INSTL_COMPLETE_DESC3="Kattintson a jobbra lévő gombra a közösségi portál új ablakban való megnyitásához."
+INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Adminisztráció bejelentkezési adatai"
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Az installation mappa törlése megtörtént már."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Nem lehetett törölni az installation mappát. Kérjük, távolítsa el kézzel a mappát."
 INSTL_COMPLETE_FOLDER_REMOVED="Az installation mappa eltávolítása sikerült"
@@ -147,20 +133,21 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="További lépések: Nyelvek telepítése"
 INSTL_LANGUAGES="Nyelvi csomagok telepítése"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Nyelv"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzió"
-INSTL_LANGUAGES_DESC="A Joomla felülete több nyelven érhető el. Válassza ki a jelölőnégyezeteikre kattintva az előnyben részesített nyelveket, és a Tovább gombra kattintva telepítse őket.<br/>Megjegyzés: Ez a művelet a letöltéshez és minden nyelv telepítéséhez körülbelül 10 másodpercig tart. Az időtúllépések elkerülése végett nem több, mint 3 telepítendő nyelvet jelöljön be."
-INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ennek a műveletnek a befejezése legfeljebb 10 másodpercig tart nyelvenként.<br />Kis türelmet, amíg letöltjük és telepítjük a nyelveket..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Válasszon egy nyelvet. Ha nem kell további nyelveket telepítenie, akkor nyomja meg a 'Vissza' gombot."
+INSTL_LANGUAGES_DESC="A Joomla felülete több nyelven érhető el. Válassza ki a jelölőnégyezeteikre kattintva az előnyben részesített nyelveket, és kattintson a Tovább gombra a telepítésökhöz.<br/>Megjegyzés: Ez a művelet minden nyelv letöltéséhez és telepítéséhez körülbelül 10 másodpercet vesz igénybe. Az időtúllépések elkerülése végett nem több, mint 3 telepítendő nyelvet jelöljön be."
+INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ennek a műveletnek a befejezése nyelvenként legfeljebb 10 másodpercig tart.<br />Kis türelmet kérünk, amíg letöltjük és telepítjük a nyelv(ek)et..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Nyomja meg a 'Vissza' gombot, ha további nyelveket kíván telepíteni."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nem jelölt ki telepítendő nyelvet. Ha több nyelvet kell telepítenie, akkor nyomja meg a 'Vissza' gombot, és válassza ki a listából a kívánt nyelveket."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Nem tudott csatlakozni a Joomla! a nyelvek kiszolgálójához. Fejezze be a telepítési folyamatot."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Megjegyzés: A Joomla! adminisztrációban később tud telepíteni nyelveket"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Vissza az utolsó telepítési lépéshez"
 
 ;Defaultlanguage view
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="A többnyelvű funkció aktiválása"
-INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Ha aktív, akkor mindegyik telepített nyelv honosított menüivel aktív lesz a többnyelvű funkció a Joomla webhelyen"
+INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Az Igen választásakor Joomla webhelyén aktív lesz a többnyelvű funkció, minden telepített nyelv számára honosított menükkel"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="A Nyelvkód beépülő modul engedélyezése"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Ha engedélyezett, akkor a Nyelvkód beépülő modul lehetővé teszi a nyelvkód átváltását a generált HTML-dokumentumban, a keresőoptimalizálás javítása végett."
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Adminisztráció alapértelmezett nyelve"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="A Joomla nem tudta beállítani alapértelmezettként a nyelvet. Az angol lesz a kiszolgáló oldali ADMINISZTRÁCIÓ alapértelmezett nyelve."
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="A Joomla nem tudta alapértelmezettként beállítani a nyelvet. A kiszolgáló oldali ADMINISZTRÁCIÓ alapértelmezett nyelve az angol lesz."
 INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="A Joomla beállította a(z) %s nyelvet az ADMINISZTRÁCIÓ alapértelmezett nyelveként."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Választás"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Nyelv"
@@ -177,17 +164,15 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="A Joomla nem tudta au
 INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="A Joomla nem tudta telepíteni a(z) %s nyelvet."
 INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="A Joomla nem tudta automatikusan közzétenni a nyelvállapot modult"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="A Joomla nem tudta automatikusan visszavonni az alapértelmezett menümodult"
-INSTL_DEFAULTLANGUAGE_DESC="A Joomla a következő nyelveket telepítette. Válassza ki a Joomla adminisztráció óhajtott alapértelmezett nyelvét."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="A Joomla a következő nyelveket telepítette. Válassza ki a Joomla felhasználói oldalának óhajtott alapértelmezett nyelvét."
+INSTL_DEFAULTLANGUAGE_DESC="A Joomla az alábbi nyelveket telepítette. Válassza ki a Joomla adminisztráció kívánt alapértelmezett nyelvét."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="A Joomla az alábbi nyelveket telepítette. Válassza ki a Joomla felhasználói oldalának kívánt alapértelmezett nyelvét."
 INSTL_DEFAULTLANGUAGE_FRONTEND="Webhely alapértelmezett nyelve"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="A Joomla nem tudta alapértelmezettként beállítani a nyelvet. Az angol lesz a WEBHELY felhasználói oldalának alapértelmezett nyelve."
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="A Joomla nem tudta alapértelmezettként beállítani a nyelvet. A WEBHELY felhasználói oldalának alapértelmezett nyelve az angol lesz."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="A Joomla beállította a(z) %s nyelvet a WEBHELY alapértelmezett nyelveként."
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Honosított tartalom telepítése"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ha aktív, akkor a Joomla telepített nyelvenként automatikusan hoz létre egy tartalom-kategóriát. Minden kategóriában egy helyőrző tartalmat tartalmazó kiemelt cikk is létrehozásra kerül"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Többnyelvű webhely"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ebben a részben van lehetőség a Joomla! többnyelvű funkciójának automatikus aktiválására"
-INSTL_DEFAULTLANGUAGE_NOTE="Megjegyzés: A Tovább gomb megnyomása után vissza fog jutni a telepítési folyamat végéhez, ahol az installation mappa törlését kérik."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Válassza ki az alapértelmezett nyelvet"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="A Joomla! adminisztrációban később tudja majd telepíteni"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Az adatbázis biztonsági mentésekor néhány hiba történt."
 INSTL_DATABASE_ERROR_CREATE="Hiba történt a(z) %s adatbázis létrehozásának megkísérlésekor.<br />Lehet, hogy nincs elég engedélye a felhasználónak az adatbázis létrehozásához. Lehet, hogy a Joomla! telepítése előtt külön kell létrehozni a szükséges adatbázist."
 INSTL_DATABASE_ERROR_DELETE="Az adatbázis törlésekor néhány hiba történt."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Hiba történt a sémaverziószám inicializálásakor"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Eltávolítás"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Biztonsági mentés"
 INSTL_DATABASE_FIX_TOO_LONG="A MySQL táblanév előtagnak legfeljebb 15 karakterből kell állnia."
@@ -211,7 +195,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="A telepítés folytatásához 2008 R2 (10
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="A telepítés folytatásához 2008 R2 (10.50.1600.1) vagy újabb szükséges. Az Ön verziója: %s"
 INSTL_DATABASE_INVALID_TYPE="Válassza ki az adatbázis típusát"
 INSTL_DATABASE_NAME_TOO_LONG="A MySQL adatbázis nevének maximum 64 karakterből kell állnia."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="A MySQL táblanév előtagnak betűvel kell kezdődnie, amit csak betűk, számok vagy aláhúzásjelek követhetnek."
 INSTL_DATABASE_INVALID_NAME="Az 5.1.6 előtti MySQL-verziók a névben nem tartalmazhatnak pontot vagy más "_QQ_"speciális"_QQ_" karaktert. Az Ön verziója: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="A MySQL adatbázisnevek és táblanevek nem kezdődhetnek vagy végződhetnek szóközzel."
 INSTL_DATABASE_NAME_INVALID_CHAR="Egy MySQL-azonosító sem tartalmazhat NUL ASCII(0x00) azonosítót."
@@ -231,33 +214,29 @@ INSTL_STD_OFFLINE_MSG="Weblapunk karbantartás miatt nem érhető el.<br /> Kér
 ;FTP model
 INSTL_FTP_INVALIDROOT="A megadott FTP-könyvtár nem ennek a Joomla!-telepítésnek a könyvtára"
 INSTL_FTP_NOCONNECT="Nem lehetett kapcsolódni az FTP-kiszolgálóhoz"
-INSTL_FTP_NODELE="A "_QQ_"DELE"_QQ_" függvény sikertelen."
+INSTL_FTP_NODELE="A "_QQ_"DELE"_QQ_" függvény végrehajtása hibás."
 INSTL_FTP_NODIRECTORYLISTING="Nem lehetett lekérni a könyvtárlistát az FTP-kiszolgálóról."
-INSTL_FTP_NOLIST="A "_QQ_"LIST"_QQ_" függvény sikertelen."
+INSTL_FTP_NOLIST="A "_QQ_"LIST"_QQ_" függvény végrehajtása hibás."
 INSTL_FTP_NOLOGIN="Nem lehetett bejelentkezni az FTP-kiszolgálóra."
-INSTL_FTP_NOMKD="Az "_QQ_"MKD"_QQ_" függvény sikertelen."
-INSTL_FTP_NONLST="Az "_QQ_"NLST"_QQ_" függvény sikertelen."
-INSTL_FTP_NOPWD="A "_QQ_"PWD"_QQ_" függvény sikertelen."
-INSTL_FTP_NORETR="A "_QQ_"RETR"_QQ_" függvény sikertelen."
-INSTL_FTP_NORMD="Az "_QQ_"RMD"_QQ_" függvény sikertelen."
+INSTL_FTP_NOMKD="Az "_QQ_"MKD"_QQ_" függvény végrehajtása hibás."
+INSTL_FTP_NONLST="Az "_QQ_"NLST"_QQ_" függvény végrehajtása hibás."
+INSTL_FTP_NOPWD="A "_QQ_"PWD"_QQ_" függvény végrehajtása hibás."
+INSTL_FTP_NORETR="A "_QQ_"RETR"_QQ_" függvény végrehajtása hibás."
+INSTL_FTP_NORMD="Az "_QQ_"RMD"_QQ_" függvény végrehajtása hibás."
 INSTL_FTP_NOROOT="Nem lehetett elérni a megadott FTP-könyvtárat."
-INSTL_FTP_NOSTOR="A "_QQ_"STOR"_QQ_" függvény sikertelen."
-INSTL_FTP_NOSYST="A "_QQ_"SYST"_QQ_" függvény sikertelen."
+INSTL_FTP_NOSTOR="A "_QQ_"STOR"_QQ_" függvény végrehajtása hibás."
+INSTL_FTP_NOSYST="A "_QQ_"SYST"_QQ_" függvény végrehajtása hibás."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Nem ismerhető fel automatikusan az FTP-gyökérmappa."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Speciális beállítások"
-INSTL_BASIC_SETTINGS="Alapbeállítások"
-INSTL_CONFPROBLEM="A konfigurációs fájl vagy könyvtár nem írható, ill. probléma volt a konfigurációs fájl létrehozásakor. Kézzel kell feltöltenie a következő kódot. Kattintson a szövegterületre a teljes kód kijelöléséhez, majd másolja a vágólapra és illessze be egy új 'configuration.php' nevű fájlba, és töltse föl a webhely gyökérkönyvtárába."
+INSTL_CONFPROBLEM="A konfigurációs fájl vagy könyvtár nem írható, ill. probléma volt a konfigurációs fájl létrehozásakor. Kézzel kell feltöltenie a következő kódot. Kattintson a szövegterületre a teljes kód kijelöléséhez, majd másolja a vágólapra és illessze be egy új 'configuration.php' nevű fájlba, majd töltse föl a webhely gyökérkönyvtárába."
 INSTL_DATABASE_SUPPORT="Adatbázis-támogatás:"
 INSTL_DISPLAY_ERRORS="Display Errors"
 INSTL_ERROR_DB="Néhány hiba merült föl az adatbázis feltöltésekor: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Az adatbázisséma nem inicializálható"
 INSTL_FILE_UPLOADS="Fájlfeltöltések"
 INSTL_GNU_GPL_LICENSE="GNU Általános Nyilvános Licenc"
-INSTL_INSTALLATION="telepítő"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-támogatás"
-INSTL_LICENSE="Licenc"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC ki"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB nyelv az alapértelmezett"
@@ -273,18 +252,17 @@ INSTL_SAFE_MODE="Safe Mode"
 INSTL_SESSION_AUTO_START="Munkamenet automatikus indítása"
 INSTL_WRITABLE="%s írható"
 INSTL_XML_SUPPORT="XML-támogatás"
-INSTL_ZIP_SUPPORT_AVAILABLE="Natív ZIP támogatás"
+INSTL_ZIP_SUPPORT_AVAILABLE="Natív ZIP-támogatás"
 INSTL_ZLIB_COMPRESSION_SUPPORT="Zlib-tömörítés támogatása"
 INSTL_PROCESS_BUSY="A feldolgozás folyamatban van. Várjon..."
 
 ;Global strings
 JADMINISTRATOR="Adminisztráció"
-JADVANCED="Speciális"
 JCHECK_AGAIN="Újraellenőrzés"
 JERROR="Hiba"
 JEMAIL="E-mail cím"
-JGLOBAL_ISFREESOFTWARE="A %s a %s alatt kiadott szabad szoftver."
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="A nyelvi csomag nem egyezik ezzel a Joomla!-verzióval. Lehet, hogy hiányzik néhány karakterlánc."
+JGLOBAL_ISFREESOFTWARE="A %s a %s alatt kiadott szabad szoftver"
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="A nyelvi csomag nem egyezik ezzel a Joomla!-verzióval. Hiányozhat néhány karakterlánc."
 JGLOBAL_SELECT_AN_OPTION="Jelöljön be egy beállítást"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="Nincsenek egyező eredmények"
 JGLOBAL_SELECT_SOME_OPTIONS="Jelöljön be néhány beállítást"
@@ -305,11 +283,12 @@ JLIB_DATABASE_ERROR_DATABASE="Adatbázishiba történt."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Nem tölthető be a(z) %s adatbázis illesztőprogramja"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="A munkamenete lejárt, töltse be újra az oldalt."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Sikertelen másolás"
-JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :fájlok: Nem mappa az elérési út. Elérési út: %s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :fájlok: Az elérési út nem mappa. Elérési út: %s"
 JLIB_FORM_FIELD_INVALID="Érvénytelen mező:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Érvénytelen mező: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Kötelező mező: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Telepítés: A(z) %1$s fájl másolása a(z) %2$s helyre sikertelen."
+JLIB_INSTALLER_NOT_ERROR="Ha a hiba a TinyMCE nyelvi fájljaival kapcsolatos, akkor annak nincs hatása a nyelv(ek) telepítésére. A Joomla! 3.2.0 előtt készített néhány nyelvi csomag megpróbálhat külön TinyMCE nyelvi fájlokat telepíteni. Mivel az alapcsomag most már tartalmazza ezeket, a továbbiakban nincs szükség a telepítésükre."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nem lehetett kapcsolódni az adatbázishoz <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -320,7 +299,7 @@ JNONE="Nincs"
 ;Necessary for errors
 ADMIN_EMAIL="Adminisztrátor e-mail címe"
 ADMIN_PASSWORD="Adminisztrátor jelszava"
-ADMIN_PASSWORD2="Az adminisztrátori jelszó megerősítése"
+ADMIN_PASSWORD2="Adminisztrátor jelszavának megerősítése"
 SITE_NAME="Webhely neve"
 
 ; Database types (allows for a more descriptive label than the internal name)
diff --git a/installation/language/hu-HU/hu-HU.xml b/installation/language/hu-HU/hu-HU.xml
index 77d1754..41ee964 100644
--- a/installation/language/hu-HU/hu-HU.xml
+++ b/installation/language/hu-HU/hu-HU.xml
@@ -6,7 +6,7 @@
 	<author>Hungarian Translation Team</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description/>
 	<files>
diff --git a/installation/language/id-ID/id-ID.ini b/installation/language/id-ID/id-ID.ini
index 4919126..2d011c7 100644
--- a/installation/language/id-ID/id-ID.ini
+++ b/installation/language/id-ID/id-ID.ini
@@ -1,6 +1,6 @@
-; $Id: id-ID.ini 850 2013-10-03 08:43:08Z sikumbang $
+; $Id: id-ID.ini 865 2014-01-29 10:11:21Z sikumbang $
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Selesai"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Pilih Bahasa Standar"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Bahasa"
 INSTL_STEP_LANGUAGES_LABEL="Pasang Bahasa"
-INSTL_STEP_LICENSE_LABEL="Lisensi"
-INSTL_STEP_PREINSTALL_LABEL="Pemeriksaan Pra-pemasangan"
 INSTL_STEP_SITE_LABEL="Pengaturan"
 INSTL_STEP_SUMMARY_LABEL="Ikhtisar"
-INSTL_STEPS_TITLE="Langkah-langkah"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Pilih Bahasa"
-INSTL_SELECT_LANGUAGE_DESC="Silakan pilih bahasa yang akan digunakan selama proses pemasangan Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Pilih Bahasa"
 INSTL_WARNJAVASCRIPT="Peringatan! Konfigurasi JavaScript harus diaktifkan untuk melanjutkan proses pemasangan Joomla!"
 INSTL_WARNJSON="Konfigurasi JSON harus diaktifkan pada pemasangan PHP Anda untuk melanjutkan proses pemasangan Joomla!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Pemeriksaan Pra-pemasangan"
-INSTL_PRECHECK_FOR_VERSION="Pemeriksaan Pra-pemasangan untuk %s:"
 INSTL_PRECHECK_DESC="Jika ada dari butir-butir berikut yang tidak didukung (ditandai dengan <strong class="_QQ_"red"_QQ_">Tidak</strong>) silakan lakukan tindakan untuk memperbaikinya.<br />Anda tidak dapat menginstall Joomla! sampai pengaturan sesuai dengan yang dibutuhkan."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Konfigurasi yang disarankan:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Berikut adalah konfigurasi yang disarankan agar PHP memiliki kesesuaian menyeluruh dengan Joomla!.<br />Joomla! akan tetap berfungsi meskipun konfigurasi tidak persis sama dengan yang disarankan."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Kemungkinan adalah &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Tipe Database"
 INSTL_DATABASE_USER_DESC="Sesuatu seperti "_QQ_"root"_QQ_" atau sebuah nama pengguna yang diberikan penyedia hosting"
 INSTL_DATABASE_USER_LABEL="Nama Pengguna"
-INSTL_DATABASE_TITLE="Pengaturan Koneksi"
-INSTL_DATABASE_DESC="<p> Situs Joomla! menyimpan semua datanya dalam sebuah database. Halaman ini memberikan informasi isian yang dibutuhkan oleh program pemasangan untuk membuat database. </p><p> Jika Anda memasang Joomla! pada sebuah server web jarak jauh (remote), Anda akan mendapatkan informasi isian ini dari pihak penyedia hosting Anda. </p> <p> Beberapa web hosting mengharuskan Anda membuat database sebelum anda memasang Joomla. Jika Anda mendapatkan pesan "_QQ_"Tidak dapat terhubung ke database"_QQ_", periksa apakah nama pengguna dan sandi Anda sudah benar. Jika Anda masih menerima pesan ini, tanyakan web hosting Anda apakah Anda perlu untuk membuat database sebelum memasang Joomla. </p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Temukan Jalur FTP secara otomatis"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="Jalur Pangkal FTP"
 INSTL_FTP_SAVE_LABEL="Simpan Sandi FTP"
 INSTL_FTP_TITLE="Konfigurasi FTP (<strong class="_QQ_"red"_QQ_">Opsional - Sebagian besar pengguna melewati langkah ini - Tekan tombol Berikutnya untuk melewati</strong>)"
 INSTL_FTP_USER_LABEL="Nama Pengguna FTP"
-INSTL_SITE_NAME_LABEL="Nama Situs"
 INSTL_VERIFY_FTP_SETTINGS="Periksa Pengaturan FTP"
 INSTL_FTP_SETTINGS_CORRECT="Pengaturan sudah benar"
 INSTL_FTP_USER_DESC="Peringatan! Anda dianjurkan untuk mengosongkan isian ini dan memasukkan nama pengguna FTP Anda setiap kali mentransfer berkas."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Atur sandi untuk akun Super Administrator dan konfirm
 INSTL_ADMIN_PASSWORD2_LABEL="Konfirmasi Sandi Admin"
 INSTL_ADMIN_USER_LABEL="Nama Pengguna Admin"
 INSTL_ADMIN_USER_DESC="Atur nama pengguna untuk akun Super Administrator Anda."
-INSTL_SITE_NAME_TITLE="Nama Situs"
+INSTL_SITE_NAME_LABEL="Nama Situs"
 INSTL_SITE_NAME_DESC="Masukkan nama untuk situs Joomla! Anda."
 INSTL_SITE_METADESC_LABEL="Deskripsi"
 INSTL_SITE_METADESC_TITLE_LABEL="Masukkan gambaran umum dari situs Anda untuk digunakan oleh mesin pencari. Umumnya paling banyak 20 kata."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Dibawah ini anda bisa temukan konfigurasi untuk website Joo
 INSTL_EMAIL_NOT_SENT="Email gagal dikirimkan."
 
 ;Complete view
-INSTL_COMPLETE="Selesai"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detail Masuk Administrasi"
-INSTL_COMPLETE_DESC1="Klik tombol Situs untuk melihat situs Joomla! And atau klik tombol Admin untuk memasuki halaman administrasi."
-INSTL_COMPLETE_DESC2="Pada Situs Komunitas Joomla! Community Site, anda akan menemukan daftar tautan ke paket bahasa, berikut tautan ke sumber daya terkait pada keluarga situs joomla.org."
-INSTL_COMPLETE_DESC3="Klik tombol dibagian kanan untuk membukan Situs Komunitas pada halaman baru."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Direktori Pemasangan (installation) sudah dihapus."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Direktori Pemasangan (installation) tidak bisa dihapus. Silakan hapus secara manual."
 INSTL_COMPLETE_FOLDER_REMOVED="Direktori Pemasangan berhasil dihapus"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Bahasa"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versi"
 INSTL_LANGUAGES_DESC="Antarmuka Joomla tersedia dalam beberapa bahasa. Pilih bahasa pilihan Anda dengan mengklik pada kotak centang dan memasangnya dengan mengklik tombol Berikutnya.<br/> Catatan: Proses pemasangan ini akan memakan waktu sekitar 10 detik untuk mengunduh dan memasang setiap bahasa. Untuk menghindari timeout silakan pilih tidak lebih dari 3 bahasa untuk dipasang"
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Operasi ini akan berlangsung sampai dengan 10 detik per bahasa untuk diselesaikan<br /> Harap tunggu sementara kami mengunduh dan memasang bahasa..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Silakan, pilih bahasa. Jika Anda tidak ingin menginstal bahasa tambahan tekan tombol 'Sebelumnya'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Tekan tombol 'Sebelumnya' jika Anda ingin memasang bahasa tambahan."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Tidak ada bahasa yang dipilih untuk pasang. Jika Anda ingin menginstal bahasa tambahan tekan tombol 'Sebelumnya' dan pilih bahasa yang diinginkan dari daftar"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! tidak dapat terhubung ke server bahasa. Silakan menyelesaikan proses pemasangan."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Catatan: Anda bisa memasang bahasa nanti dengan menggunakan Joomla! administrator"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Kembali ke langkah pemasangan terakhir"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Pasang konten terlokalisasi"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Jika aktif, Joomla secara otomatis akan membuat satu kategori konten untuk masing-masing bahasa terinstall. Juga, satu artikel terpilih berisi konten dummy akan dibuat pada setiap kategori"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multibahasa"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Bagian ini memungkinkan anda untuk mengaktifkan fitur multibahasa Joomla! secara otomatis"
-INSTL_DEFAULTLANGUAGE_NOTE="Catatan: Setelah Anda menekan tombol Berikutnya Anda akan kembali ke akhir dari proses pemasangan di mana Anda akan diminta untuk menghapus folder pemasangan."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Pilih bahasa standar Anda"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Anda masih bisa menginstalnya nanti menggunakan halaman administrasi Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Terjadi kesalahan (galat) pada saat membuat cadangan database."
 INSTL_DATABASE_ERROR_CREATE="Sebuah kesalahan (galat) telah terjadi pada saat mencoba membuat database %s.<br />Pengguna mungkin tidak memiliki hak akses yang cukup untuk membuat database. Database yang diperlukan mungkin harus dibuat secara terpisah sebelum Anda dapat memasang Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Beberapa kesalahan (galat) telah terjadi pada saat menghapus database."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Galat memulai nomor versi skema"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Hapus"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Buat Cadangan"
 INSTL_DATABASE_FIX_TOO_LONG="Prefiks (awalan) untuk tabel database MySQL tidak boleh lebih dari 15 karakter"
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Anda membutuhkan SQL Server 2008 R2 (10.5
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Anda membutuhkan SQL Server 2008 R2 (10.50.1600.1) atau lebih tinggi untuk melanjutkan proses pemasangan. Versi Anda adalah: %s"
 INSTL_DATABASE_INVALID_TYPE="Silahkan pilih jenis database"
 INSTL_DATABASE_NAME_TOO_LONG="Panjang nama Database MySQL maksimal 64 karakter."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Awalan Table MySQL harus dimulai dengan sebuah huruf dan diikuti oleh huruf, angka dan garisbawah."
 INSTL_DATABASE_INVALID_NAME="Versi MySQL sebelum 5.1.6 tidak boleh mengandung period atau karakter "_QQ_"khusus"_QQ_" pada namanya. Versi anda adalah: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Nama database MySQL dan nama tabel tidak boleh dimulai atau diakhiri dengan spasi."
-INSTL_DATABASE_NAME_INVALID_CHAR="Pengenal MySQL tidak dapat berisi sebuah NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Pengenal MySQL tidak dapat berisi sebuah NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Berkas %s tidak eksis"
 
 ;controllers
@@ -228,7 +211,7 @@ INSTL_PAGE_TITLE="Pemasang Situs Joomla!"
 INSTL_ERROR_CONNECT_DB="Tidak dapat terhubung dengan database. Penghubung mengembalikan angka: %s"
 INSTL_STD_OFFLINE_MSG="Situs ini sedang dalam pemeliharaan.<br />Silahkan periksa kembali beberapa saat lagi."
 
-;Filesystem model
+;FTP model
 INSTL_FTP_INVALIDROOT="Direktori FTP yang ditentukan bukan merupakan direktori pemasangan Joomla! ini"
 INSTL_FTP_NOCONNECT="Tidak bisa terhubung dengan server FTP"
 INSTL_FTP_NODELE="Fungsi "_QQ_"DELE"_QQ_" gagal."
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Fungsi "_QQ_"SYST"_QQ_" gagal."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Tidak bisa otomatis mendeteksi direktori pangkal FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Pengaturan Tingkat Lanjut"
-INSTL_BASIC_SETTINGS="Pengaturan Dasar"
 INSTL_CONFPROBLEM="Berkas konfigurasi anda atau direktori tidak bisa ditulisi atau terjadi masalah pada pembuatan berkas konfigurasi. Anda harus mengunggah kode berikut secara manual. Klik pada area teks untuk menyorot semua kode dan kemudian salin dan tempel kedalam sebuah berkas teks baru. Berinama berkas ini dengan 'configuration.php' dan unggah berkas tersebut ke direktori pangkal situs anda."
 INSTL_DATABASE_SUPPORT="Dukungan Database:"
 INSTL_DISPLAY_ERRORS="Tampilkan Galat"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Beberapa galat terjadi ketika mengisi database: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Tidak dapat mengenali skema database"
 INSTL_FILE_UPLOADS="Unggah Berkas"
 INSTL_GNU_GPL_LICENSE="Lisensi GNU General Public"
-INSTL_INSTALLATION="Pemasangan"
 INSTL_JSON_SUPPORT_AVAILABLE="Dukungan JSON"
-INSTL_LICENSE="Lisensi"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Languange adalah Standar"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Proses sedang berlangsung. Harap tunggu..."
 
 ;Global strings
 JADMINISTRATOR="Administrasi"
-JADVANCED="Tingkat Lanjut"
 JCHECK_AGAIN="Periksa Lagi"
 JERROR="Galat"
 JEMAIL="Email"
@@ -310,6 +288,7 @@ JLIB_FORM_FIELD_INVALID="Isian tidak benar:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Isian yang tidak benar: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Isian yang diperlukan: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Gagal menyalin berkas %1$s ke %2$s."
+JLIB_INSTALLER_NOT_ERROR="Jika galat ini berhubungan dengan pemasangan berkas bahasa TinyMCE maka ini tidak akan memberikan dampak pada pemasangan bahasa secara umum. Beberapa paket bahasa yang dibuat sebelum Joomla 3.2.0 mungkin mencoba memasang berkas bahasa TinyMCE secara terpisah. Karena sekarang sudah sudah disertakan secara standar mereka hal tersebut tidak diperlukan lagi."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Tidak dapat tehubung dengan database <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/id-ID/id-ID.xml b/installation/language/id-ID/id-ID.xml
index 52a019f..38f0dc2 100644
--- a/installation/language/id-ID/id-ID.xml
+++ b/installation/language/id-ID/id-ID.xml
@@ -7,7 +7,7 @@
 	<creationDate>January 2013</creationDate>
 	<author>Tim Hanacaraka Joomla Indonesia</author>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/it-IT/it-IT.ini b/installation/language/it-IT/it-IT.ini
index 65787a0..20084c1 100644
--- a/installation/language/it-IT/it-IT.ini
+++ b/installation/language/it-IT/it-IT.ini
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Conclusione"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Scegli la lingua predefinita"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Lingua"
 INSTL_STEP_LANGUAGES_LABEL="Installa lingue"
-INSTL_STEP_LICENSE_LABEL="Licenza"
-INSTL_STEP_PREINSTALL_LABEL="Controlli pre-installazione"
 INSTL_STEP_SITE_LABEL="Configurazione"
 INSTL_STEP_SUMMARY_LABEL="Riepilogo dati"
-INSTL_STEPS_TITLE="Fasi"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Scegli la lingua"
 INSTL_SELECT_LANGUAGE_TITLE="Seleziona la lingua"
-INSTL_SELECT_LANGUAGE_DESC="Scegli la lingua da utilizzare durante le fasi di installazione di Joomla!®:"
 INSTL_WARNJAVASCRIPT="Attenzione! JavaScript dev'essere abilitato per un'appropriata installazione di Joomla!®"
 INSTL_WARNJSON="La tua installazione di PHP deve avere JSON abilitato perchè Joomla!® venga installato!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Controlli pre-installazione"
-INSTL_PRECHECK_FOR_VERSION="Controlli pre-installazione per %s:"
 INSTL_PRECHECK_DESC="Se alcuni elementi nella lista non sono supportati (indicati come <strong class="_QQ_"red"_QQ_">No</strong>) devono essere prese adeguate misure per correggerne lo stato.<br /> Non puoi installare Joomla!® finchè non vengono rispettati i seguenti requisiti."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Impostazioni raccomandate"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Queste sono le impostazioni del PHP raccomandate per assicurare la piena compatibilità con Joomla!®.<br />In ogni caso, Joomla!® potrebbe anche funzionare se le impostazioni non corrispondessero pienamente alla configurazione raccomandata."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Generalmente è &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Tipo database"
 INSTL_DATABASE_USER_DESC="Potrebbe essere il nome utente Mysql predefinito "_QQ_"root"_QQ_" oppure un nome utente fornito dal tuo gestore di hosting oppure un nome utente da te impostato al momento della creazione del database."
 INSTL_DATABASE_USER_LABEL="Nome utente"
-INSTL_DATABASE_TITLE="Configurazione connessione"
-INSTL_DATABASE_DESC="<p>Un sito Joomla!® registra tutti i dati nel database. Questa schermata fornisce al programma di installazione le informazioni necessarie per creare la struttura del database.</p><p> Se stai installando Joomla!® su un server remoto, avrai bisogno delle seguenti informazioni dal tuo host.</p><p>Alcuni host richiedono di creare il database prima di installare Joomla. Se ottieni questo messaggio "_QQ_"Impossibile connettersi al database"_QQ_", controlla che i tuoi username e password siano corretti. Se vedi ancora questo messaggio, controlla con il tuo host se c'è bisogno di creare il database prima di installare Joomla!®.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Trova automaticamente il percorso FTP"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="Percorso root FTP"
 INSTL_FTP_SAVE_LABEL="Salva Password FTP"
 INSTL_FTP_TITLE="Configurazione FTP (<strong class="_QQ_"red"_QQ_">Opzionale - La maggior parte degli utenti può saltare questa fase - Clicca su Avanti per proseguire</strong>)"
 INSTL_FTP_USER_LABEL="Nome utente FTP"
-INSTL_SITE_NAME_LABEL="Nome sito"
 INSTL_VERIFY_FTP_SETTINGS="Verifica le impostazioni FTP"
 INSTL_FTP_SETTINGS_CORRECT="Impostazioni corrette"
 INSTL_FTP_USER_DESC="Attenzione! Si raccomanda di lasciare questo campo vuoto e inserire il proprio nome utente FTP ogni volta che si trasferiscono dei file."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Imposta la password dell'account Super Amministratore
 INSTL_ADMIN_PASSWORD2_LABEL="Conferma Password amministratore"
 INSTL_ADMIN_USER_LABEL="Nome utente amministratore"
 INSTL_ADMIN_USER_DESC="Imposta il nome utente per il tuo account Super Amministratore."
-INSTL_SITE_NAME_TITLE="Nome sito"
+INSTL_SITE_NAME_LABEL="Nome sito"
 INSTL_SITE_NAME_DESC="Inserisci il nome del tuo sito Joomla!®."
 INSTL_SITE_METADESC_LABEL="Descrizione"
 INSTL_SITE_METADESC_TITLE_LABEL="Inserisci una descrizione del sito che verrà utilizzata dai motori di ricerca. Generalmente, è ottimale un massimo di 20 parole."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Di seguito sono riportate le impostazioni della configurazi
 INSTL_EMAIL_NOT_SENT="Non è stato possibile inviare l'email."
 
 ;Complete view
-INSTL_COMPLETE="Conclusione"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Dettagli Login Amministratore"
-INSTL_COMPLETE_DESC1="Clicca sul pulsante Sito per vedere la prima pagina del sito Joomla!® oppure su Pannello amministrativo per accedere all'amministrazione di Joomla!®."
-INSTL_COMPLETE_DESC2="Cliccando sul link <i>Joomla!® nella tua lingua?</i>  presente nel riquadro qui a destra, troverai delle indicazioni (in inglese) per installare i pacchetti lingua disponibili."
-INSTL_COMPLETE_DESC3="Clicca sul pulsante a destra per aprire il sito Community in una nuova finestra."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="La cartella installation è già stata eliminata."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Non è stato possibile eliminare la cartella installation. Elimina la cartella manualmente."
 INSTL_COMPLETE_FOLDER_REMOVED="Cartella installation eliminata correttamente"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Lingua"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versione"
 INSTL_LANGUAGES_DESC="L'interfaccia di Joomla!® è disponibile in molte lingue. Scegli le lingue selezionando i ckeckbox e poi installale cliccando sul pulsante Avanti.<br/>Nota: questa operazione richiederà circa 10 secondi per il download e l'installazione delle lingue. Per evitare il timeout non selezionare più di 3 lingue alla volta."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Questa operazione richiederà fino a 10 secondi a lingua<br />Download e installazione delle lingue, attendere prego... "
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Seleziona una lingua. Se non hai bisogno di installare altre lingue, clicca sul pulsante 'Indietro'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Clicca il pulsante 'Indietro' se desideri installare altre lingue."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Non è stata selezionata alcuna lingua da installare. Se hai bisogno di installare altre lingue, clicca sul pulsante 'Indietro' e scegli dall'elenco le lingue che desideri."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla!® non si è potuto connettere al server delle lingue. Concludi il processo di installazione."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Potrai installare le lingue successivamente dal pannello amministrativo di Joomla!®"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Torna all'ultima fase dell'installazione"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Installa contenuti localizzati"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Se attivato, Joomla!® creerà automaticamente una categoria di contenuti per ciascuna lingua installata. Inoltre verrà creato un articolo in evidenza con un testo semplice per ciascuna categoria"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingua"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Questa sezione ti consente di attivare automaticamente il multilingua di Joomla!®"
-INSTL_DEFAULTLANGUAGE_NOTE="Nota: una volta cliccato sul pulsante Avanti tornerai alla fine del processo di installazione dove ti verrà chiesto di eliminare la cartella installation."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Seleziona la tua lingua predefinita"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="La potrai installare successivamente da amministrazione di Joomla!®"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Si sono verificati alcuni errori durante il back up del database."
 INSTL_DATABASE_ERROR_CREATE="Si è verificato un errore durante la creazione del database %s.<br />L'utente sql potrebbe non avere i privilegi per creare un database. Il database richiesto deve quindi essere creato separatamente prima di installare Joomla!®."
 INSTL_DATABASE_ERROR_DELETE="Si sono verificati alcuni errori durante la cancellazione del database."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Errore nell'inizializzazione del numero di versione dello schema"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Elimina"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Salva"
 INSTL_DATABASE_FIX_TOO_LONG="Il prefisso delle tabelle MySQL deve essere al massimo di 15 caratteri."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Devi avere la versione di SQL Server 2008
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Devi avere la versione di SQL Server 2008 R2 (10.50.1600.1) o superiore per continuare l'installazione. La tua versione è: %s"
 INSTL_DATABASE_INVALID_TYPE="Indicare il tipo di database utilizzato"
 INSTL_DATABASE_NAME_TOO_LONG="Il nome del Database MySQL deve essere al massimo di 64 caratteri."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Il prefisso delle tabelle MySQL deve iniziare con una lettera ed essere seguito da sole lettere, numeri o underscore."
 INSTL_DATABASE_INVALID_NAME="Versioni di MySQL precedenti la 5.1.6 non possono contenere periodi o altri caratteri "_QQ_"speciali"_QQ_" nel nome. La tua versione: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Il nome del database MySQL e i nomi delle tabelle non devono iniziare o finire con spazi."
-INSTL_DATABASE_NAME_INVALID_CHAR="Nessun identificatore MySQL può contenere un NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Nessun identificatore MySQL può contenere un NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Il file %s non esiste"
 
 ;controllers
@@ -246,18 +229,14 @@ INSTL_FTP_NOSYST="E' fallita la funzione "_QQ_"SYST"_QQ_"."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Impossibile determinare la cartella root FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Configurazione avanzata"
-INSTL_BASIC_SETTINGS="Configurazione base"
-INSTL_CONFPROBLEM="Il file di configurazione o la cartella non è scrivibile,\n                        oppure si sono verificati problemi durante la creazione del file configuration.php.\n                        Crea un nuovo file configuration.php nella root del tuo sito e copia manualmente il seguente. Clicca nell'area di testo sottostante per evidenziare il codice\n ."
+INSTL_CONFPROBLEM="Il file di configurazione o la cartella non è scrivibile, oppure si sono verificati problemi durante la creazione del file configuration.php. Clicca nell'area di testo sottostante per evidenziare tutto il codice e copialo in un nuovo file di testo. Nomina questo file configuration.php e caricalo nella root del tuo sito."
 INSTL_DATABASE_SUPPORT="Supporto Database:"
 INSTL_DISPLAY_ERRORS="Display Errors"
 INSTL_ERROR_DB="Si sono verificati alcuni errori durante il popolamento del database: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Impossibile inizializzare lo schema del database"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Installazione"
 INSTL_JSON_SUPPORT_AVAILABLE="Supporto JSON"
-INSTL_LICENSE="Licenza"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB language è predefinito"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Processo in esecuzione. Attendere prego..."
 
 ;Global strings
 JADMINISTRATOR="Pannello amministrativo"
-JADVANCED="Avanzato"
 JCHECK_AGAIN="Controlla di nuovo"
 JERROR="Errore"
 JEMAIL="Email"
@@ -303,13 +281,14 @@ JYES="Sì"
 JLIB_DATABASE_ERROR_DATABASE="Si è verificato un errore del database."
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Non è stato possibile connettersi a MySQL."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Non è stato possibile caricare il Database Driver: %s"
-JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: il percorso non è una cartella. Percorso: %s"
-JLIB_FORM_FIELD_INVALID="Campo non valido:&#160;"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="La tua sessione è scaduta, ricarica la pagina."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Copia fallita"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: il percorso non è una cartella. Percorso: %s"
+JLIB_FORM_FIELD_INVALID="Campo non valido:&#160;"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Campo richiesto: %s"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Campo non valido: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Copia del file %1$s in %2$s fallita."
+JLIB_INSTALLER_NOT_ERROR="Se l'errore è correlato all'installazione dei file lingua di TinyMCE, non ha effetto sull'installazione della(e) lingua(e). Alcuni pacchetti lingua creati prima di Joomla! 3.2.0 potrebbero cercare di installare separatamente i file lingua di TinyMCE. Ora sono inclusi nel core quindi non è più necessario installarli."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Non è stato possibile connettersi al database <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -330,4 +309,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/it-IT/it-IT.xml b/installation/language/it-IT/it-IT.xml
index 98fa5b3..561e6e1 100644
--- a/installation/language/it-IT/it-IT.xml
+++ b/installation/language/it-IT/it-IT.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>March 2009</creationDate>
 	<author>Italian Translation team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Italian language installation for Joomla</description>
 	<files>
diff --git a/installation/language/ja-JP/ja-JP.ini b/installation/language/ja-JP/ja-JP.ini
index 1173a72..cd124dd 100644
--- a/installation/language/ja-JP/ja-JP.ini
+++ b/installation/language/ja-JP/ja-JP.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="完了"
 INSTL_STEP_DATABASE_LABEL="データベース"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="標準言語の選択"
 INSTL_STEP_FTP_LABEL="FTP(オプション)"
-INSTL_STEP_LANGUAGE_LABEL="言語"
 INSTL_STEP_LANGUAGES_LABEL="言語のインストール"
-INSTL_STEP_LICENSE_LABEL="ライセンス"
-INSTL_STEP_PREINSTALL_LABEL="インストール前の確認"
 INSTL_STEP_SITE_LABEL="サイト設定"
 INSTL_STEP_SUMMARY_LABEL="概要"
-INSTL_STEPS_TITLE="手順"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="インストール言語の選択"
-INSTL_SELECT_LANGUAGE_DESC="インストール作業で使用する言語を選択してください。"
 INSTL_SELECT_LANGUAGE_TITLE="言語の選択"
 INSTL_WARNJAVASCRIPT="警告 - Joomla!をインストールするにはJavaScriptを有効にする必要があります。"
 INSTL_WARNJSON="JoomlaをインストールするにはPHPでJSONが扱える必要があります。"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="インストール前の確認"
-INSTL_PRECHECK_FOR_VERSION="インストール前の確認 for %s:"
 INSTL_PRECHECK_DESC="<strong class="_QQ_"red"_QQ_">いいえ</strong>の項目があれば、修正してからインストールを進めてください。<br />下記の要件を満たすまでJoomla!をインストールできません。"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="推奨設定"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Joomlaのと完全な互換性を確保するための推奨PHP設定です。<br />ここで示された推奨値のとおりでなくても、インストール作業を進めることができますが、機会があれば修正することをおすすめします。"
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="おそらく <b>MySQLi</b> をご利用です"
 INSTL_DATABASE_TYPE_LABEL="データベース"
 INSTL_DATABASE_USER_DESC="データベースのユーザ名です。"
 INSTL_DATABASE_USER_LABEL="ユーザ名"
-INSTL_DATABASE_TITLE="接続設定"
-INSTL_DATABASE_DESC="<p>データベースの設定を指定します。テーブルプレフィックスを変更してデータ領域を分けると、複数のJoomla!をインストールできます。</p><p>このインストールがアップデート作業である場合は、運用中のデータ(テーブル)をここで同時にバックアップすることができます。</p>" 
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="FTPパスを自動検出"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTPルートパス"
 INSTL_FTP_SAVE_LABEL="FTPパスワードの保存"
 INSTL_FTP_TITLE="FTP設定 (※このステップは省略できます)"
 INSTL_FTP_USER_LABEL="FTPユーザ名"
-INSTL_SITE_NAME_LABEL="サイト名"
 INSTL_VERIFY_FTP_SETTINGS="FTP設定を確認する"
 INSTL_FTP_SETTINGS_CORRECT="設定は正常です"
 INSTL_FTP_USER_DESC="空白のままにして、ファイル転送のたびにユーザ名を入力することをおすすめします。安全管理上の懸念がない場合は、ここで設定しておくと便利です。"
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="最高管理者のパスワードを指定し、下
 INSTL_ADMIN_PASSWORD2_LABEL="パスワード再入力"
 INSTL_ADMIN_USER_LABEL="管理者ユーザ名"
 INSTL_ADMIN_USER_DESC="最高管理者のユーザ名を設定します。"
-INSTL_SITE_NAME_TITLE="サイト名"
+INSTL_SITE_NAME_LABEL="サイト名"
 INSTL_SITE_NAME_DESC="サイト名を入力します。"
 INSTL_SITE_METADESC_LABEL="サイトの説明<br />(meta-description)"
 INSTL_SITE_METADESC_TITLE_LABEL="検索エンジンの検索結果一覧に表示される、サイト全体の説明文を入力します。<br />一般的に最大110文字まで認識されますが、簡潔で分かりやすい文章が効果的です。"
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="サイト設定の内容は以下のとおりです。"
 INSTL_EMAIL_NOT_SENT="メール送信できませんでした。"
 
 ;Complete view
-INSTL_COMPLETE="完了"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="管理者ログイン情報"
-INSTL_COMPLETE_DESC1="インストールを完了し、管理画面にログインできるようになりました。正しくインストールされたことを確認するために、以下のチェックをおすすめします。<ul><li>グローバル設定を開き、各部の設定を任意に変更</li><li>既存の記事を編集・更新</li><li>テンプレートを変更(サイトおよび管理画面)</li><li>プラグインの一覧を開き、利用できる機能を確認</li><li>プロファイルの設定を任意に変更</li></ul>問題点がありましたら、公式フォーラムに報告をお願いします。"
-INSTL_COMPLETE_DESC2=""
-INSTL_COMPLETE_DESC3=""
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="installationディレクトリはすでに削除されています。"
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="installationディレクトリを削除することができませんでした。手動でフォルダを削除してください。"
 INSTL_COMPLETE_FOLDER_REMOVED="installationディレクトリを正常に削除しました"
@@ -149,7 +135,9 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="言語"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="バージョン"
 INSTL_LANGUAGES_DESC="Joomla!のインターフェイスは、いくつかの言語で提供されています。チェックボックスをクリックしてお好みの言語を選択し、「次へ」ボタンをクリックしてインストールします。<br/>（注）各言語のダウンロードしてインストールするには10秒ほどかかります。タイムアウトを回避するには、インストールする言語は3つ以内にしてください。"
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="完了までに言語ごとに最大10秒かかります。<br />言語をダウンロードしてインストールが完了するまで、しばらくお待ちください..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="言語を選択してください。他の言語をインストールする必要がない場合は、「前へ」ボタンを押してください"
+INSTL_LANGUAGES_MORE_LANGUAGES="もっと多くの言語をインストールするには「前へ」ボタンを押してください。"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="インストールする言語を選択してください。さらに言語を追加する場合は、「前へ」ボタンを押して一覧から言語を選んでください。"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="インストールする言語を選択してください。他の言語をインストールする必要がない場合は、「前へ」ボタンを押してください"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla!の言語サーバに接続できませんでした。インストール作業を完了してください。"
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="（注）後ほど管理画面から言語をインストールすることができます。"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="最後のインストール手順に戻る"
@@ -186,8 +174,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="ローカライズされたコ
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="自動的にインストールされた各言語に対してコンテンツカテゴリを1つ作成し、各カテゴリにサンプル注目記事を1つ作成します。"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="多言語機能"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="自動的にJoomlaの多言語機能を有効にすることができます"
-INSTL_DEFAULTLANGUAGE_NOTE="（注）一度「次へ」ボタンを押すと、インストールの最終処理ページに戻り、installation フォルダを削除するよう要求されます。"
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="標準言語の選択"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="管理画面で後でインストールすることができます"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +186,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="データベースのバックアップ中にいくつかのエラーが発生しました。"
 INSTL_DATABASE_ERROR_CREATE="データベース %s の作成中にエラーが発生しました。<br />ユーザがデータベースを作成する十分な特権を持っていない場合があります。必要なデータベースは、Joomla!をインストールする前に別に作成する必要があります。"
 INSTL_DATABASE_ERROR_DELETE="データベースの削除中にいくつかのエラーが発生しました。"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="スキーマバージョン番号の初期化エラー"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="削除"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="バックアップ"
 INSTL_DATABASE_FIX_TOO_LONG="The MySQLテーブルのプレフィックスは最大15文字まで入力できます。"
@@ -211,10 +196,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="インストールを続行するにはSQ
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="インストールを続行するにはSQLサーバ 2008 R2 (10.50.1600.1)以上が必要です。お使いのバージョンは %s です。"
 INSTL_DATABASE_INVALID_TYPE="データベースの種類を選択してください"
 INSTL_DATABASE_NAME_TOO_LONG="MySQLデータベース名は最大64文字まで入力できます。"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQLテーブルのプレフィックスは文字で始まる必要があり、そのあと文字、数字またはアンダースコアのみで続けて記述します。"
 INSTL_DATABASE_INVALID_NAME="MySQLの5.1.6以前のバージョンはピリオドまたはその他の 特殊文字を含めることはできません。お使いのバージョンは %s です。"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQLデータベース名とテーブル名は先頭や末尾にスペースを入れることはできません。"
-INSTL_DATABASE_NAME_INVALID_CHAR="MySQLの識別子にnull文字のASCII(0x00)を含めることはできません。"
+INSTL_DATABASE_NAME_INVALID_CHAR="MySQLの識別子にNULL、ASCII（0x00）を含めることはできません。"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="ファイル %s は存在しません"
 
 ;controllers
@@ -246,8 +230,6 @@ INSTL_FTP_NOSYST=""_QQ_"SYST"_QQ_" 失敗しました。"
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTPルートフォルダを自動検出できません。"
 
 ;others
-INSTL_ADVANCED_SETTINGS="詳細設定"
-INSTL_BASIC_SETTINGS="基本設定"
 INSTL_CONFPROBLEM="設定ファイルの生成中に問題が発生しました。設定ファイルあるいはディレクトリが書き込み可能でないため、手動で次のコードをアップロードする必要があります。テキストエリアをクリックしてすべてのコードを選択状態にしてコピーし、新規テキストファイルに貼り付けて、ファイル名を「configuration.php」とし、サイトのルートフォルダにアップロードしてください。"
 INSTL_DATABASE_SUPPORT="Database Support:"
 INSTL_DISPLAY_ERRORS="Display Errors"
@@ -255,9 +237,7 @@ INSTL_ERROR_DB="データベース %s の作成中にいくつかのエラーが
 INSTL_ERROR_INITIALISE_SCHEMA="データベーススキーマを初期化できません"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU一般公衆利用許諾契約"
-INSTL_INSTALLATION="のインストール"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
-INSTL_LICENSE="ライセンス"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
@@ -279,7 +259,6 @@ INSTL_PROCESS_BUSY="プロセスが進行中です。しばらくお待ちくだ
 
 ;Global strings
 JADMINISTRATOR="管理画面"
-JADVANCED="詳細"
 JCHECK_AGAIN="再チェック"
 JERROR="エラー"
 JEMAIL="メールアドレス"
@@ -306,7 +285,7 @@ JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="データベースドライバを読
 JLIB_ENVIRONMENT_SESSION_EXPIRED="セッションが無効になったため、ログアウトされました。ページを再読込してください。"
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="コピーに失敗しました"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: パスはフォルダではありません。 パス: %s"
-JLIB_FORM_FIELD_INVALID="&#160 を入力してください"
+JLIB_FORM_FIELD_INVALID="未入力箇所があります:&#160"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="<b>%s</b> は入力必須です"
 JLIB_FORM_VALIDATE_FIELD_INVALID="無効な項目です: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: ファイル %1$s を %2$s にコピーできませんでした"
@@ -342,4 +321,4 @@ INSTL_SAMPLE_BLOG_JP_SET_DESC="いくつかの記事と過去の記事、ブロ
 INSTL_SAMPLE_BROCHURE_JP_SET_DESC="いくつかのページ（ホーム・私たちについて・ニュース・お問い合わせで構成されるメニュー）と検索、カスタムHTML、ログインフォームモジュールを表示したサンプルです。"
 INSTL_SAMPLE_DATA_JP_SET_DESC="1ページ（1リンクのみのメニュー）と最新の記事、ログインフォームモジュールを表示したサンプルです。"
 INSTL_SAMPLE_LEARN_JP_SET_DESC="どのようにJoomla!が動作するかの解説記事を表示したサンプルです。"
-INSTL_SAMPLE_TESTING_JP_SET_DESC="Joomla!の動作テストに役立つすべてのメニューアイテムを表示したサンプルです。"
+INSTL_SAMPLE_TESTING_JP_SET_DESC="Joomla!の動作テストに役立つすべてのメニューアイテムを表示したサンプルです。"
\ No newline at end of file
diff --git a/installation/language/ja-JP/ja-JP.xml b/installation/language/ja-JP/ja-JP.xml
index a575403..f1a8171 100644
--- a/installation/language/ja-JP/ja-JP.xml
+++ b/installation/language/ja-JP/ja-JP.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012-09-24</creationDate>
 	<author>Japanese Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/ko-KR/ko-KR.xml b/installation/language/ko-KR/ko-KR.xml
index 12a9304..c501115 100644
--- a/installation/language/ko-KR/ko-KR.xml
+++ b/installation/language/ko-KR/ko-KR.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>SEPTEMBER 2012</creationDate>
 	<author>kangc</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/lv-LV/lv-LV.ini b/installation/language/lv-LV/lv-LV.ini
index d01e9ca..9913561 100644
--- a/installation/language/lv-LV/lv-LV.ini
+++ b/installation/language/lv-LV/lv-LV.ini
@@ -1,4 +1,4 @@
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; Database types (allows for a more descriptive label than the internal name)
 ; Database view
 ; Framework strings necessary when no lang pack is available
@@ -17,14 +17,8 @@ INSTL_ADMIN_PASSWORD_DESC="Ievadiet vietnes galvenā administratora paroli un ap
 INSTL_ADMIN_PASSWORD_LABEL="Administratora parole"
 INSTL_ADMIN_USER_DESC="Jums ir iespēja mainīt noklusēto administratora lietotāja vārdu <strong>admin</strong>."
 INSTL_ADMIN_USER_LABEL="Administratora lietotāja vārds"
-INSTL_ADVANCED_SETTINGS="Papildus izvēles"
 INSTL_AUTOFIND_FTP_PATH="Automātiski meklēt FTP ceļu"
-INSTL_BASIC_SETTINGS="Pamata izvēles"
-INSTL_COMPLETE="Beigas"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Pieslēgšanās administrācijai"
-INSTL_COMPLETE_DESC1="Spiediet pogu "_QQ_"Vietne"_QQ_", lai atvērtu jaunizveidoto Joomla vietni vai pogu "_QQ_"Administrācijas panelis"_QQ_", lai atvērtu administrācijas paneli."
-INSTL_COMPLETE_DESC2="Joomla kopienas vietnē jūs atradīsiet saites tulkojuma pakotņu ielādei kā arī citus ar valodām saistītus resursus joomla.org vietnēs."
-INSTL_COMPLETE_DESC3="Spiediet pogu labajā pusē, lai atvērtu kopienas vietni jaunā logā."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Instalācijas mape jau ir izdzēsta."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instalācijas mapi nav iespējams izdzēst. Jums ir jāizdzēš tā pašam."
 INSTL_COMPLETE_FOLDER_REMOVED="Instalācijas mape ir izdzēsta."
@@ -40,12 +34,10 @@ INSTL_COOKIES_NOT_ENABLED="Iespējams pārlūkprogrammai nav ieslēgts sīkdatņ
 INSTL_DATABASE="Datu bāzes konfigurācija"
 INSTL_DATABASE_COULD_NOT_CONNECT="Nevar pieslēgties datu bāzei.  Kļūdas paziņojums: %s"
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Nav iespējams atjaunot aprakstošo failu kešu paplašinājumam: %s"
-INSTL_DATABASE_DESC="<p>Joomla vietnes uzstādīšana uz jūsu servera sastāv no 4 vienkāršiem soļiem...</p><p>Lūdzu ievadiet servera adresi, kur instalēsiet savu vietni.</p><p>Ievadiet MySQL lietotāja vārdu, paroli un datu bāzes nosaukumu.</p><p>Ievadiet instalējamās vietnes tabulu prefiksu. Izvēlieties kā rīkoties ar vecās instalācijas tabulām. Ja veiciet instalāciju uz attālināta servera, tad datu bāzes informāciju variet saņemt no sava pakalpojuma sniedzēja, vai izveidot datu bāzi pašapkalpošanās vietnē.</p>"
 INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Kļūda veidojot datu bāzes rezerves kopiju."
 INSTL_DATABASE_ERROR_CREATE="Kļūda izveidojot datu bāzi %s.<br /> Iespējams datu bāzes lietotājam nav tiesību izveidot datu bāzi. Šādā gadījumā Jums ir jāizveido datu bāze pirms Joomla instalācijas."
 INSTL_DATABASE_ERROR_DELETE="Kļūda dzēšot datu bāzi"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Kļūda inicializējot shēmas versijas numuru"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Izveidot rezerves tabulas"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Dzēst"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Fails %s nav atrodams"
@@ -70,11 +62,9 @@ INSTL_DATABASE_OLD_PROCESS_LABEL="Rīcība ar veco datu bāzi"
 INSTL_DATABASE_PASSWORD_DESC="Lai nodrošinātu vietnes drošību, obligāti jālieto datu bāzes lietotāja parole."
 INSTL_DATABASE_PASSWORD_LABEL="Parole"
 INSTL_DATABASE_PREFIX_DESC="Ierakstiet datu bāzes tabulu prefiksu vai izvēlieties <b>automātiski ģenerētu</b>, tam būtu jābūt trīs vai četrus simbolus garam, jāsastāv tikai no latīņu burtiem un OBLIGĀTI jābeidzas ar pasvītrojuma zīmi. <b>Pārliecinieties, ka šāds prefikss netiek lietots citām tabulām</b>."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL tabulas prefiksam jāsākas ar burtu, pēc tam var būt tikai burti, cipari, vai pasvītrojuma simboli"
 INSTL_DATABASE_PREFIX_LABEL="Tabulas nosaukuma prefikss"
 INSTL_DATABASE_PREFIX_MSG="Datu bāzes prefiksam ir jāsākas ar burtu, pēc tā var būt cipari, burti un pasvītrojuma zīmes."
 INSTL_DATABASE_SUPPORT="Datu bāzu atbalsts:"
-INSTL_DATABASE_TITLE="Datu bāzes pieslēguma informācija"
 INSTL_DATABASE_TYPE_DESC="Tas parasti ir "_QQ_"MySQLi"_QQ_""
 INSTL_DATABASE_TYPE_LABEL="Datu bāzes tips"
 INSTL_DATABASE_USER_DESC="Var būt  "_QQ_"root"_QQ_" vai kāds cits resursu izīrētāja dots lietotāja vārds"
@@ -111,8 +101,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Izvēloties šo iespēju,
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Šajā sadaļā var ieslēgt Joomla daudzvalodu funkcijas"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Vairāku valodu"
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Latviešu"
-INSTL_DEFAULTLANGUAGE_NOTE="Ievērojiet: pēc pogas 'Turpināt' nospiešanas, tiks atvērts pēdējais instalācijas logs, kurā prasīs izdzēst instalācijas mapi."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Izvēlieties noklusēto valodu"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Būs iespēja to instalēt vēlāk administrācijas panelī."
 INSTL_DISPLAY_ERRORS="Rādīt kļūdu paziņojumus"
 INSTL_EMAIL_HEADING="Šeit ir iespējams apskatīt jaunās Joomla vietnes iestatījumu kopsavilkumu:"
@@ -153,7 +141,6 @@ INSTL_FTP_USER_DESC="Uzmanību! Ir ieteicams šo lauku atstāt neaizpildītu un
 INSTL_FTP_USER_LABEL="FTP lietotāja vārds"
 INSTL_GNU_GPL_LICENSE="GNU/GPL licence"
 INSTL_HEADER_ERROR="Kļūda"
-INSTL_INSTALLATION="Instalācija"
 INSTL_INSTALLING="Notiek instalācija..."
 INSTL_INSTALLING_CONFIG="Konfigurācijas datnes izveide"
 INSTL_INSTALLING_DATABASE="Datu bāzes tabulu izveide"
@@ -167,12 +154,11 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Valoda"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versija"
 INSTL_LANGUAGES_DESC="Joomla lietotāja interfeiss ir pieejams vairākās valodās. Izvēlieties jums nepieciešamās, atzīmējot izvēles rūtiņas, un spiediet pogu 'Turpināt'.<br/>Ievērojiet: lai ielādētu un instalētu katru tulkojumu būs vajadzīgs vismaz 5 sekundes. Ieteicams izvēlēties ne vairāk kā 3 valodas, lai netiktu pārsniegts lapas ielādei atļautais laiks."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Šai darbībai ir nepieciešamas vismaz 10 sekundēm katram izvēlētajam tulkojumam<br />Lūdzu uzgaidiet, kamēr tiek ielādēti un instalēti izvēlētie tulkojumi ..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Spiediet pogu 'Atpakaļ', ja vēlaties instalēt vēl kādu tulkojumu."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Lūdzu izvēlieties kādu valodu. Ja nav nepieciešams instalēt kādu tulkojumu, spiediet pogu 'Atpakaļ'."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Atgriezties uz pēdējo instalācijas soli"
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Atcerieties: ir iespējams instalēt nepieciešamos tulkojumus ar Joomla administrācijas panelī."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Nav iespējams savienoties ar tulkojumu serveri. Lūdzu pabeidziet instalācijas procesu."
-INSTL_LANGUAGE_TITLE="Instalācijas valoda"
-INSTL_LICENSE="Licence"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC atslēgtas"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Daudz bitu kodējums ir noklusētais"
@@ -187,7 +173,6 @@ INSTL_PHP_VERSION="PHP versija"
 INSTL_PRECHECK_ACTUAL="Esošais"
 INSTL_PRECHECK_DESC="Ja kāds no nosacījumiem nav izpildīts (atzīmēts ar <strong class="_QQ_"red"_QQ_">Nē</strong>), veiciet darbības, lai novērstu nepilnības. Ja tas netiks izdarīts, Joomla instalēt nebūs iespējams."
 INSTL_PRECHECK_DIRECTIVE="Iestatījums"
-INSTL_PRECHECK_FOR_VERSION="Instalācijas nosacījumi %s:"
 INSTL_PRECHECK_RECOMMENDED="Vēlamais"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Šie ir ieteicamie PHP iestatījumi, lai serveris būtu pilnībā savietojams ar Joomla.<br />Tomēr, Joomla var darboties arī tad ja visi nosacījumi nav izpildīti."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Ieteicamie iestatījumi:"
@@ -205,8 +190,6 @@ INSTL_SAMPLE_LEARN_SET="Datu kopa Joomla apguvei angļu valodā"
 INSTL_SAMPLE_LEARN_SET_DESC="Tiks instalēta vietne ar parauga rakstiem, kas paskaidro, Joomla dažādās funkcijas."
 INSTL_SAMPLE_TESTING_SET="Datu kopa sistēmas darbības pārbaudei angļu valodā"
 INSTL_SAMPLE_TESTING_SET_DESC="Tiks instalēta Joomla vietne ar datiem, kas paredzēti sistēmas darbības pārbaudei."
-INSTL_SELECT_LANGUAGE_DESC="Izvēlieties valodu, ko lietot Joomla instalācijas procesā!"
-
 INSTL_SELECT_LANGUAGE_TITLE="Valodas izvēle"
 INSTL_SESSION_AUTO_START="Automātiski sākt sesiju"
 INSTL_SITE="Vietnes konfigurācija"
@@ -218,19 +201,14 @@ INSTL_SITE_METADESC_LABEL="Vietnes apraksts metadatiem"
 INSTL_SITE_METADESC_TITLE_LABEL="Ievadiet vietnes meklēšanas servisiem paredzēto aprakstu. Optimālais garums 20 vārdi."
 INSTL_SITE_NAME_DESC="Ievadiet vietnes nosaukumu."
 INSTL_SITE_NAME_LABEL="Vietnes nosaukums"
-INSTL_SITE_NAME_TITLE="Vietnes nosaukums"
 INSTL_SITE_OFFLINE_LABEL="Atslēgt vietni"
 INSTL_SITE_OFFLINE_TITLE_LABEL="Vai atslēgt vietni pēc instalācijas? Vēlāk to var ieslēgt vietnes iestatījumos administrācijas panelī."
 INSTL_STD_OFFLINE_MSG="Tiek veikti uzlabošanas darbi.<br /> Pēc brīža nāciet vēl."
-INSTL_STEPS_TITLE="Instalācijas soļi"
 INSTL_STEP_COMPLETE_LABEL="Beigas"
 INSTL_STEP_DATABASE_LABEL="Datu bāze"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Izvēlieties noklusēto valodu"
 INSTL_STEP_FTP_LABEL="FTP"
 INSTL_STEP_LANGUAGES_LABEL="Instalēt tulkojumus"
-INSTL_STEP_LANGUAGE_LABEL="Valodas izvēle"
-INSTL_STEP_LICENSE_LABEL="Licence"
-INSTL_STEP_PREINSTALL_LABEL="Instalācijas nosacījumi"
 INSTL_STEP_SITE_LABEL="Konfigurācija"
 INSTL_STEP_SUMMARY_LABEL="Pārskats"
 INSTL_SUMMARY_EMAIL_DESC="Izvēlieties vai nosūtīt konfigurācijas iestatījumus uz %s e-pasta adresi."
@@ -246,7 +224,6 @@ INSTL_XML_SUPPORT="XML atbalsts"
 INSTL_ZIP_SUPPORT_AVAILABLE="Iebūvētā ZIP bibliotēka (Ieteicams)"
 INSTL_ZLIB_COMPRESSION_SUPPORT="zlib kompresijas bibliotēka"
 JADMINISTRATOR="Atvērt administrācijas paneli"
-JADVANCED="Papildus"
 JCHECK_AGAIN="Pārbaudīt vēlreiz"
 JDEBUG_LANGUAGE_FILES_IN_ERROR="Kļūdas tulkojuma datnēs"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Neiztulkotās virknes"
@@ -268,7 +245,9 @@ JLIB_FORM_FIELD_INVALID="Nepareizs lauks:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Laukā "_QQ_"%s"_QQ_" ir nepareizi dati."
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Lauks "_QQ_"%s"_QQ_" ir obligāti jāaizpilda."
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: kļūda kopējot datni no %1$s uz %2$s."
-JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: nav iespējams pieslēgties datu bāzei <br />joomla.library: %1$s - %2$s"
+JLIB_INSTALLER_NOT_ERROR="Ja kļūdas paziņojums ir saistīts ar TinyMCE tulkojuma instalāciju, tad tam nav saistības ar pārējo tulkojuma pakotnes datņu instalāciju. Dažas tulkojuma pakotnes, kas ir veidotas pirms Joomla! 3.2.0 var mēģināt instalēt redaktora TinyMCE tulkojuma datnes. Kopš Joomla 3.2.0 versijas šīs datnes ir iekļautas Joomla kodola sastāvā un to instalācija nav nepieciešama."
+
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase::getInstance: nav iespējams pieslēgties datu bāzei <br />joomla.library: %1$s - %2$s"
 JNEXT="Turpināt"
 JNO="Nē"
 JNONE="Nekas"
diff --git a/installation/language/lv-LV/lv-LV.xml b/installation/language/lv-LV/lv-LV.xml
index 56cc697..13c8dfa 100644
--- a/installation/language/lv-LV/lv-LV.xml
+++ b/installation/language/lv-LV/lv-LV.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>16.09.2012</creationDate>
 	<author>Latvian Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Latvian language installation for Joomla 3.0</description>
 	<files>
diff --git a/installation/language/mk-MK/mk-MK.ini b/installation/language/mk-MK/mk-MK.ini
index 612178a..b905812 100644
--- a/installation/language/mk-MK/mk-MK.ini
+++ b/installation/language/mk-MK/mk-MK.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Финиш"
 INSTL_STEP_DATABASE_LABEL="База на податоци"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Одберете поставен јазик"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Јазик"
 INSTL_STEP_LANGUAGES_LABEL="Инсталирај јазици"
-INSTL_STEP_LICENSE_LABEL="Лиценца"
-INSTL_STEP_PREINSTALL_LABEL="Проверка пред инсталација"
 INSTL_STEP_SITE_LABEL="Конфигурација"
 INSTL_STEP_SUMMARY_LABEL="Преглед"
-INSTL_STEPS_TITLE="Чекори"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Одберете јазик"
-INSTL_SELECT_LANGUAGE_DESC="Одберете јазик кој ќе се користи низ чекорите за инсталација на Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Одберете јазик"
 INSTL_WARNJAVASCRIPT="Внимание! JavaScript мора да е дозволено за правилна инсталација на Joomla!"
 INSTL_WARNJSON="На вашата PHP инсталација треба да е вклучен JSON за да може да биде инсталирана Joomla!"
 
  ;Preinstall view
 INSTL_PRECHECK_TITLE="Проверка пред инсталација"
-INSTL_PRECHECK_FOR_VERSION="Проверка пред инсталација на %s:"
 INSTL_PRECHECK_DESC="Ако нешто од ова не е поддржано (означено со <strong class="_QQ_"red"_QQ_">Не</strong>) направете нешто за да го корегирате тоа.<br />Не можете да ја инсталирате вашата Joomla! додека не се задоволат условите подолу."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Препорачани поставки:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Овие поставки се препорачани за PHP за да се обезбеди целосна компатибилност со Joomla.<br />Како и да е, Joomla! сепак ќе функционира и ако вашите поставки не се совпаѓаат со препорачаниве."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Ова е веројатно &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Тип на база на податоци"
 INSTL_DATABASE_USER_DESC="Нешто како "_QQ_"root"_QQ_" или корисничко име дадено до вашиот домаќин"
 INSTL_DATABASE_USER_LABEL="Корисничко име"
-INSTL_DATABASE_TITLE="Поставки за конекцијата"
-INSTL_DATABASE_DESC="<p>Поставувањто на Joomla! да работи на вашиот сервер се состои од 4 едноставни чекори...</p><p>Внесете го името на вашиот домаќин за серверот каде ќе ја инсталирате Joomla!-та.</p><p>Внесете корисничко име, шифра и име на MySQL базата на податоци која сакате да ја користите со Joomla!.</p><p>Внесте префикс кој ќе се користи за табели за оваа инсталација на Joomla!. Одберете што со постојните табели од претходни инсталации.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Автоматско барање FTP патека"
@@ -62,20 +53,18 @@ INSTL_FTP="FTP конфигурација"
 INSTL_FTP_DESC="<p>На некои сервери можеби ќе треба да побарате FTP дозволи пред да можете да ја завршите инсталацијата. Ако имате проблеми при инсталацијата без овие дозволи, проверете кај вашиот домаќин дали овие дозволи се неопходни. </p><p>Заради безбедносни причини, најдобро е да се направи посебна FTP корисничка сметка со пристап единствено до Joomla! папките а не и до целиот веб-сервер. Вашиот домаќин може да ви помогне околу ова.</p><p><b>Забелешка:</b> Ако инсталирате на оперативниот систем Windows, користењето FTP <strong>не</strong> е пожелно.</p>"
 INSTL_FTP_ENABLE_LABEL="Вклучи FTP"
 INSTL_FTP_HOST_LABEL="FTP домаќин"
+INSTL_FTP_PASSWORD_DESC="Внимание! Препорачливо е тука да оставите празно и да ја внесувате вашата FTP шифра при секој трансфер на датотеки."
 INSTL_FTP_PASSWORD_LABEL="FTP шифра"
 INSTL_FTP_PORT_LABEL="FTP порта"
 INSTL_FTP_ROOT_LABEL="FTP основна патека"
 INSTL_FTP_SAVE_LABEL="Зачувај ја FTP шифрата"
+INSTL_FTP_SETTINGS_CORRECT="Поставките се во ред"
 INSTL_FTP_TITLE="Конфигурирање на FTP (<strong class="_QQ_"red"_QQ_">По желба - Повеќето корисници можат да го прескокнат овој чекор - Одберете Понатаму или Прескокни</strong>)"
 INSTL_FTP_USER_LABEL="FTP корисничко име"
-INSTL_SITE_NAME_LABEL="Име на сајтот"
-INSTL_VERIFY_FTP_SETTINGS="Верификација на FTP поставките"
-INSTL_FTP_SETTINGS_CORRECT="Поставките се во ред"
 INSTL_FTP_USER_DESC="Внимание! Препорачливо е тука да оставите празно и да го внесувате вашето FTP корисничко име при секој трансфер на датотеки."
-INSTL_FTP_PASSWORD_DESC="Внимание! Препорачливо е тука да оставите празно и да ја внесувате вашата FTP шифра при секој трансфер на датотеки."
+INSTL_VERIFY_FTP_SETTINGS="Верификација на FTP поставките"
 
 ;Site View
-INSTL_SITE="Главна конфигурација"
 INSTL_ADMIN_EMAIL_LABEL="Администраторска е-пошта"
 INSTL_ADMIN_EMAIL_DESC="Внесете администраторска е-пошта. Оваа е-пошта ќе биде е-пошта на супер-администраторот на веб сајтот."
 INSTL_ADMIN_PASSWORD_LABEL="Администраторска шифра"
@@ -83,8 +72,9 @@ INSTL_ADMIN_PASSWORD_DESC="Поставете шифра за вашата су
 INSTL_ADMIN_PASSWORD2_LABEL="Потврда на администраторската шифра"
 INSTL_ADMIN_USER_LABEL="Администраторско корисничко име"
 INSTL_ADMIN_USER_DESC="Одберете корисничко име за вашата Супер администраторска сметка."
-INSTL_SITE_NAME_TITLE="Име на сајтот"
+INSTL_SITE="Главна конфигурација"
 INSTL_SITE_NAME_DESC="Внесете име за вашиот Joomla! сајт."
+INSTL_SITE_NAME_LABEL="Име на сајтот"
 INSTL_SITE_METADESC_LABEL="Опис"
 INSTL_SITE_METADESC_TITLE_LABEL="Внесете опис кој најдобро ќе го претстави вашиот сајт кај машините за пребарување. Генерално, најмногу 20 зборови е најоптимално."
 INSTL_SITE_OFFLINE_LABEL="Недостапен сајт"
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Подолу ги имате конфигурацискит
 INSTL_EMAIL_NOT_SENT="Е-пораката не може да биде пратена."
 
 ;Complete view
-INSTL_COMPLETE="Финиш"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Детали за администраторска најава"
-INSTL_COMPLETE_DESC1="Кликнете на копчето сајт за да го видите вашиот Joomla! веб сајт или на копчето админ за да ве одведе до најавата за администраторскиот дел."
-INSTL_COMPLETE_DESC2="На страниците за помош на Joomla!, ќе најдете лесно, чекор по чекор упатство за инсталирање на ваш јазичен пакет во Joomla! Ќе најдете и листа со врски до достапните јазични пакети."
-INSTL_COMPLETE_DESC3="Кликнете на врската десно за да ги отворите страниците за помош во нов прозорец."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Папката installation е веќе избришана."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Инсталациската папка не може да биде избришана. Избришете ја папката рачно."
 INSTL_COMPLETE_FOLDER_REMOVED="Инсталациската папка е успешно избришана."
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Јазик"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Верзија"
 INSTL_LANGUAGES_DESC="Joomla! е достапна во повеќе јазици. Штиклирајте ги јазиците кои ви се потребни и инсталирајте ги со клик на копчето Понатаму.<br/>Забелешка: за ова ќе е потребно околу 10 секунди по јазик за симнување и инсталирање. Затоа одберете не повеќе од 3 јазици одеднаш за да одбегнете можен истек на време на чекање од серверот."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Потребно ќе е околу 10 секунди по јазик.<br />Причекајте додека се преземаат и инсталираат јазиците..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Одберете јазик. Ако немате потреба да инсталирате други јазици кликнете на копчето Претходно."
+INSTL_LANGUAGES_MORE_LANGUAGES="Кликнете го копчето 'Претходно' ако сакате да инсталирате повеќе јазици."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Немате одбрано јазици за инсталирање. Ако сакате да инсталирате други јазици кликнете на копчето Претходно."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! не може да конектира со јазичниот сервер. Завршете го инсталацискиот процес."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Забелешка: Ќе можете подоцна да ги инсталирате јазиците преку Joomla! администрацијата."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Назад кон последниот инсталациски чекор."
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Инсталирај локал
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ако е активно, Joomla автоматски ќе создаде по една категорија за секој инсталиран јазик. Исто така, по еден насловен артикл со лажна содржина ќе биде создаден во секоја категорија"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Повеќејазичност"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Овој дел ви овозможува автоматски да ја активирате повеќејазичноста во вашата Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Забелешка: откако ќе го притиснете копчето понатаму ќе бидете вратени до крајот на инсталацискиот процес каде ќе се бара да ја избришете инсталациската папка."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Одберете ваш поставен јазик"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Ќе можете подоцна да инсталирате преку администрацијата на Joomla!"
  
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Се појави грешка при правење резервна копија на базата на податоци."
 INSTL_DATABASE_ERROR_CREATE="Се појави грешка при обидот за создавање база на податоци %s.<br />Можеби корисникот нема доволно привилегии за создавање база на податоци. Потребната база на податоци можеби ќе треба да биде создадена посебно пред да може да се продолжи со инсталација на Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Се појави грешка при бришење на базата на податоци."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Грешка при иницијализација на бројчаната шема за верзиите"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Избриши"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Копија"
 INSTL_DATABASE_FIX_TOO_LONG="Префиксот на MySQL табелата мора да е најмногу до 15 карактери."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Ви треба SQL Server 2008 R2 (10.50
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Ви треба SQL Server 2008 R2 (10.50.1600.1) или понова верзија за да продолжите со инсталацијата. Вашата верзија е: %s"
 INSTL_DATABASE_INVALID_TYPE="Одберете тип на база на податоци"
 INSTL_DATABASE_NAME_TOO_LONG="Името на MySQL базата на податоци мора да е до најмногу 64 карактери."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Префиксот на MySQL табелата мора да почнува со буква и да биде следена само од букви, бројки или долна црта."
 INSTL_DATABASE_INVALID_NAME="MySQL верзиите пред 5.1.6 можат да не содржат празни места или други "_QQ_"специјални"_QQ_" карактери во името. Вашата верзија е: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Имињата на MySQL базата на податоци и табелата не смеат да почнуваат или завршуваат со празно место."
-INSTL_DATABASE_NAME_INVALID_CHAR="Ниеден MySQL идентификатор не смее да содржи NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Ниеден MySQL идентификатор не смее да содржи NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Датотеката %s не постои"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Функцијата "_QQ_"SYST"_QQ_" не успеа."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Неможна автоматска детекција на FTP основната папка."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Напредни поставки"
-INSTL_BASIC_SETTINGS="Основни поставки"
 INSTL_CONFPROBLEM="Вашиот конфигурациски документ или папка се невпишливи или има проблем при создавањето на конфигурацискиот документ. Ќе треба следниот код да го внесете рачно. Кликнете во полето за текст за да го селектирате целиот код и потоа ископирајте го во нов текстуален документ. Тој документ потоа наречете го 'configuration.php' и качете го во основната папка на вашиот сајт."
 INSTL_DATABASE_SUPPORT="Поддршка за база на податоци:"
 INSTL_DISPLAY_ERRORS="Прикажи грешки"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Се појавија некои грешки при попол
 INSTL_ERROR_INITIALISE_SCHEMA="Неможно покренување шема на базата"
 INSTL_FILE_UPLOADS="Качување документи"
 INSTL_GNU_GPL_LICENSE="ГНУ Генерална јавна лиценца"
-INSTL_INSTALLATION="Инсталација"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON поддршка"
-INSTL_LICENSE="Лиценца"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC исклучено"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes околина"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB јазикот е поставен"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Процесот е во тек. Бидете трпелив
 
 ;Global strings
 JADMINISTRATOR="Администратор"
-JADVANCED="Напредно"
 JCHECK_AGAIN="Провери пак"
 JERROR="Грешка"
 JEMAIL="Е-адреса"
@@ -310,6 +288,7 @@ JLIB_FORM_FIELD_INVALID="Погрешно поле:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Погрешно поле: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Потребно е полето: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Неуспешно копирање на документот %1$s во %2$s."
+JLIB_INSTALLER_NOT_ERROR="Ако грешката се однесува на инсталирањето на TinyMCE јазичните документи тоа нема да влијае на инсталирањето на јазикот(ците). Некои јазични пакети креирани пред Joomla! 3.2.0 може да се обидат да инсталираат посебни TinyMCE јазични документи. Бидејќи тие се веќе вклучени во јадрото, тие веќе нема потреба да бидат инсталирани."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Неможна конекција со базата на податоци <br />joomla.library: %1$s - %2$s"
 
 ;Strings for the language debugger
diff --git a/installation/language/mk-MK/mk-MK.xml b/installation/language/mk-MK/mk-MK.xml
index 3188d52..15dc75b 100644
--- a/installation/language/mk-MK/mk-MK.xml
+++ b/installation/language/mk-MK/mk-MK.xml
@@ -8,7 +8,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/ms-MY/ms-MY.ini b/installation/language/ms-MY/ms-MY.ini
index 901162f..b9cde67 100644
--- a/installation/language/ms-MY/ms-MY.ini
+++ b/installation/language/ms-MY/ms-MY.ini
@@ -1,6 +1,6 @@
-; translator : MU DOT MY )http://mu.my)
+; translator : MU DOT MY (http://mu.my)
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Tamat"
 INSTL_STEP_DATABASE_LABEL="Pangkalan Data"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Pilih bahasa anda"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Bahasa"
 INSTL_STEP_LANGUAGES_LABEL="Pemasangan Bahasa-Bahasa"
-INSTL_STEP_LICENSE_LABEL="Lesen"
-INSTL_STEP_PREINSTALL_LABEL="Semak Pra-Pemasangan"
 INSTL_STEP_SITE_LABEL="Konfigurasi"
 INSTL_STEP_SUMMARY_LABEL="Ringkasan"
-INSTL_STEPS_TITLE="Langkah-langkah"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Pilih bahasa"
-INSTL_SELECT_LANGUAGE_DESC="Sila pilih bahasa yang digunakan semasa langkah pemasangan Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Pilih bahasa anda"
 INSTL_WARNJAVASCRIPT="Amaran! Javascript mesti diaktifkan untuk pemasangan Joomla! yang betul"
 INSTL_WARNJSON="Pemasangan PHP anda perlu mempunyai JSON diaktifkan untuk Joomla! yang akan dipasang!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Semak Pra-Pemasangan"
-INSTL_PRECHECK_FOR_VERSION="Semak pra-pemasangan untuk %s:"
 INSTL_PRECHECK_DESC="Sekiranya salah satu daripada butiran ini tidak disokong (ditandakan sebagai <strong class="_QQ_"red"_QQ_">Tidak</strong>) maka sila betulkan kesalahan tersebut.<br />Anda tidak boleh melakukan pemasangan Joomla! sehingga persediaan anda menepati syarat-syarat di bawah."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Tetapan yang disyorkan :"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Tetapan ini adalah disyorkan untuk PHP untuk memastikan keserasian penuh dengan Joomla!. <br /> Walau bagaimanapun, Joomla! masih akan beroperasi jika tetapan anda tidak cukup sepadan dengan konfigurasi yang disyorkan."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Kemungkinan ini &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Jenis pangkalan data"
 INSTL_DATABASE_USER_DESC="Sama ada sesuatu yang "_QQ_" root "_QQ_" atau nama pengguna yang diberikan oleh host"
 INSTL_DATABASE_USER_LABEL="Nama pengguna"
-INSTL_DATABASE_TITLE="Tetapan sambungan"
-INSTL_DATABASE_DESC="<p>Laman sesawang Joomla! menyimpan semua data di dalam pangkalan data. Skrin ini memberikan program pemasangan maklumat yang diperlukan untuk membuat pangkalan data ini.</p><p> Sekiranya anda memasang Joomla! di pelayan sesawang capaian jauh, anda akan mendapat maklumat ini melalui host anda.</p><p>Sebahagian host sesawang memerlukan anda untuk membuat pangkalan daya sebelum anda memasang Joomla. Sekiranya anda mendapat mesej seperti "_QQ_"Tidak boleh menyambungkan ke pangkalan data"_QQ_", pastikan nama pengguna dan kata laluan anda betul. Sekiranya masih lagi mendapat mesej yang sama, semak dengan host anda untuk mengetahui sama ada anda perlu membuat pangkalan data sebelum pemasangan Joomla dilakukan.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Carian automatik jejak FTP"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="Jejak Akar Umbi FTP"
 INSTL_FTP_SAVE_LABEL="Simpan Kata Laluan FTP"
 INSTL_FTP_TITLE="Konfigurasi FTP (<strong class="_QQ_"red"_QQ_">Pilihan - Kebanyakan Pengguna Boleh Melangkau Langkah Ini - Tekan Seterusnya Untuk Melangkau</strong>)"
 INSTL_FTP_USER_LABEL="Nama Pengguna FTP"
-INSTL_SITE_NAME_LABEL="Nama Tapak"
 INSTL_VERIFY_FTP_SETTINGS="Pengesahan Tetapan FTP"
 INSTL_FTP_SETTINGS_CORRECT="Tetapan yang Betul"
 INSTL_FTP_USER_DESC="Amaran! Disarankan supaya anda membiarkan tempat ini kosong dan masukkan nama pengguna FTP anda setiap kali melakukan pemindahan fail-fail."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Tetapkan kata laluan untuk akaun Pentadbir Tertinggi
 INSTL_ADMIN_PASSWORD2_LABEL="Sahkan Kata Laluan Pentadbir"
 INSTL_ADMIN_USER_LABEL="Nama pengguna Pentadbir"
 INSTL_ADMIN_USER_DESC="Tetapkan nama pengguna untuk akaun Pentadbir Tertinggi."
-INSTL_SITE_NAME_TITLE="Nama Tapak"
+INSTL_SITE_NAME_LABEL="Nama Tapak"
 INSTL_SITE_NAME_DESC="Masukkan nama laman Joomla anda."
 INSTL_SITE_METADESC_LABEL="Keterangan"
 INSTL_SITE_METADESC_TITLE_LABEL="Masukkan huraian keseluruhan berkenaan laman sesawang yang akan digunakan oleh enjin carian. Secara amnya, maksima 20 patah perkataan adalah paling sesuai."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Di bawah terdapat tetapan konfigurasi untuk penyediaan lama
 INSTL_EMAIL_NOT_SENT="E-mel tidak dapat dihantar."
 
 ;Complete view
-INSTL_COMPLETE="Tamat"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Perincian Pendaftaran Log Masuk"
-INSTL_COMPLETE_DESC1="Klik pada butang laman untuk melihat laman sesawang Joomla! anda atau butang Pentadbir untuk terus ke Log Masuk Pentadbiran."
-INSTL_COMPLETE_DESC2="Di Laman Komuniti Joomla!, anda boleh mendaptatkan senarai pautan untuk pakej bahasa yang disediakan dan juga pautan kepada bahasa yang berkaitan dengan sumber-sumber di laman keluarga joomla.org."
-INSTL_COMPLETE_DESC3="Klik pada butang di sebelah kanan untuk membuka Laman Komuniti pada tetingkap yang baru."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Folder pemasangan telah dipadamkan sebelum ini."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Folder pemasangan tidak dapat dipadamkankan. Sila padamkan folder tersebut secara manual."
 INSTL_COMPLETE_FOLDER_REMOVED="Folder pemasangan telah dipadam"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Bahasa"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versi"
 INSTL_LANGUAGES_DESC="Antara muka Joomla! boleh didapati di dalam beberapa bahasa. Pilih pilihan bahasa anda dengan menekan kotak pilihan dan lakukan pemasangan dengan menekan butang Seterusnya.<br/>Nota: operasi ini akan mengambil masa 10 saat untuk memuat turun dan memasang setiap bahasa. Untuk mengelakkan masa yang diberikan tamat, jangan pilih lebih daripada 3 bahasa untuk dipasang."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Operasi ini mengambil masa sehingga 10 saat untuk setiap satu bahasa siap dipasang.<br />Sila tunggu sebentar sementara kami memuat turun seterusnya memasang pilihan bahasa tersebut..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Sila pilih bahasa. Jika anda tidak perlu untuk memasang pilihan bahasa yang lain, tekan butang Sebelumnya"
+INSTL_LANGUAGES_MORE_LANGUAGES="Tekan butang 'Sebelumnya' jika ingin memasang lebih daripada satu bahasa."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Tiada bahasa yang dipilih untuk dipasang. Jika anda ingin memasang lebih bahasa tekan butang 'Sebelumnya' dan pilih bahasa daripada senarai yang diberikan."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! tidak dapat berhubung dengan pelayan bahasa. Sila habiskan proses pemasangan."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Nota: Anda boleh melakukan pemasangan bahasa kemudian dengan menggunakan Pentadbir Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Kembali ke langkah pemasangan lepas"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Pasang kandungan setempat"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Jika aktif, Joomla! akan membuat satu kandungan kategori untuk setiap bahasa yang dipasang secara automatik. Juga satu artikel yang diketengahkan yang mengandungi isi kandungan tiruan yang dibuat untuk setiap kategori"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Berbilang Bahasa"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Bahagian ini membolehkan anda mengaktifkan fungsi berbilang bahasa Joomla! secara automatik"
-INSTL_DEFAULTLANGUAGE_NOTE="Nota: Sebaik sahaja anda menekan butang Seterusnya anda akan kembali ke penghujung proses pemasangan dimana anda akan diminta untuk memadamkan folder pemasangan."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Pilih bahasa asal anda"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Anda juga boleh memasangnya kemudian dengan menggunakan Pentadbir Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,8 +185,7 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Beberapa ralat telah berlaku semasa membuat sandaran data kepada pangkalan data."
 INSTL_DATABASE_ERROR_CREATE="Satu Ralat telah berlaku semasa cubaan untuk membuat pangkalan data %s.<br />Pengguna mungkin tidak diberi keistimewaan yang sepatutnya untuk membuat pangakalan data. Pangkalan data yang diperlukan hendaklah dibuat berasingan sebelum anda melakukan pemasangan Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Beberapa ralat berlaku semasa memadamkan pangkalan data."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Ralat dalam menentukan skema nombor versi"
-INSTL_DATABASE_FIELD_VALUE_REMOVE="Buang"
+INSTL_DATABASE_FIELD_VALUE_REMOVE="Padam"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Sandaran"
 INSTL_DATABASE_FIX_TOO_LONG="Awalan jadual MySQL mestilah maksimum 15 huruf."
 INSTL_DATABASE_INVALID_DB_DETAILS="Butiran pangkalan data yang diberikan adalah tidak betul dan/atau kosong."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Anda memerlukan SQL Server 2008 R2 (10.50
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Anda memerlukan SQL Server 2008 R2 (10.50.1600.1) atau lebih tinggi untuk meneruskan pemasangan. Versi anda ialah: %s "
 INSTL_DATABASE_INVALID_TYPE="Sila pilih jenis pangkalan data"
 INSTL_DATABASE_NAME_TOO_LONG="Nama pangkalan data MySQL mestilah maksimum 64 huruf."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Awalan jadual MySQL mesti bermula dengan huruf dan diikuti dengan huruf, nombor atau sengkang bawah."
 INSTL_DATABASE_INVALID_NAME="Versi MySQL terdahulu hingga versi 5.1.6 mungkin tidak mempunyai tanda noktah atau karekter "_QQ_"khas"_QQ_" yang lain di dalam nama. Versi anda ialah: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Nama pangkalan data MySQL dan nama-nama jadual tidak boleh bermula atau berakhir dengan ruang."
-INSTL_DATABASE_NAME_INVALID_CHAR="Tiada pengenalpasti MySQL boleh mengandungi ASCII NUL (0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Tiada pengenalpasti MySQL boleh mengandungi ASCII NULL (0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Fail %s tidak wujud"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Fungsi "_QQ_"SYST"_QQ_" gagal."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Tidak dapat mengesan secara automatik folder root FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Tetapan Lanjutan"
-INSTL_BASIC_SETTINGS="Tetapan Asas"
 INSTL_CONFPROBLEM="Fail atau direktori konfigurasi anda tidak boleh diubah atau terdapat masalah ketika membuat fail konfigurasi ini. Anda perlu memuat naik kod ini secara manual. Klik pada ruang teks menandakan keseluruhan kod dan tampalkan pada fail teks yang baru. Namakan fail ini sebagai 'configuration.php' dan muat naiknya ke dalam folder di laman root anda."
 INSTL_DATABASE_SUPPORT="Sokongan pangkalan data:"
 INSTL_DISPLAY_ERRORS="Paparan Ralat-Ralat"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Beberapa ralat berlaku semasa mengumpulkan pangkalan data: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Tidak boleh meletakkan nilai mula untuk skema pangkalan data"
 INSTL_FILE_UPLOADS="Muat Naik Fail"
 INSTL_GNU_GPL_LICENSE="Lesen Awam Am GNU"
-INSTL_INSTALLATION="Pemasangan"
 INSTL_JSON_SUPPORT_AVAILABLE="Sokongan JSON"
-INSTL_LICENSE="Lesen"
 INSTL_MAGIC_QUOTES_GPC="Tutup Magic Quotes GPC"
 INSTL_MAGIC_QUOTES_RUNTIME="Waktu Jalan Magic Quotes"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Bahasa MB adalah Bahasa Asal"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Proses sedang dijalankan. Sila tunggu..."
 
 ;Global strings
 JADMINISTRATOR="Pentadbiran"
-JADVANCED="Lanjutan"
 JCHECK_AGAIN="Semak Lagi"
 JERROR="Ralat"
 JEMAIL="E-mel"
@@ -310,6 +288,7 @@ JLIB_FORM_FIELD_INVALID="Ruangan Tidak Sah:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ruangan Tidak Sah: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Ruangan ini prlu diisi: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Pemasangan: Gagal untuk menyalin fail %1$s kepada %2$s."
+JLIB_INSTALLER_NOT_ERROR="Jika ralat berkaitan dengan pemasangan fail bahasa TinyMCE, ia tidak memberi kesan kepada pemasangan bahasa. Sesetengah pek bahasa yang dicipta untuk Joomla! 3.2.0 mungkian akan cuba memasang fail bahasa TinyMCE secara berasingan. Fail ini tidak perlu dipasang secara berasingan kerana ia terdapat di dalam asas Joomla!"
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Tidak boleh menyambung ke pangkalan data <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/ms-MY/ms-MY.xml b/installation/language/ms-MY/ms-MY.xml
index 2964025..b764f08 100644
--- a/installation/language/ms-MY/ms-MY.xml
+++ b/installation/language/ms-MY/ms-MY.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2013-10-01</creationDate>
 	<author>MU DOT MY</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/nb-NO/nb-NO.ini b/installation/language/nb-NO/nb-NO.ini
index e92c655..77e058d 100644
--- a/installation/language/nb-NO/nb-NO.ini
+++ b/installation/language/nb-NO/nb-NO.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Ferdig"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Velg standardspråk"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Språk"
 INSTL_STEP_LANGUAGES_LABEL="Installer språk"
-INSTL_STEP_LICENSE_LABEL="Lisens"
-INSTL_STEP_PREINSTALL_LABEL="Systemsjekk"
 INSTL_STEP_SITE_LABEL="Konfigurasjon"
 INSTL_STEP_SUMMARY_LABEL="Oversikt"
-INSTL_STEPS_TITLE="Steg"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Velg språk"
-INSTL_SELECT_LANGUAGE_DESC="Velg språk som skal brukes under installasjonen av Joomla!"
 INSTL_SELECT_LANGUAGE_TITLE="Velg språk"
 INSTL_WARNJAVASCRIPT="Advarsel! JavaScript må være aktivert for riktig installasjon av Joomla!"
 INSTL_WARNJSON="JSON må være aktivert i din PHP-installasjon før Joomla kan installeres!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Systemsjekk"
-INSTL_PRECHECK_FOR_VERSION="Systemsjekk for %s:"
 INSTL_PRECHECK_DESC="Dersom noen av disse elementene ikke er støttet (merket med <strong class="_QQ_"red"_QQ_">Nei</strong>) bør du sørge for korrigering av disse. Du kan ikke installere Joomla før ditt oppsett oppfyller kravene listet nedenfor."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Anbefalte innstillinger:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Disse innstillingene er anbefalt for PHP for å sikre full kompatibilitet med Joomla, men Joomla vil likevel kunne kjøre selv om dine innstillinger ikke stemmer helt med de anbefalte."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Dette er trolig 'MySQLi'"
 INSTL_DATABASE_TYPE_LABEL="Databasetype"
 INSTL_DATABASE_USER_DESC="Enten noe slikt som 'root', eller et brukernavn satt av din leverandør."
 INSTL_DATABASE_USER_LABEL="Brukernavn"
-INSTL_DATABASE_TITLE="Innstillinger for tilkobling"
-INSTL_DATABASE_DESC="<p>Et Joomla-nettsted lagrer alle sine data i en database. Dette skjermbildet gir installasjonsprogrammet nødvendig informasjon for å opprette denne databasen</p><p>Dersom du installerer Joomla på en ekstern server vil du måtte få denne informasjonen fra din leverandør.</p><p>Noen netthotell krever at du oppretter databasen før du installerer Joomla. Dersom du får meldingen «Kunne ikke koble til databasen» må du sjekke om brukernavn og passord er riktig. Dersom du fortsatt får denne meldingen etter å ha forsikret deg om at dette er riktig vil du måtte sjekke med leverandøren om du må opprette databasen før du installerer Joomla!.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Finn FTP-sti automatisk"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP-rotsti"
 INSTL_FTP_SAVE_LABEL="Lagre FTP-passord"
 INSTL_FTP_TITLE="FTP-konfigurasjon (<strong class="_QQ_"red"_QQ_">Valgfritt - De fleste brukere kan hoppe over dette trinnet - Trykk <em>Neste</em> for å fortsette</strong>)"
 INSTL_FTP_USER_LABEL="FTP-brukernavn"
-INSTL_SITE_NAME_LABEL="Nettstednavn"
 INSTL_VERIFY_FTP_SETTINGS="Bekreft FTP-innstillinger"
 INSTL_FTP_SETTINGS_CORRECT="Innstillinger er korrekt"
 INSTL_FTP_USER_DESC="Advarsel! Det anbefales å la dette stå tomt, og heller skrive inn FTP-brukernavn for hver gang du overfører filer."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Skriv inn et passord for superadministratorens bruker
 INSTL_ADMIN_PASSWORD2_LABEL="Bekreft passord"
 INSTL_ADMIN_USER_LABEL="Brukernavn"
 INSTL_ADMIN_USER_DESC="Skriv inn et brukernavn for superadministratorens brukerkonto."
-INSTL_SITE_NAME_TITLE="Nettstednavn"
+INSTL_SITE_NAME_LABEL="Nettstednavn"
 INSTL_SITE_NAME_DESC="Skriv inn et navn for nettsted."
 INSTL_SITE_METADESC_LABEL="Metabeskrivelse"
 INSTL_SITE_METADESC_TITLE_LABEL="Skriv inn en global beskrivelse for nettstedet som skal brukes av søkemotorer. Generelt er maks 20 ord optimalt."
@@ -135,11 +125,7 @@ INSTL_EMAIL_HEADING="Her finner du konfigurasjonsdetaljene for et nylig installe
 INSTL_EMAIL_NOT_SENT="E-post kunne ikke sendes."
 
 ;Complete view
-INSTL_COMPLETE="Ferdig"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Innloggingsdetaljer for administrasjonspanelet"
-INSTL_COMPLETE_DESC1="Klikk på <em>Nettsted</em>-knappen for å åpne ditt Joomla-nettsted eller <em>Administrator</em>-knappen for å åpne innloggingssiden for administrasjonspanelet."
-INSTL_COMPLETE_DESC2="På <em>Joomla! Community</em>-nettsiden vil du finne en liste med lenker til tilgjengelige språkpakker, samt lenker til språkrelaterte ressurser på joomla.org sine nettsider."
-INSTL_COMPLETE_DESC3="Klikk på lenken til høyre for å åpne fellesskapssidene i et nytt vindu."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installasjonsmappen er allerede slettet."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installasjonsmappen kunne ikke slettes, du må slette denne manuelt."
 INSTL_COMPLETE_FOLDER_REMOVED="Installasjonsmappen ble slettet"
@@ -157,7 +143,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Språk"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versjon"
 INSTL_LANGUAGES_DESC="Joomla-grensesnittet er tilgjengelig i flere språk. Velg ønskede språk ved å merke av i avkrysningsrutene, for så å installere dem ved å klikke på 'Neste'.<br/>Merk: Denne operasjonen vil ta cirka 10 sekunder for nedlasting og installasjon av hvert språk. Det anbefales derfor ikke at man velger mer enn 3 språk, dette for å unngå tidsutløp."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Denne operasjonen vil ta cirka 10 sekunder per språk.<br />Vennligst vent mens vi laster ned og installerer ..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Velg et språk. Dersom du ikke ønsker å installere flere språk kan du klikke på 'Tilbake'."
+INSTL_LANGUAGES_MORE_LANGUAGES="Klikk på 'Tilbake'-knappen dersom du ønsker å installere flere språk."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Ingen språk har blitt installert. Dersom du ønsker å installere flere språk kan du klikke på 'Tilbake'-knappen og velge ønsket språk fra listen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kunne ikke koble til språkserveren. Fullfør installasjonen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Merk: Du vil kunne installere språk senere via administrasjonspanelet."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Gå tilbake til siste steg av installasjonen."
@@ -194,8 +181,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Installer lokalisert innhold"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Dersom aktivert vil Joomla automatisk opprette en innholdkategori for hvert installerte språk, samt en fremhevet artikkel inneholdende 'dummy'-tekst i hver av kategoriene."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Flerspråklig"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Denne delen lar deg aktivere Joomlas flerspråklige funksjonalitet automatisk."
-INSTL_DEFAULTLANGUAGE_NOTE="Merk: Når du klikker på 'Neste' vil du komme tilbake til siste steg av installasjonen, hvor du blir bedt om å slette installasjonsmappen."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Velg ditt standardspråk"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Du vil kunne installere dette senere gjennom administrasjonspanelet."
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -208,7 +193,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Feil oppstod under sikkerhetskopiering av database."
 INSTL_DATABASE_ERROR_CREATE="En feil oppstod under forsøk på å opprette databasen %s.<br />Bruker har kanskje ikke tilstrekkelige rettigheter for å opprettet en ny database, eller databasen må opprettes i netthotellets kontrollpanel, phpMyAdmin eller lignende før du kan installere Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Feil oppstod under sletting av databasen."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Feil ved initialisering av skjemaversjonnummer."
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Slett"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Sikkerhetskopier"
 INSTL_DATABASE_FIX_TOO_LONG="Tabellprefikset kan ikke være lenger enn 15 tegn"
@@ -219,7 +203,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Du må ha SQL Server 2008 R2 (10.50.1600.
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Du må ha SQL Server 2008 R2 (10.50.1600.1) eller nyere for å fortsette installasjonen. Din versjon er: %s"
 INSTL_DATABASE_INVALID_TYPE="Velg databasetype"
 INSTL_DATABASE_NAME_TOO_LONG="Databasenavnet kan ikke være lenger enn 64 tegn."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Tabellprefikset må starte med en bokstav, etterfulgt av bokstaver, tall eller understrek."
 INSTL_DATABASE_INVALID_NAME="MySQL-versjoner eldre enn 5.1.6 kan ikke inneholde punktum eller andre spesialtegn i navnet. Din versjon er: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL-databasenavn og -tabellnavn kan ikke begynne eller slutte med mellomrom."
 INSTL_DATABASE_NAME_INVALID_CHAR="Ingen MySQL-identifikator kan inneholde en NULL ASCII(0x00)."
@@ -254,8 +237,6 @@ INSTL_FTP_NOSYST="Funksjonen 'SYST' feilet."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Kunne ikke finne FTP-rotmappe automatisk."
 
 ;others - husk at vi IKKE oversetter direktiver/navn/betegnelser.
-INSTL_ADVANCED_SETTINGS="Avanserte innstillinger"
-INSTL_BASIC_SETTINGS="Grunninnstillinger"
 INSTL_CONFPROBLEM="Din konfigurasjonsfil eller -mappe er skrivebeskyttet, eller det var et annet problem som forhindret opprettelse av konfigurasjonsfilen. Du må derfor laste opp konfigurasjonskoden manuelt. Klikk i tekstfeltet nedenfor for å merke og kopiere hele koden (Høyreklikk-Kopier eller Ctrl+C). Deretter limer du innholdet inn i en ny tekstfil (Høyreklikk-Lim inn eller Ctrl+V), som du navngir <em>configuration.php</em>. Denne fila laster du så opp i rotmappen for ditt nettsted."
 INSTL_DATABASE_SUPPORT="Database-støtte:"
 INSTL_DISPLAY_ERRORS="Display Errors"
@@ -263,9 +244,7 @@ INSTL_ERROR_DB="Noen feil oppstod under forsøk på å legg inn data i databasen
 INSTL_ERROR_INITIALISE_SCHEMA="Kan ikke initialisere databaseskjema"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU General Public-lisens"
-INSTL_INSTALLATION="Installasjon"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON-støtte"
-INSTL_LICENSE="Lisens"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC er av"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language er standard"
@@ -287,7 +266,6 @@ INSTL_PROCESS_BUSY="Prosess pågår. Vennligst vent ..."
 
 ;Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Avansert"
 JCHECK_AGAIN="Sjekk igjen"
 JERROR="Feil"
 JEMAIL="E-post"
@@ -318,6 +296,7 @@ JLIB_FORM_FIELD_INVALID="Ugyldig felt:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ugyldig felt: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Obligatorisk felt: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kunne ikke kopiere filen %1$s til %2$s."
+JLIB_INSTALLER_NOT_ERROR="Dersom feilen er relatert til installasjonen av språkfiler for TinyMCE vil det ikke påvirke installasjon av kjernespråk. Noen språkpakker laget for eldre versjoner enn Joomla 3.2 vil kunne forsøke installere egne språkfiler for TinyMCE, men ettersom disse nå er inkludert i kjernen behøves de ikke installeres lengre."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kunne ikke koble til database<br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
@@ -325,7 +304,7 @@ JDEBUG_LANGUAGE_FILES_IN_ERROR="Analysefeil i språkfiler"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Uoversatte strenger"
 JNONE="Ingen"
 
-;Necessary for errors
+; Necessary for errors
 ADMIN_EMAIL="E-postadresse"
 ADMIN_PASSWORD="Passord"
 ADMIN_PASSWORD2="Bekreft passord"
diff --git a/installation/language/nb-NO/nb-NO.xml b/installation/language/nb-NO/nb-NO.xml
index a61e67e..a198b7b 100644
--- a/installation/language/nb-NO/nb-NO.xml
+++ b/installation/language/nb-NO/nb-NO.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012-09-27</creationDate>
 	<author>Joomla! i Norge</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/nl-NL/nl-NL.ini b/installation/language/nl-NL/nl-NL.ini
index 0236f31..bd6ea64 100644
--- a/installation/language/nl-NL/nl-NL.ini
+++ b/installation/language/nl-NL/nl-NL.ini
@@ -1,6 +1,6 @@
 ; nl-NL.ini 3.0
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Voltooien"
 INSTL_STEP_DATABASE_LABEL="Database"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Kies de standaard taal"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Taal"
 INSTL_STEP_LANGUAGES_LABEL="Installeer talen"
-INSTL_STEP_LICENSE_LABEL="Licentie"
-INSTL_STEP_PREINSTALL_LABEL="Pre-installatie controle"
 INSTL_STEP_SITE_LABEL="Configuratie"
 INSTL_STEP_SUMMARY_LABEL="Samenvatting"
-INSTL_STEPS_TITLE="Stappen"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Kies taal"
-INSTL_SELECT_LANGUAGE_DESC="Kies de taal die u wilt gebruiken tijdens de installatie van Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Selecteer taal"
 INSTL_WARNJAVASCRIPT="Waarschuwing! JavaScript dient ingeschakeld te zijn voor een juiste installatie van Joomla!"
 INSTL_WARNJSON="In de PHP installatie dient JSON ingeschakeld te zijn om Joomla te kunnen installeren!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Pre-installatie controle"
-INSTL_PRECHECK_FOR_VERSION="Pre-installatie controle voor %s:"
 INSTL_PRECHECK_DESC="Indien één van deze items niet ondersteund wordt (weergegeven als <strong class="_QQ_"red"_QQ_">Nee</strong>) neem dan de nodige stappen om dit te corrigeren.<br />Joomla! kan niet geïnstalleerd worden wanneer de instellingen niet aan de onderstaande vereisten voldoen."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Aanbevolen instellingen:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Deze PHP instellingen worden aanbevolen om een goede werking van Joomla! te garanderen.<br />Echter, Joomla! kan toch nog correct werken als deze aanbevolen instellingen niet volledig overeenkomen."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Dit is waarschijnlijk &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Databasetype"
 INSTL_DATABASE_USER_DESC="Dit kan de standaard MySQL gebruikersnaam "_QQ_"root"_QQ_" zijn of een gebruikersnaam die de hostingprovider heeft opgegeven"
 INSTL_DATABASE_USER_LABEL="Gebruikersnaam"
-INSTL_DATABASE_TITLE="Verbindingsinstellingen"
-INSTL_DATABASE_DESC="<p>Een Joomla! website bewaart alle data in een database. Dit venster zorgt ervoor dat het installatieprogramma alle benodigde gegevens krijgt waarmee deze database gemaakt kan worden.</p><p> Als u Joomla! op een externe server installeert dient u deze gegevens via uw webhost te verkrijgen.</p><p>Sommige webhosts vereisen dat u de database maakt voordat u Joomla! installeert. Wanneer u het bericht "_QQ_"Er kan geen verbinding worden gemaakt met de database"_QQ_" ziet, controleer dan of de gebruikersnaam en het wachtwoord correct zijn ingevuld. Indien u het bericht blijft zien vraag dan uw webhost of het nodig is de database te maken voordat Joomla geïnstalleerd wordt.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Automatisch FTP pad zoeken"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP rootpad"
 INSTL_FTP_SAVE_LABEL="FTP wachtwoord opslaan"
 INSTL_FTP_TITLE="FTP Configuratie (<strong class="_QQ_"red"_QQ_">Optioneel - De meeste gebruikers kunnen deze stap overslaan - Klik op volgende om verder te gaan</strong>)"
 INSTL_FTP_USER_LABEL="FTP gebruikersnaam"
-INSTL_SITE_NAME_LABEL="Websitenaam"
 INSTL_VERIFY_FTP_SETTINGS="Bevestig FTP instellingen"
 INSTL_FTP_SETTINGS_CORRECT="De instellingen zijn juist"
 INSTL_FTP_USER_DESC="Waarschuwing! Aanbevolen wordt dit leeg te laten en uw FTP gebruikersnaam telkens in te vullen wanneer u bestanden overbrengt."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Vul het wachtwoord voor de super administrator accoun
 INSTL_ADMIN_PASSWORD2_LABEL="Bevestig wachtwoord administrator"
 INSTL_ADMIN_USER_LABEL="Gebruikersnaam administrator"
 INSTL_ADMIN_USER_DESC="Vul de gebruikersnaam voor uw super gebruiker account in."
-INSTL_SITE_NAME_TITLE="Websitenaam"
+INSTL_SITE_NAME_LABEL="Websitenaam"
 INSTL_SITE_NAME_DESC="Vul de naam in van uw Joomla! website."
 INSTL_SITE_METADESC_LABEL="Beschrijving"
 INSTL_SITE_METADESC_TITLE_LABEL="Vul een beschrijving van de algehele website in die gebruikt zal worden door zoekmachines. Over het algemeen is een maximum van 20 woorden optimaal."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Hieronder vindt u de instellingen van de nieuwe geïnstalle
 INSTL_EMAIL_NOT_SENT="E-mail kan niet worden verzonden."
 
 ;Complete view
-INSTL_COMPLETE="Voltooien"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Inloggegevens beheergedeelte"
-INSTL_COMPLETE_DESC1="Klik op de knop Website om uw Joomla! Website te bekijken of op de knop Administratie om in te loggen op het beheergedeelte."
-INSTL_COMPLETE_DESC2="Op de Joomla! Community website kunt u een lijst met links vinden naar beschikbare taalpakketten evenals links naar taalgerelateerde bronnen op de joomla.org websites."
-INSTL_COMPLETE_DESC3="Klik op de link rechts om de Community website te openen in een nieuw venster."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="De installatiemap is al verwijderd."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="De installatiemap kan niet verwijderd worden. Verwijder de map handmatig."
 INSTL_COMPLETE_FOLDER_REMOVED="Installatiemap verwijderen geslaagd"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Taal"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versie"
 INSTL_LANGUAGES_DESC="De Joomla interface is beschikbaar in verschillende talen. Kies de benodigde talen door deze aan te vinken en installeer ze door op de knop 'Volgende' te klikken.<br/>Let op: deze handeling neemt ongeveer 10 seconden voor het downloaden en installeren van iedere taal in beslag. Om een time-out te voorkomen wordt aanbevolen niet meer dan 3 talen te selecteren."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Deze handeling neemt ongeveer 5 seconden per taal in beslag<br />Taalpakketten worden gedownload en geïnstalleerd, even geduld..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Selecteer een taal. Klik op de knop 'Vorige' wanneer er geen andere talen geïnstalleerd hoeven te worden"
+INSTL_LANGUAGES_MORE_LANGUAGES="Klik op de knop 'Vorige' wanneer er meer talen geïnstalleerd moeten worden."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED=INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Er zijn geen talen om te installeren geselecteerd. Klik op de knop 'Vorige' wanneer er meer talen geïnstalleerd moeten worden en kies de talen uit de lijst."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kan geen verbinding maken met de taalserver. Voltooi de installatieprocedure."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Let op: Taalpakketten kunnen later vanaf het beheergedeelte geïnstalleerd worden"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Ga terug naar de laatste installatiestap"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Installeer bijbehorende inhoud"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Iindien geactiveerd zal Joomla automatisch een artikelcategorie per geïnstalleerde taal maken. Tevens wordt er een speciaal artikel met dummy-tekst in iedere categorie gemaakt"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Meertalig"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Dit gedeelte maakt het mogelijk om de meertalige functionaliteit van Joomla! te activeren"
-INSTL_DEFAULTLANGUAGE_NOTE="Let op: Wanneer op de knop 'Volgende' wordt geklikt gaat u terug naar het einde van de installatieprocedure waar wordt gevraagd de installatiemap te verwijderen."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Selecteer de standaard taal"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="U kunt deze later vanaf het beheergedeelte installeren"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Er deden zich enkele fouten voor tijdens de back-up van de database."
 INSTL_DATABASE_ERROR_CREATE="Er deed zich een fout voor bij het aanmaken van de database %s.<br/>De gebruiker heeft mogelijk niet voldoende rechten voor het aanmaken van een database. De vereiste database moet mogelijk apart aangemaakt worden voordat u Joomla! kunt installeren."
 INSTL_DATABASE_ERROR_DELETE="Er deden zich enkele fouten voor tijdens het verwijderen van de database."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Fout tijdens het initialiseren van het schemaversienummer"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Verwijderen"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Back-up"
 INSTL_DATABASE_FIX_TOO_LONG="Het MySQL tabelvoorvoegsel mag maximaal 15 tekens bevatten."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="SQL Server 2008 R2 (10.50.1600.1) of hoge
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="SQL Server 2008 R2 (10.50.1600.1) of hoger is vereist om de installatie te vervolgen. Uw versie is: %s"
 INSTL_DATABASE_INVALID_TYPE="Selecteer een databasetype"
 INSTL_DATABASE_NAME_TOO_LONG="De MySQL databasenaam mag maximaal 64 tekens bevatten."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Het MySQL tabelvoorvoegsel moet beginnen met een letter en gevolgd worden door alleen letters, nummers of onderstrepingstekens."
 INSTL_DATABASE_INVALID_NAME="In MySQL versies ouder dan 5.1.6 mag de naam geen punten of andere "_QQ_"speciale"_QQ_" tekens bevatten. Uw versie is: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL databasenamen en tabelnamen mogen niet beginnen of eindigen met een spatie."
-INSTL_DATABASE_NAME_INVALID_CHAR="Geen MySQL identifier kan een NUL ASCII(0x00) bevatten."
+INSTL_DATABASE_NAME_INVALID_CHAR="Een MySQL identifier kan geen NULL ASCII(0x00) bevatten."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Bestand %s bestaat niet"
 
 ;controllers
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="De functie "_QQ_"SYST"_QQ_" is mislukt."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Kan FTP rootmap niet automatisch vinden."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Geavanceerde instellingen"
-INSTL_BASIC_SETTINGS="Basis instellingen"
 INSTL_CONFPROBLEM="Uw configuratiebestand of map is niet schrijfbaar of er is een probleem bij het aanmaken hiervan. U dient volgende code handmatig te uploaden. Klik in het tekstvak om alle code te kopiëren, en plak de code in een nieuw bestand. Noem dit bestand 'configuration.php' en upload deze naar de rootmap van uw website."
 INSTL_DATABASE_SUPPORT="Database ondersteuning:"
 INSTL_DISPLAY_ERRORS="Fouten weergeven"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Er zijn enkele fouten ontstaan bij het invoeren in de database:
 INSTL_ERROR_INITIALISE_SCHEMA="Kan databaseschema niet initialiseren"
 INSTL_FILE_UPLOADS="Bestandsupload"
 INSTL_GNU_GPL_LICENSE="GNU Algemene Publieke Licentie"
-INSTL_INSTALLATION="Installatie"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON ondersteuning"
-INSTL_LICENSE="Licentie"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC uitgeschakeld"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB taal is standaard"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Verwerking is bezig. Even geduld..."
 
 ;Global strings
 JADMINISTRATOR="Administratie"
-JADVANCED="Geavanceerd"
 JCHECK_AGAIN="Controleer opnieuw"
 JERROR="Fout"
 JEMAIL="E-mail"
@@ -310,6 +288,7 @@ JLIB_FORM_FIELD_INVALID="Ongeldig veld:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ongeldig veld: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Verplicht veld: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Installeren: Kopiëren bestand %1$s naar %2$s mislukt."
+JLIB_INSTALLER_NOT_ERROR="Wanneer deze foutmelding betrekking heeft op de installatie van TinyMCE taalbestanden heeft dit geen effect op de installatie van de ta(a)l(en). Sommige taalpakketten die gemaakt zijn voor oudere versies dan Joomla! 3.2.0 bevatten aparte TinyMCE taalbestanden. Deze hoeven niet langer apart geïnstalleerd te worden omdat Joomla core deze al bevat."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kan niet verbinden met de database <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/nl-NL/nl-NL.xml b/installation/language/nl-NL/nl-NL.xml
index 5a68745..71f377d 100644
--- a/installation/language/nl-NL/nl-NL.xml
+++ b/installation/language/nl-NL/nl-NL.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Dutch Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Dutch language installation for Joomla 3.0</description>
 	<files>
diff --git a/installation/language/pl-PL/pl-PL.ini b/installation/language/pl-PL/pl-PL.ini
index 70e6afd..8995172 100644
--- a/installation/language/pl-PL/pl-PL.ini
+++ b/installation/language/pl-PL/pl-PL.ini
@@ -10,24 +10,16 @@ INSTL_STEP_COMPLETE_LABEL="Zakończenie"
 INSTL_STEP_DATABASE_LABEL="Baza danych"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Wybierz domyślny język"
 INSTL_STEP_FTP_LABEL="Konfiguracja FTP"
-INSTL_STEP_LANGUAGE_LABEL=" Wybór języka"
 INSTL_STEP_LANGUAGES_LABEL="Instaluj język"
-INSTL_STEP_LICENSE_LABEL="Akceptacja licencji"
-INSTL_STEP_PREINSTALL_LABEL="Test środowiska"
 INSTL_STEP_SITE_LABEL="Konfiguracja witryny"
 INSTL_STEP_SUMMARY_LABEL="Podsumowanie"
-INSTL_STEPS_TITLE="Kolejne kroki"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Wybierz język"
-INSTL_SELECT_LANGUAGE_DESC="Wybierz język, który zostanie wykorzystany podczas kolejnych kroków procesu instalacji środowiska Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Wybierz język"
 INSTL_WARNJAVASCRIPT="Ostrzeżenie! Do poprawnej instalacji środowiska Joomla! wymagana jest włączona obsługa JavaScript w przeglądarce!"
 INSTL_WARNJSON="Aby zainstalować Joomla, w ustawieniach PHP na serwerze musi być włączona obsługa JSON."
 
 ;Preinstall view
-INSTL_PRECHECK_TITLE="Przegląd ustawień środowiska"
-INSTL_PRECHECK_FOR_VERSION="Ustawienia wymagane dla %s:"
 INSTL_PRECHECK_DESC="Jeżeli któryś z warunków nie został spełniony (został oznaczony następująco <strong class="_QQ_"red"_QQ_">Nie</strong>), podejmij stosowne kroki, by to zmienić. Nie można zainstalować Joomla!, dopóki nie zostaną spełnione poniższe wymagania."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Ustawienia zalecane:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Poniższe zalecane ustawienia PHP zapewnią pełną zgodność ze środowiskiem Joomla!.<br />Joomla! będzie jednak działać, nawet gdy twoje ustawienia niezupełnie odpowiadają tym zalecanym."
@@ -53,8 +45,6 @@ INSTL_DATABASE_TYPE_DESC="Prawdopodobnie "_QQ_"MySQLi"_QQ_""
 INSTL_DATABASE_TYPE_LABEL="Typ bazy danych"
 INSTL_DATABASE_USER_DESC="Prawdopodobnie jedno z dwojga: albo "_QQ_"root"_QQ_" albo nazwa użytkownika, którą przekazał ci usługodawca"
 INSTL_DATABASE_USER_LABEL="Nazwa użytkownika"
-INSTL_DATABASE_TITLE="Ustawienie połączenia"
-INSTL_DATABASE_DESC="<p>Joomla! przechowuje wszystkie dane witryny. W tym kroku konfigurujesz połączenie niezbędne do stworzenia bazy danych.</p><p>Jeśli instalujesz Joomla! na zdalnym serwerze, niezbędne informacje uzyskasz od firmy hostingowej.</p><p>Na niektórych serwerach konieczne jest utworzenie bazy danych przed zainstalowaniem Joomla. Jeśli otrzymasz komunikat "_QQ_"Nie można połączyć się z bazą danych"_QQ_", sprawdź, czy nazwa użytkownika i hasło są poprawne. Jeśli nadal otrzymujesz ten komunikat, skontaktuj się z hostingodawcą, aby sprawdzić, czy konieczne jest utworzenie bazy danych przed instalacją Joomla!.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Automatyczne znajdowanie ścieżki FTP"
@@ -68,7 +58,6 @@ INSTL_FTP_ROOT_LABEL="Ścieżka dostępu do głównego katalogu FTP"
 INSTL_FTP_SAVE_LABEL="Zapisz hasło do konta FTP"
 INSTL_FTP_TITLE="Konfiguracja obsługi FTP (<strong class="_QQ_"red"_QQ_">Opcjonalna: większość użytkowników może ten etap pominąć, wciskając przycisk &bdquo;Dalej&rdquo;</strong>)"
 INSTL_FTP_USER_LABEL="Nazwa użytkownika FTP"
-INSTL_SITE_NAME_LABEL="Nazwa witryny"
 INSTL_VERIFY_FTP_SETTINGS="Zweryfikuj ustawienia FTP"
 INSTL_FTP_SETTINGS_CORRECT="Ustawienia są prawidłowe"
 INSTL_FTP_USER_DESC="Uwaga! Zaleca się niewypełnianie tego pola i każdorazowe wprowadzanie nazwy użytkownika konta FTP przed przesłaniem plików."
@@ -83,7 +72,7 @@ INSTL_ADMIN_PASSWORD_DESC="Ustal hasło konta głównego administratora i&nbsp;p
 INSTL_ADMIN_PASSWORD2_LABEL="Powtórz hasło administratora"
 INSTL_ADMIN_USER_LABEL="Nazwa&nbsp;administratora"
 INSTL_ADMIN_USER_DESC="Ustal nazwę konta głównego administratora."
-INSTL_SITE_NAME_TITLE="Nazwa witryny"
+INSTL_SITE_NAME_LABEL="Nazwa witryny"
 INSTL_SITE_NAME_DESC="Wpisz nazwę swojej witryny Joomla!."
 INSTL_SITE_METADESC_LABEL="Opis witryny"
 INSTL_SITE_METADESC_TITLE_LABEL="Opisz zwięźle treść witryny. Opis jest używany przez wyszukiwarki. Optymalnie: nie więcej niż 20 słów."
@@ -91,7 +80,7 @@ INSTL_SITE_OFFLINE_LABEL="Witryna wyłączona"
 INSTL_SITE_OFFLINE_TITLE_LABEL="Wyłącz witrynę na czas, dopóki nie zostanie zainstalowana i skonfigurowana. Witrynę można włączyć po zakończeniu instalacji na stronie Konfiguracja globalna."
 INSTL_SITE_INSTALL_SAMPLE_LABEL="Załaduj przykładowe dane"
 INSTL_SITE_INSTALL_SAMPLE_DESC="Początkującym użytkownikom Joomla! stanowczo zaleca się załadowanie (do bazy danych) przykładowych danych. Dzięki temu w bazie znajdą się przykładowe dane dołączone do pakietu instalacyjnego Joomla!"
-INSTL_SITE_INSTALL_SAMPLE_NONE="Bez przykładowych danych <strong>Wymagane, aby utworzyć podstawową witrynę wielojęzyczną</strong>"
+INSTL_SITE_INSTALL_SAMPLE_NONE="Bez przykładowych danych. <strong>Wymagane, aby utworzyć podstawy witryny wielojęzycznej.</strong>"
 INSTL_SAMPLE_BLOG_SET="Blog - dane przykładowe w języku angielskim (GB)"
 INSTL_SAMPLE_BROCHURE_SET="Wizytówka - dane przykładowe w języku angielskim (GB)"
 INSTL_SAMPLE_DATA_SET="Domyślne dane przykładowe w języku angielskim (GB)"
@@ -127,18 +116,14 @@ INSTL_EMAIL_HEADING="Poniżej znajdują się ustawienia konfiguracyjne nowej wit
 INSTL_EMAIL_NOT_SENT="Email nie został wysłany."
 
 ;Complete view
-INSTL_COMPLETE="Zakończenie"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Szczegóły logowania dla administratora"
-INSTL_COMPLETE_DESC1="Kliknij przycisk <em>Witryna</em>, by zobaczyć stronę startową swojej witryny Joomla! lub przycisk <em>Zaplecze</em>, jeżeli chcesz przejść do strony logowania do zaplecza witryny."
-INSTL_COMPLETE_DESC2="Na stronie polskiej dokumentacji Joomla! znajdziesz prostą instrukcję krok po kroku mówiącą o tym, w jaki sposób zainstalować tłumaczenie etykiet i komunikatów ekranowych na język polski. Jest tam również lista odnośników do innych paczek językowych."
-INSTL_COMPLETE_DESC3="Kliknij na przycisku widocznym po prawej stronie, by otworzyć stronę Pomocy Joomla! w nowym oknie."
-INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Folder instalacyjny został już usunięty"
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="Folderu instalacyjnego nie można usunąć. Usuń ten folder ręcznie."
-INSTL_COMPLETE_FOLDER_REMOVED="Folder instalacyjny usunięto"
-INSTL_COMPLETE_LANGUAGE_1="Joomla! w twoim języku ojczystym i/lub automatycznie utworzonej wielojęzyzności"
+INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Katalog instalacyjny został już usunięty"
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Folderu instalacyjnego nie można usunąć. Usuń ten katalog ręcznie."
+INSTL_COMPLETE_FOLDER_REMOVED="Katalog instalacyjny usunięto"
+INSTL_COMPLETE_LANGUAGE_1="Joomla! w twoim języku ojczystym i automatycznie utworzonej wielojęzyczności"
 INSTL_COMPLETE_LANGUAGE_DESC="Przed usunięciem folderu instalacyjnego można zainstalować dodatkowe języki. Jeśli chcesz dodać kolejne języki do aplikacji Joomla!, kliknij poniższy przycisk."
 INSTL_COMPLETE_LANGUAGE_DESC2="Uwaga: będzie potrzebny dostęp do Internetu, aby umożliwić Joomla! pobranie i zainstalowanie nowych języków.<br/> Niektóre konfiguracje serwerów nie pozwolą Joomla! na przeprowadzenie instalacji języków. Jeśli tak jest w twoim przypadku, nie martw się, języki będzie można zainstalować później za pomocą instalatora dostępnego na zapleczu administracyjnym."
-INSTL_COMPLETE_REMOVE_FOLDER="Usuń folder instalacyjny"
+INSTL_COMPLETE_REMOVE_FOLDER="Usuń katalog instalacyjny"
 INSTL_COMPLETE_REMOVE_INSTALLATION="Pamiętaj, by całkowicie usunąć katalog instalacyjny (nazwany installation).<br />Nie będziesz mógł przejść do kolejnego kroku procesu instalacji, dopóki nie usuniesz tego katalogu. Jest to wymóg podyktowany bezpieczeństwem środowiska Joomla!"
 INSTL_COMPLETE_TITLE="Gratulacje! Udało Ci się zainstalować Joomla!"
 INSTL_COMPLETE_INSTALL_LANGUAGES="Dodatkowy krok: Instaluj języki"
@@ -149,6 +134,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Język"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Wersja"
 INSTL_LANGUAGES_DESC="Interfejs Joomla! jest dostępny w wielu językach. Zaznacz preferowane języki, klikając w polu wyboru i zainstaluj je, klikając przycisk Dalej.<br/>Uwaga: Ta operacja trwa około 10 sekund potrzebnych na pobranie i zainstalowanie każdego języka. Proszę wybrać nie więcej niż 3 języki do zainstalowania, aby uniknąć opóźnień."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ta operacja wymaga około 10 sekund na zakończenie<br />Proszę czekać, aż wybrane języki zostaną pobrane i..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Kliknij przycisk 'Poprzedni', jeśli chcesz zainstalowac więcej języków."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Proszę wybrać język. Jeśli nie chcesz instalować innych języków, naciśnij przycisk 'Poprzedni'"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! nie może połączyć się z serwerem języków. Prosimy zakończyć proces instalacji."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Uwaga: Języki będzie można zainstalować później za pomocą instalatora dostępnego na zapleczu administracyjnym Joomla!"
@@ -180,14 +166,12 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla nie był w sta
 INSTL_DEFAULTLANGUAGE_DESC="W Joomla zainstalowano następujące języki. Prosimy wybrać pożądany język domyślny zaplecza Joomla."
 INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="W Joomla zainstalowano następujące języki. Prosimy wybrać pożądany język domyślny witryny Joomla."
 INSTL_DEFAULTLANGUAGE_FRONTEND="Domyślny język witryny"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla nie był w stanie ustawić domyślnego języka WITRYNY. Jako domyślny język witryny zostanie zastosowany język angielski."
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla nie był w stanie ustawić domyślnego języka WITRYNY. Jako domyślny język WITRYNY zostanie zastosowany język angielski."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla ustawił język %s jako domyślny język WITRYNY."
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instaluj zlokalizowaną zawartość"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Jeśli aktywne, Joomla automatycznie utworzy jedną kategorię zawartości dla każdego zainstalowanego języka. Ponadto w każdej kategorii zostanie utworzony jeden artykuł zawierający atrapę treści"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Wielojęzyczność"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ta sekcja umożliwia automatyczne włączenie funkcji obsługujących wielojęzyczność Joomla"
-INSTL_DEFAULTLANGUAGE_NOTE="Uwaga: gdy naciśniesz przycisk Dalej, Joomla! przekieruje cię z powrotem do ostatniego kroku instalacji, gdzie zostaniesz poproszony o usunięcie folderu instalacyjnego."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Wybierz język domyślny"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Będzie go można zainstalować później za pomocą instalatora dostępnego na zapleczu administracyjnym Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +184,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Podczas tworzenia kopii bezpieczeństwa (backup) wystąpiły błędy."
 INSTL_DATABASE_ERROR_CREATE="Podczas próby stworzenia bazy danych %s wystąpiły błędy.<br />Użytkownik może nie posiadać dostatecznych uprawnień, by stworzyć bazę danych. Być może konieczne będzie stworzenie bazy danych bez udziału programu instalacyjnego, zanim będziesz mógł kontynuować proces instalacji środowiska Joomla!"
 INSTL_DATABASE_ERROR_DELETE="Podczas usuwania bazy danych wystąpiły błędy."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Błąd inicjalizacji numeru wersji schematu bazy danych"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Usuń starsze tabele"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Archiwizuj starsze tabele"
 INSTL_DATABASE_FIX_TOO_LONG="Przedrostek tabel MySQL nie może mieć więcej niż 15 znaków."
@@ -211,7 +194,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Wymagany jest SQL Server 2008 R2 (10.50.1
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Wymagany jest SQL Server 2008 R2 (10.50.1600.1) lub nowszy, aby kontynuować instalację. Twoja wersja: %s"
 INSTL_DATABASE_INVALID_TYPE="Proszę wybierz typ bazy danych"
 INSTL_DATABASE_NAME_TOO_LONG="Długość nazwy bazy danych MySQL nie może przekroczyć 64 znaków."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Nazwa przedrostka tabel MySQL musi zaczynać się literą i może zawierać wyłącznie litery, cyfry lub znak podkreślenia."
 INSTL_DATABASE_INVALID_NAME="Dla wersji MySQL wcześniejszych niż 5.1.6 nazwa nie może zawierać kropek lub innych "_QQ_"specjalnych"_QQ_" znaków. Wersja twojego serwera to: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Nazwy baz MySQL oraz nazwy tabel nie mogą się zaczynać ani kończyć spacją."
 INSTL_DATABASE_NAME_INVALID_CHAR="Żaden z identyfikatorów MySQL nie może zawierać NUL ASCII(0x00)."
@@ -246,8 +228,6 @@ INSTL_FTP_NOSYST="Nie powiodło się użycie funkcji "_QQ_"SYST"_QQ_"."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Nie powiodło się automatyczne wykrycie głównego katalogu FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Ustawienia rozszerzone"
-INSTL_BASIC_SETTINGS="Ustawienia podstawowe"
 INSTL_CONFPROBLEM="Twój plik lub katalog konfiguracyjny nie ma ustawionych praw pozwalających na ich zapisanie lub wystąpił problem ze stworzeniem pliku konfiguracyjnego. Wobec tego musisz ręcznie przesłać na serwer kod znajdujący się poniżej. Kliknij obszar zawierający tekst, by go podświetlić, a następnie wklej go do nowego pliku tekstowego. Nadaj temu plikowi nazwę 'configuration.php' i umieść go w głównym katalogu swojej witryny."
 INSTL_DATABASE_SUPPORT="Obsługiwane bazy danych:"
 INSTL_DISPLAY_ERRORS="Wyświetlanie błędów"
@@ -255,9 +235,7 @@ INSTL_ERROR_DB="Podczas wypełniania bazy danych wystąpiły błędy: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Nie można zainicjować schematu bazy danych"
 INSTL_FILE_UPLOADS="Przesyłanie plików"
 INSTL_GNU_GPL_LICENSE="GNU Powszechna Licencja Publiczna"
-INSTL_INSTALLATION="Instalacja"
 INSTL_JSON_SUPPORT_AVAILABLE="Obsługa JSON"
-INSTL_LICENSE="Licencja"
 INSTL_MAGIC_QUOTES_GPC="Magiczne apostrofy GPC wyłączone"
 INSTL_MAGIC_QUOTES_RUNTIME="Magiczne apostrofy Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Język wielobajtowy - neutralny"
@@ -279,7 +257,6 @@ INSTL_PROCESS_BUSY="Trwa przetwarzanie. Proszę czekać..."
 
 ;Global strings
 JADMINISTRATOR="Zaplecze"
-JADVANCED="Dodatkowe"
 JCHECK_AGAIN="Spróbuj ponownie"
 JERROR="Błąd"
 JEMAIL="Email"
@@ -296,7 +273,7 @@ JOFF="Wyłączone"
 JON="Włączone"
 JPREVIOUS="Cofnij"
 JSITE="Witryna"
-JUSERNAME="Nazwa użytkownika"
+JUSERNAME="Użytkownik"
 JYES="Tak"
 
 ; Framework strings necessary when no lang pack is available
@@ -310,6 +287,7 @@ JLIB_FORM_FIELD_INVALID="Niepoprawne pole:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Niepoprawne pole: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Wymagane pole: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Nie udało się kopiowanie pliku %1$s do %2$s."
+JLIB_INSTALLER_NOT_ERROR="Jeśli bład jest związany z instalacją plików językowych TinyMCE, nie ma to wpływu na instalację języka. Niektóre pakiety językowe stworzone przed Joomla! 3.2.0 mogą próbowac instalowac osobne pliki językowe TinyMCE. Ponieważ są one obecnie zawarte w rdzeniu, nie trzeba ich już instalować."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Nie można się połączyć z bazą danych <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/pl-PL/pl-PL.xml b/installation/language/pl-PL/pl-PL.xml
index 071db53..60db873 100644
--- a/installation/language/pl-PL/pl-PL.xml
+++ b/installation/language/pl-PL/pl-PL.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>15 września 2012</creationDate>
 	<author>Polskie Centrum Joomla!: joomla.pl</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/ro-RO/ro-RO.ini b/installation/language/ro-RO/ro-RO.ini
index 99500f1..60b6808 100644
--- a/installation/language/ro-RO/ro-RO.ini
+++ b/installation/language/ro-RO/ro-RO.ini
@@ -1,6 +1,8 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
+; Romanian Joomla! Translation Team
+; Author : Horia Negura, Quanta, fakemoth@gmail.com
 ; Note : All ini files need to be saved as UTF-8
 
 
@@ -10,24 +12,17 @@ INSTL_STEP_COMPLETE_LABEL="Finalizare"
 INSTL_STEP_DATABASE_LABEL="Baza de date"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Alegeți limba implicită"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Limbă"
 INSTL_STEP_LANGUAGES_LABEL="Instalare Limbi"
-INSTL_STEP_LICENSE_LABEL="Licenţă"
-INSTL_STEP_PREINSTALL_LABEL="Verificare înaintea instalării"
 INSTL_STEP_SITE_LABEL="Configurare"
 INSTL_STEP_SUMMARY_LABEL="Rezumat"
-INSTL_STEPS_TITLE="Paşi"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Alegere limbă"
-INSTL_SELECT_LANGUAGE_DESC="Vă rugăm selectaţi limba folosită pe parcursul instalării Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Selectare limbă"
 INSTL_WARNJAVASCRIPT="Atenție! Pentru o instalare corectă a Joomla!, JavaScript trebuie activat!"
 INSTL_WARNJSON="Pentru a instala Joomla, instalarea dvs PHP trebuie să conţină JSON activat!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Verificare înaintea instalării"
-INSTL_PRECHECK_FOR_VERSION="Verificare înaintea instalării pentru %s:"
 INSTL_PRECHECK_DESC="Dacă oricare dintre aceste elemente nu este suportat (marcat cu <strong class="_QQ_"red"_QQ_">Nu</strong>), atunci vă rugăm să corectaţi aceste erori. În caz contrar, este posibil ca instarea Joomla! să nu funcționeze."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Setări recomandate:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Aceste setări sunt recomandate pentru PHP în vederea asigurării compatibilităţii totale cu Joomla.<br />Totuşi, Joomla va funcţiona chiar dacă setările dumneavoastră nu se potrivesc perfect cu cele recomandate."
@@ -53,8 +48,6 @@ INSTL_DATABASE_TYPE_DESC="Aceasta este probabil "_QQ_"MySQLi"_QQ_""
 INSTL_DATABASE_TYPE_LABEL="Tip bază de date"
 INSTL_DATABASE_USER_DESC="Acesta poate fi utilizatorul "_QQ_"root"_QQ_" sau un nume de utilizator oferit de serviciul de găzduire"
 INSTL_DATABASE_USER_LABEL="Utilizator"
-INSTL_DATABASE_TITLE="Setări conexiune"
-INSTL_DATABASE_DESC="<p>Un site Joomla! stochează toate datele într-o bază de date. Aceast formular oferă programului de instalare datele necesare pentru crearea bazei de date.</p><p> Dacă instalați Joomla! pe un server la distanță, trebuie să procurați aceste date de la furnizorul de găzduire.</p><p> Unele servere necesită crearea bazei de date înaintea instalării Joomla!. Dacă primiți eroarea "_QQ_"Nu s-a putut efectua conexiunea la baza de date"_QQ_" verificați dacă utilizatorul și parola sunt corecte. Dacă eroarea persistă, solicitați ajutorul furnizorului de gazduire, pentru a verifica dacă trebuie să creați baza de date înaintea instalării Joomla!.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Găsire automată a căii FTP"
@@ -68,7 +61,6 @@ INSTL_FTP_ROOT_LABEL="Cale director rădăcină FTP"
 INSTL_FTP_SAVE_LABEL="Salvare parolă FTP"
 INSTL_FTP_TITLE="Configurare FTP (<strong class="_QQ_"red"_QQ_">Opțional - Majoritatea utilizatorilor pot sa sară peste acest pas - Apăsați Pasul următor</strong>)"
 INSTL_FTP_USER_LABEL="Utilizator FTP"
-INSTL_SITE_NAME_LABEL="Nume site"
 INSTL_VERIFY_FTP_SETTINGS="Verificați setările FTP"
 INSTL_FTP_SETTINGS_CORRECT="Setările sunt corecte"
 INSTL_FTP_USER_DESC="Atenție! Este recomandat să lăsați acest câmp gol și să introduceți utilizatorul FTP de fiecare dată când doriți să transferați fișiere."
@@ -83,7 +75,7 @@ INSTL_ADMIN_PASSWORD_DESC="Setați parola pentru contul Super Administratorului,
 INSTL_ADMIN_PASSWORD2_LABEL="Confirmare parolă administrator"
 INSTL_ADMIN_USER_LABEL="Nume utilizator Administrator"
 INSTL_ADMIN_USER_DESC="Puteți modifica numele de utilizator implicit <strong>admin</strong>."
-INSTL_SITE_NAME_TITLE="Nume site"
+INSTL_SITE_NAME_LABEL="Nume site"
 INSTL_SITE_NAME_DESC="Introduceţi numele site-ului dvs Joomla!."
 INSTL_SITE_METADESC_LABEL="Descriere"
 INSTL_SITE_METADESC_TITLE_LABEL="Introduceți descrierea globală a site-ului pentru a fi folosită de motoarele de căutare. De regulă, maxim 20 de cuvinte este considerat optim."
@@ -127,11 +119,7 @@ INSTL_EMAIL_HEADING="Mai jos gasiți setările de configurare pentru noul websit
 INSTL_EMAIL_NOT_SENT="Emailul nu a putut fi trimis."
 
 ;Complete view
-INSTL_COMPLETE="Sfârșit"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalii de autentificare pentru Administrare"
-INSTL_COMPLETE_DESC1="Apasați butonul Site pentru a vizualiza site-ul Joomla! sau butonul Admin pentru a fi transferat la interfaţa de administrator."
-INSTL_COMPLETE_DESC2="Pe site-ul Comunității Joomla! veți găsi o listă cu pachetele de limbă disponibile precum și link-uri spre resurse de limbă pentru familia de site-uri joomla.org."
-INSTL_COMPLETE_DESC3="Urmaţi link-ul din dreapta pentru a deschide Site-ul comunității într-o nouă fereastră."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Directorul de instalare a fost deja șters."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Directorul de instalare nu a putut fi șters. Vă rugăm să ștergeți directorul manual."
 INSTL_COMPLETE_FOLDER_REMOVED="Directorul de instalare a fost șters cu succes"
@@ -149,7 +137,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Limbă"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Versiune"
 INSTL_LANGUAGES_DESC="Interfața Joomla este disponibilă în mai multe limbi. Alegeți limbile dorite prin selectarea casuțelor și instalați-le prin apăsarea butonului Pasul următor.<br/>Observație: această operațiune va dura cam 10 secunde pentru descărcarea și instalarea fiecărei limbi. Vă rugăm să nu selectați mai mult de 3 limbi pentru a evita expirarea timpului de lucru."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Această operațiune va dura până la 10 secunde pentru fiecare limbă<br />Vă rugăm să așteptați până se descarcă și instalează limbile...."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Vă rugăm, să selectați o limbă. Dacă nu doriți să instalați alte limbi apăsați butonul 'Pasul precedent'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Apăsați butonul 'Precedent' dacă doriți să instalați mai multe limbi."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nici o limbă nu a fost selectată pentru instalare. Dacă doriți să instalați alte limbi, apăsați butonul 'Precedent' și alegeți limbile dorite din listă."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! nu a reușit să se conecteze la serverul de limbă. Vă rugăm finalizați procesul de instalare."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Observație: Veți putea instala mai tarziu limbile folosind secțiunea de administrare Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Înapoi la ultimul pas de instalare"
@@ -186,8 +175,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalare conținut localizat"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Dacă este activ, Joomla va crea automat câte o categorie pentru fiecare limbă instalată. De asemenea, un articol recomandat cu conținut mostră va fi creat în fiecare categorie"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multilingvistic"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Această secțiune vă permite activarea automată a funcționalității multilingvistice Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Observație: odată apăsat butonul Pasul următor veți ajunge la finalul procesului de instalare unde veți fi rugat să ștergeți directorul de instalare."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Selectați Limba implicită"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Veți putea instala mai târziu folosind administratorul Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +187,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Au apărut erori în timpul creării copiei de siguranţă a bazei de date."
 INSTL_DATABASE_ERROR_CREATE="A apărut o eroare în timpul creării bazei de date %s<br/>Este posibil ca utilizatorul să nu aibe permisiunile de a crea o bază de date. Este posibil ca baza de date necesară să fie creată separat înainte de a instala Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Au apărut erori în timpul ştergerii bazei de date."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Eroare la inițializarea numărului versiunii schemei"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Eliminare"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Copie de siguranță"
 INSTL_DATABASE_FIX_TOO_LONG="Prefixul de tabel MySQL trebuie să aibă o lungime maximă de 15 caractere."
@@ -211,10 +197,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Pentru a continua instalarea aveți nevoi
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Pentru a continua instalarea aveți nevoie de versiunea SQL Server 2008 R2 (10.50.1600.1) sau mai mare. Versiunea actuală este: %s"
 INSTL_DATABASE_INVALID_TYPE="Alegeți tipul bazei de date"
 INSTL_DATABASE_NAME_TOO_LONG="Numele bazei de date MySQL trebuie să aibă o lungime maximă de 64 caractere."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Prefixul de tabel MySQL trebuie să înceapă cu o literă şi să fie urmată doar de litere, numere sau linii de subliniere."
 INSTL_DATABASE_INVALID_NAME="Versiunile MySQL precedente 5.1.6 nu conțin puncte sau alte caractere "_QQ_"speciale"_QQ_" în nume. Versiunea actuală este: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Numele bazei de date MySQL si a tabelelor nu trebuie sa înceapă sau să se termine cu spații."
-INSTL_DATABASE_NAME_INVALID_CHAR="Niciun identificator MySQL nu poate conține NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Nici un identificator MySQL nu poate conține un NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Fișierul %s nu există"
 
 ;controllers
@@ -246,8 +231,6 @@ INSTL_FTP_NOSYST="Funcţia "_QQ_"SYST"_QQ_" a eșuat."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Nu s-a putut detecta directorul rădăcină FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Setări avansate"
-INSTL_BASIC_SETTINGS="Setări de bază"
 INSTL_CONFPROBLEM="Fişierul de configurare sau directorul unde se găseşte acesta nu are permisiuni de scriere, sau a apărut o problemă la crearea fişierului. Va trebui să încărcaţi următorul cod manual. Navigaţi în zona de text, selectaţi codul şi apoi copiaţi-l într-un nou fişier denumit 'configuration.php', pe care-l încărcaţi în directorul rădăcină al site-ului dumneavoastră."
 INSTL_DATABASE_SUPPORT="Suport bază de date:"
 INSTL_DISPLAY_ERRORS="Afișare erori"
@@ -255,9 +238,7 @@ INSTL_ERROR_DB="Au apărut câteva erori în timpul populării bazei de date: %s
 INSTL_ERROR_INITIALISE_SCHEMA="Nu se poate inițializa schema bazei de date"
 INSTL_FILE_UPLOADS="Încărcări fișiere"
 INSTL_GNU_GPL_LICENSE="Licența Publică Generală GNU"
-INSTL_INSTALLATION="Instalare"
 INSTL_JSON_SUPPORT_AVAILABLE="Suport JSON"
-INSTL_LICENSE="Licenţă"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language este implicit"
@@ -279,7 +260,6 @@ INSTL_PROCESS_BUSY="Se procesează datele. Vă rugam aşteptaţi..."
 
 ;Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Avansat"
 JCHECK_AGAIN="Verificați din nou"
 JERROR="Eroare"
 JEMAIL="Email"
@@ -289,12 +269,12 @@ JGLOBAL_SELECT_AN_OPTION="Selectați o opțiune"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="Niciun rezultat găsit"
 JGLOBAL_SELECT_SOME_OPTIONS="Selectați câteva opțiuni"
 JINVALID_TOKEN="Ultima cerere a fost respinsă deoarece conținea un token de securitate care nu este valid. Vă rugăm să reîncărcați pagina și să încercați din nou."
-JNEXT="Pasul următor"
+JNEXT="Următor"
 JNO="Nu"
 JNOTICE="Notificare"
 JOFF="Oprit"
 JON="Pornit"
-JPREVIOUS="Pasul anterior"
+JPREVIOUS="Precedent"
 JSITE="Site"
 JUSERNAME="Utilizator"
 JYES="Da"
diff --git a/installation/language/ro-RO/ro-RO.xml b/installation/language/ro-RO/ro-RO.xml
index a182e60..4344333 100644
--- a/installation/language/ro-RO/ro-RO.xml
+++ b/installation/language/ro-RO/ro-RO.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2013-11-26</creationDate>
 	<author>Horia Negura - Quanta</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/ru-RU/ru-RU.ini b/installation/language/ru-RU/ru-RU.ini
index 1c9ba7b..f2ce715 100644
--- a/installation/language/ru-RU/ru-RU.ini
+++ b/installation/language/ru-RU/ru-RU.ini
@@ -1,5 +1,5 @@
 ; Russian Translation Community (http://joomlaportal.ru)
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014	 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -8,25 +8,17 @@ INSTL_STEP_COMPLETE_LABEL="Завершение установки"
 INSTL_STEP_DATABASE_LABEL="Конфигурация БД"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Выбор языка по умолчанию"
 INSTL_STEP_FTP_LABEL="Конфигурация FTP"
-INSTL_STEP_LANGUAGE_LABEL="Выбор языка"
 INSTL_STEP_LANGUAGES_LABEL="Установка языковых пакетов"
-INSTL_STEP_LICENSE_LABEL="Лицензия"
-INSTL_STEP_PREINSTALL_LABEL="Начальная проверка"
 INSTL_STEP_SITE_LABEL="Конфигурация сайта"
 INSTL_STEP_SUMMARY_LABEL="Обзор"
-INSTL_STEPS_TITLE="Шаги"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Выберите язык"
-INSTL_SELECT_LANGUAGE_DESC="Выберите язык установки Joomla!"
 INSTL_SELECT_LANGUAGE_TITLE="Выберите язык"
-INSTL_LANGUAGE_TITLE="Выбор языка"
 INSTL_WARNJAVASCRIPT="Внимание! В вашем браузере отключен обработчик JavaScript. Пожалуйста, разрешите использование JavaScript перед тем, как продолжить установку Joomla!"
 INSTL_WARNJSON="Для установки Joomla необходимо включить поддержку JSON в PHP!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Начальная проверка"
-INSTL_PRECHECK_FOR_VERSION="Начальная проверка для %s:"
 INSTL_PRECHECK_DESC="Если любая из этих установок не поддерживается (выделена как <strong class="_QQ_"red"_QQ_">Нет</strong>), то настройки вашей системы не соответствуют минимально-необходимым требованиям. Вы не сможете установить Joomla! до тех пор, пока настройки вашей системы не будут соответствовать указанным требованиям."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Рекомендуемые установки:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Эти установки рекомендуются для полнофункциональной совместимости PHP с Joomla!.<br />Однако, Joomla! может работать, даже если ваши текущие установки не полностью совпадают с рекомендованными."
@@ -52,8 +44,6 @@ INSTL_DATABASE_TYPE_DESC="Это обычно &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Тип базы данных"
 INSTL_DATABASE_USER_DESC="Введите имя пользователя базы данных, выданное хостером. На локальном сервере обычно используется учётная запись &quot;root&quot; без пароля."
 INSTL_DATABASE_USER_LABEL="Имя пользователя"
-INSTL_DATABASE_TITLE="Настройки подключения к базе данных"
-INSTL_DATABASE_DESC="<p>Joomla! хранит информацию сайта в базе данных. На этой странице вводится информация, необходимая для создания базы данных.</p><p>Если вы устанавливаете сайт на рабочем сервере в интернете, вам потребуется узнать параметры подключения у вашего хостера.</p><p>На некоторых хостингах требуется предварительно создать базу данных и только после этого начинать установку Joomla!. Если вы увидите сообщение "_QQ_"Не удалось подключиться к базе данных"_QQ_", убедитесь, что имя пользователя и пароль доступа к базе данных введены правильно. Если сообщение появится снова, уточните у хостера, не требуется ли на его сервере создать базу данных до установки Joomla!.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Автопоиск пути FTP"
@@ -67,7 +57,6 @@ INSTL_FTP_ROOT_LABEL="Путь к корню FTP"
 INSTL_FTP_SAVE_LABEL="Сохранить пароль FTP"
 INSTL_FTP_TITLE="Конфигурация FTP (<strong class="_QQ_"red"_QQ_">Не обязательно - этот шаг можно пропустить - нажмите "_QQ_"Далее"_QQ_" для перехода к следующему шагу</strong>)"
 INSTL_FTP_USER_LABEL="Пользователь FTP"
-INSTL_SITE_NAME_LABEL="Название сайта"
 INSTL_VERIFY_FTP_SETTINGS="Проверить установки FTP"
 INSTL_FTP_SETTINGS_CORRECT="Настройки FTP верны"
 INSTL_FTP_USER_DESC="Внимание! Рекомендуем оставить поле пустым и вводить имя пользователя FTP каждый раз при перемещении файлов."
@@ -82,7 +71,7 @@ INSTL_ADMIN_PASSWORD_DESC="Введите пароль для учетной з
 INSTL_ADMIN_PASSWORD2_LABEL="Подтверждение пароля"
 INSTL_ADMIN_USER_LABEL="Логин администратора"
 INSTL_ADMIN_USER_DESC="Введите логин Суперадминистратора сайта."
-INSTL_SITE_NAME_TITLE="Название сайта"
+INSTL_SITE_NAME_LABEL="Название сайта"
 INSTL_SITE_NAME_DESC="Введите название вашего сайта."
 INSTL_SITE_METADESC_LABEL="Описание"
 INSTL_SITE_METADESC_TITLE_LABEL="Введите описание вашего сайта для&#160;Поисковых систем. Оптимальная длина описания - 20 слов."
@@ -126,11 +115,7 @@ INSTL_EMAIL_HEADING="Параметры конфигурации для сайт
 INSTL_EMAIL_NOT_SENT="Ошибка отправки e-mail."
 
 ;Complete view
-INSTL_COMPLETE="Завершение установки"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Подробности учетной записи администратора:"
-INSTL_COMPLETE_DESC1="Нажмите кнопку &laquo;Сайт&raquo;, чтобы перейти к сайту на Joomla! или &laquo;Панель управления&raquo; для перехода к административной панели."
-INSTL_COMPLETE_DESC2="На сайте Сообщества Joomla! вы найдёте список со ссылками на доступные языковые пакеты Joomla! и инструкции по установке языковых пакетов."
-INSTL_COMPLETE_DESC3="Нажмите на кнопку справа, чтобы открыть сайт Сообщества Joomla! в новом окне."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Директория 'installation' уже удалена."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Не удалось удалить директорию 'installation'. Пожалуйста, удалите эту директорию вручную."
 INSTL_COMPLETE_FOLDER_REMOVED="Директория 'installation' успешно удалена."
@@ -148,7 +133,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Язык"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Версия"
 INSTL_LANGUAGES_DESC="Интерфейс Joomla доступен на множестве языков. Отметьте нужные языки и продолжите установку нажатием кнопки &laquo;Далее&raquo;.<br/>Примечание: на установку каждого языкового пакета требуется порядка 10 секунд. Не рекомендуется выбирать более 3-х языковых пакетов."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Эта операция занимает примерно 10 секунд на каждый языковой пакет.<br />Пожалуйста, подождите пока языковые пакеты будут загружены и установлены..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Пожалуйста, выберите язык. Если вы не хотите устанавливать дополнительные языковые пакеты нажмите кнопку &laquo;Назад&raquo;."
+INSTL_LANGUAGES_MORE_LANGUAGES="Нажмите кнопку «Назад» если вам необходимо установить дополнительные языковые пакеты."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Пожалуйста, выберите язык. Для установки дополнительных языковых пакетов нажмите кнопку «Назад» и выберите языковые пакеты из списка."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Ошибка подключения к серверу языковых пакетов Joomla!. Пожалуйста, завершите процесс установки."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Примечание: Вы сможете установить языковые пакеты позже в панели управления Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Вернуться к предыдущему шагу"
@@ -185,8 +171,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Установить локал
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Позволяет автоматически создать по одной категории материалов для каждого из установленных языков. В каждую из категорий будет помещен один тестовый материал."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Мультиязычность"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Данный раздел позволяет вам автоматически активировать функцию мультиязычности Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Примечание: после нажатия кнопки &laquo;Далее&raquo; вы будете перенаправлены на завершающий этап установки Joomla и вам будет предложено удалить директорию 'installation'."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Выберите язык по умолчанию"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Вы сможете это изменить позже в Панели управления Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -199,7 +183,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Возникли ошибки при резервном копировании базы данных."
 INSTL_DATABASE_ERROR_CREATE="При создании базы данных возникла следующая ошибка: %s.<br />Возможно текущий пользователь не имеет достаточно прав для создания новой базы данных. В этом случае база данных может быть создана вручную, до начала установки Joomla!."
 INSTL_DATABASE_ERROR_DELETE="При удалении базы данных возникли ошибки."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Ошибка инициализации номера версии схемы"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Удалить"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Переименовать"
 INSTL_DATABASE_FIX_TOO_LONG="Префикс таблиц MySQL должен содержать не более 15 символов"
@@ -210,7 +193,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Для продолжения устан
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Для продолжения установки требуется SQL Server 2008 R2 (10.50.1600.1) или выше. Текущая версия SQL Server: %s"
 INSTL_DATABASE_INVALID_TYPE="Пожалуйста, выберите тип базы данных"
 INSTL_DATABASE_NAME_TOO_LONG="Имя базы данных MySQL должно содержать не более 64 символов"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Префикс таблиц MySQL должен начинаться с латинской буквы и может содержать только латинские буквы, цифры или символ подчеркивания (A-Z,a-z,0-9,_)"
 INSTL_DATABASE_INVALID_NAME="В версиях MySQL меньше, чем 5.1.6 запрещено использовать точки или другие "_QQ_"специальные"_QQ_" символы в имени. Текущая версия MySQL: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Имя базы данных и таблиц MySQL не может начинаться или заканчиваться пробелами."
 INSTL_DATABASE_NAME_INVALID_CHAR="В именах баз данных и таблиц MySQL запрещено использование символа ASCII(0x00)."
@@ -245,8 +227,6 @@ INSTL_FTP_NOSYST="Сбой выполнения команды "_QQ_"SYST"_QQ_".
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Невозможно автоматически определить корневую директорию FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Расширенные установки"
-INSTL_BASIC_SETTINGS="Основные установки"
 INSTL_CONFPROBLEM="Возникла проблема создания конфигурационного файла. Необходимо вручную создать текстовый файл 'configuration.php' в корне сайта и вставить в него содержимое текстового поля."
 INSTL_DATABASE_SUPPORT="Поддержка базы данных:"
 INSTL_DISPLAY_ERRORS="Показывать ошибки"
@@ -254,9 +234,7 @@ INSTL_ERROR_DB="При заполнении базы данных возникл
 INSTL_ERROR_INITIALISE_SCHEMA="Ошибка инициализации схемы базы данных"
 INSTL_FILE_UPLOADS="Загрузка файлов"
 INSTL_GNU_GPL_LICENSE="GNU/GPL"
-INSTL_INSTALLATION="Установка"
 INSTL_JSON_SUPPORT_AVAILABLE="Поддержка JSON"
-INSTL_LICENSE="Лицензия"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB язык по умолчанию"
@@ -267,7 +245,6 @@ INSTL_NOTICEYOUCANSTILLINSTALL="<br />Вы можете продолжить у
 INSTL_OUTPUT_BUFFERING="Буферизация вывода"
 INSTL_PARSE_INI_FILE_AVAILABLE="Поддержка INI Parser"
 INSTL_PHP_VERSION="Версия PHP"
-
 INSTL_REGISTER_GLOBALS="Register Globals Off"
 INSTL_SAFE_MODE="Safe Mode"
 INSTL_SESSION_AUTO_START="Session Auto Start"
@@ -279,7 +256,6 @@ INSTL_PROCESS_BUSY="Идет процесс установки. Пожалуйс
 
 ;Global strings
 JADMINISTRATOR="Панель управления"
-JADVANCED="Расширенные"
 JCHECK_AGAIN="Повторить проверку"
 JERROR="Ошибка"
 JEMAIL="E-mail"
@@ -310,6 +286,7 @@ JLIB_FORM_FIELD_INVALID="Некорректно заполнено поле:&#16
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Необходимо заполнить поле: %s"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Некорректно заполнено поле: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Ошибка копирования файла %1$s в %2$s."
+JLIB_INSTALLER_NOT_ERROR="Ошибка связанная с установкой языковых файлов TinyMCE никак не влияет на установку языкового пакета. Некоторые языковые пакеты, созданные для версий Joomla! младше 3.2.0, могут пытаться установить локализацию TinyMCE. Однако, файлы локализации TinyMCE уже включены в дистрибутив, поэтому дополнительная их установка не требуется."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Не удалось подключиться к базе данных <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/ru-RU/ru-RU.xml b/installation/language/ru-RU/ru-RU.xml
index 5354b57..a23da83 100644
--- a/installation/language/ru-RU/ru-RU.xml
+++ b/installation/language/ru-RU/ru-RU.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012-09-27</creationDate>
 	<author>Joomlaportal.ru</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Русский языковой файл для мастера установки Joomla</description>
 	<files>
diff --git a/installation/language/sk-SK/sk-SK.ini b/installation/language/sk-SK/sk-SK.ini
index b02e492..9de23c6 100644
--- a/installation/language/sk-SK/sk-SK.ini
+++ b/installation/language/sk-SK/sk-SK.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -8,24 +8,17 @@ INSTL_STEP_COMPLETE_LABEL="Dokončenie"
 INSTL_STEP_DATABASE_LABEL="Nastavenie databázy"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Vyberte si predvolený jazyk"
 INSTL_STEP_FTP_LABEL="Nastavenie FTP účtu"
-INSTL_STEP_LANGUAGE_LABEL="Výber jazyka"
 INSTL_STEP_LANGUAGES_LABEL="Nainštalovať jazyky"
-INSTL_STEP_LICENSE_LABEL="Licencia"
-INSTL_STEP_PREINSTALL_LABEL="Predinštalačná kontrola"
 INSTL_STEP_SITE_LABEL="Nastavenie webu"
 INSTL_STEP_SUMMARY_LABEL="Prehľad"
-INSTL_STEPS_TITLE="Priebeh inštalácie"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Výber jazyka"
-INSTL_SELECT_LANGUAGE_DESC="Zo zoznamu si vyberte jazyk, ktorý bude použitý počas inštalácie systému Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Zvoľte jazyk"
 INSTL_WARNJAVASCRIPT="Pozor! Pre správnu inštaláciu systému Joomla! musí byť zapnutý JavaScript!"
 INSTL_WARNJSON="Vaša inštalácia PHP musí mať zapnuté JSON, aby mohla byť Joomla! nainštalovaná!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Predinštalačná kontrola"
-INSTL_PRECHECK_FOR_VERSION="Predinštalačná kontrola požiadaviek na inštaláciu systému %s:"
 INSTL_PRECHECK_DESC="Ak niektoré z týchto položiek nie sú podporované (sú označené ako  <strong class="_QQ_"red"_QQ_">Nie</strong>) urobte potrebné opatrenia na nápravu.<br />Nemôžete pokračovať v inštalácii systému Joomla!, pokiaľ nie sú splnené všetky nižšie uvedené požiadavky."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Odporúčané nastavenia:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Tieto nastavenia sú odporúčané pre PHP a sú navrhnuté tak, aby boli plne kompatibilné so systémom Joomla.<br />Napriek tomu Joomla! bude fungovať, aj keď aktuálne nastavenia nie sú rovnaké, ako tie odporúčané."
@@ -51,8 +44,6 @@ INSTL_DATABASE_TYPE_DESC="Toto je pravdepodobne &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Typ databázy"
 INSTL_DATABASE_USER_DESC="Buď niečo, ako "_QQ_"root"_QQ_" alebo užívateľské meno poskytnuté hostiteľom"
 INSTL_DATABASE_USER_LABEL="Meno užívateľa"
-INSTL_DATABASE_TITLE="Nastavenia pripojenia"
-INSTL_DATABASE_DESC="<p>Webové stránky so systémom Joomla! ukladajú všetky svoje údaje do databázy. Na tejto stránke v sprievodcovi inštaláciou zadajte údaje potrebné na vytvorenie databázy.</p><p> Ak systém Joomla! inštalujete na vzdialený server, musíte získať tieto informácie od poskytovateľa hostingu.</p><p>Niektoré webhostingy vyžadujú vytvorenie databázy ešte pred inštaláciou systému Joomla. Ak sa zobrazí správa "_QQ_"Nemôžem sa spojiť s databázou"_QQ_", skontrolujte správnosť užívateľského mena a hesla. Ak sa napriek tomu chybová správa zobrazuje, skontrolujte podmienky hostingu a preverte, či potrebujete vytvoriť databázu ešte pred inštaláciou systému Joomla.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Automatické vyhľadanie FTP cesty"
@@ -66,11 +57,11 @@ INSTL_FTP_ROOT_LABEL="Cesta do hlavného adresára FTP"
 INSTL_FTP_SAVE_LABEL="Uložiť heslo k FTP účtu"
 INSTL_FTP_TITLE="Nastavenia účtu FTP (<strong class="_QQ_"red"_QQ_">Voliteľné - Väčšina užívateľov môže tento krok preskočiť - Stlačte Ďalej pre preskočenie na ďalší krok</strong>)"
 INSTL_FTP_USER_LABEL="Užívateľské meno FTP účtu"
-INSTL_SITE_NAME_LABEL="Názov webu"
 INSTL_VERIFY_FTP_SETTINGS="Overiť nastavenia FTP"
 INSTL_FTP_SETTINGS_CORRECT="Nastavenia sú správne"
 INSTL_FTP_USER_DESC="Pozor! Odporúčame nechať toto pole prázdne a zadávať užívateľské meno FTP účtu vždy, keď prenášate súbory."
 INSTL_FTP_PASSWORD_DESC="Pozor! Odporúčame nechať toto pole prázdne a zadávať heslo FTP účtu vždy, keď prenášate súbory."
+INSTL_SITE_NAME_LABEL="Názov webu"
 
 ;Site View
 INSTL_SITE="Základné nastavenia webu"
@@ -81,7 +72,6 @@ INSTL_ADMIN_PASSWORD_DESC="Zadajte heslo vášho administrátorského účtu a p
 INSTL_ADMIN_PASSWORD2_LABEL="Overenie hesla administrátora"
 INSTL_ADMIN_USER_LABEL="Užívateľské meno administrátora"
 INSTL_ADMIN_USER_DESC="Nastavte uživateľské meno vášho administrátorského účtu."
-INSTL_SITE_NAME_TITLE="Názov webových stránok"
 INSTL_SITE_NAME_DESC="Zadajte názov vašich webových stránok so systémom Joomla!."
 INSTL_SITE_METADESC_LABEL="Popis"
 INSTL_SITE_METADESC_TITLE_LABEL="Napíšte popis celého webu. Tento popis budú používať vyhľadávače. Všeobecne je 20 slov považovaných za optimálny rozsah."
@@ -125,11 +115,7 @@ INSTL_EMAIL_HEADING="Nižie nájdete konfiguračné nastavenia novo vytvorených
 INSTL_EMAIL_NOT_SENT="E-mail nemohol byť poslaný."
 
 ;Complete view
-INSTL_COMPLETE="Dokončenie inštalácie"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Prihlasovacie údaje do správcovského rozhrania"
-INSTL_COMPLETE_DESC1="Kliknite na tlačidlo Web pre zobrazenie vášho webu so systémom Joomla! alebo na tlačidlo Administrácia pre otvorenie správcovského rozhrania."
-INSTL_COMPLETE_DESC2="Na webe Joomla! komunity nájdete zoznam odkazov na dostupné jazykové balíčky, ako aj odkazy na zdroje systému v zodpovedajúcom jazyku na webe joomla.org alebo partnerských stránkach."
-INSTL_COMPLETE_DESC3="Kliknite na tlačidlo vpravo pre otvorenie stánok komunity v novom okne."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Inštalačný adresár už bol vymazaný."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Inštalačný adresár nemôže byť vymazaný. Vymažte ho ručne, prosím."
 INSTL_COMPLETE_FOLDER_REMOVED="Inštalačný adresár bol úspešne odstránený"
@@ -147,7 +133,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jazyk"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzia"
 INSTL_LANGUAGES_DESC="Rozhranie systému Joomla je dostupné v množstve jazykov. Vyberte si požadované jazyky kliknutím na zaškrtávacie polia a nainštalujte ich kliknutím na tlačidlo Ďalej.<br/>Pozn.: táto operácia zaberie približne 10 sekúnd na stiahnutie a inštaláciu každého z jazykov. Prosím, nevyberajte viac než 3 jazyky pre predídenie 'zamrznutiu'."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Dokončenie tejto operácie zaberie približne 10 sekúnd na jeden jazyk.<br />Prosím, počkajte kým sa jazyky stiahnu a nainštalujú..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Zvoľte jazyk, prosím. Ak nepotrebujete doinštalovať ďalšie jazyky, stlačte tlačidlo 'Predchádzajúci'"
+INSTL_LANGUAGES_MORE_LANGUAGES="Ak chcete nainštalovať viac jazykov, kliknite na tlačidlo 'Predchádzajúci'."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Nebol nainštalovaný žiadny jazyk. Ak potrebujete nainštalovať viac jazykov, kliknite na tlačidlo 'Predchádzajúci' a zo zoznamu vyberte požadované jazyky."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! sa nemôže spojiť so serverom s jazykovými balíčkami. Dokončite, prosím, proces inštalácie."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Pozn.: Možnosť pridať ďalšie jazyky máte aj neskôr v správcovskom rozhraní Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Späť k poslednému kroku inštalácie"
@@ -184,8 +171,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Nainštalovať lokalizovaný ob
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ak je voľba aktívna, Joomla automaticky vytvorí jednu kategóriu obsahu pre každý nainštalovaný jazyk. V každej kategórii taktiež bude vytvorený jeden zvýraznený článok s ukážkovým obsahom."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Viacjazyčný web"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Táto sekcia vám umožní automaticky aktivovať viacjazyčné funkcie systému Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Pozn.: keď stlačíte tlačidlo Ďalej budete presmerovaný späť do inštalačného procesu, kde bude požiadaný o vymazanie inštalačného adresára."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Zvoľte Váš predvolený jazyk"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Stále budete mať možnosť nainštalovať ďalší jazyk pomocou administrátorského rozhrania systému Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -198,7 +183,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Počas zálohovania databázy došlo k chybám."
 INSTL_DATABASE_ERROR_CREATE="Počas pokusu vytvoriť databázu %s došlo k chybe.<br />Užívateľ asi nemá dostatočné oprávnenia na vytvorenie databázy. Požadovaná databáza môže byť vytvorená osobitne pred začatím inštalácie systému Joomla!."
 INSTL_DATABASE_ERROR_DELETE="Počas mazania databázy došlo k chybám."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Chyba pri inicializácii čísla verzie schémy"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Odstrániť"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Zálohovať"
 INSTL_DATABASE_FIX_TOO_LONG="Predpona tabuľky MySQL môže mať maximálne 15 znakov."
@@ -209,10 +193,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Pre pokračovanie procesu inštalácie mu
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Pre pokračovanie procesu inštalácie musíte mať SQL Server 2008 R2 (10.50.1600.1) alebo vyšší. Vaša verzia: %s"
 INSTL_DATABASE_INVALID_TYPE="Vyberte typ databázy"
 INSTL_DATABASE_NAME_TOO_LONG="Názov MySQL databázy môže obsahovať najviac 64 znakov."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Predpona tabuľky MySQL musí začínať písmenom, za ktorým nasledujú len písmená, čísla alebo podčiarkovníky."
 INSTL_DATABASE_INVALID_NAME="Verzie MySQL staršie ako verzia 5.1.6 neobsahujú bodky alebo ďalšie "_QQ_"špeciálne"_QQ_" znaky v názve. Vaša verzia: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Názvy databáz a tabuliek v MySQL nesmú začínať alebo končiť medzerou."
-INSTL_DATABASE_NAME_INVALID_CHAR="Žiadny MySQL identifikátor nemôže obsahovať NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Žiadny MySQL identifikátor nemôže obsahovať NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Súbor %s neexistuje"
 
 ;controllers
@@ -244,8 +227,6 @@ INSTL_FTP_NOSYST="Zlyhala funkcia "_QQ_"SYST"_QQ_"."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Neviem automaticky zistiť hlavný adresár FTP."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Rozšírené nastavenia"
-INSTL_BASIC_SETTINGS="Základné nastavenia"
 INSTL_CONFPROBLEM="Do konfiguračného súboru alebo adresára sa nedá zapisovať alebo počas vytvárania konfiguračného súboru došlo k chybe. Budete musieť nahrať nasledovný kód ručne. Kliknite na textovú oblasť pre označenie celého kódu, skopírujte ho do schránky a vložte do nového textového súboru. Pomenujte tento súbor názvom 'configuration.php' a nahrajte ho do hlavného adresára vášho webu."
 INSTL_DATABASE_SUPPORT="Podpora databázy:"
 INSTL_DISPLAY_ERRORS="Zobrazenie chýb (Display Errors)"
@@ -253,9 +234,7 @@ INSTL_ERROR_DB="Počas napĺňania databázy došlo k chybám: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Nemôžem inicializovať schému databázy"
 INSTL_FILE_UPLOADS="Nahrávanie súborov"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Inštalácia"
 INSTL_JSON_SUPPORT_AVAILABLE="Podpora JSON"
-INSTL_LICENSE="Licencia"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC vypnuté"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Predvolené MB Language"
@@ -277,7 +256,6 @@ INSTL_PROCESS_BUSY="Proces pracuje. Prosím, čakajte..."
 
 ;Global strings
 JADMINISTRATOR="Administrácia"
-JADVANCED="Rozšírené"
 JCHECK_AGAIN="Skontrolovať znova"
 JERROR="Chyba"
 JEMAIL="Email"
diff --git a/installation/language/sk-SK/sk-SK.xml b/installation/language/sk-SK/sk-SK.xml
index 2c0cfe1..940246a 100644
--- a/installation/language/sk-SK/sk-SK.xml
+++ b/installation/language/sk-SK/sk-SK.xml
@@ -7,7 +7,7 @@
 	<creationDate>September 2012</creationDate>
 	<author>Joomla! Project</author>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Slovak language file for Joomla! 3.0 installation</description>
 	<files>
diff --git a/installation/language/sr-RS/sr-RS.ini b/installation/language/sr-RS/sr-RS.ini
index 29986e4..ad1fb31 100644
--- a/installation/language/sr-RS/sr-RS.ini
+++ b/installation/language/sr-RS/sr-RS.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Крај"
 INSTL_STEP_DATABASE_LABEL="База"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Одаберите подразумевани језик"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Језик"
 INSTL_STEP_LANGUAGES_LABEL="Инсталирајте језик"
-INSTL_STEP_LICENSE_LABEL="Лиценца"
-INSTL_STEP_PREINSTALL_LABEL="Преинсталациона провера"
 INSTL_STEP_SITE_LABEL="Конфигурација"
 INSTL_STEP_SUMMARY_LABEL="Преглед"
-INSTL_STEPS_TITLE="Кораци"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Изаберите језик"
-INSTL_SELECT_LANGUAGE_DESC="Обележите језик који ћете користити у току Joomla! инсталације:"
 INSTL_SELECT_LANGUAGE_TITLE="Одаберите језик"
 INSTL_WARNJAVASCRIPT="Упозорење! JavaScript мора бити омогућен за исправну Joomla! инсталацију"
 INSTL_WARNJSON="За Joomla! инсталацију PHP мора имати омогућену JSON екстензију"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Преинсталациона провера"
-INSTL_PRECHECK_FOR_VERSION="Преинсталациона провера %s:"
 INSTL_PRECHECK_DESC="Ако било која од ових ставки није подржана (обележена као <strong class="_QQ_"red"_QQ_">НЕ</strong>) Joomla! неће моћи да се инсталира."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Препоручена подешавања:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Препоручена подешавања PHP-а за потпуну компатибилност са Joomla.<br />Joomla! ће бити операбилна и ако подешавања нису идентична са препорученим."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Ово је вероватно &quot;mysql&quot;"
 INSTL_DATABASE_TYPE_LABEL="Тип базе података"
 INSTL_DATABASE_USER_DESC="Нешто као "_QQ_"root"_QQ_" или корисничко име добијено од хоста"
 INSTL_DATABASE_USER_LABEL="Корисничко име"
-INSTL_DATABASE_TITLE="Подешавање повезивања"
-INSTL_DATABASE_DESC="<p>Инсталација Joomla!-е на ваш сервер захтева 4 једноставна корака ...</p><p>Молим унесите hostname of the server Joomla! is to be installed on.</p><p>Унесите MySQL корисничко име, лозинку и име базе које ће користити ваш Joomla сајт.</p><p>Унесите префикс за табеле у овој Joomla! инсталацији. Одаберите шта ће се урадити са табелама из претходне инсталације.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Аутоматска претрага FTP путање"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP основни директоријум"
 INSTL_FTP_SAVE_LABEL="Сачувај FTP лозинку"
 INSTL_FTP_TITLE="Конфигурација (<strong class="_QQ_"red"_QQ_">Опционо - већина корисника може да прескочи овај корак - Кликните на даље да прескочите овај део</strong>)"
 INSTL_FTP_USER_LABEL="FTP корисничко име"
-INSTL_SITE_NAME_LABEL="Име сајта"
 INSTL_VERIFY_FTP_SETTINGS="Провери FTP подешавање"
 INSTL_FTP_SETTINGS_CORRECT="Подешавање исправно"
 INSTL_FTP_USER_DESC="Упозорење! Препоручљиво је да ово оставите празно и да унесете ваше FTP корисничко име приликом сваког копирања фајлова."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Унесите лозинку за супер адм
 INSTL_ADMIN_PASSWORD2_LABEL="Потврдите администраторску шифру"
 INSTL_ADMIN_USER_LABEL="Администраторско корисничко име"
 INSTL_ADMIN_USER_DESC="Одаберите корисничко име вашег супер администраторског налога."
-INSTL_SITE_NAME_TITLE="Име сајта"
+INSTL_SITE_NAME_LABEL="Име сајта"
 INSTL_SITE_NAME_DESC="Унесите име вашег Joomla! сајта."
 INSTL_SITE_METADESC_LABEL="Опис"
 INSTL_SITE_METADESC_TITLE_LABEL="Унесите опис сајта ће користити wеб претраживачи. Оптимално је до 20 речи."
@@ -98,10 +88,10 @@ INSTL_SAMPLE_DATA_SET="Подразумевани English (GB) пример"
 INSTL_SAMPLE_LEARN_SET="Научите Joomla English (GB) пример"
 INSTL_SAMPLE_TESTING_SET="Тест English (GB) пример"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! инсталација са само једним менијем и формом за пријављивање, без примера садржаја."
-INSTL_SAMPLE_BLOG_SET_DESC="Joomla! инсталација са неколико чланака и одговарајућим блог модулима као што су модули за старе или најчитаније текстове и сл."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla! инсталација са неколико страна (мени са ставкама: Home, About Us, News, Contact Us) и модулима за претрагу, пријаву или Custom HTML."
-INSTL_SAMPLE_DATA_SET_DESC="Joomla! инсталација са једном страном (мени са једним линком) и модулима као што су најновији чланци или форма за пријаву."
-INSTL_SAMPLE_LEARN_SET_DESC="Joomla! инсталација са чланцима који описују како ради Joomla."
+INSTL_SAMPLE_BLOG_SET_DESC="Joomla инсталација са неколико чланака и одговарајућим блог модулима као што су модули за старе или најчитаније текстове и сл."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla инсталација са неколико страна (мени са ставкама: Home, About Us, News, Contact Us) и модулима за претрагу, пријаву или Custom HTML."
+INSTL_SAMPLE_DATA_SET_DESC="Joomla инсталација са једном страном (мени са једним линком) и модулима као што су најновији чланци или форма за пријаву."
+INSTL_SAMPLE_LEARN_SET_DESC="Joomla инсталација са чланцима који описују како ради Joomla."
 INSTL_SAMPLE_TESTING_SET_DESC="Инсталација Joomle са свим могућим ставкама да би се помогло тестирање Joomle."
 
 ;Summary view
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Испод можете видети нову конфиг
 INSTL_EMAIL_NOT_SENT="Ел. пошта не може бити послата."
 
 ;Complete view
-INSTL_COMPLETE="Крај"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Детаљи администраторске пријаве"
-INSTL_COMPLETE_DESC1="Кликните на дугме Сајт да видите ваш Joomla! веб сајт или дугме Админ да бисте се пријавили као администратор."
-INSTL_COMPLETE_DESC2="Напомена: да би Joomla! преузела и инсталирала нови језик, потребан вам је приступ интернету.сте инсталирали нови језик, потребна вам је интернет веза. <br/>Неке конфигурације сервера неће дозволити Јоомла! инсталацију језика. Ако је ово ваш случај, не брините, касније можете инсталирати језик на стандардни начин из Јоомла! администратора."
-INSTL_COMPLETE_DESC3="Кликните дугме на десној страни да бисте отворили сајт за помоћ у новом прозору."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Инсталациони директоријум је већ обрисан."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Инсталациони директоријум не може бити обрисан. Молим, обришите га ручно."
 INSTL_COMPLETE_FOLDER_REMOVED="Инсталациони директоријум је успешно обрисан"
@@ -149,6 +135,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Језик"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Верзија"
 INSTL_LANGUAGES_DESC="Joomla интерфејс је доступан на неколико језика. Изаберите језик и инсталирајте га једним кликом на дугме<br/>Напомена: ова операција траје око 5 секунди за преузимање и инсталирање сваког језика. Немојте изабрати више од 3 језика за истовремену инсталацију, да због превише дуге инсталације не би дошло до прекида програма."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ова операција траје око 10 секунди по језику<br />Молим сачекајте да Joomla преузме и инсталира језик..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Кликните на дугме 'Претходно' ако желите да инсталирате још неки језик."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Одаберите језик. Ако не желите додатни језик кликните на дугме 'Претходно'"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! не може да се пријави на сервер са језицима. Завршите инсталациони процес."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Напомена: Језик можете инсталирати из Joomla! администрације"
@@ -186,8 +173,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Инсталација лока
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ако је активна, Joomla ће аутоматски креирати једну категорију садржаја за сваки инсталирани језик. Такође ће се креирати и један водећи чланак са примером садржаја у свакој категорији"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="вишејезичност"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ова секција омогућава да аутоматски активирате Joomla! вишејезичност"
-INSTL_DEFAULTLANGUAGE_NOTE="Напомена: када кликнете дугме за следећи корак, доћи ћете до краја инсталационог процеса и обавештење да треба да обришете инсталациони директоријум."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Одаберите подразумевани језик"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Касније ћете моћи да га инсталирате кроз администраторски део Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Грешка приликом копирања базе."
 INSTL_DATABASE_ERROR_CREATE="Грешка приликом прављења базе %s.<br/> Корисник можда нема дозволу за креирање базе. Потребна база може бити инсталирана одвојено пре него што наставите са Joomla! инсталацијом."
 INSTL_DATABASE_ERROR_DELETE="Појавиле су се грешке приликом брисања базе."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Грешка при иницијализацији броја верзије"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Обриши"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Резервна копија"
 INSTL_DATABASE_FIX_TOO_LONG="Префикс MySQL табеле мора имати највише 15 карактера"
@@ -211,7 +195,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Потребан је SQL Server 2008 R2
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Потребан је SQL Server 2008 R2 (10.50.1600.1) или новији за наставак инсталације. Ваша верзија је: %s"
 INSTL_DATABASE_INVALID_TYPE="Одаберите тип базе"
 INSTL_DATABASE_NAME_TOO_LONG="Име MySQL базе података мора имати највише 64 карактера."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL префикс табеле мора почети словом и може да садржи само слова, бројеве или доње црте."
 INSTL_DATABASE_INVALID_NAME="MySQL верзија је пре 5.1.6 не сме да садржи тачке или друге "_QQ_"special"_QQ_" карактере у имену. Ваша верзија је: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL имебазе и табеле не може почети или завршити се празним местом (spaces)."
 INSTL_DATABASE_NAME_INVALID_CHAR="Ниједан MySQL identifier не може да садржи NUL ASCII(0x00)."
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Функција "_QQ_"SYST"_QQ_" није успела."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Немогуће аутоматско препознавање основног FTP директоријума."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Напредно подешавање"
-INSTL_BASIC_SETTINGS="Основно подешавање"
 INSTL_CONFPROBLEM="Ваша датотека или директоријум нису подешени за упис или је дошло до проблема у прављењу датотеке са подешавањима. Треба да препишете следећи код ручно. Кликните на простор за текст да обележите цео текст кода и онда Копирај и Додај у нову датотеку са именом configuration.php и ископирајте то у основни директоријум вашег сајта."
 INSTL_DATABASE_SUPPORT="Подршка базе:"
 INSTL_DISPLAY_ERRORS="Приказ грешака"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Постоје грешке приликом објављива
 INSTL_ERROR_INITIALISE_SCHEMA="Не може да се иницијализира шема базе"
 INSTL_FILE_UPLOADS="Копирање датотеке на сервер"
 INSTL_GNU_GPL_LICENSE="GNU Општа Јавна Лиценца"
-INSTL_INSTALLATION="Инсталација"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON подршка"
-INSTL_LICENSE="Лиценца"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC искључен"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes окружење"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB језик је подразумеван"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Процес је у току. Молим вас сачек
 
 ;Global strings
 JADMINISTRATOR="Администратор"
-JADVANCED="Напредно"
 JCHECK_AGAIN="Поновна провера"
 JERROR="Грешка"
 JEMAIL="Ел. пошта"
@@ -330,4 +308,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/sr-RS/sr-RS.xml b/installation/language/sr-RS/sr-RS.xml
index 75e9357..2077231 100644
--- a/installation/language/sr-RS/sr-RS.xml
+++ b/installation/language/sr-RS/sr-RS.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>17-9-2012</creationDate>
 	<author>joomla-serbia.com</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/sr-YU/sr-YU.ini b/installation/language/sr-YU/sr-YU.ini
index cda36c9..e835fbc 100644
--- a/installation/language/sr-YU/sr-YU.ini
+++ b/installation/language/sr-YU/sr-YU.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Kraj"
 INSTL_STEP_DATABASE_LABEL="Baza"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Odaberite podrazumevani jezik"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Jezik"
 INSTL_STEP_LANGUAGES_LABEL="Instalirajte jezik"
-INSTL_STEP_LICENSE_LABEL="Licenca"
-INSTL_STEP_PREINSTALL_LABEL="Preinstalaciona provera"
 INSTL_STEP_SITE_LABEL="Konfiguracija"
 INSTL_STEP_SUMMARY_LABEL="Pregled"
-INSTL_STEPS_TITLE="Koraci"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Izaberite jezik"
-INSTL_SELECT_LANGUAGE_DESC="Obeležite jezik koji ćete koristiti u toku Joomla! instalacije:"
 INSTL_SELECT_LANGUAGE_TITLE="Odaberite jezik"
 INSTL_WARNJAVASCRIPT="Upozorenje! JavaScript mora biti omogućen za ispravnu Joomla! instalaciju"
 INSTL_WARNJSON="Za Joomla! instalaciju PHP mora imati omogućenu JSON ekstenziju"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Preinstalaciona provera"
-INSTL_PRECHECK_FOR_VERSION="Preinstalaciona provera %s:"
 INSTL_PRECHECK_DESC="Ako bilo koja od ovih stavki nije podržana (obeležena kao <strong class="_QQ_"red"_QQ_">NE</strong>) Joomla! neće moći da se instalira."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Preporučena podešavanja:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Preporučena podešavanja PHP-a za potpunu kompatibilnost sa Joomla.<br />Joomla! će biti operabilna i ako podešavanja nisu identična sa preporučenim."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Ovo je verovatno &quot;mysql&quot;"
 INSTL_DATABASE_TYPE_LABEL="Tip baze podataka"
 INSTL_DATABASE_USER_DESC="Nešto kao "_QQ_"root"_QQ_" ili korisničko ime dobijeno od hosta"
 INSTL_DATABASE_USER_LABEL="Korisničko ime"
-INSTL_DATABASE_TITLE="Podešavanje povezivanja"
-INSTL_DATABASE_DESC="<p>Instalacija Joomla!-e na vaš server zahteva 4 jednostavna koraka ...</p><p>Molim unesite hostname of the server Joomla! is to be installed on.</p><p>Unesite MySQL korisničko ime, lozinku i ime baze koje će koristiti vaš Joomla sajt.</p><p>Unesite prefiks za tabele u ovoj Joomla! instalaciji. Odaberite šta će se uraditi sa tabelama iz prethodne instalacije.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Automatska pretraga FTP putanje"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP osnovni direktorijum"
 INSTL_FTP_SAVE_LABEL="Sačuvaj FTP lozinku"
 INSTL_FTP_TITLE="Konfiguracija (<strong class="_QQ_"red"_QQ_">Opciono - većina korisnika može da preskoči ovaj korak - Kliknite na dalje da preskočite ovaj deo</strong>)"
 INSTL_FTP_USER_LABEL="FTP korisničko ime"
-INSTL_SITE_NAME_LABEL="Ime sajta"
 INSTL_VERIFY_FTP_SETTINGS="Proveri FTP podešavanje"
 INSTL_FTP_SETTINGS_CORRECT="Podešavanje ispravno"
 INSTL_FTP_USER_DESC="Upozorenje! Preporučljivo je da ovo ostavite prazno i da unesete vaše FTP korisničko ime prilikom svakog kopiranja fajlova."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Unesite lozinku za super administratorski nalog i pot
 INSTL_ADMIN_PASSWORD2_LABEL="Potvrdite administratorsku šifru"
 INSTL_ADMIN_USER_LABEL="Administratorsko korisničko ime"
 INSTL_ADMIN_USER_DESC="Odaberite korisničko ime vašeg super administratorskog naloga."
-INSTL_SITE_NAME_TITLE="Ime sajta"
+INSTL_SITE_NAME_LABEL="Ime sajta"
 INSTL_SITE_NAME_DESC="Unesite ime vašeg Joomla! sajta."
 INSTL_SITE_METADESC_LABEL="Opis"
 INSTL_SITE_METADESC_TITLE_LABEL="Unesite opis sajta će koristiti web pretraživači. Optimalno je do 20 reči."
@@ -98,10 +88,10 @@ INSTL_SAMPLE_DATA_SET="Podrazumevani English (GB) primer"
 INSTL_SAMPLE_LEARN_SET="Naučite Joomla English (GB) primer"
 INSTL_SAMPLE_TESTING_SET="Test English (GB) primer"
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="Joomla! instalacija sa samo jednim menijem i formom za prijavljivanje, bez primera sadržaja."
-INSTL_SAMPLE_BLOG_SET_DESC="Joomla! instalacija sa nekoliko članaka i odgovarajućim blog modulima kao što su moduli za stare ili najčitanije tekstove i sl."
-INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla! instalacija sa nekoliko strana (meni sa stavkama: Home, About Us, News, Contact Us) i modulima za pretragu, prijavu ili Custom HTML."
-INSTL_SAMPLE_DATA_SET_DESC="Joomla! instalacija sa jednom stranom (meni sa jednim linkom) i modulima kao što su najnoviji članci ili forma za prijavu."
-INSTL_SAMPLE_LEARN_SET_DESC="Joomla! instalacija sa člancima koji opisuju kako radi Joomla."
+INSTL_SAMPLE_BLOG_SET_DESC="Joomla instalacija sa nekoliko članaka i odgovarajućim blog modulima kao što su moduli za stare ili najčitanije tekstove i sl."
+INSTL_SAMPLE_BROCHURE_SET_DESC="Joomla instalacija sa nekoliko strana (meni sa stavkama: Home, About Us, News, Contact Us) i modulima za pretragu, prijavu ili Custom HTML."
+INSTL_SAMPLE_DATA_SET_DESC="Joomla instalacija sa jednom stranom (meni sa jednim linkom) i modulima kao što su najnoviji članci ili forma za prijavu."
+INSTL_SAMPLE_LEARN_SET_DESC="Joomla instalacija sa člancima koji opisuju kako radi Joomla."
 INSTL_SAMPLE_TESTING_SET_DESC="Instalacija Joomle sa svim mogućim stavkama da bi se pomoglo testiranje Joomle."
 
 ;Summary view
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Ispod možete videti novu konfiguraciju vašeg Joomla! sajt
 INSTL_EMAIL_NOT_SENT="El. pošta ne može biti poslata."
 
 ;Complete view
-INSTL_COMPLETE="Kraj"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Detalji administratorske prijave"
-INSTL_COMPLETE_DESC1="Kliknite na dugme Sajt da vidite vaš Joomla! veb sajt ili dugme Admin da biste se prijavili kao administrator."
-INSTL_COMPLETE_DESC2="Napomena: da bi Joomla! preuzela i instalirala novi jezik, potreban vam je pristup internetu.ste instalirali novi jezik, potrebna vam je internet veza. <br/>Neke konfiguracije servera neće dozvoliti Joomla! instalaciju jezika. Ako je ovo vaš slučaj, ne brinite, kasnije možete instalirati jezik na standardni način iz Joomla! administratora."
-INSTL_COMPLETE_DESC3="Kliknite dugme na desnoj strani da biste otvorili sajt za pomoć u novom prozoru."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Instalacioni direktorijum je već obrisan."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Instalacioni direktorijum ne može biti obrisan. Molim, obrišite ga ručno."
 INSTL_COMPLETE_FOLDER_REMOVED="Instalacioni direktorijum je uspešno obrisan"
@@ -149,6 +135,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Jezik"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Verzija"
 INSTL_LANGUAGES_DESC="Joomla interfejs je dostupan na nekoliko jezika. Izaberite jezik i instalirajte ga jednim klikom na dugme<br/>Napomena: ova operacija traje oko 5 sekundi za preuzimanje i instaliranje svakog jezika. Nemojte izabrati više od 3 jezika za istovremenu instalaciju, da zbog previše duge instalacije ne bi došlo do prekida programa."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Ova operacija traje oko 10 sekundi po jeziku<br />Molim sačekajte da Joomla preuzme i instalira jezik..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Kliknite na dugme 'Prethodno' ako želite da instalirate još neki jezik."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Odaberite jezik. Ako ne želite dodatni jezik kliknite na dugme 'Prethodno'"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! ne može da se prijavi na server sa jezicima. Završite instalacioni proces."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Napomena: Jezik možete instalirati iz Joomla! administracije"
@@ -186,12 +173,10 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Instalacija lokalizovanog sadr
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ako je aktivna, Joomla će automatski kreirati jednu kategoriju sadržaja za svaki instalirani jezik. Takođe će se kreirati i jedan vodeći članak sa primerom sadržaja u svakoj kategoriji"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="višejezičnost"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Ova sekcija omogućava da automatski aktivirate Joomla! višejezičnost"
-INSTL_DEFAULTLANGUAGE_NOTE="Napomena: kada kliknete dugme za sledeći korak, doći ćete do kraja instalacionog procesa i obaveštenje da treba da obrišete instalacioni direktorijum."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Odaberite podrazumevani jezik"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Kasnije ćete moći da ga instalirate kroz administratorski deo Joomla!"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Srpski-latinica"
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Srpski-ćirilica"
 
 ;Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="Nije moguće povezati se na bazu. Konektor vraća broj: %s"
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Greška prilikom kopiranja baze."
 INSTL_DATABASE_ERROR_CREATE="Greška prilikom pravljenja baze %s.<br/> Korisnik možda nema dozvolu za kreiranje baze. Potrebna baza može biti instalirana odvojeno pre nego što nastavite sa Joomla! instalacijom."
 INSTL_DATABASE_ERROR_DELETE="Pojavile su se greške prilikom brisanja baze."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Greška pri inicijalizaciji broja verzije"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Obriši"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Rezervna kopija"
 INSTL_DATABASE_FIX_TOO_LONG="Prefiks MySQL tabele mora imati najviše 15 karaktera"
@@ -211,7 +195,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Potreban je SQL Server 2008 R2 (10.50.160
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Potreban je SQL Server 2008 R2 (10.50.1600.1) ili noviji za nastavak instalacije. Vaša verzija je: %s"
 INSTL_DATABASE_INVALID_TYPE="Odaberite tip baze"
 INSTL_DATABASE_NAME_TOO_LONG="Ime MySQL baze podataka mora imati najviše 64 karaktera."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL prefiks tabele mora početi slovom i može da sadrži samo slova, brojeve ili donje crte."
 INSTL_DATABASE_INVALID_NAME="MySQL verzija je pre 5.1.6 ne sme da sadrži tačke ili druge "_QQ_"special"_QQ_" karaktere u imenu. Vaša verzija je: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL imebaze i tabele ne može početi ili završiti se praznim mestom (spaces)."
 INSTL_DATABASE_NAME_INVALID_CHAR="Nijedan MySQL identifier ne može da sadrži NUL ASCII(0x00)."
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Funkcija "_QQ_"SYST"_QQ_" nije uspela."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Nemoguće automatsko prepoznavanje osnovnog FTP direktorijuma."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Napredno podešavanje"
-INSTL_BASIC_SETTINGS="Osnovno podešavanje"
 INSTL_CONFPROBLEM="Vaša datoteka ili direktorijum nisu podešeni za upis ili je došlo do problema u pravljenju datoteke sa podešavanjima. Treba da prepišete sledeći kod ručno. Kliknite na prostor za tekst da obeležite ceo tekst koda i onda Kopiraj i Dodaj u novu datoteku sa imenom configuration.php i iskopirajte to u osnovni direktorijum vašeg sajta."
 INSTL_DATABASE_SUPPORT="Podrška baze:"
 INSTL_DISPLAY_ERRORS="Prikaz grešaka"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Postoje greške prilikom objavljivanja baze: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Ne može da se inicijalizira šema baze"
 INSTL_FILE_UPLOADS="Kopiranje datoteke na server"
 INSTL_GNU_GPL_LICENSE="GNU Opšta Javna Licenca"
-INSTL_INSTALLATION="Instalacija"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON podrška"
-INSTL_LICENSE="Licenca"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC isključen"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes okruženje"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB jezik je podrazumevan"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Proces je u toku. Molim vas sačekajte..."
 
 ;Global strings
 JADMINISTRATOR="Administrator"
-JADVANCED="Napredno"
 JCHECK_AGAIN="Ponovna provera"
 JERROR="Greška"
 JEMAIL="El. pošta"
@@ -330,4 +308,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/srp-ME/srp-ME.ini b/installation/language/srp-ME/srp-ME.ini
index 44c3d08..bf5dcc7 100644
--- a/installation/language/srp-ME/srp-ME.ini
+++ b/installation/language/srp-ME/srp-ME.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/installation/language/sv-SE/sv-SE.ini b/installation/language/sv-SE/sv-SE.ini
index 8e4c547..08c3fb2 100644
--- a/installation/language/sv-SE/sv-SE.ini
+++ b/installation/language/sv-SE/sv-SE.ini
@@ -1,7 +1,7 @@
-; Joomla! Swedish Translation version 3.2.0 - 2013-10-26
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Joomla! Swedish Translation version 3.2.2 - 2014-01-24
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Copyright (C) Translation 2005 - 2013 Joomla Sweden Translator Team: Stefan Gagner, Sune Hultman, Olle Zettergeren (www.svenskjoomla.se)
+; Copyright (C) Translation 2005 - 2014 Joomla Sweden Translator Team: Stefan Gagner, Sune Hultman, Olle Zettergeren (www.svenskjoomla.se)
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
 
@@ -11,24 +11,17 @@ INSTL_STEP_COMPLETE_LABEL="Avsluta"
 INSTL_STEP_DATABASE_LABEL="Databas"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Välj standardspråk"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Språk"
 INSTL_STEP_LANGUAGES_LABEL="Installera språk"
-INSTL_STEP_LICENSE_LABEL="Licens"
-INSTL_STEP_PREINSTALL_LABEL="Installationskontroll"
 INSTL_STEP_SITE_LABEL="Inställningar"
 INSTL_STEP_SUMMARY_LABEL="Översikt"
-INSTL_STEPS_TITLE="Steg"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="Välj språk"
-INSTL_SELECT_LANGUAGE_DESC="Välj språk att använda under installationen av Joomla!"
 INSTL_SELECT_LANGUAGE_TITLE="Välj språk"
 INSTL_WARNJAVASCRIPT="Varning! JavaScript måste vara aktiverat för att Joomla! ska installeras korrekt"
 INSTL_WARNJSON="Din PHP-installation måste ha JSON aktiverat för att Joomla ska kunna installeras!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="Installationskontroll"
-INSTL_PRECHECK_FOR_VERSION="Installationskontroll för %s:"
 INSTL_PRECHECK_DESC="Om någon av dessa parametrar inte stöds (markerade med <strong class="_QQ_"red"_QQ_">Nej</strong>) så bör du göra nödvändiga förändringar nu. Om du inte gör det, kan det hända att din Joomla-installation inte fungerar som den ska."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Rekommenderade inställningar:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Dessa PHP-inställningar rekommenderas för att garantera full kompatibilitet med Joomla.<br />Joomla! kommer dock att fungera även om dina inställningar inte helt överensstämmer med rekommendationen."
@@ -54,8 +47,6 @@ INSTL_DATABASE_TYPE_DESC="Detta är vanligen &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Databastyp"
 INSTL_DATABASE_USER_DESC="Antingen någonting som "_QQ_"root"_QQ_" eller ett användarnamn tillhandahållet av webbhotellet"
 INSTL_DATABASE_USER_LABEL="Användarnamn"
-INSTL_DATABASE_TITLE="Anslutningsinställningar"
-INSTL_DATABASE_DESC="<p>En Joomla! webbplats lagrar all sin data i en databas. Här kan du skriva in den information som installationsprogrammet behöver för att skapa databasen.</p><p> Om du installerar Joomla! på ett webbhotell, behöver du få den här informationen från webbhotellet.</p><p>Vissa webbhotell kräver att du skapar databasen innan du installerar Joomla. Om du får meddelandet "_QQ_"Kunde inte ansluta till databasen"_QQ_", kontrollera att användarnamn och lösenord är korrekt ifyllda. Om du fortfarande får detta meddelande, kontrollera med ditt webbhotell om du måste skapa databasen innan du installerar Joomla.</p>" 
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="Hitta FTP-sökväg"
@@ -69,7 +60,6 @@ INSTL_FTP_ROOT_LABEL="FTP-sökväg rot"
 INSTL_FTP_SAVE_LABEL="Spara FTP-lösenord"
 INSTL_FTP_TITLE="FTP-inställningar (<strong class="_QQ_"red"_QQ_">Tillval - De flesta användare kan hoppa över detta steg - Klicka Nästa för att fortsätta</strong>)"
 INSTL_FTP_USER_LABEL="FTP användarnamn"
-INSTL_SITE_NAME_LABEL="Webbplatsens namn"
 INSTL_VERIFY_FTP_SETTINGS="Verifiera FTP-inställningarna"
 INSTL_FTP_SETTINGS_CORRECT="Inställningarna är korrekta"
 INSTL_FTP_USER_DESC="Varning! Det rekommenderas att du lämnar fältet tomt och anger FTP-användarnamn varje gång du överför filer."
@@ -128,11 +118,7 @@ INSTL_EMAIL_HEADING="Du kan se inställningarna för din nyinstallerade Joomla!
 INSTL_EMAIL_NOT_SENT="Kunde inte skicka e-post."
 
 ;Complete view
-INSTL_COMPLETE="Avsluta"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Administration inloggningsuppgifter"
-INSTL_COMPLETE_DESC1="Klicka på <strong>Frontend</strong> för att starta din Joomla! webbplats eller <strong>Backend</strong> för att logga in på adminsidan."
-INSTL_COMPLETE_DESC2="På Joomlas Community-webbplats, hittar du en lista med länkar till tillgängliga språkpaket samt länkar till språkrelaterade sidor på joomla.org."
-INSTL_COMPLETE_DESC3="Klicka på knappen till höger för att öppna Joomlas Community-webbplats i ett nytt fönster."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Installationsmappen är redan borttagen."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installationsmappen kunde inte tas bort. Du kan ta bort den manuellt."
 INSTL_COMPLETE_FOLDER_REMOVED="Installationsmappen har tagits bort"
@@ -151,6 +137,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Version"
 INSTL_LANGUAGES_DESC="Joomlas gränssnitt finns tillgängligt på flera språk. Välj de språk du vill installera genom att klicka i kryssrutorna och installera dem genom att klicka på Nästa.<br/>OBS: åtgärden kommer att ta några sekunder extra för varje språk som ska laddas ner och installeras. Du bör inte välja fler än tre språk för att undvika timeout."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Den här åtgärden kommer att ta upp till 10 sekunder per språk att slutföra<br />Vänta medan språk laddas ner och installeras..."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Välj ett språk. Om du inte behöver installera fler språk, klicka på 'Föregående'"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Inga språk har valts för att installeras. Om du vill installera fler språk, klicka på knappen 'Tillbaka' och välj önskat språk i listan."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! kunde inte ansluta till språkservern. Du kan fortsätta med att slutföra installationsprocessen."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="OBS: Du kommer att kunna installera språk senare via Joomlas adminsida."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Gå tillbaka till föregående installationssteg"
@@ -187,8 +174,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Installera språkanpassat inneh
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Om aktiverad, kkommer Joomla att automatiskt skapa en artikelkategori till varje installerat språk. Dessutom en utvald artikel med testinnehåll att skapas i varje kategori."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Multispråk"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Denna sektion låter dig automatiskt aktivera Joomla!:s funktion för att hantera flera språk"
-INSTL_DEFAULTLANGUAGE_NOTE="OBS: När du har klickat på Nästa kommer du tillbaka till slutet av installationsprocessen där du kommer att uppmanas att ta bort installationsmappen."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Välj standardspråk"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Du kommer att kunna installera det senare via Joomla! backend"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Kan inte rensa manifest-cache f
 INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Fel inträffade vid backup av databas"
 INSTL_DATABASE_ERROR_CREATE="Ett fel inträffade vid skapande av databasen %s. <br/>Användaren saknar antagligen rättighet att skapa en databas. Den nödvändiga databasen måste skapas manuellt innan Joomla-installationen kan påbörjas."
-INSTL_DATABASE_ERROR_DELETE="Några fel inträffade vid radering av databas"
 INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Kunde inte initiera schema version nummer"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Ta bort"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup"
@@ -212,7 +196,6 @@ INSTL_DATABASE_INVALID_SQLZURE_VERSION="Du måste ha SQL Server 2008 R2 (10.50.1
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="Du måste ha MySQL 5.0.4 eller högre för att fortsätta installationen. Din version är: %s"
 INSTL_DATABASE_INVALID_TYPE="Välj databastyp"
 INSTL_DATABASE_NAME_TOO_LONG="MySQL databasnamn får innehålla maximalt 64 tecken"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Tabellprefixet i MySQL måste starta med en bokstav och åtföljas endast av bokstäver, siffror eller understrykningstecken"
 INSTL_DATABASE_INVALID_NAME="MySQL-versioner före 5.1.6 får inte innehålla punkt eller andra "_QQ_"special"_QQ_" tecken i namnet. Din version är: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL databasnamn och tabellnamn får inte börja eller sluta med mellanslag."
 INSTL_DATABASE_NAME_INVALID_CHAR="Ingen MySQL-identifierare kan innehålla ett NUL ASCII(0x00)."
@@ -247,18 +230,14 @@ INSTL_FTP_NOSYST="Funktionen "_QQ_"SYST"_QQ_" misslyckades."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Kunde inte autodetektera FTP rotmapp."
 
 ;others
-INSTL_ADVANCED_SETTINGS="Avancerade inställningar"
-INSTL_BASIC_SETTINGS="Grundinställningar"
 INSTL_CONFPROBLEM="Din konfigurationsfil eller mapp är inte skrivbar, eller så var det problem att skapa konfigurationsfilen. Du måste ladda upp nedanstående kod manuellt. Klicka i textarean för att markera all kod, klipp och klistra sedan in koden i en ny fil som du döper till configuration.php. Ladda upp filen till rotmappen på din webbplats."
 INSTL_DATABASE_SUPPORT="Databas support:"
-INSTL_DISPLAY_ERRORS="Display Errors"
+INSTL_DISPLAY_ERRORS="Visa Felmeddelanden"
 INSTL_ERROR_DB="Något fel inträffade när databasen skulle fyllas: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Kan inte initiera databasschema"
-INSTL_FILE_UPLOADS="File Uploads"
+INSTL_FILE_UPLOADS="Filuppladdningar"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Installation"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
-INSTL_LICENSE="Licens"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB language är standard"
@@ -268,10 +247,10 @@ INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload är aktiverat. Dett
 INSTL_NOTICEYOUCANSTILLINSTALL="<br />Du kan fortsätta installationen eftersom inställningarna kommer att visas som kod i slutet. Du kan då ladda upp koden manuellt. Klicka i textarean för att markera den visade koden, kopiera och klistra in koden i en ny fil som du döper till 'configuration.php'. Ladda sedan upp filen till webbplatsens rotmapp."
 INSTL_OUTPUT_BUFFERING="Output Buffering"
 INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support"
-INSTL_PHP_VERSION="PHP version"
+INSTL_PHP_VERSION="PHP Version"
 INSTL_REGISTER_GLOBALS="Register Globals"
-INSTL_SAFE_MODE="Safemode"
-INSTL_SESSION_AUTO_START="Session autostart"
+INSTL_SAFE_MODE="Safe Mode"
+INSTL_SESSION_AUTO_START="Session Auto Start"
 INSTL_WRITABLE="Skrivbar"
 INSTL_XML_SUPPORT="XML-stöd"
 INSTL_ZIP_SUPPORT_AVAILABLE="Inbyggt stöd för ZIP"
@@ -280,7 +259,6 @@ INSTL_PROCESS_BUSY="Processen pågår. Vänta..."
 
 ;Global strings
 JADMINISTRATOR="Backend"
-JADVANCED="Avancerad"
 JCHECK_AGAIN="Kontrollera igen"
 JERROR="fel"
 JEMAIL="E-post"
@@ -311,7 +289,8 @@ JLIB_FORM_FIELD_INVALID="Ogiltigt fält:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Ogiltigt fält: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Obligatoriskt fält: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Kan inte kopiera filen %1$s till %2$s."
-JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kunde inte ansluta till databasen <br />joomla.library: %1$s - %2$s"
+JLIB_INSTALLER_NOT_ERROR="Om felmeddelanden är relaterade till installation av språkfiler för TinyMCE, så har de ingen påverkan på installation av språket. Vissa språkpaket skapade före Joomla! 3.2.0 kan försöka att installera separata TinyMCE språkfiler. Dessa ingår nu i grundpaketet och skall inte längre installeras."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Kan inte ansluta till databasen <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
 JDEBUG_LANGUAGE_FILES_IN_ERROR="Parsingfel i språkfilen"
diff --git a/installation/language/sv-SE/sv-SE.xml b/installation/language/sv-SE/sv-SE.xml
index 8d8602c..3856de8 100644
--- a/installation/language/sv-SE/sv-SE.xml
+++ b/installation/language/sv-SE/sv-SE.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012-09-19</creationDate>
 	<author>Swedish Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/sw-KE/sw-KE.ini b/installation/language/sw-KE/sw-KE.ini
index 40aa6c5..e864688 100644
--- a/installation/language/sw-KE/sw-KE.ini
+++ b/installation/language/sw-KE/sw-KE.ini
@@ -1,7 +1,7 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters and Hassan Abdalla (for Swahili language). All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
-; Note : All ini files need to be saved as UTF-8
+; Note : All ini files need to be saved as UTF-8; Note : All ini files need to be saved as UTF-8
 
 
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Maliza"
 INSTL_STEP_DATABASE_LABEL="Hifadhidata"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Chagua lugha ya difoti"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Lugha"
 INSTL_STEP_LANGUAGES_LABEL="Sakinisha lugha"
-INSTL_STEP_LICENSE_LABEL="Leseni"
-INSTL_STEP_PREINSTALL_LABEL="Kagua kabla ya kusakinisha"
 INSTL_STEP_SITE_LABEL="Usanidi"
 INSTL_STEP_SUMMARY_LABEL="Muhtasari (kama maelezo ya ujumla)"
-INSTL_STEPS_TITLE="Hatua"
 
 ;Mtazamo wa lugha
-INSTL_LANGUAGE_TITLE="Chagua lugha"
-INSTL_SELECT_LANGUAGE_DESC="Tafadhali chagua lugha ya kutumia wakati wa hatua za kusakinisha Joomla!:"
 INSTL_SELECT_LANGUAGE_TITLE="Chagua lugha"
 INSTL_WARNJAVASCRIPT="Ilani! JavaScript lazima kuwezeshwa kwa kusakinisha Joomla! vizuri."
 INSTL_WARNJSON="JSON nilazima iwezeshwe katika mfumo wako wa PHP kabla ya kusakinisha Joomla!"
 
 ;Mtazamo kabla ya kusakinisha
 INSTL_PRECHECK_TITLE="Kagua kabla ya kusakinisha"
-INSTL_PRECHECK_FOR_VERSION="Kagua kabla ya kusakinisha kwa %s:"
 INSTL_PRECHECK_DESC="Ikiwa mojawapo ya vitu hivi haviungwimkono (alama kama <strong class="_QQ_"red"_QQ_">hapana</strong>) alafu tafadhali chukua hatua ya kurekebisha. <br />Huwezi kusakinisha Joomla! mpaka uwe na mahitaji yanayotakiwa hapo chini."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Matayarisho yaliyopendekezwa:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Matayarisho haya yaliyopendekezwa kwa PHP ili kuhakisha kwa utangamano kamili wa Joomla.<br />Hatakama, Joomla! itaendelea kufanya kazi hata ikiwa matayarisho yako hayalingani na yaliyopendekezwa."
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Pengine ni hii &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Aina ya hifadhidata"
 INSTL_DATABASE_USER_DESC="Pengine kitu kama "_QQ_"root"_QQ_" au jina la mtumiaji lililopeanwa na hosti"
 INSTL_DATABASE_USER_LABEL="Jina la mtumiaji"
-INSTL_DATABASE_TITLE="Matayarisho ya uhusiano"
-INSTL_DATABASE_DESC="<p>Wavuti wa Joomla! inahifadhi data zote ndani ya hifadhidata. Skrini hii inapeana programu ya kusakinisha na maelezo yanayohusika kwa kutengeza hifadhidata hii. </p><p>Ikiwa unasakinisha Joomla! katika seva ya mtandao wa nje, utahitaji maelezo haya kutoka kwa hosti yako. </p><p>Hosti zingine za tovuti zinahitaji kama wewe unatengeza hifadhidata kabla hujasakinisha Joomla. Ikiwa utapata ujumbe "_QQ_"Haikuweza kukuunganisha na hifadhidata"_QQ_", sahihi jina lako la mtumiaji na nenosiri. Ikiwa bado utatapa ujumbe huu, sahihi na hosti yako na uangalie ikiwa unatakiwa kurekebisha hifadhidata kabla ya kusakinisha Joomla.</p>"
 
 ;Mtazamo wa FTP
 INSTL_AUTOFIND_FTP_PATH="Kujipatiayenyewe njia ya FTP"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="Njia ya enzi ya FTP"
 INSTL_FTP_SAVE_LABEL="Hifadhi nenosiri la FTP"
 INSTL_FTP_TITLE="Usanidi wa FTP (<strong class="_QQ_"red"_QQ_">Hiari - watumiaji wengi wanairuka hii hatua kwa kubofya Ifuatayo</strong>)"
 INSTL_FTP_USER_LABEL="Jina la mtumiaji la FTP"
-INSTL_SITE_NAME_LABEL="Jina la tovuti"
 INSTL_VERIFY_FTP_SETTINGS="Thibitisha matayarisho ya FTP"
 INSTL_FTP_SETTINGS_CORRECT="Matayarisho ni sahihi"
 INSTL_FTP_USER_DESC="Onyo! Unashauriwa kuacha sehemu hii tupu kwa kilawakati wa kuhamisha faili zako katika kuingiza jina la mtumiaji kwa FTP."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Weka nenosiri kwa akaunti yako ya msimamizi mkubwa na
 INSTL_ADMIN_PASSWORD2_LABEL="Hakikisha nenosiri la msimamizi"
 INSTL_ADMIN_USER_LABEL="Jina la msimamizi"
 INSTL_ADMIN_USER_DESC="Weka jina la mtumiaji kwa akaunti yako ya msimamizi mkuu."
-INSTL_SITE_NAME_TITLE="Jina la tovuti"
+INSTL_SITE_NAME_LABEL="Jina la tovuti"
 INSTL_SITE_NAME_DESC="Andika jina la tovuti lako kwa Joomla!."
 INSTL_SITE_METADESC_LABEL="Fafanuo"
 INSTL_SITE_METADESC_TITLE_LABEL="Weka fafanuo la wavuti kwa jumla ambalo litatumiwa na mashini ya kutafuta. Kwa jumla, kiwango cha maneno 20 bora."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Hapo chini utapata matayarisho ya usanidi kwa wavuti wapya
 INSTL_EMAIL_NOT_SENT="Barua pepe haikuweza kutumika."
 
 ;Mtazamo kamili
-INSTL_COMPLETE="Maliza"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Maelezo ya Msimamizi kwa kuingia"
-INSTL_COMPLETE_DESC1="Bofya Tovuti kwa kuonyesha wavuti wako wa Joomla! au bofya kwa msimamizi ndio uweze kwenda kwa msimamizi wako wa kuingia."
-INSTL_COMPLETE_DESC2="Katika tovuti ya Joomla! Community, utapata orodha ya viungo vya  mapaketi ya lugha zinazopatikana na viungo vya  rasilimali zinazohusika na lugha ndani ya famili ya tovuti ya joomla.org."
-INSTL_COMPLETE_DESC3="Bofya kibonyezo kwa kulia kufungua tovuti ya Joomla! Community katika dirisha jipya."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Folda ya kusakinisha tayari imefutwa."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Folda ya kusakinisha haiwezi kufutwa. Tafadhali futa folda kwa mkono."
 INSTL_COMPLETE_FOLDER_REMOVED="Folda ya kusakinisha imetolewa vizuri"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Lugha"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Toleo"
 INSTL_LANGUAGES_DESC="Kusano la Joomla linapatikana katika lugha tofauti. Chagua lugha yako unayopendelea kwa kubofya vijisanduku vya tiki na sakinisha kwa kubofya kibonyezo 'Ifuatayo'.<br />Kumbuka: Uendeshaji huu utachukua muda wa sekunde kumi kwa kushusha na kusakinisha kila lugha. Kwa kutopoteza muda ulionao, tafadhali usichague lugha zaidi ya tatu kwa kusakinisha."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Uendeshaji huu utachukua muda wa sekunde kumi kwa kumaliza kila lugha. <br/>Tafadhali ngojea wakati inashusha na kunasakinisha lugha..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Tafadhali chagua lugha. Ikiwa hutaki kusakinisha lugha zingine, bofya kibonyezo 'Iliopita'."
+INSTL_LANGUAGES_MORE_LANGUAGES="Bofya kibonyezo 'Iliopita' ikiwa unataka kusakinisha lugha nyingi"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Hakuna lugha zilizochaguliwa kwa kusakinisha. Ikiwa unataka kusakinisha lugha nyingi, bofya kibonyezo 'Iliopita' na chagua lugha unayopenda kutoka kwa orodha."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! Haikuwa na uwezo wa kukuunganisha katika seva ya lugha. Tafadhali maliza maendeleo ya kusakinisha."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Kumbuka: Utaweza kusakinisha lugha baadaye kwa kutumia msimamizi wa Joomla!"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="Rudi kwa hatua ya mwisho ya kusakinisha"
@@ -160,7 +147,7 @@ INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="Ikiwa imeamilishwa, tovuti ya
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="Wezesha plugin ya kodi ya lugha"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="Ikiwa imewezeshwa, plugin ya kodi ya lugha itawezeshwa, ambayo itaongeza uwezo wa kubadilisha kodi ya lugha ndani ya hati ya HTML kwa kuboresha SEO."
 INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="Lugha ya difoti ya msimamizi"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla Haikuwa na uwezo wa kuweka lugha kama ya difoti. Kiingereza itatumika kama lugha ya difoti ya MSIMAMIZI katika upande ya nyuma."
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla haikuwa na uwezo wa kuweka lugha kama ya difoti. Kiingereza itatumika kama lugha ya difoti ya MSIMAMIZI katika upande ya nyuma."
 INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="Joomla imeweka %s kama lugha yako ya difoti ya MSIMAMIZI."
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="Chagua"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="Lugha"
@@ -180,14 +167,12 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="Joomla haikuweza kuto
 INSTL_DEFAULTLANGUAGE_DESC="Joomla imesakinisha lugha zifuatazo. Tafadhali chagua lugha ya difoti unayopendelea kwa msimamizi wa Joomla."
 INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="Joomla imesakinisha lugha zifuatazo. Tafadhali chagua lugha ya difoti unayopendelea kwa upande wa mbele wa Joomla. "
 INSTL_DEFAULTLANGUAGE_FRONTEND="Lugha ya difoti ya tovuti"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla Haikuwa na uwezo wa kuweka lugha kama ya difoti. Kiingereza itatumika kama lugha ya difoti katika upande wa mbele wa TOVUTI."
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla haikuwa na uwezo wa kuweka lugha kama ya difoti. Kiingereza itatumika kama lugha ya difoti katika upande wa mbele wa TOVUTI."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="Joomla imeweka %s kama lugha ya difoti ya TOVUTI."
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Sakinisha yaliyomo yaliojanibishwa"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Ikiwa imeamilishwa, Joomla itajitengezea jamii moja ya yaliyomo kwa kila lugha iliosakinishwa. Na pia itatengeza makala muhimu moja ya yaliyomo kwa kishika kwa kila jamii"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Lugha nyingi"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Sehemu hii inakuruhusu kwa kujiamilisha kipengele cha lugha nyingi za Joomla!"
-INSTL_DEFAULTLANGUAGE_NOTE="Kumbuka: Wakati ukibofya 'Ifuatayo', utarudishwa mwisho wa maendeleo ya kusakinisha, na utaelezwa kufuta folda ya kusakinisha."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Chagua lugha yako ya difoti"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Utaweza kusakinisha baadaye kwa kutumia msimamizi wa Joomla!"
 
 ; ILANI MUHIMU KWA WATAFSIRI: Usitafsiri laini hii neno kwa neno; badala hii, ongeza jina lililojanibishwa la lugha. Kwa mfano, Spanish itakuwa Español
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Baadhi ya makosa yametokea wakati wa kufanya backup ya hifadhidata. "
 INSTL_DATABASE_ERROR_CREATE="Kosa limetokea wakati wa kujaribu kutengeza hifadhidata %s.<br />Pengine mtumiaji hanahaki ya kutosha ya kutengeza hifadhidata. Itakubidi pengine utengeze hifadhidata inayotakiwa kando kabla ya kusakinisha Joomla!"
 INSTL_DATABASE_ERROR_DELETE="Baadhi ya makosa yametokea wakati wa kufuta hifadhidata."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Kosa katika kutayarisha nambari za toleo la muundo"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Ondoa"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Backup"
 INSTL_DATABASE_FIX_TOO_LONG="Prefix ya jedwali ya MySQL lazima iwe si zaidi ya herufi 15."
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Unataka SQL Sever 2008 R2 (10.50.1600.1)
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Unataka SQL Sever 2008 R2 (10.50.1600.1) au juu kwa kuendelea kusakinisha. Toleo lako ni: %s"
 INSTL_DATABASE_INVALID_TYPE="Tafadhali chagua aina ya hifadhidata"
 INSTL_DATABASE_NAME_TOO_LONG="Jina la hifadhidata la MySQL lazima liwe si zaidi ya herufi 64."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="Prefix ya jedwali ya MySQL lazima ianze kwa herufi na kufuatiwa na maherufi, nambari au kimstari cha chini (_) pekee."
 INSTL_DATABASE_INVALID_NAME="MySQL matoleo ya awali 5.1.6 huenda kuwa yenye alama ya kumaliza (.) au herufi nyingine "_QQ_"maalum"_QQ_" ndani ya jina. Toleo lako ni: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="Majina ya hifadhidata ya MySQL na majina ya jedwali silazima kuanza au kuisha na nafasi."
-INSTL_DATABASE_NAME_INVALID_CHAR="Hakuna utambulisho wa MySQL inaweza kuwa NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="Hakuna utambulisho wa MySQL inaweza kuwa NULL ASCII(0x00)."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="Faili %s haipo"
 
 ;Watawala
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST="Imekataa jukumu la "_QQ_"SYST"_QQ_"."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="Haiwezi kujigundua kwa folda ya enzi ya FTP."
 
 ;Wengineo
-INSTL_ADVANCED_SETTINGS="Matayarisho ya hali ya juu"
-INSTL_BASIC_SETTINGS="Matayarisho ya msingi"
 INSTL_CONFPROBLEM="Faili au orodha yako ya usanidi haiandikiki au kulikuwa na matatizo katika kutengeza faili ya usanidi. Itakubidi upakie kodi ifwatayo kwa mkono. Bofya ndani ya eneo la maandishi kwa kualamisha kodi zote, na ubandike ndani ya faili mpya ya maandishi. Ipatie jina faili hii 'configuration.php' na pakia katika folda ya enzi ya tovuti yako."
 INSTL_DATABASE_SUPPORT="Usaidizi wa hifadhidata:"
 INSTL_DISPLAY_ERRORS="Onyesha makosa"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Baadhi ya makosa yalitokea wakati wa kuweka data ndani ya hifadh
 INSTL_ERROR_INITIALISE_SCHEMA="Haiwezi kutayarisha muundo wa hifadhidata"
 INSTL_FILE_UPLOADS="Upakiaji wa mafaili"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="Usakinishaji"
 INSTL_JSON_SUPPORT_AVAILABLE="Usaidizi wa JSON"
-INSTL_LICENSE="Leseni"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC zima"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="Lugha ya MB ni difoti"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="Maandao yanaendelea. Tafadhali ngonjea..."
 
 ;Masharti ya kidunia
 JADMINISTRATOR="Msimamizi"
-JADVANCED="Hali ya juu"
 JCHECK_AGAIN="Kagua tena"
 JERROR="Kosa"
 JEMAIL="Barua pepe"
@@ -299,9 +277,9 @@ JSITE="Tovuti"
 JUSERNAME="Jina la mtumiaji"
 JYES="Ndiyo"
 
-; Masharti ya muundo muhimu, ikiwa paketi ya lugha haipatikani
-JLIB_DATABASE_ERROR_DATABASE="Makosa yametokea kwa hifadhidata."
+; Masharti muhimu na matokeo tofauti, ikiwa paketi ya lugha haipatikani
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="Haikuweza kuunganishwa na MYSQL"
+JLIB_DATABASE_ERROR_DATABASE="Makosa yametokea kwa hifadhidata."
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="Haiwezi kupakia madereva kwa hifadhidata: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="Wakati wa kikao chako umekwisha, tafadhali pakia tena ukurasa."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="Imekataa kunakili"
@@ -310,9 +288,10 @@ JLIB_FORM_FIELD_INVALID="Eneo batili:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Eneo batili: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Eneo linalohitajika %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Kusakinisha: Imeshindwa kunakili faili %1$s kwa %2$s."
+JLIB_INSTALLER_NOT_ERROR="Ikiwa makosa yanalingana na usakinishaji wa mafaili ya lugha za TinyMCE, haitasababisha usakinishaji wa lugha. Baadhi ya paketi za lugha zilitengezwa kabla ya Joomla! 3.2.0 pengine zitajaribu kusakinisha mafaili zaidi ya lugha za TinyMCE. Kama faili hizi sasa ziko ndani ya ukuu (core), hazihitaji kusakinishwa tena."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Haikuweza kuunganishwa na hifadhitata <br />joomla.library: %1$s - %2$s"
 
-;Masharti ya utatuaji Lugha
+; Masharti ya utatuaji lugha
 JDEBUG_LANGUAGE_FILES_IN_ERROR="Pambua makosa katika faili za lugha"
 JDEBUG_LANGUAGE_UNTRANSLATED_STRING="Masharti ambayo hayakutafsiriwa"
 JNONE="Hakuna"
diff --git a/installation/language/sw-KE/sw-KE.xml b/installation/language/sw-KE/sw-KE.xml
index 1a8823c..4bc585b 100644
--- a/installation/language/sw-KE/sw-KE.xml
+++ b/installation/language/sw-KE/sw-KE.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>November 2012</creationDate>
 	<author>Hassan Abdalla</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/sy-IQ/sy-IQ.ini b/installation/language/sy-IQ/sy-IQ.ini
index daae5b9..6a55616 100644
--- a/installation/language/sy-IQ/sy-IQ.ini
+++ b/installation/language/sy-IQ/sy-IQ.ini
@@ -1,6 +1,4 @@
-; Joomla! 3.2.0 sy-IQ.ini 2013-10-04 pauls
-; author East Syriac Translation Team
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
@@ -10,24 +8,17 @@ INSTL_STEP_COMPLETE_LABEL="ܫܘܠܡܐ"
 INSTL_STEP_DATABASE_LABEL="ܐܣܬ ܡܘܕܥܢܘܢܘܬܐ"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="ܦܪܘܫ ܠܠܫܢܐ ܪܫܝܡܐ"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="ܠܫܢܐ"
 INSTL_STEP_LANGUAGES_LABEL="ܡܩܝܡ ܠܫܢܐ"
-INSTL_STEP_LICENSE_LABEL="ܦܣܣܐ"
-INSTL_STEP_PREINSTALL_LABEL="ܨܚܨܝܬܐ ܕܡܩܝܡܬܐ ـ ܚܐܪܬܐ"
 INSTL_STEP_SITE_LABEL="ܡܗܘܝܢܘܬܐ"
 INSTL_STEP_SUMMARY_LABEL="ܓܫܩܬܐ ܓܘܢܝܬܐ"
-INSTL_STEPS_TITLE="ܦܣܘܥܝܬ݂̈ܐ"
 
 ; Language view
-INSTL_LANGUAGE_TITLE="ܓܒܝ ܠܠܫܢܐ"
-INSTL_SELECT_LANGUAGE_DESC="ܓܒܝ ܠܠܫܢܐ ܕܡܦܠܚܬܠܗ ܒܥܕܢܐ ܕܡܩܝܡܬܐ ܕܓ̰ܘܡܠܐ!"
 INSTL_SELECT_LANGUAGE_TITLE="ܓܒܝ ܠܠܫܢܐ"
 INSTL_WARNJAVASCRIPT="ܙܘܗܪܐ! ܐܠܝܨܬܐ ܝܠܗ̇ ܕܝܒ݂ܐ ܣܟܩܝܦܬ ܕܗܘܐ ܥܒ݂ܘܕܐ ܩܐ ܕܓ̰ܘܘܡܠܐ ܦܐܫ ܡܘܩܝܡܬܐ ܬܪܝܨܐܝܬ!"
 INSTL_WARNJSON="ܕܦܐܫ ܥܒ݂ܘܕܐ ܩܐ ܡܩܝܡܬܐ ܕܓ̰ܘܡܠܐ JONSON ܕܝܘܟܼ ܣܢܝܩܐ ܝܠܗ ܕܗܘܐ ܠܗ PHP ܡܩܝܡܬܐ ܕ"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="̊ܨܚܨܝ  ܩܕ݇ܡ ܡܩܡܬܐ"
-INSTL_PRECHECK_FOR_VERSION="ܨܚܨܝܬܐ  ܩܕܡ ܠܡܩܝܡܬܐ %s:"
 INSTL_PRECHECK_DESC="ܐܢ ܚܕ ܡ̣ܢ ܐܢ̈ܐ ܦܪܡܬܪ̈ܐ ܠܐ ܝܠܗ ܡܥܕܪܢܐ (ܓܘܫܩܐ ܐܝܢܟܼ <strong class="_QQ_"red"_QQ_">ܠܐ</strong>) ܗܕܟ݂ܐ ܐܠܝܨܐ ܝܘܬ ܕܥܒ݂ܕܬ ܫܘܚܠܦ̈ܐ ܐܠܨܝ̈ܐ. ܐܢ ܠܐ ܡܘܢܬܐ ܠܘܟܼ ܠܡܓܡܘܪܐ ܠܐܗܐ ܡܬܡܨܝܢ<br />ܠܐ ܡܨܬ ܠܡܩܝܘܡܐ ܓ̰ܘܡܠܐ ܗܠ ܕܡܬܒ݂ܝܢܬܘܟ݂ ܠܚܡܝ ܥܡ ܒܥܘܝܬ̈ܐ"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="ܡܬܒ݂ܝܬ̈ܐ ܡܘܚܫܚ̈ܐ:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="ܐܢ̈ܐ ܡܬܒ݂ܝܬ̈ܐ ܦܝܫܐ ܝܠܝܗܝ ܡܘܚܫܚ̈ܐ ܡܛܠ ܡܬܠܚܡܢܘܬܐ ܓܡܝܪܬܐ ܥܡ ܓ̰ܘܡܠܐPHP.<br />ܕܐܟ݂ܝ ܕܗܘܝܐ ܓ̰ܘܡܠܐ ܒܕ ܦܠܚ ܐܦܢ ܡܬܒ݂ܝܬ̈ܐ ܠܐ ܝܠܝܗܝ ܒܠܚܡܐ ܥܡ ܡܚܫܚܝܬ̈ܐ ܕܗܘܝܢܘܬܐ"
@@ -53,28 +44,16 @@ INSTL_DATABASE_TYPE_DESC="ܡܬܗܘܝܢܬܐ ܝܠܗ̇ ܕܐܗܐ &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="ܐܕܫܐ ܕܐܣܬ݂ ܡܘܕܥܢܘܢܘܬܐ"
 INSTL_DATABASE_USER_DESC="ܐܘ ܚܕ ܡܢܕܝ ܐܝܟܼ "_QQ_"ܥܩܪܐ"_QQ_" ܐܘ ܚܕܐ ܡܠܬܐ ܕܥܒ݂ܪܐ ܝܘܗܒ݂ܐ ܒܝܕ ܡܐܪܚܢܘܬܐ"
 INSTL_DATABASE_USER_LABEL="ܫܡܐ ܕܡܦܠܚܢܐ"
-INSTL_DATABASE_TITLE="ܡܬܒ݂ܝܬ̈ܐ ܕܡܘܛܝ̈ܐ"
-INSTL_DATABASE_DESC="<p>ܡܬܒ݂ܝܬ̈ܐ ܕܓ̰ܘܡܠܐـ ܩܐ ܛܪܝܬܐ ܥܠ ܬܔܡܫܢܘܟܼ ܐܘ ܣܪܒ݂ܪ ܐܝܬܠܘܟܼ 4 ܦܣܘܥܝܬ̈ܐ ܦܫܝܛ̈ܐ...</p><p>ܡܥܒ݂ܪ ܠܫܡܐ ܕܡܐܪܚܢܐ ܕܣܪܒ݂ܪ ܕܓ̰ܘܡܠܐ ܐܝܢܝ ܕܦܐܫ ܡܘܨܠܝܐ ܓܘܗ.</p><p>ܘܐܣܬ ܕܡܘܕܥܢܘܢܘܬܐ ܐܝܢܝ ܕܒܥܬ ܠܡܦܠܘܚܐ ܥܡ ܓ̰ܘܡܠܐ MySQLܡܥܒ݂ܪ ܫܡܐ ܕܡܦܠܚܢܐ ܘܡܠܬܐ ܕܥܒ݂ܪܬܐ.</p><p>ܡܥܒ݂ܪ ܚܕܐ ܫܪܝܘܬܐ ܡܛܠ ܡܦܠܚܬܗ̇ ܒܝܕ ܣܘܪܓܕܐ ܩܐ ܡܨܠܝܬܐ ܕܐܗܐ ܓ̰ܘܡܠܐ. ܓܒܝ ܕܐܟ݂ܝ ܒܦܠܚܬ ܥܠ ܣܘܪ̈ܓܕܐ ܕܐܝܬ ܡ̣ܢ ܡܨܠܝܬܐ ܕܕܥܒ݂ܪ.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="FTP ܡܫܟ̰ܚܬܐ ܐܘܬܘܡܛܝܩܝܬܐ ܕܐܘܪܚܐ ܕ"
 INSTL_FTP="FTP ܗܘܝܢܘܬܐ ܕ"
-INSTL_FTP_DESC="<p>ܥܠ ܚܕܟܡܐ ܣܪܒ݂ܪ ܣܢܝܩܐ ܝܘܬ ܠܝܗܒ݂ܐ ܡܘܕܥܢܘܬ̈ܐ ܩܐ ܡܓܡܪܬܐ ܕܡܩܝܡܬܢܘܬܐ. ܐܢ ܐܝܬ ܠܘܟܼ ܥܣܩܘܬܐ ܓܘ ܡܓܡܪܬܐ ܕܡܩܝܡܬܐ ܕܡܐ ܐܢ̈ܐ ܡܘܕܥܢܘܬ̈ܐ، ܨܚܨܝ ܥܡ ܡܐܪܚܢܘܟܼ ܠܫܪܪܬܗ ܐܢ ܝܠܗ̇ ܐܠܨܝܬܐ. </p><p>ܒܥܠܬܐ ܕܫܝܢܘܬܐ، ܝܠܗ̇ ܒܫ ܨܦܝܝ ܕܡܒܪܝܬ ܚܕ FTP ܕܚܘܫܒܘܢܝܐ ܕܡܦܠܚܢܐ ܠܥܒ݂ܪܐ ܠܓ̰ܘܡܠܐ، ܡܩܝܡܬܐ ܐܚܟ̰ܝ ܘܠܐ ܟܠܗ ܒ݂ܝܒ ܣܪܒ݂ܪ. ܡܐܪܚܢܐ ܕܝܘܟܼ ܡܨܐ ܠܡܥܕܪܘܢܘܟ݂ ܓܘ ܕܐܗܐ.</p><p><b>ܢܘܗܪܐ:</b> ܐܢ ܝܘܬ ܡܩܝܘܡܐ ܥܠ ܚܕ ܛܟ݂ܣܐ  ܕܡܦܠܚܬܐ ܕܒ݂ܝܢܕܘܙ، ܛܒܩ̈ܐ ܕFTP <strong>ܠܐ ܝܠܝܝܗܝ</strong> ܣܢܝܩ̈ܐ.</p>"
-INSTL_FTP_ENABLE_LABEL="ܛܒܩ̈ܐ  FTP ܥܒ݂ܘܕܠܝܗܝ ܥܒ݂ܘܕܐ"
-INSTL_FTP_HOST_LABEL="FTP ܡܐܪܚܢܐ"
-INSTL_FTP_PASSWORD_LABEL="FTP ܡܠܬܐ ܕܥܒ݂ܪܬܐ"
-INSTL_FTP_PORT_LABEL="FTP ܬܪܥܐ"
-INSTL_FTP_ROOT_LABEL="FTP ܐܘܪܚܐ ܥܩܪܝܬܐ"
-INSTL_FTP_SAVE_LABEL="FTP ܚܡܝ ܡܠܬܐ ܕܥܒ݂ܪܬܐ ܕ"
-INSTL_FTP_TITLE="FTP ܗܘܝܢܘܬܐ ܕ (<strong class="_QQ_"red"_QQ_">ܚܐܪܘܬ ܓܘܒܝܐ - ܙܘܕܐ ܡ̣ܢ ܡܦܠܚܢ̈ܐ ܡܨܝ ܫܒ݂ܩܝ ܠܐܗܐ ܦܣܘܥܬܐ - ܕܘܫ ܕܒܬܪܗ ܠܫܒ݂ܩܗ̇</strong>)"
-INSTL_FTP_USER_LABEL="FTP ܫܡܐ ܕܡܦܠܚܢܐ ܕ"
-INSTL_SITE_NAME_LABEL="ܫܡܐ ܕܕܦܐ"
 INSTL_VERIFY_FTP_SETTINGS="FTP ܫܪܪ ܠܡܬܒ݂ܝܬ̈ܐ ܕ"
 INSTL_FTP_SETTINGS_CORRECT="ܡܬܒ݂ܝܬ̈ܐ ܬܪܝܨܐ ܝܠܝܗܝ"
 INSTL_FTP_USER_DESC="ܙܘܗܪܐ! ܡܚܫܚܬܐ ܝܠܗ̇ ܫܒ݂ܩܬܐ ܕܐܗܐ ܣܦܝܩܬܐ  ܫܡܐ ܕܡܦܠܚܢܐ ܕ FTP ܟܠ ܥܕܢܐ ܕܫܢܝܬܐ ܕܟܢܦܪ̈ܐ."
 INSTL_FTP_PASSWORD_DESC="ܙܘܗܪܐ! ܡܚܫܚܬܐ ܝܠܗ̇ ܫܒ݂ܩܬܐ ܕܐܗܐ ܣܦܝܩܬܐ  ܘܡܥܒ݂ܪܬܐ ܠܡܠܬܐ ܕܥܒ݂ܪܬܐ ܕ FTP ܟܠ ܥܕܢܐ ܕܫܢܝܬܐ ܕܟܢܦܪ̈ܐ."
-
-;Site View
+INSTL_FTP_DESC="<p>ܥܠ ܚܕܟܡܐ ܣܪܒ݂ܪ ܣܢܝܩܐ ܝܘܬ ܠܝܗܒ݂ܐ ܡܘܕܥܢܘܬ̈ܐ ܩܐ ܡܓܡܪܬܐ ܕܡܩܝܡܬܢܘܬܐ. ܐܢ ܐܝܬ ܠܘܟܼ ܥܣܩܘܬܐ ܓܘ ܡܓܡܪܬܐ ܕܡܩܝܡܬܐ ܕܡܐ ܐܢ̈ܐ ܡܘܕܥܢܘܬ̈ܐ، ܨܚܨܝ ܥܡ ܡܐܪܚܢܘܟܼ ܠܫܪܪܬܗ ܐܢ ܝܠܗ̇ ܐܠܨܝܬܐ. </p><p>ܒܥܠܬܐ ܕܫܝܢܘܬܐ، ܝܠܗ̇ ܒܫ ܨܦܝܝ ܕܡܒܪܝܬ ܚܕ FTP ܕܚܘܫܒܘܢܝܐ ܕܡܦܠܚܢܐ ܠܥܒ݂ܪܐ ܠܓ̰ܘܡܠܐ، ܡܩܝܡܬܐ ܐܚܟ̰ܝ ܘܠܐ ܟܠܗ ܒ݂ܝܒ ܣܪܒ݂ܪ. ܡܐܪܚܢܐ ܕܝܘܟܼ ܡܨܐ ܠܡܥܕܪܘܢܘܟ݂ ܓܘ ܕܐܗܐ.</p><p><b>ܢܘܗܪܐ:</b> ܐܢ ܝܘܬ ܡܩܝܘܡܐ ܥܠ ܚܕ ܛܟ݂ܣܐ  ܕܡܦܠܚܬܐ ܕܒ݂ܝܢܕܘܙ، ܛܒܩ̈ܐ ܕFTP <strong>ܠܐ ܝܠܝܝܗܝ</strong> ܣܢܝܩ̈ܐ.</p>"
+INSTL_FTP_ENABLE_LABEL="ܛܒܩ̈ܐ  FTP ܥܒ݂ܘܕܠܝܗܝ ܥܒ݂ܘܕܐ"
 INSTL_SITE="ܗܘܝܢܘܬܐ ܪܫܝܬܐ"
 INSTL_ADMIN_EMAIL_LABEL="ܒܝܠܕܪܐ ܐܠܟܬܪܘܢܝܐ ܕܦܪܢܣܐ"
 INSTL_ADMIN_EMAIL_DESC="ܡܥܒ݂ܪ ܠܒܝܠܕܪܐ ܐܠܟܬܪܘܢܝܐ ܕܝܘܟܼ. ܐܗܐ ܒܕ ܗܘܐ ܒܝܠܕܪܐ ܐܠܟܬܪܘܢܝܐ ܕܒܝܬܕܦܐ ܕܪܫ ܦܪ̈ܢܣܐ "
@@ -83,7 +62,16 @@ INSTL_ADMIN_PASSWORD_DESC="ܡܬܒ݂ ܡܠܬܐ ܕܥܒ݂ܪܬܐ ܩܐ ܚܘܫܒܘܢܐ
 INSTL_ADMIN_PASSWORD2_LABEL="ܫܪܪ ܠܡܠܬܐ ܕܥܒ݂ܪܬܐ ܕܦܪܢܣܐ"
 INSTL_ADMIN_USER_LABEL="ܫܡܐ ܕܡܦܠܚܢܐ ܕܦܪܢܣܐ"
 INSTL_ADMIN_USER_DESC="ܡܬܘܒ݂ ܫܡܐ ܕܡܦܠܚܢܐ ܩܐ ܚܘܫܒܘܢܐ ܕܪܫ ܦܪܢܣܐ."
-INSTL_SITE_NAME_TITLE="ܫܡܐ ܕܕܦܐ"
+INSTL_FTP_HOST_LABEL="FTP ܡܐܪܚܢܐ"
+INSTL_FTP_PASSWORD_LABEL="FTP ܡܠܬܐ ܕܥܒ݂ܪܬܐ"
+INSTL_FTP_PORT_LABEL="FTP ܬܪܥܐ"
+INSTL_FTP_ROOT_LABEL="FTP ܐܘܪܚܐ ܥܩܪܝܬܐ"
+INSTL_FTP_SAVE_LABEL="FTP ܚܡܝ ܡܠܬܐ ܕܥܒ݂ܪܬܐ ܕ"
+INSTL_FTP_TITLE="FTP ܗܘܝܢܘܬܐ ܕ (<strong class="_QQ_"red"_QQ_">ܚܐܪܘܬ ܓܘܒܝܐ - ܙܘܕܐ ܡ̣ܢ ܡܦܠܚܢ̈ܐ ܡܨܝ ܫܒ݂ܩܝ ܠܐܗܐ ܦܣܘܥܬܐ - ܕܘܫ ܕܒܬܪܗ ܠܫܒ݂ܩܗ̇</strong>)"
+INSTL_FTP_USER_LABEL="FTP ܫܡܐ ܕܡܦܠܚܢܐ ܕ"
+INSTL_SITE_NAME_LABEL="ܫܡܐ ܕܕܦܐ"
+
+;Site View
 INSTL_SITE_NAME_DESC="<br/>ܒܪܒܥܝܬܐ:<br/> ܡܨܬ ܐܘܦܙܐ ܡܥܒ݂ܪܬ ܠܐܪܝܟ݂ܘܬܐ ܕܡܐܬܐ ܘܡܐܬܐ ܕܩܕܝܠܬ ܚܒܪ̈ܐ ܩܐ ܕܦܘܟܼ <br/> ܡܬܡܨܝܢܬܐ ܝܠܗ ܕܐܢ݇ܬ ܦܣܩܬ ܐܢ ܦܬܐ ܕܩܕܡܝܘܬܐ ܐܢ ܗܘܝܐ ܐܕܝܐ ܥܒ݂ܘܕܬܐ ܐܘ ܠܐ ܒܬܪ ܕܡܩܝܡܬܐ ܦܪܩܬܐ ܝܠܗ̇"
 INSTL_SITE_METADESC_LABEL="ܐܪ̈ܝܟ݂ܘܬܐ ܕܡܐܬܐ"
 INSTL_SITE_METADESC_TITLE_LABEL="ܡܥܒ݂ܪ ܚܕܐ ܐܪܝܟ݂ܘܬܐ ܥܠ ܟܠܗ ܒܝܬ݂ ܘܝܒ ܐܝܢܝ ܕܦܐܫ ܡܘܦܠܚܐ ܒܝܕ ܒܨܘܝܐ ܕܡܙܝܥܢܐ.ܓܘܢܐܝܬ، ܠܐ ܝܬܝܪ ܡ̣ܢ 20 ܚܒܪ̈ܐ ܝܠܝܗܝ ܩܒܝܠ̈ܐ."
@@ -127,14 +115,11 @@ INSTL_EMAIL_HEADING="ܒܐܠܬܚܬ ܡܨܬ ܡܫܟܚܬ ܠܡܬܒ݂ܝܬ̈ܐ ܕܡܗܘ
 INSTL_EMAIL_NOT_SENT="ܠܐ ܡܨܝܬܐ ܕܫܕܪܬܐ ܕܒܝܠܕܪܐ ܐܠܟܬܪܘܢܝܐ"
 
 ;Complete view
-INSTL_COMPLETE="ܫܘܠܡܐ"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="ܐܪ̈ܝܟ݂ܘܬܐ ܕܥܒ݂ܪܬܐ ܕܡܕܒܪܢܘܬܐ."
-INSTL_COMPLETE_DESC1="ܢܩܘܫ ܠܬܪܘܩܬܐ ܕܕܦܐ ܕܚܙܬ ܠܒܝܬ ܕܦܐ ܕܓ̰ܘܡܠܐ! ܐܘ ܠܬܪܘܩܬܐ ܕܦܪܢܣܐ ܕܫܩܠܘܟ݂ ܠܕܘܟܐ ܕܥܒ݂ܪܬܐ ܕܡܕܒܪܢܘܬܐ."
-INSTL_COMPLETE_DESC2="ܥܠ ܕܦܐ ܕܡܥܕܪܢܘܬܐ ܕܓ̰ܘܡܠܐ!  ܒܕ ܡܫܟ̰ܚܬ ܚܕ ܡܗܕܝܢܐ ܦܫܝܛܐ ܦܣܘܥܬܐ ـ ܒܬܪ ـ ܦܣܘܥܬܐ ܩܐ ܡܩܡܬܐ ܕܡܐܣܪܐ ܕܠܫܢܘܟ݂ ܓܘ ܓ̰ܘܡܠܐ! ܐܢ݇ܬ ܒܕ ܡܫܟ̰ܚܬ ܚܕܐ ܠܝܣܬܐ ܕܐܣܪ̈ܐ ܕܡܐܣܪ̈ܝܬܐ ܕܠܫܢ̈ܐ ܕܐܝܬ    ."
-INSTL_COMPLETE_DESC3="ܢܩܘܫ ܠܬܪܘܩܬܐ ܕܝܡܢܐ ܠܦܬܚܐ ܦܬܐ ܕܗܝܪܬܐ ܓܘ ܚܕܐ ܟܘܬܐ ܚܕܬܐ."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="ܒܚܬܝܬܘܬܐ ܦܝܫܠܗ ܫܝܦܐ ܠܕܘܒܩܐ ܕܡܩܝܡܬܐ."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="ܠܐ ܡܘܢܬܐܠܗ̇ ܠܫܝܦܬܐ ܕܕܘܒܩܐ ܕܡܩܝܡܬܐ. ܐܢ ܒܣܡܐ ܠܘܟ݂ ܫܘܦܠܗ̇ ܐܝܕܢܝܐܝܬ."
 INSTL_COMPLETE_FOLDER_REMOVED="ܦܝܫܠܗ ܫܝܦܐ ܠܕܘܒܩܐ ܕܡܩܝܡܬܐ ܒܡܢܬܝܬܐ"
+INSTL_LANGUAGES_MORE_LANGUAGES="ܕܘܫ ܬܪܘܩܬܐ ’ܕܩܕܡܬܐ’ ܐܢ ܒܥܬ ܢܨܒ݂ܬ ܠܫܢ̈ܐ ܐܚܪ̈ܢܐ"
 INSTL_COMPLETE_LANGUAGE_1="ܓ̰ܘܡܠܐ! ܓܘ ܠܫܢܘܟ݂ ܘ/ܐܘ ܝܬܝܐܝܬ ܒܪܝܬܐ ܕܕܦܐ ܐܣܝܐ ܦܫܝܛܐ ܕܣܓܝ ܠܫܢ̈ܐ"
 INSTL_COMPLETE_LANGUAGE_DESC="ܡ̣ܢ ܩܕܡ ܫܝܦܬܐ ܠܕܘܒܩܐ ܕܡܩܝܡܬܐ ܡܨܬ ܡܩܝܡܬܐ ܠܫܢܐ ܙܘܕܢܐ. ܐܢ ܒܥܬ ܬܘܣܦܬ ܠܫܢܐ ܙܘܕܢܐ ܥܠ ܓ̰ܘܡܠܐ! ܢܩܘܫ ܕܬܪܘܩܬܐ ܕܣܘܥܪܢܐ ܕܒܐܬܝܐ."
 INSTL_COMPLETE_LANGUAGE_DESC2="ܚܕܟܡܐ ܡܛܝܒ݂ܢܘܬ̈ܐ ܕܬܫܡܫܢܐ ܠܐ ܫܒ݂ܩ ܠܓ̰ܘܡܠܐ ܠܡܩܝܡܬܐ ܕܠܫܢܐ. ܐܢ ܐܗܐ ܝܠܗ ܐܝܟܢܝܘܬܘܟܼ ܠܐ ܬܚܡܢܬ ܒܕ ܡܨܬ ܠܡܩܝܘܢܡܝܗܝ ܚܪܬܐ ܒܡܦܠܚܬܐ ܕܠܦܪܢܣܐ ܕܓ̰ܘܡܠܐ<br/>ܙܘܗܪܐ: ܣܢܝܩܐ ܝܘܬ ܠܡܬܥܒ݂ܪܢܘܬܐ ܕܐܢܬܪܢܝܬ ܩܐ ܓ̰ܘܡܠܐ ܩܐ ܡܨܠܝܬܐ ܘܡܩܝܡܬܐ ܕܠܫܢܐ ܚܕܬܐ"
@@ -149,7 +134,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="ܠܫܢܐ"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="ܡܢܬܐ"
 INSTL_LANGUAGES_DESC="ܙܘܗܪܐ: ܐܗܐ ܣܘܥܪܢܐ ܒܕ ܫܩܠ 10 ܪ̈ܦܦܐ ܠܡܨܠܝܬܐ ܘܡܩܝܡܬܐ ܕܟܠ ܠܫܢܐ ܠܪܩܬܐ ܡ̣ܢ ܫܘܠܡܐ ܕܥܕܢܐ ܠܐ ܓܒܬ ܙܘܕܐ ܡ̣̤ 3 ܠܫܢ̈ܐ ܩܐ ܡܩܝܡܬܐ<br/>ܩܘܒܠܐ ܕܓ̰ܘܡܠܐ ܝܠܗ ܡܬܡܨܝܢܐ ܓܘ ܪܒܐ ܠܫܢ̈ܐ. ܦܪܘܫ ܠܠܫܢܘܟ݂ ܒܝܕ ܢܩܫܬܐ ܓܘ ܡܪ̈ܒܥܐ ܕܦܪܫܬܐ ܘܚܪܬܐ ܡܩܝܡܠܗܘܢ ܒܝܕ ܢܩܫܬܐ ܠܬܪܘܩܬܐ ܕܒܬܪܗ"
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="ܐܗܐ ܣܘܥܪܢܐ ܒܕ ܫܩܠ ܗܠ 10 ܩܛܢܝܬ̈ܐ ܠܟܠ ܠܫܢܐ ܩܐ ܡܓܡܪܬܗ<br />ܣܦܘܪ ܒܥܕܢܐ ܕܐܚܢܢ ܡܨܠܚܠܗ ܘܡܩܝܡ ܠܠܫܢ̈ܐ..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="ܦܪܘܫ ܚܕ ܠܫܢܐ. ܐܢ ܠܐ ܝܘܬ ܣܢܝܩܐ ܠܡܩܝܡܬܐ ܕܠܫܢ̈ܐ ܐܚܪ̈ܢܐ ܕܘܫ 'ܕܥܒ݂ܪ' ܬܪܘܩܬܐ"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="ܠܐ ܝܠܝܗܝ ܦܪ̈ܝܫܐ ܠܫܢ̈ܐ ܩܐ ܢܨܒ݂ܬܐ. ܐܢ ܒܥܬ ܢܨܒ݂ܬ ܒܫ ܝܬܝܪ ܠܫܢ̈ܐ ܕܘܫ 'ܕܩܕܡܬܐ' ܬܪܘܩܬܐ ܘܦܪܘܫ ܠܠܫܢܐ ܒܥܝܐ ܡ̣ܢ ܠܝܣܬܐ"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="ܓ̰ܘܡܠܐ! ܠܐ ܡܨܐܠܗ ܠܡܛܝܐ ܠܠܫܢ̈ܐ ܕܣܝܪܒ݂ܝܪ. ܦܪܘܩ ܡ̣ܢ ܣܘܥܪܢܐ ܕܡܩܝܡܬܐ"
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="ܡܥܝܪܢܘܬܐ: ܒܕ ܡܨܬ ܠܡܩܝܘܡܐ ܠܠܫܢ̈ܐ ܚܪܬܐ ܒܡܦܠܚܬܐ ܕܓ̰ܘܡܠܐ ! ܦܪܢܣܐ"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="ܕܥܘܪ ܠܦܣܘܥܬܐ ܕܡܩܝܡܬܐ ܚܪܝܬܐ"
@@ -186,11 +171,9 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="ܡܩܝܡ ܚܒ݂ܝܫܘܬܐ ܕܘ
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="ܐܢ ܝܠܗ̇ ܥܒ݂ܘܕܬܐ, ܓ̰ܘܡܐ ܝܬܢܐܝܬ ܒܕ ܒܪܐ ܚܕܐ ܩܘܒܘܚܬܐ ܕܚܒ݂ܝܫܘܬܐ ܠܟܠ ܠܫܢܐ ܡܘܩܝܡܐ . ܐܦܙܐ, ܚܕ ܡܐܡܪܐ ܐܝܢܝܐ ܒܚܒ݂ܫܐ ܚܒ݂ܝܫܘܬܐ ܣܦܝܩܬܐ ܒܕ ܦܝܫܐ ܦܪܝܬܐ ܓܘ ܟܠ ܩܘܒܘܚܬܐ"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="ܣܓܝ ܠܫܢ̈ܐ"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="ܐܗܐ ܦܣܩܐ ܒܕ ܫܒ݂ܠܘܟܼ ܝܬܢܐܝܬ ܠܡܦܥܘܠܐ ܓ̰ܘܡܠܐ! ܐܝܢܝܘܬܐ ܕܣܓܝ ܠܫܢ̈ܐ"
-INSTL_DEFAULTLANGUAGE_NOTE="ܡܥܝܪܢܘܬܐ: ܒܥܕܢܐ ܕܕܝܫܬ ܠܬܪܘܩܬܐ ܕܒܬܪܐ ܒܕ ܐܬܬ ܠܫܘܠܡܐ ܕܣܘܥܪܢܐ ܕܡܩܝܡܬܐ ܐܝܟܐ ܕܦܝܫܬ ܒܘܩܪܐ ܕܫܝܦܬ ܠܕܘܒܩܐ ܕܡܩܝܡܬܐ"
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="ܦܪܘܫ ܠܠܫܘܟܼ ܪܫܝܡܐ"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="ܒܕ ܗܘܬ ܡܬܡܨܝܢܐ ܩܐ ܕܡܩܝܡܬ ܠܗ ܚܪܬܐ ܒܡܦܠܚܬܐ ܕܓ̰ܘܡܠܐ! ܦܪܢܣܐ"
 
-; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Soreth (sy)"
 
 ;Database Model
@@ -200,7 +183,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="ܚܕܟܡܐ ܦܘܕ̈ܐ ܓܕܫܠܗܘܢ ܓܘ ܡܕܥܪܬܐ ܕܐܣܬ ܕܡܘܕܥܢܘܢܘܬܐ."
 INSTL_DATABASE_ERROR_CREATE="ܚܕ ܦܘܕܐ ܓܕܫܠܗ ܒܥܕܢܐ ܕܓ̰ܪܒܬܐ ܕܡܒܪܝܬܐ ܕܐܣܬ ܕܡܘܕܥܢܘܢܘܬܐ %s.<br />ܡܦܠܚܢܐ ܒܠܟܝ ܠܝܬܠܗ ܦܣܣܐ ܠܡܒܪܝܬܐ ܕܚܕ ܐܣܬ ܕܡܘܕܥܢܘܢܘܬܐ. ܐܣܬ ܕܡܘܕܥܢܘܢܘܬܐ ܒܠܟܝ ܣܢܝܩܬܐ ܝܠܗ̇ ܦܝܫܐ ܡܘܒܪܝܬܐ ܠܚܘܕܐܝܬ ܗ.ܕ ܠܐ ܐܘܬܘܡܛܝܩܝ ܡ̣ܢ ܩܕ݇ܡ ܡܩܡܬܐ ܕܓ̰ܘܡܠܐ!."
 INSTL_DATABASE_ERROR_DELETE="ܚܕܟܡܐ ܦܘܕ̈ܐ ܓܕܫܠܗܘܢ ܒܥܕܢܐ ܕܫܝܦܬܐ ܕܐܣܬ ܕܡܘܕܥܢܘܢܘܬܐ."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="ܦܘܕܐ ܓܘ ܡܬܫܪܝܢܘܬܐ ܕܡܪܝܙܬܐ ܕܪܩܡܐ ܕܡܢܬܐ"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="ܫܝܘܦ"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="ܢܣܟ݂̈ܐ ܙܗܝܪ̈ܐ"
 INSTL_DATABASE_FIX_TOO_LONG="ܢܘܦܩܬ݂ ܛܒ݂ܠܝܬܐ ܐܠܨܝܬܐ ܝܠܗ̇ ܕܠܐ ܗܘܝ ܝܬܝܪ ܡ̣ܢ 15 ܪ̈ܡܙܐ."
@@ -211,10 +193,9 @@ INSTL_DATABASE_INVALID_MYSQLI_VERSION="ܐܠܝܨ ܕܗܘܐ ܠܘܟܼ MySQL 5.0.4 ܐ
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="ܐܠܝܨ ܕܗܘܐ ܠܘܟܼ SQL Server 2008 R2 (10.50.1600.1) ܐܘ ܒܫ ܥܠܠ ܩܐ ܐܡܝܢܘܬܐ ܕܡܩܝܡܬܐ. ܡܢܬܘܟܼ ܝܠܗ̇: %s"
 INSTL_DATABASE_INVALID_TYPE="ܓܒܝ ܠܐܕܫܐ ܕܐܣܬ ܡܘܕܥܢܘܢܘܬܐ"
 INSTL_DATABASE_NAME_TOO_LONG="ܐܠܝܨܬܐ ܝܠܗ̇ ܕܫܡܐ ܕܐܣܬ ܡܘܕܥܢܘܢܘܬܐ ܠܐ ܗܘܐ ܝܬܝܪ ܡ̣ܢ 64 ܪ̈ܡܙܐ MySQL."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="ܐܠܝܨܬܐ ܝܠܗ̇ ܕܫܪܝܘܬ ܛܒܠܐ ܫܪܝܐ ܒܝܕ ܚܕܐ ܐܬܘܬܐ ܘܕܒܬܪܗ̇ ܗܘܝ ܐܬܘܬ̈ܐ ، ܪ̈ܩܡܐ ܐܘ ܣܪܛܐ ܬܚܬܝܐ. MySQL."
 INSTL_DATABASE_INVALID_NAME="ܡ̣ܢ ܩܕ݇ܡ 5.1.6 ܠܐ ܗܘܝܐ ܕܗܘܐܠܗ ܛܦܦ̈ܐ ܐ݇ܚܪܢܐ MySQL ܪܩܡܐ ܕܕܘܦܩܐ ܕ"_QQ_"ܕܝܠܢܝܐ"_QQ_" ܪ̈ܡܙܐ ܓܘ ܫܡܐ. ܢܘܦܩܐ ܕܝܘܟ݂ ܝܠܗ: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="ܫܡܢ̈ܐ ܕܕܐܣܬ ܡܘܕܥܢܘܢܘܬܐ ܘ ܫܡܢ̈ܐ ܕܛܒܠ̈ܐ ܐܠܝܨܬܐ ܝܠܗ̇ ܕܠܐ ܫܪܝ ܐܘ ܦܪܩܝ ܒܝܕ ܣܦܝܩܘܬܐ MySQL."
-INSTL_DATABASE_NAME_INVALID_CHAR="ܠܝܬܠܗ ܝܕܥܢܐ ܕܡܨܐ ܚܒ݂ܫ ܚܕ ـ NUL ASCII(0X00)ـ MySQL."
+INSTL_DATABASE_NAME_INVALID_CHAR="ܠܝܬܠܗ ܝܕܥܢܐ ܕܡܨܐ ܚܒ݂ܫ ܚܕ ـ NULL ASCII(0X00)ـ MySQL."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="ܟܢܦܪܐ %s ܠܝܬ ܠܗ ܐܝܬܘܬܐ"
 
 ;controllers
@@ -246,8 +227,6 @@ INSTL_FTP_NOSYST="ܚܫܚܬܐ "_QQ_"SYST"_QQ_" ܠܐ ܡܘܢܬܐܠܗ̇."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTP ܠܐ ܡܨܐܠܗ ܕܡܫܟ̰ܚ ܐܘܬܘܡܛܝܩܐܝܬ ܠܥܩܪܐ ܕܕܘܒܩܐ."
 
 ;others
-INSTL_ADVANCED_SETTINGS="ܡܬܒ݂ܝܬ̈ܐ ܡܫܘܘܫܛ̈ܐ"
-INSTL_BASIC_SETTINGS="ܡܬܒ݂ܝܬ̈ܐ ܐܣܝ̈ܐ"
 INSTL_CONFPROBLEM="ܘܡܛܥܢܗ ܠܕܘܒܩܐ ܥܩܪܝܐ ܕܕܦܘܟ݂ configuration.php ܗܘܝܢܘܬܐ ܕܟܢܦܪܐ ܕܝܘܟ݂ ܐܘ ܕܘܒܩܐ ܠܐ ܝܠܗ ܡܬܟܒ݂ܢܐ ܐܘ ܐܝܬ ܚܕ ܩܛܪܐ ܓܘ ܡܒܪܝܬܐ ܕܟܢܦܪܐ ܕܗܘܝܢܘܬܐ. ܢܩܘܫ ܥܠ ܚܩܠܐ ܕܨܚܚܐ ܩܐ ܕܡܛܠܠܬܐ ܕܟܠܗ ܟܘܕ ܘܩܛܥܠܗ ܘܕܒܫܠܗ ܓܘ ܟܢܦܪܐ ܕܨܚܚܐ ܚܕܬܐ. ܩܪܝ ܠܐܗܐ ܟܢܦܪܐ."
 INSTL_DATABASE_SUPPORT="ܣܘܡܟ݂ܐ ܕܡܘܕܥܢܘܢܘܬܐ:"
 INSTL_DISPLAY_ERRORS="ܦܘܕ̈ܐ ܓܘ ܦܪܣܐ"
@@ -255,9 +234,7 @@ INSTL_ERROR_DB="ܚܕܟܡܐ ܦܘܕ̈ܐ ܓܕܫܠܗܘܢ ܒܥܕܢܐ ܕܟܬܒ݂ܬܐ 
 INSTL_ERROR_INITIALISE_SCHEMA="ܠܐ ܝܠܗ ܡܨܝܐ ܡܛܝܒܘܢܐ ܠܣܕܪܐ ܕܐܣܬ ܡܘܕܥܢܘܢܘܬܐ"
 INSTL_FILE_UPLOADS="ܡܛܥܢܬܐ ܕܟܢܦܪܐ"
 INSTL_GNU_GPL_LICENSE="GNU/GPL ܦܣܣܐ"
-INSTL_INSTALLATION="ܡܩܝܡܬܐ"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON ܥܘܕܪܢܐ"
-INSTL_LICENSE="ܦܣܣܐ"
 INSTL_MAGIC_QUOTES_GPC="GPC ܩܠܬܐ ܡܥܒܕܝܬܐ ܕܒ݂ܪܬܐ"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB language ܡܘܬܒ݂ܐ"
@@ -279,7 +256,6 @@ INSTL_PROCESS_BUSY="ܒܦܠܚܐ ܝܠܗ ܣܘܥܪܢܐ. ܣܦܘܪ..."
 
 ;Global strings
 JADMINISTRATOR="ܦܪܢܣܐ"
-JADVANCED="ܡܫܘܫܛܐ"
 JCHECK_AGAIN="ܨܚܨܝܠܗ ܚܕܐ ܓܗܐ ܐ݇ܚܪܬܐ"
 JERROR="Error"
 JEMAIL="ܒܝܠܕܪܐ ܐܠܟܬܪܘܢܝܐ"
diff --git a/installation/language/sy-IQ/sy-IQ.xml b/installation/language/sy-IQ/sy-IQ.xml
index 5c5cbab..5c30177 100644
--- a/installation/language/sy-IQ/sy-IQ.xml
+++ b/installation/language/sy-IQ/sy-IQ.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012-09-25</creationDate>
 	<author>East Syriac Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/ta-IN/ta-IN.ini b/installation/language/ta-IN/ta-IN.ini
index 45ad561..75c1e38 100644
--- a/installation/language/ta-IN/ta-IN.ini
+++ b/installation/language/ta-IN/ta-IN.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -8,27 +8,20 @@
 ;Stepbar
 INSTL_STEP_COMPLETE_LABEL="முடிவு"
 INSTL_STEP_DATABASE_LABEL="தரவுத்தளம்"
-INSTL_STEP_DEFAULTLANGUAGE_LABEL="உள்ளிருப்பு மொழியைத் தேர்வு செய்க"
+INSTL_STEP_DEFAULTLANGUAGE_LABEL="உள்ளிருப்பு மொழியைத் தேர்வுசெய்க"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="மொழி"
 INSTL_STEP_LANGUAGES_LABEL="மொழிகளை நிறுவுக"
-INSTL_STEP_LICENSE_LABEL="உரிமம்"
-INSTL_STEP_PREINSTALL_LABEL="முன்-நிறுவல் சரிபார்ப்பு"
 INSTL_STEP_SITE_LABEL="உருவாக்கம்"
 INSTL_STEP_SUMMARY_LABEL="மீள்பார்வை"
-INSTL_STEPS_TITLE="கட்டங்கள்"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="மொழியைத் தேர்வு செய்க"
-INSTL_SELECT_LANGUAGE_TITLE="மொழியைத் தேர்வு செய்க"
-INSTL_SELECT_LANGUAGE_DESC="தயவுசெய்து Joomla! நிறுவலின்போது (Installation) பயன்படுத்த வேண்டிய மொழியைத் (Language) தேர்வு செய்க:"
+INSTL_SELECT_LANGUAGE_TITLE="மொழியைத் தேர்வுசெய்க"
 INSTL_WARNJAVASCRIPT="எச்சரிக்கை! Joomla!-வை சரியாக நிறுவுவதற்கு JavaScript கட்டாயம் இயலுமைப்படுத்தப்பட வேண்டும்"
 INSTL_WARNJSON="Joomla-வை நிறுவுவதற்கு, தங்கள் PHP நிறுவலில் JSON ஆனது இயலுமைப்படுத்தப்பட்டிருக்க வேண்டும்!"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="முன்-நிறுவல் சரிபார்ப்பு"
-INSTL_PRECHECK_FOR_VERSION="%s-க்கான முன்-நிறுவல் சரிபார்ப்பு:"
-INSTL_PRECHECK_DESC="இந்த உருப்படிகளில் எவற்றிற்கேனும் ஆதரவு இல்லையெனில் (<strong class="_QQ_"red"_QQ_">இல்லை</strong> எனக் குறியிடப்பட்டது) தயவுசெய்து பிழைகளை நீக்கத் தகுந்த நடவடிக்கைகளை மேற்கொள்க.<br />கீழே குறிப்பிட்டுள்ள தேவைகள் தங்கள் அமைவில் பூர்த்தியாகும் வரை தாங்கள் Joomla!-வை நிறுவ இயலாது."
+INSTL_PRECHECK_DESC="இந்த உருப்படிகளில் எவற்றிற்கேனும் ஆதரவு இல்லையெனில் (<strong class="_QQ_"red"_QQ_">இல்லை</strong> எனக் குறியிடப்பட்டது) தயவுசெய்து பிழைகளை நீக்கத் தகுந்த நடவடிக்கைகளை மேற்கொள்க.<br />கீழே குறிப்பிட்டுள்ள தேவைகள் தங்கள் அமைவில் பூர்த்தியாகும் வரை தாங்கள் Joomla!-வை நிறுவ முடியாது."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="பரிந்துரைக்கப்படும் அமைப்புகள்:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="இந்த அமைப்புகள் (Settings) PHP-க்கு Joomla! உடன் முழுமையாக பொருந்தக்கூடியவை (Compatibility) என உறுதிப்படுத்துவதற்காக பரிந்துரைக்கப்பட்ட (Recommended) அமைப்புகள் ஆகும்.<br /><br />பரிந்துரைக்கப்பட்ட உருவாக்கத்துடன் (configuration) தங்கள் அமைப்புகள் ஒத்திராவிட்டாலும் Joomla! செயல்படும்."
 INSTL_PRECHECK_DIRECTIVE="அமைப்பு"
@@ -37,41 +30,38 @@ INSTL_PRECHECK_ACTUAL="இருப்பது"
 
 ;Database view
 INSTL_DATABASE="தரவுத்தள உருவாக்கம்"
-INSTL_DATABASE_HOST_DESC="இது வழக்கமாக &quot;localhost&quot; ஆகும்"
-INSTL_DATABASE_HOST_LABEL="விருந்தோம்பும் கணிப்பொறி பெயர்"
-INSTL_DATABASE_NAME_DESC="சில விருந்தோம்பும் சேவை வழங்குபவர்கள் ஒரு சேவைக்கணக்குக்கு ஒரு குறிப்பிட்ட தரவுத்தள பெயரை மட்டும் அனுமதிப்பார்கள். இவ்வாறு இருப்பின், ஒன்றுக்கு மேற்பட்ட Joomla! தளத்தை வேறுபடுத்த அட்டவணை முன்-ஒட்டைப் (Table Prefix) பயன்படுத்தவும்."
+INSTL_DATABASE_HOST_DESC="இது (Host name) பொதுவாக &quot;localhost&quot; ஆகும்"
+INSTL_DATABASE_HOST_LABEL="புரவலர் கணினி பெயர்"
+INSTL_DATABASE_NAME_DESC="சில சேவை வழங்குபவர்கள் ஒரு சேவைக்கணக்குக்கு ஒரு குறிப்பிட்ட தரவுத்தள பெயரை மட்டும் அனுமதிப்பார்கள். இவ்வாறு இருப்பின், ஒன்றுக்கு மேற்பட்ட Joomla! தளத்தை வேறுபடுத்த அட்டவணை முன்-ஒட்டைப் (Table Prefix) பயன்படுத்தவும்."
 INSTL_DATABASE_NAME_LABEL="தரவுத்தள பெயர்"
 INSTL_DATABASE_NO_SCHEMA="இந்த தரவுத்தள வகைக்கு, அமைப்புமுறைகள் (schema) இல்லை."
-INSTL_DATABASE_OLD_PROCESS_DESC="முந்தைய Joomla! நிறுவலில் உள்ள காப்பு நகலெடுக்கப்பட்ட அட்டவணைகள் மாற்றப்படும்"
+INSTL_DATABASE_OLD_PROCESS_DESC="முந்தைய Joomla! நிறுவலில் உள்ள காப்பு நகலெடுக்கப்பட்ட அட்டவணைகள் இருந்தால் அவை மாற்றப்படும்"
 INSTL_DATABASE_OLD_PROCESS_LABEL="பழைய தரவுத்தள செயல்முறை"
 INSTL_DATABASE_PASSWORD_DESC="தளப் பாதுகாப்பிற்கு தரவுத்தள சேவைக்கணக்குக்குக் கடவுச்சொல் பயன்படுத்துதல் அத்தியாவசியமானது"
 INSTL_DATABASE_PASSWORD_LABEL="கடவுச்சொல்"
-INSTL_DATABASE_PREFIX_DESC="ஒரு அட்டவணை முன்-ஒட்டைத் தேர்வு செய்க அல்லது <b>குறிப்பிலா வகையில் உருவாக்கப்பட்டதை</b>ப் பயன்படுத்துக. இது, மூன்று அல்லது நான்கு எண்ணெழுத்து உருக்கள் கொண்டதாகவும், கட்டாயம் அடிக்கோடுடன் முடிவதாகவும் இருத்தல் வேண்டும். <b>தேர்ந்தெடுக்கப்பட்ட ஒட்டு ஆனது மற்ற எந்த அட்டவணையிலும் பயன்படுத்தப்படவில்லை என்பதை உறுதி செய்க</b>."
+INSTL_DATABASE_PREFIX_DESC="ஒரு அட்டவணை முன்-ஒட்டைத் தேர்வுசெய்க அல்லது <b>குறிப்பிலா வகையில் உருவாக்கப்பட்டதை</b>ப் பயன்படுத்துக. இது, மூன்று அல்லது நான்கு எண்ணெழுத்து உருக்கள் கொண்டதாகவும், கட்டாயம் அடிக்கோடுடன் முடிவதாகவும் இருத்தல் வேண்டும். <b>தேர்ந்தெடுக்கப்பட்ட ஒட்டு ஆனது மற்ற எந்த அட்டவணையிலும் பயன்படுத்தப்படவில்லை என்பதை உறுதி செய்க</b>."
 INSTL_DATABASE_PREFIX_LABEL="அட்டவணை முன்-ஒட்டு"
 INSTL_DATABASE_PREFIX_MSG="அட்டவணை முன்-ஒட்டு ஆனது கட்டாயம் ஒரு எழுத்தில் ஆரம்பித்து, விருப்பமானால் எண்ணெழுத்து உருக்களால் பின்பற்றப்பட்டு, கட்டாயம் அடிக்கோடுடன் முடிவதாகவும் இருத்தல் வேண்டும்"
-INSTL_DATABASE_TYPE_DESC="இது பெரும்பாலும் &quot;mysqli&quot; ஆகும்"
+INSTL_DATABASE_TYPE_DESC="இது (Database type) பெரும்பாலும் &quot;mysqli&quot; ஆகும்"
 INSTL_DATABASE_TYPE_LABEL="தரவுத்தள வகை"
-INSTL_DATABASE_USER_DESC="இது பெரும்பாலும் "_QQ_"root"_QQ_" அல்லது விருந்தோம்பும் சேவை வழங்குபவர் கொடுக்கும் பயனாளர் பெயர் இரண்டில் ஏதேனுமொன்றாக இருக்கக்கூடும்"
+INSTL_DATABASE_USER_DESC="இது பெரும்பாலும் "_QQ_"root"_QQ_" அல்லது சேவை வழங்குபவர் கொடுக்கும் பயனாளர் பெயர் இரண்டில் ஏதேனுமொன்றாக இருக்கக்கூடும்"
 INSTL_DATABASE_USER_LABEL="பயனாளர் பெயர்"
-INSTL_DATABASE_TITLE="இணைப்பு அமைப்புகள்"
-INSTL_DATABASE_DESC="<p>ஒரு Joomla! இணையதளம் அதன் அனைத்துத் தரவுகளையும் தரவுத்தளத்தில் (Database) சேமிக்கிறது. இத்திரை, இத்தரவுத்தளத்தை உருவாக்கத் தேவையான தகவலை நிறுவல் நிரலுக்குக் (Installation Program) கொடுக்கிறது.</p><p>தாங்கள் Joomla!-வைத் தொலை இணைய சேவையகத்தில் (Remote Web Server) நிறுவுவதாயின், இத்தகவலைத் தங்கள் விருந்தோம்பும் சேவை வழங்குபவரிடமிருந்து (Host Service Provider) பெறுக.</p><p>சில விருந்தோம்பும் சேவையகங்களில் வேண்டிய தரவுத்தளத்தை Joomla!-வை நிறுவுவதற்கு முன் தனியாக உருவாக்க வேண்டியிருக்கலாம். "_QQ_"தரவுத்தளத்துடன் தொடர்பு கொள்ள இயலவில்லை"_QQ_" என்ற பிழை ஏற்பட்டால் தாங்கள் நிரப்பிய பயனாளர் பெயர் (Username) மற்றும் கடவுச்சொல்லை (Password) சரி பார்க்கவும். மீண்டும் இப்பிழை ஏற்பட்டால், தரவுத்தளத்தை Joomla!-வை நிறுவுவதற்கு முன் உருவாக்க வேண்டுமா எனத் தங்கள் விருந்தோம்பும் சேவை வழங்குபவரிடம் சரி பார்க்கவும்.</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="FTP பாதையைத் தன்னியக்கமாகக் கண்டுபிடி"
 INSTL_FTP="FTP உருவாக்கம்"
-INSTL_FTP_DESC="<p>சில சேவையகங்களில் நிறுவலை முடிக்க தாங்கள் FTP அத்தாட்சிகளைக் (Credentials) கொடுக்க வேண்டி இருக்கலாம். இந்த அத்தாட்சிகள் இல்லாமல் நிறுவலை முடிக்க தங்களுக்குப் பிரச்சினைகள் இருந்தால் தங்கள் விருந்தோம்பும் சேவை வழங்குபவரிடம் (Host Service Provider) இது அவசியமானதா என சரி பார்க்கவும்.</p><p>இயலுமானால், பாதுகாப்புக் காரணங்களுக்காக Joomla! நிறுவதலுக்கு மட்டும் அணுக்கம் (Access) உள்ள மற்றும் முழு இணைய சேவையகத்துக்கும் (Web Server) அணுக்கம் அல்லாத ஒரு தனியான FTP பயனாளர் சேவைக் கணக்கை (User Account) உருவாக்குவது சாலச் சிறந்தது. இதற்கு தங்கள் விருந்தோம்பும் சேவை வழங்குபவர் தங்களுக்கு உதவி செய்யக்கூடும்.</p><p><b>கவனிக்க:</b> தாங்கள் Windows இயக்க அமைப்பில் (Operating System) நிறுவுவதாயின் FTP அடுக்கு (Layer) <strong>தேவையற்றது</strong>.</p>"
+INSTL_FTP_DESC="<p>சில சேவையகங்களில் நிறுவலை முடிக்க தாங்கள் FTP அத்தாட்சிகளைக் (Credentials) கொடுக்க வேண்டி இருக்கலாம். இந்த அத்தாட்சிகள் இல்லாமல் நிறுவலை முடிக்க தங்களுக்குப் பிரச்சினைகள் இருந்தால் தங்கள் புரவலர் சேவை வழங்குபவரிடம் (Host Service Provider) இது அவசியமானதா என சரி பார்க்கவும்.</p><p>இயலுமானால், பாதுகாப்புக் காரணங்களுக்காக Joomla! நிறுவதலுக்கு மட்டும் அணுக்கம் (Access) உள்ள மற்றும் முழு இணைய சேவையகத்துக்கும் (Web Server) அணுக்கம் அல்லாத ஒரு தனியான FTP பயனாளர் சேவைக் கணக்கை (User Account) உருவாக்குவது சாலச் சிறந்தது. இதற்கு தங்கள் விருந்தோம்பும் சேவை வழங்குபவர் தங்களுக்கு உதவி செய்யக்கூடும்.</p><p><b>கவனிக்க:</b> தாங்கள் Windows இயக்க அமைப்பில் (Operating System) நிறுவுவதாயின் FTP அடுக்கு (Layer) <strong>தேவையற்றது</strong>.</p>"
 INSTL_FTP_ENABLE_LABEL="FTP அடுக்கை இயலுமைப்படுத்துக"
-INSTL_FTP_HOST_LABEL="FTP விருந்தோம்பும் கணிப்பொறி (Host)"
+INSTL_FTP_HOST_LABEL="FTP புரவலர் கணினி (Host)"
 INSTL_FTP_PASSWORD_LABEL="FTP கடவுச்சொல்"
 INSTL_FTP_PORT_LABEL="FTP துறை (Port)"
 INSTL_FTP_ROOT_LABEL="FTP வேர்ப் பாதை"
 INSTL_FTP_SAVE_LABEL="FTP கடவுச்சொல்லை சேமிக்கவும்"
 INSTL_FTP_TITLE="FTP உருவாக்கம் (<strong class="_QQ_"red"_QQ_"><small>விருப்பத்தேர்வு - பெரும்பாலான பயனாளர்கள் இந்தக் கட்டத்தைத் தவிர்க்கலாம் - இதற்கு &quot;அடுத்த&quot; பொத்தானை அமுக்குக</small></strong>)"
-INSTL_FTP_USER_LABEL="FTP பயனாளர் பெயர்"
-INSTL_SITE_NAME_LABEL="தளப் பெயர்"
+INSTL_FTP_USER_LABEL="FTP பயனாளர்பெயர்"
 INSTL_VERIFY_FTP_SETTINGS="FTP அமைப்புகளை உறுதி செய்"
 INSTL_FTP_SETTINGS_CORRECT="அமைப்புகள் சரி"
-INSTL_FTP_USER_DESC="எச்சரிக்கை! இதனை நிரப்பாமல் இருக்க பரிந்துரைக்கப்படுகிறது; ஒவ்வொரு முறையும் தாங்கள் கோப்புகளை (Files) வேறு இடத்துக்கு மாற்றும்போது தங்கள் FTP பயனாளர் பெயரை (Username) நிரப்பவும்."
+INSTL_FTP_USER_DESC="எச்சரிக்கை! இதனை நிரப்பாமல் இருக்க பரிந்துரைக்கப்படுகிறது; ஒவ்வொரு முறையும் தாங்கள் கோப்புகளை (Files) வேறு இடத்துக்கு மாற்றும்போது தங்கள் FTP பயனாளர்பெயரை (Username) நிரப்பவும்."
 INSTL_FTP_PASSWORD_DESC="எச்சரிக்கை! இதனை நிரப்பாமல் இருக்க பரிந்துரைக்கப்படுகிறது; ஒவ்வொரு முறையும் தாங்கள் கோப்புகளை வேறு இடத்துக்கு மாற்றும்போது தங்கள் FTP கடவுச்சொல்லை (Password) நிரப்பவும்."
 
 ;Site View
@@ -81,14 +71,14 @@ INSTL_ADMIN_EMAIL_DESC="ஒரு மின்-அஞ்சல் முகவ
 INSTL_ADMIN_PASSWORD_LABEL="நிர்வாகி கடவுச்சொல்"
 INSTL_ADMIN_PASSWORD_DESC="தங்கள் தள உயர் நிர்வாகி சேவைக்கணக்கின் கடவுச்சொல்லை நிரப்புக மற்றும் கீழுள்ள புலத்தில் அதனை உறுதி செய்க."
 INSTL_ADMIN_PASSWORD2_LABEL="நிர்வாகி கடவுச்சொல்லை உறுதிப்படுத்துக"
-INSTL_ADMIN_USER_LABEL="நிர்வாகி பயனாளர் பெயர்"
-INSTL_ADMIN_USER_DESC="தங்கள் தள உயர் நிர்வாகி சேவைக்கணக்கின் பயனாளர் பெயரை நிரப்புக."
-INSTL_SITE_NAME_TITLE="தளப் பெயர்"
+INSTL_ADMIN_USER_LABEL="நிர்வாகி பயனாளர்பெயர்"
+INSTL_ADMIN_USER_DESC="தங்கள் தள உயர் நிர்வாகி சேவைக்கணக்கின் பயனாளர்பெயரை நிரப்புக."
+INSTL_SITE_NAME_LABEL="தளப் பெயர்"
 INSTL_SITE_NAME_DESC="தங்கள் Joomla! தளத்தின் பெயரை (Site Name) நிரப்புக."
 INSTL_SITE_METADESC_LABEL="விவரிப்பு"
 INSTL_SITE_METADESC_TITLE_LABEL="தேடற் பொறிகள் பயன்படுத்தக்கூடிய ஒட்டுமொத்த இணைய தளத்தின் விவரிப்பை நிரப்புக. பொதுவாக, அதிகபட்சமாக 20 சொற்கள் அனுகூலமாக இருக்கும்."
-INSTL_SITE_OFFLINE_LABEL="தளத்தை இணையதளத்துடன் இணைப்பில்லா-நிலையில் அமைக்க"
-INSTL_SITE_OFFLINE_TITLE_LABEL="நிறுவல் முடிந்ததும், தள முன்-புறத்தை இணையதளத்துடன் இணைப்பில்லா-நிலையில் அமைக்க. அகிலத்தள உருவாக்கம் மூலம், தளத்தை, பிறகு, இணையதளத்துடன் இணைப்பு-நிலையில் அமைக்கலாம்."
+INSTL_SITE_OFFLINE_LABEL="தளத்தை இணைப்பறு-நிலையில் அமைக்க"
+INSTL_SITE_OFFLINE_TITLE_LABEL="நிறுவல் முடிந்ததும், தள முன்-புறத்தை இணைப்பறு-நிலையில் (offline) அமைக்க. அகிலத்தள உருவாக்கம் மூலம், பிறகு, தளத்தை இணைப்பு-நிலையில் (online) அமைக்கலாம்."
 INSTL_SITE_INSTALL_SAMPLE_LABEL="மாதிரித் தரவை நிறுவுக"
 INSTL_SITE_INSTALL_SAMPLE_DESC="புதிதாகத் தொடங்குபவருக்கு மாதிரித் தரவு நிறுவல் அழுத்தமாகப் பரிந்துரைக்கப்படுகிறது.<br />இது Joomla! நிறுவல் தொகுப்பிலுள்ள உள்ளிருப்பு மாதிரித் தரவை நிறுவும்."
 INSTL_SITE_INSTALL_SAMPLE_NONE="ஏதுமில்லை (<strong>அடிப்படை பன்மொழித் தளத்தை உருவாக்குவதற்குத் தேவை</strong>)"
@@ -124,22 +114,18 @@ INSTL_INSTALLING_EMAIL="%s-க்கு மின்-அஞ்சல் அன
 ;Email
 INSTL_EMAIL_SUBJECT="உருவாக்க விவரம்: %s"
 INSTL_EMAIL_HEADING="புதிதாக அமையப்பெற்ற Joomla! இணையதளத்துக்கான உருவாக்க அமைப்புகளைத் தாங்கள் கீழே காணலாம்:"
-INSTL_EMAIL_NOT_SENT="மின்-அஞ்சல் அனுப்ப இயலவில்லை."
+INSTL_EMAIL_NOT_SENT="மின்-அஞ்சல் அனுப்ப முடியவில்லை."
 
 ;Complete view
-INSTL_COMPLETE="முடிவு"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="நிர்வாகப் புகுபதிகை விவரங்கள்"
-INSTL_COMPLETE_DESC1="தங்களுடைய Joomla! இணைய தளத்தைக் காண &quot;தளம்&quot; பொத்தானை அமுக்குக அல்லது தங்களைத் தங்கள் நிர்வாகி புகுபதிகைக்குக் கொண்டு செல்ல &quot;நிர்வாகம்&quot; பொத்தானை அமுக்குக."
-INSTL_COMPLETE_DESC2="Joomla! உதவித் தளத்தில், தாங்கள் விரும்பும் மொழித் தொகுப்பை (language pack) நிறுவுவதற்கான படிப்படியான இலகுவான வழிகாட்டி இருப்பதைக் காணலாம். மேலும், தாங்கள் இருக்கின்ற மொழித் தொகுப்புகளின் இணைப்புகளின் பட்டியலைக் காணலாம்."
-INSTL_COMPLETE_DESC3="உதவித் தளத்தைப் புதிய ஜன்னலில் திறக்க, வலது பக்கத்திலுள்ள இணைப்பைச் சொடுக்குக."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="installation என்று பெயரிட்ட கோப்பகம் ஏற்கனவே நீக்கப்பட்டுள்ளது."
-INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation என்று பெயரிட்ட கோப்பகத்தை நீக்க இயலவில்லை. தயவுசெய்து இக்கோப்பகத்தைக் கைமுறையால் நீக்குக."
+INSTL_COMPLETE_ERROR_FOLDER_DELETE="Installation என்று பெயரிட்ட கோப்பகத்தை நீக்க முடியவில்லை. தயவுசெய்து இக்கோப்பகத்தைக் கைமுறையால் நீக்குக."
 INSTL_COMPLETE_FOLDER_REMOVED="installation என்று பெயரிட்ட கோப்பகம் வெற்றிகரமாக நீக்கப்பட்டது"
 INSTL_COMPLETE_LANGUAGE_1="Joomla! தாங்கள் விரும்பும் மொழியில் மற்றும்/அல்லது தன்னியக்க அடிப்படை பன்மொழித் தள உருவாக்கம்"
-INSTL_COMPLETE_LANGUAGE_DESC="installation என்று பெயரிட்ட கோப்பகத்தை நீக்குவதற்கு முன், தாங்கள் கூடுதல் மொழிகளை நிறுவலாம். தங்கள் Joomla! செயலிக்கு (Application) கூடுதல் மொழிகளை தாங்கள் சேர்க்க விரும்பினால் பின்வரும் பொத்தானை சொடுக்குக."
+INSTL_COMPLETE_LANGUAGE_DESC="installation என்று பெயரிட்ட கோப்பகத்தை நீக்குவதற்கு முன், தாங்கள் கூடுதல் மொழிகளை நிறுவலாம். தங்கள் Joomla! செயலிக்கு (Application) கூடுதல் மொழிகளை தாங்கள் சேர்க்க விரும்பினால் பின்வரும் பொத்தானைச் சொடுக்குக."
 INSTL_COMPLETE_LANGUAGE_DESC2="குறிப்பு: புதிய மொழிகளை பதிவிறக்கம் செய்து நிறுவ, Joomla!-வுக்கு இணைய இணைப்பு மிக அவசியம். <br/>சில சேவையக உருவாக்கங்கள் (server configurations), மொழிகளை நிறுவ Joomla!-வை அனுமதிக்காது. தங்களுக்கு இவ்வாறு இடையூறு ஏற்பட்டால், கவலைப்பட வேண்டாம்; Joomla! நிர்வாகியைப் பயன்படுத்தி, பின்னர், தாங்கள் மொழிகளை நிறுவலாம்."
 INSTL_COMPLETE_REMOVE_FOLDER="installation என்று பெயரிட்ட கோப்பகத்தை நீக்குக"
-INSTL_COMPLETE_REMOVE_INSTALLATION="தயவு செய்து நினைவில் கொள்க: installation என்று பெயரிட்ட கோப்பகத்தை (Directory) முற்றிலும் நீக்குக.<br />installation என்று பெயரிட்ட கோப்பகத்தை நீக்காதவரை தாங்கள் இதற்கு மேல் தொடர இயலாது. இது Joomla!-வின் ஒரு பாதுகாப்பு அம்சம்."
+INSTL_COMPLETE_REMOVE_INSTALLATION="தயவுசெய்து நினைவில் கொள்க: installation என்று பெயரிட்ட கோப்பகத்தை (Directory) முற்றிலும் நீக்குக.<br />installation என்று பெயரிட்ட கோப்பகத்தை நீக்காதவரை தாங்கள் இதற்கு மேல் தொடர முடியாது. இது Joomla!-வின் ஒரு பாதுகாப்பு அம்சம்."
 INSTL_COMPLETE_TITLE="வாழ்த்துகள்! Joomla! தற்போது நிறுவப்பட்டுள்ளது."
 INSTL_COMPLETE_INSTALL_LANGUAGES="கூடுதல் கட்டங்கள்: மொழிகளை நிறுவுக"
 
@@ -147,11 +133,12 @@ INSTL_COMPLETE_INSTALL_LANGUAGES="கூடுதல் கட்டங்கள
 INSTL_LANGUAGES="மொழித் தொகுப்புகளை நிறுவுக"
 INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="மொழி"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="பதிப்பு"
-INSTL_LANGUAGES_DESC="Joomla! இடைமுகமானது பல்வேறு மொழிகளில் கிடைக்கிறது. தாங்கள் விரும்பும் மொழிகளை, முதலில், அவற்றின் தெரிவுப்பெட்டிகளில் சொடுக்கி தேர்வு செய்க; பின்னர், அவற்றை நிறுவ 'அடுத்த' பொத்தானை அமுக்குக.<br />குறிப்பு: இந்த செயல்பாடானது (பதிவிறக்கம் மற்றும் நிறுவல்) ஒவ்வொரு மொழிக்கும் சுமார் 10 வினாடிகள் எடுத்துக்கொள்ளும். எனவே, நேரம் முடிதலைத் (timeout) தவிர்க்க, தயவுசெய்து 3 மொழிகளுக்கு மிகாமல் தேர்வு செய்க."
+INSTL_LANGUAGES_DESC="Joomla! இடைமுகமானது பல்வேறு மொழிகளில் கிடைக்கிறது. தாங்கள் விரும்பும் மொழிகளை, முதலில், அவற்றின் தெரிவுப்பெட்டிகளில் சொடுக்கி தேர்வுசெய்க; பின்னர், அவற்றை நிறுவ 'அடுத்த' பொத்தானை அமுக்குக.<br />குறிப்பு: இந்த செயல்பாடானது (பதிவிறக்கம் மற்றும் நிறுவல்) ஒவ்வொரு மொழிக்கும் சுமார் 10 வினாடிகள் எடுத்துக்கொள்ளும். எனவே, நேரம் முடிதலைத் (timeout) தவிர்க்க, தயவுசெய்து 3 மொழிகளுக்கு மிகாமல் தேர்வுசெய்க."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="இந்த செயல்பாடானது ஒவ்வொரு மொழிக்கும் சுமார் 10 வினாடிகள் எடுத்துக்கொள்ளும்.<br />தயவுசெய்து மொழிகள் பதிவிறக்கம் செய்து நிறுவும் வரை காத்திருக்கவும்..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="தயவுசெய்து மொழியைத் தேர்வு செய்க. தங்களுக்கு பிற மொழிகளை நிறுவ வேண்டாமென்றால் 'முந்தைய' பொத்தானை அமுக்குக."
-INSTL_LANGUAGES_WARNING_NO_INTERNET="மொழி சேவையகத்துடன் Joomla! இணைக்க இயலவில்லை. தயவுசெய்து நிறுவலை முடிக்கவும்."
-INSTL_LANGUAGES_WARNING_NO_INTERNET2="குறிப்பு: Joomla! நிர்வாகியைப் பயன்படுத்தி, பின்னர், தங்களால் மொழிகளை நிறுவ இயலும்."
+INSTL_LANGUAGES_MORE_LANGUAGES="தாங்கள் மேலும் பல மொழிகளை நிறுவ விரும்பினால் 'முந்தைய' பொத்தானை அமுக்குக."
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="நிறுவதற்கு எந்த மொழியும் தேர்வுசெய்யப்படவில்லை. தங்களுக்கு பிற மொழிகளை நிறுவ வேண்டுமென்றால் 'முந்தைய' பொத்தானை அமுக்குக மற்றும் பட்டியலிலிருந்து விரும்பும் மொழிகளைத் தேர்வுசெய்க."
+INSTL_LANGUAGES_WARNING_NO_INTERNET="மொழி சேவையகத்துடன் Joomla! இணைக்க முடியவில்லை. தயவுசெய்து நிறுவலை முடிக்கவும்."
+INSTL_LANGUAGES_WARNING_NO_INTERNET2="குறிப்பு: Joomla! நிர்வாகியைப் பயன்படுத்தி, பின்னர், தங்களால் மொழிகளை நிறுவ முடியும்."
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="கடந்த நிறுவல் கட்டத்திற்கு செல்க"
 
 ;Defaultlanguage view
@@ -159,9 +146,9 @@ INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE="பன்மொழி அம்ச
 INSTL_DEFAULTLANGUAGE_ACTIVATE_MULTILANGUAGE_DESC="செயற்படுத்தப்பட்டால், தங்கள் Joomla! தளத்தில், நிறுவப்பட்ட ஒவ்வொரு மொழிக்கும், மொழிபெயர்க்கப்பட்ட பட்டிகளைக் கொண்ட பன்மொழி அம்சம் செயற்படுத்தப்பட்டிருக்கும்"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN="மொழிக் குறியீடு சொருகியை இயலுமைப்படுத்துக"
 INSTL_DEFAULTLANGUAGE_ACTIVATE_LANGUAGE_CODE_PLUGIN_DESC="இயலுமைப்படுத்தப்பட்டால், மொழிக் குறியீடு சொருகியானது, SEO-வை மேம்படுத்த, உருவாக்கப்பட்ட HTML ஆவணத்தில், மொழிக் குறியீடை மாற்றும் ஆற்றலைச் சேர்க்கும்."
-INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="உள்ளிருப்பு நிர்வாகி மொழி"
-INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla!-வால் மொழியை உள்ளிருப்பாக அமைக்க இயலவில்லை. ஆகவே, நிர்வாகத்தின் உள்ளிருப்பு மொழியாக ஆங்கிலம் பயன்படுத்தப்படும்."
-INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="தங்கள் உள்ளிருப்பு நிர்வாகி மொழியாக Joomla! அமைத்திருக்கும் மொழியானது: %s"
+INSTL_DEFAULTLANGUAGE_ADMINISTRATOR="உள்ளிருப்பு நிர்வாக மொழி"
+INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="Joomla!-வால் மொழியை உள்ளிருப்பாக அமைக்க முடியவில்லை. ஆகவே, நிர்வாக உள்ளிருப்பு மொழியாக ஆங்கிலம் பயன்படுத்தப்படும்."
+INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="தங்கள் உள்ளிருப்பு நிர்வாக மொழியாக Joomla! அமைத்திருக்கும் மொழியானது: %s"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="தேர்வு"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="மொழி"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="அடையாள ஒட்டு"
@@ -174,33 +161,30 @@ INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_ARTICLE="மொழிக்கான க
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_MODULESWHITCHER_LANGUAGECODE="மொழி மாற்றி கூறகத்தை Joomla!-வினால் தன்னியக்கமாக வெளியிட முடியவில்லை"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGECODE="மொழிக் குறியீடு சொருகியை Joomla!-வினால் தன்னியக்கமாக இயலுமைப்படுத்த முடியவில்லை"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_ENABLE_PLG_LANGUAGEFILTER="மொழி வடிகட்டி சொருகியை Joomla!-வினால் தன்னியக்கமாக இயலுமைப்படுத்த முடியவில்லை"
-INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="Joomla!-வால் %s மொழியை நிறுவ இயலவில்லை."
+INSTL_DEFAULTLANGUAGE_COULD_NOT_INSTALL_LANGUAGE="மொழியை (%s) Joomla!-வினால் நிறுவ முடியவில்லை"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_PUBLISH_MOD_MULTILANGSTATUS="பன்மொழி நிலை கூறகத்தை Joomla!-வினால் தன்னியக்கமாக வெளியிட முடியவில்லை"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_UNPUBLISH_MOD_DEFAULTMENU="உள்ளிருப்பு பட்டி கூறகத்தை Joomla!-வினால் தன்னியக்கமாக வெளியீட்டிலிருந்து நீக்க முடியவில்லை"
-INSTL_DEFAULTLANGUAGE_DESC="பின்வரும் மொழிகளை Joomla! நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla! நிர்வாகத்துக்கான உள்ளிருப்பு மொழியைத் தேர்வு செய்க."
-INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="பின்வரும் மொழிகளை Joomla! நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla! தளத்துக்கான உள்ளிருப்பு மொழியைத் தேர்வு செய்க."
+INSTL_DEFAULTLANGUAGE_DESC="பின்வரும் மொழிகளை Joomla! நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla! நிர்வாகத்துக்கான உள்ளிருப்பு மொழியைத் தேர்வுசெய்க."
+INSTL_DEFAULTLANGUAGE_DESC_FRONTEND="பின்வரும் மொழிகளை Joomla! நிறுவியுள்ளது. தயவுசெய்து தாங்கள் விரும்பும் Joomla! தளத்துக்கான உள்ளிருப்பு மொழியைத் தேர்வுசெய்க."
 INSTL_DEFAULTLANGUAGE_FRONTEND="உள்ளிருப்பு தள மொழி"
-INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla!-வால் மொழியை உள்ளிருப்பாக அமைக்க இயலவில்லை. ஆகவே, தளத்தின் உள்ளிருப்பு மொழியாக ஆங்கிலம் பயன்படுத்தப்படும்."
+INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="Joomla!-வால் மொழியை உள்ளிருப்பாக அமைக்க முடியவில்லை. ஆகவே, தளத்தின் உள்ளிருப்பு மொழியாக ஆங்கிலம் பயன்படுத்தப்படும்."
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="தங்கள் உள்ளிருப்பு தள மொழியாக Joomla! அமைத்திருக்கும் மொழியானது: %s"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="மொழிபெயர்க்கப்பட்ட உள்ளடக்கத்தை நிறுவுக"
-INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="செயற்படுத்தப்பட்டால், நிறுவப்பட்ட ஒவ்வொரு மொழிக்கும் ஒரு உள்ளடக்கப் பிரிவை Joomla! தன்னியக்கமாக உருவாக்கும். மேலும், ஒவ்வொரு பிரிவிலும் ஒன்றுக்குமுதவாத அடையாள உள்ளடக்கம் கொண்ட ஒரு முக்கிய கட்டுரை உருவாக்கப்படும்."
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="செயற்படுத்தப்பட்டால், நிறுவப்பட்ட ஒவ்வொரு மொழிக்கும் ஒரு உள்ளடக்கப் பிரிவை Joomla! தன்னியக்கமாக உருவாக்கும். மேலும், ஒவ்வொரு பிரிவிலும் ஒன்றுக்கும் உதவாத அடையாள உள்ளடக்கம் கொண்ட ஒரு சிறப்பு கட்டுரை உருவாக்கப்படும்."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="பன்மொழி"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="இப்பகுதி, Joomla! பன்மொழி அம்சத்தை தன்னியக்கமாக செயற்படுத்த அனுமதிக்கிறது."
-INSTL_DEFAULTLANGUAGE_NOTE="குறிப்பு: தற்போது, தாங்கள் 'அடுத்த' பொத்தானை அமுக்கினால் நிறுவல் செயல்பாட்டின் இறுதி கட்டத்துக்குச் செல்வீர்கள். அங்கு, installation என்று பெயரிடப்பட்ட கோப்பகத்தை நீக்கும்படி கேட்டுக்கொள்ளப்படுவீர்கள்."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="தங்கள் உள்ளிருப்பு மொழியைத் தேர்வு செய்க"
-INSTL_DEFAULTLANGUAGE_TRY_LATER="Joomla! நிர்வாகியைப் பயன்படுத்தி, பின்னர், தங்களால் இதனை நிறுவ இயலும்."
+INSTL_DEFAULTLANGUAGE_TRY_LATER="Joomla! நிர்வாகியைப் பயன்படுத்தி, பின்னர், தங்களால் இதனை நிறுவ முடியும்."
 
 ;IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="தமிழ் (இந்தியா)"
 
 ;Database Model
-INSTL_DATABASE_COULD_NOT_CONNECT="தரவுத்தளத்துடன் தொடர்பு கொள்ள இயலவில்லை. இணைப்பான் (Connector) திருப்பிய எண்: %s"
-INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="நீட்சி %s-க்கான வெளிப்படுத்தும் பதுக்கு நினைவகத்தைப் (manifest cache) புதுப்பிக்க (refresh) இயலவில்லை"
+INSTL_DATABASE_COULD_NOT_CONNECT="தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை. இணைப்பான் (Connector) திருப்பிய எண்: %s"
+INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="நீட்சி %s-க்கான வெளிப்படுத்தும் பதுக்குநினைவகத்தைப் (manifest cache) புதுப்பிக்க (refresh) முடியவில்லை"
 INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="தரவுத்தளத்தை காப்பு நகலெடுக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன."
-INSTL_DATABASE_ERROR_CREATE="%s என்ற தரவுத்தளத்தை உருவாக்க முயலும் போது பிழை ஏற்பட்டுள்ளது.<br />பயனாளருக்குத் தரவுத்தளத்தை உருவாக்கப் போதிய உரிமை இல்லாமல் இருக்கக்கூடும். வேண்டிய தரவுத்தளத்தை Joomla!-வை நிறுவுவதற்கு முன் தனியாக உருவாக்க வேண்டியிருக்கலாம்."
+INSTL_DATABASE_ERROR_CREATE="%s என்ற தரவுத்தளத்தை உருவாக்க முயலும்போது பிழை ஏற்பட்டுள்ளது.<br />பயனாளருக்குத் தரவுத்தளத்தை உருவாக்கப் போதிய உரிமை இல்லாமல் இருக்கக்கூடும். வேண்டிய தரவுத்தளத்தை Joomla!-வை நிறுவுவதற்கு முன் தனியாக உருவாக்க வேண்டியிருக்கலாம்."
 INSTL_DATABASE_ERROR_DELETE="தரவுத்தளத்தை நீக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="அமைப்புமுறைகள் (schema) பதிப்பு எண்ணின் (version number) தொடக்க மதிப்பளித்தலில் (initialising) பிழை"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="நீக்குக"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="காப்பு நகலெடுக்க"
 INSTL_DATABASE_FIX_TOO_LONG="MySQL அட்டவணையின் முன்-ஒட்டு கட்டாயம் 15 உருக்களுக்கு மிகாமல் இருக்க வேண்டும்."
@@ -209,85 +193,79 @@ INSTL_DATABASE_INVALID_MYSQL_VERSION="நிறுவலைத் தொடர 
 INSTL_DATABASE_INVALID_MYSQLI_VERSION="நிறுவலைத் தொடர தங்களுக்கு MySQL 5.0.4 அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு: %s"
 INSTL_DATABASE_INVALID_SQLSRV_VERSION="நிறுவலைத் தொடர தங்களுக்கு SQL Server 2008 R2 (10.50.1600.1) அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு: %s"
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="நிறுவலைத் தொடர தங்களுக்கு SQL Server 2008 R2 (10.50.1600.1) அல்லது அதற்கும் மேலானது தேவை. தங்கள் பதிப்பு: %s"
-INSTL_DATABASE_INVALID_TYPE="தயவுசெய்து தரவுத்தள வகையைத் தேர்வு செய்க"
+INSTL_DATABASE_INVALID_TYPE="தயவுசெய்து தரவுத்தள வகையைத் தேர்வுசெய்க"
 INSTL_DATABASE_NAME_TOO_LONG="MySQL தரவுத்தளப் பெயர் கட்டாயம் 64 உருக்களுக்கு மிகாமல் இருக்க வேண்டும்."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL அட்டவணையின் முன்-ஒட்டு கட்டாயம் ஒரு எழுத்தில் ஆரம்பிக்கப்பட்டு பின்னர் எழுத்து, எண் அல்லது அடிக்கோடு (underscore) உருக்களைக் கொண்டிருக்கலாம்."
 INSTL_DATABASE_INVALID_NAME="MySQL 5.1.6-க்கு முந்தைய பதிப்புகளில், பெயர், முற்றுப்புள்ளிகள் (Periods) அல்லது "_QQ_"சிறப்பு"_QQ_" (Special) உருக்கள் (Characters) கொண்டு இருக்கக்கூடாது. தங்கள் பதிப்பு: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL தரவுத்தள பெயர்கள் மற்றும் அட்டவணை பெயர்கள் இடைவெளிகளைக் கொண்டு ஆரம்பிக்கவோ அல்லது முடிக்கவோ கூடாது."
-INSTL_DATABASE_NAME_INVALID_CHAR="எந்த ஒரு MySQL குறிப்பானும் (identifier) NUM ASCII(0x00) கொண்டு இருக்கக்கூடாது."
+INSTL_DATABASE_NAME_INVALID_CHAR="எந்த ஒரு MySQL குறிப்பானும் (identifier) NULL ASCII(0x00) கொண்டு இருக்கக்கூடாது."
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="கோப்பு &quot;%s&quot; இல்லை."
 
 ;controllers
-INSTL_COOKIES_NOT_ENABLED="தங்கள் மேலோடியில் நினைவிகள் (cookies) இயலுமைப்படுத்தியிருப்பதாகத் தெரியவில்லை. இந்த அம்சம் (feature) முடக்கப்பட்டிருந்தால் தாங்கள் செயலியை (application) நிறுவ இயலாது. மாறாக, சேவையகத்தின் <strong>session.save_path</strong>-இல் பிரச்சினை இருக்கலாம். இவ்வாறு இருந்து, தங்களுக்கு சரி பார்க்க மற்றும் பழுது நீக்கத் தெரியாவிட்டால், தயவு செய்து தாங்கள் விருந்தோம்பும் சேவை வழங்குபவரிடம் (hosting provider) ஆலோசிக்க."
+INSTL_COOKIES_NOT_ENABLED="தங்கள் உலாவியில் (browser) நினைவிகள் (cookies) இயலுமைப்படுத்தியிருப்பதாகத் தெரியவில்லை. இந்த அம்சம் (feature) முடக்கப்பட்டிருந்தால் தாங்கள் செயலியை (application) நிறுவ முடியாது. மாறாக, சேவையகத்தின் <strong>session.save_path</strong>-இல் பிரச்சினை இருக்கலாம். இவ்வாறு இருந்து, தங்களுக்கு சரி பார்க்க மற்றும் பழுது நீக்கத் தெரியாவிட்டால், தயவுசெய்து தாங்கள் புரவலர் சேவை வழங்குபவரிடம் (hosting provider) ஆலோசிக்க."
 INSTL_HEADER_ERROR="பிழை"
 
 ;Helpers
 INSTL_PAGE_TITLE="Joomla! இணைய நிறுவி"
 
 ;Configuration model
-INSTL_ERROR_CONNECT_DB="தரவுத்தளத்துடன் தொடர்பு கொள்ள இயலவில்லை. இணைப்பான் திருப்பிய எண்: %s"
+INSTL_ERROR_CONNECT_DB="தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை. இணைப்பான் திருப்பிய எண்: %s"
 INSTL_STD_OFFLINE_MSG="இத்தளம் பராமரிப்புக்காக நிறுத்தப்பட்டுள்ளது.<br /> தயவுசெய்து மீண்டும் விரைவில் உலாவ வருக."
 
 ;FTP model
 INSTL_FTP_INVALIDROOT="குறிப்பிட்ட FTP கோப்பகம் இந்த Joomla! நிறுவலின் கோப்பகம் அல்ல."
-INSTL_FTP_NOCONNECT="FTP சேவையகத்துடன் தொடர்பு கொள்ள இயலவில்லை"
+INSTL_FTP_NOCONNECT="FTP சேவையகத்துடன் தொடர்பு கொள்ள முடியவில்லை"
 INSTL_FTP_NODELE="செயற்கூறு "_QQ_"DELE"_QQ_" தோல்வியுற்றது."
-INSTL_FTP_NODIRECTORYLISTING="FTP சேவையகத்திலிருந்து கோப்பகப் பட்டியலைப் பெற இயலவில்லை."
+INSTL_FTP_NODIRECTORYLISTING="FTP சேவையகத்திலிருந்து கோப்பகப் பட்டியலைப் பெற முடியவில்லை."
 INSTL_FTP_NOLIST="செயற்கூறு "_QQ_"LIST"_QQ_" தோல்வியுற்றது."
-INSTL_FTP_NOLOGIN="FTP சேவையகத்தில் புகுபதிகை செய்ய இயலவில்லை."
+INSTL_FTP_NOLOGIN="FTP சேவையகத்தில் புகுபதிகை செய்ய முடியவில்லை."
 INSTL_FTP_NOMKD="செயற்கூறு "_QQ_"MKD"_QQ_" தோல்வியுற்றது."
 INSTL_FTP_NONLST="செயற்கூறு "_QQ_"NLST"_QQ_" தோல்வியுற்றது."
 INSTL_FTP_NOPWD="செயற்கூறு "_QQ_"PWD"_QQ_" தோல்வியுற்றது."
 INSTL_FTP_NORETR="செயற்கூறு "_QQ_"RETR"_QQ_" தோல்வியுற்றது."
 INSTL_FTP_NORMD="செயற்கூறு "_QQ_"RMD"_QQ_" தோல்வியுற்றது."
-INSTL_FTP_NOROOT="குறிப்பிட்ட FTP கோப்பகத்தை அணுக இயலவில்லை."
+INSTL_FTP_NOROOT="குறிப்பிட்ட FTP கோப்பகத்தை அணுக முடியவில்லை."
 INSTL_FTP_NOSTOR="செயற்கூறு "_QQ_"STOR"_QQ_" தோல்வியுற்றது."
 INSTL_FTP_NOSYST="செயற்கூறு "_QQ_"SYST"_QQ_" தோல்வியுற்றது."
-INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTP வேர்க் கோப்பகத்தைத் தன்னியக்கமாகக் கண்டுபிடிக்க இயலவில்லை."
+INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTP வேர்க் கோப்பகத்தைத் தன்னியக்கமாகக் கண்டுபிடிக்க முடியவில்லை."
 
 ;others
-INSTL_ADVANCED_SETTINGS="மேன்மையுற்ற அமைப்புகள்"
-INSTL_BASIC_SETTINGS="அடிப்படை அமைப்புகள்"
-INSTL_CONFPROBLEM="தங்கள் உருவாக்கக் (configuration) கோப்பு அல்லது கோப்பகம் எழுத முடியாதது அல்லது கோப்பை எழுதுவதில் பிரச்சினை உள்ளது. தாங்கள் கீழ்க்காணும் குறிமுறையைக் கையால் மேலேற்ற வேண்டும். அனைத்துக் குறிமுறைகளையும் தேர்வு செய்ய உரைப் பிரதேசத்தில் சொடுக்குக. பிறகு, புதிய உரைக் கோப்பில் தேர்வு செய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயரிட்டு அதனைத் தங்கள் தளத்தின் வேர்க் கோப்பகத்தில் மேலேற்றுக."
+INSTL_CONFPROBLEM="தங்கள் உருவாக்கக் (configuration) கோப்பு அல்லது கோப்பகம் எழுத முடியாதது அல்லது கோப்பை எழுதுவதில் பிரச்சினை உள்ளது. தாங்கள் கீழ்க்காணும் குறிமுறையைக் கையால் பதிவேற்ற வேண்டும். அனைத்துக் குறிமுறைகளையும் தேர்வுசெய்ய உரைப் பிரதேசத்தில் சொடுக்குக. பிறகு, புதிய உரைக் கோப்பில் தேர்வுசெய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயரிட்டு அதனைத் தங்கள் தளத்தின் வேர்க் கோப்பகத்தில் பதிவேற்றுக."
 INSTL_DATABASE_SUPPORT="தரவுத்தள ஆதரவு:"
 INSTL_DISPLAY_ERRORS="Display Errors"
 INSTL_ERROR_DB="தரவுத்தளம் &quot;%s&quot;ஐ நிரப்ப முயற்சிக்கும்போது சில பிழைகள் ஏற்பட்டுள்ளன"
-INSTL_ERROR_INITIALISE_SCHEMA="தரவுத்தள அமைப்புமுறையை (schema) தொடக்க மதிப்பளித்தல் (initialise) செய்ய இயலவில்லை."
+INSTL_ERROR_INITIALISE_SCHEMA="தரவுத்தள அமைப்புமுறையை (schema) தொடக்க மதிப்பளித்தல் (initialise) செய்ய முடியவில்லை."
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="நிறுவுதல்"
-INSTL_JSON_SUPPORT_AVAILABLE="JSON ஆதரவு"
-INSTL_LICENSE="உரிமம்"
+INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
 INSTL_MB_STRING_OVERLOAD_OFF="MB String Overload Off"
-INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language நடு நிலையாக (neutral) அமைக்கப்படவில்லை. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.language neutral</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் அமைக்க (locally set) இயலும்."
-INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload அமைக்கப்பட்டுள்ளது. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.func_overload 0</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் நிறுத்த இயலும் (turned off locally)."
-INSTL_NOTICEYOUCANSTILLINSTALL="<br />உருவாக்க அமைப்புகள் (Configuration Settings) இறுதியில் காட்டப்படுமாதலால், தாங்கள் நிறுவலைத் தொடரலாம். தாங்கள் குறிமுறையைத் (code) தாங்களாகவே மேலேற்ற வேண்டும். உரைப் பிரதேசத்தில் சொடுக்கி அனைத்துக் குறிமுறைகளையும் தேர்வு செய்து, புதிய உரைக் கோப்பில் தேர்வு செய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயரிட்டு அதனைத் தங்கள் தள வேர்க் (root) கோப்பகத்தில் மேலேற்றுக."
+INSTL_NOTICEMBLANGNOTDEFAULT="PHP mbstring language நடு நிலையாக (neutral) அமைக்கப்படவில்லை. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.language neutral</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் அமைக்க (locally set) முடியும்."
+INSTL_NOTICEMBSTRINGOVERLOAD="PHP mbstring function overload அமைக்கப்பட்டுள்ளது. இதனைத் தங்கள் தளத்தில் <strong>php_value mbstring.func_overload 0</strong> என்ற சொற்றொடரைத் தங்கள் <code>.htaccess</code> கோப்பில் எழுதுவதின் மூலம் நிறுத்த முடியும் (turned off locally)."
+INSTL_NOTICEYOUCANSTILLINSTALL="<br />உருவாக்க அமைப்புகள் (Configuration Settings) இறுதியில் காட்டப்படுமாதலால், தாங்கள் நிறுவலைத் தொடரலாம். தாங்கள் குறிமுறையைத் (code) தாங்களாகவே மேலேற்ற வேண்டும். உரைப் பிரதேசத்தில் சொடுக்கி அனைத்துக் குறிமுறைகளையும் தேர்வுசெய்து, புதிய உரைக் கோப்பில் தேர்வுசெய்தக் குறிமுறையை ஒட்டுக. இந்த உரைக் கோப்பை &quot;configuration.php&quot; எனப் பெயரிட்டு அதனைத் தங்கள் தள வேர்க் (root) கோப்பகத்தில் பதிவேற்றுக."
 INSTL_OUTPUT_BUFFERING="Output Buffering"
-INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser ஆதரவு"
-INSTL_PHP_VERSION="PHP பதிப்பு"
+INSTL_PARSE_INI_FILE_AVAILABLE="INI Parser Support"
+INSTL_PHP_VERSION="PHP Version"
 INSTL_REGISTER_GLOBALS="Register Globals Off"
 INSTL_SAFE_MODE="Safe Mode"
 INSTL_SESSION_AUTO_START="Session Auto Start"
 INSTL_WRITABLE="%s எழுதக்கூடியது"
-INSTL_XML_SUPPORT="XML ஆதரவு"
-INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP ஆதரவு"
-INSTL_ZLIB_COMPRESSION_SUPPORT="ZLIB சுருக்குதல் ஆதரவு"
+INSTL_XML_SUPPORT="XML Support"
+INSTL_ZIP_SUPPORT_AVAILABLE="Native ZIP Support (பரிந்துரைக்கப்படுகிறது)"
+INSTL_ZLIB_COMPRESSION_SUPPORT="ZLIB Compression Support"
 INSTL_PROCESS_BUSY="செயலாக்கம் நடந்தேறிக் கொண்டிருக்கிறது. தயவுசெய்து காத்திருக்க…"
 
 ;Global strings
 JADMINISTRATOR="நிர்வாகம்"
-JADVANCED="மேன்மையுற்ற"
 JCHECK_AGAIN="மீண்டும் சரிபார்க்க"
 JERROR="பிழை"
 JEMAIL="மின்-அஞ்சல்"
 JGLOBAL_ISFREESOFTWARE="%s-வானது %s-இன் கீழ் வெளியிடப்பட்ட ஒரு இலவச மென்பொருள்."
 JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="மொழித்தொகுப்பானது இந்த Joomla! பதிப்புடன் பொருந்தவில்லை. சில எழுத்துச்சரங்கள் காணாமல் இருக்கக்கூடும்."
-JGLOBAL_SELECT_AN_OPTION="ஒரு விருப்பைத் தேர்வு செய்க"
+JGLOBAL_SELECT_AN_OPTION="ஒரு விருப்பைத் தேர்வுசெய்க"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="பொருந்தும் எந்த முடிவும் இல்லை"
-JGLOBAL_SELECT_SOME_OPTIONS="சில விருப்புகளைத் தேர்வு செய்க"
+JGLOBAL_SELECT_SOME_OPTIONS="சில விருப்புகளைத் தேர்வுசெய்க"
 JINVALID_TOKEN="செல்லாத பாதுகாப்பு token கொண்டிருந்ததால் சமீபத்திய வேண்டுதல் மறுக்கப்பட்டது. தயவுசெய்து பக்கத்தைப் புதுப்பித்தல் செய்து மீண்டும் முயற்சி செய்க."
 JNEXT="அடுத்த"
 JNO="இல்லை"
@@ -296,12 +274,12 @@ JOFF="Off"
 JON="On"
 JPREVIOUS="முந்தைய"
 JSITE="தளம்"
-JUSERNAME="பயனாளர் பெயர்"
+JUSERNAME="பயனாளர்பெயர்"
 JYES="ஆம்"
 
 ;Framework strings necessary when no lang pack is available
 JLIB_DATABASE_ERROR_DATABASE="ஒரு தரவுத்தள பிழை ஏற்பட்டுள்ளது."
-JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL உடன் தொடர்பு கொள்ள இயலவில்லை"
+JLIB_DATABASE_ERROR_CONNECT_MYSQL="MySQL உடன் தொடர்பு கொள்ள முடியவில்லை"
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="மேலேற்ற இயலாத தரவுத்தள இயக்கி (Driver): %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="தங்கள் அமர்வு நேரம் (session) காலாவதியாகிவிட்டது; தயவுசெய்து இந்தப் பக்கத்தைப் புதுப்பித்தல் (reload) செய்க."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="நகலெடுத்தல் தோல்வியுற்றது"
@@ -310,7 +288,8 @@ JLIB_FORM_FIELD_INVALID="செல்லாத புலம்:&#160"
 JLIB_FORM_VALIDATE_FIELD_INVALID="செல்லாத புலம்: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="தேவைப்படும் புலம்: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: கோப்பு %1$s-ஐ %2$s-க்கு நகலெடுத்தல் தோல்வியுற்றது"
-JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: தரவுத்தளத்துடன் தொடர்பு கொள்ள இயலவில்லை <br />joomla.library: %1$s - %2$s"
+JLIB_INSTALLER_NOT_ERROR="பிழையானது TinyMCE மொழிக் கோப்புகள் நிறுவல் தொடர்பானது என்றால் இப்பிழை Joomla! மொழி(கள்) நிறுவலுக்கு எந்த விளைவையும் ஏற்படுத்தாது. Joomla! 3.2.0-க்கு முன் உருவாக்கப்பட்ட சில மொழித் தொகுப்புகள் TinyMCE மொழிக் கோப்புகளைத் தனியாக நிறுவ முயற்சிக்கலாம். இந்த TinyMCE மொழிக் கோப்புகள் தற்சமயம் Joomla!-இல் சேர்க்கப்பட்டிருப்பதால் இவற்றைத் தனியாக நிறுவ வேண்டாம்."
+JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: தரவுத்தளத்துடன் தொடர்பு கொள்ள முடியவில்லை <br />joomla.library: %1$s - %2$s"
 
 ;Strings for the language debugger
 JDEBUG_LANGUAGE_FILES_IN_ERROR="மொழிக் கோப்புகளில் அலகிடல்/சொல்லிலக்கணப் பிழைகள்"
@@ -333,8 +312,8 @@ SQLITE="SQLite"
 SQLSRV="Microsoft SQL Server"
 
 ; Additional language strings used when a customized distribution is made
-INSTL_SAMPLE_BLOG_TA_SET="வலைப்பதிவு - தமிழ்/Tamil (IN) மாதிரித் தரவு"
-INSTL_SAMPLE_BROCHURE_TA_SET="சிறு புத்தகம் - தமிழ்/Tamil (IN) மாதிரித் தரவு"
-INSTL_SAMPLE_DATA_TA_SET="உள்ளிருப்பு - தமிழ்/Tamil (IN) மாதிரித் தரவு"
-INSTL_SAMPLE_LEARN_TA_SET="கற்க Joomla! - தமிழ்/Tamil (IN) மாதிரித் தரவு"
-INSTL_SAMPLE_TESTING_TA_SET="பரிசோதனை - தமிழ்/Tamil (IN) மாதிரித் தரவு"
+INSTL_SAMPLE_BLOG_TA_SET="வலைப்பதிவு - தமிழ் (இந்தியா) மாதிரித் தரவு"
+INSTL_SAMPLE_BROCHURE_TA_SET="சிறு புத்தகம் - தமிழ் (இந்தியா) மாதிரித் தரவு"
+INSTL_SAMPLE_DATA_TA_SET="உள்ளிருப்பு - தமிழ் (இந்தியா) மாதிரித் தரவு"
+INSTL_SAMPLE_LEARN_TA_SET="கற்க Joomla! - தமிழ் (இந்தியா) மாதிரித் தரவு"
+INSTL_SAMPLE_TESTING_TA_SET="பரிசோதனை - தமிழ் (இந்தியா) மாதிரித் தரவு"
diff --git a/installation/language/ta-IN/ta-IN.xml b/installation/language/ta-IN/ta-IN.xml
index 9d949ee..e93bc97 100644
--- a/installation/language/ta-IN/ta-IN.xml
+++ b/installation/language/ta-IN/ta-IN.xml
@@ -7,7 +7,7 @@
 	<creationDate>2012-09-15</creationDate>
 	<author>Ilagnayeru 'MIG' Manickam, Elango Samy Manim</author>
 	<authorUrl></authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Tamil (India) language installation pack for Joomla</description>
 	<files>
diff --git a/installation/language/th-TH/th-TH.ini b/installation/language/th-TH/th-TH.ini
index b8c1c58..7773cfb 100644
--- a/installation/language/th-TH/th-TH.ini
+++ b/installation/language/th-TH/th-TH.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,27 +10,20 @@ INSTL_STEP_COMPLETE_LABEL="เสร็จสิ้น"
 INSTL_STEP_DATABASE_LABEL="ฐานข้อมูล"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="เลือกภาษา ที่เป็นค่าเริ่มต้น"
 INSTL_STEP_FTP_LABEL="ตั้งค่า FTP"
-INSTL_STEP_LANGUAGE_LABEL="เลือกภาษา"
 INSTL_STEP_LANGUAGES_LABEL="ติดตั้งภาษา"
-INSTL_STEP_LICENSE_LABEL="ลิขสิทธิ์"
-INSTL_STEP_PREINSTALL_LABEL="ตรวจสอบก่อนการติดตั้ง"
 INSTL_STEP_SITE_LABEL="ตั้งค่าเว็บ"
 INSTL_STEP_SUMMARY_LABEL="ภาพรวม"
-INSTL_STEPS_TITLE="ขั้นตอน"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="เลือกภาษา"
-INSTL_SELECT_LANGUAGE_DESC="กรุณาเลือกภาษาในขณะติดตั้ง:"
 INSTL_SELECT_LANGUAGE_TITLE="เลือกภาษา"
 INSTL_WARNJAVASCRIPT="คำเตือน! คุณไม่ได้เปิดการใช้งาน JavaScript จูมล่าต้องการใช้ JavaScript ในขณะติดตั้ง"
 INSTL_WARNJSON="คุณต้องเปิดการใช้งาน JSON สำหรับการติดตั้งจูมล่า"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="ตรวจสอบระบบก่อนการติดตั้ง"
-INSTL_PRECHECK_FOR_VERSION="ตรวจสอบระบบก่อนการติดตั้งสำหรับ %s:"
-INSTL_PRECHECK_DESC="ในส่วนนี้สำคัญ! ถ้าระบบไม่รองรับ (เป็นคำว่า <strong class="_QQ_"red"_QQ_">ไม่</strong>) ต้องทำให้มันรองรับ ทั้งหมดไม่เช่นนั้นคุณจะติดตั้งจูมล่าไม่ได้"
+INSTL_PRECHECK_DESC="ในส่วนนี้สำคัญ! ถ้าระบบไม่รองรับ (เป็นคำว่า <strong class="_QQ_"red"_QQ_">ไม่</strong>) ต้องทำให้มันรองรับทั้งหมด ไม่เช่นนั้นคุณจะติดตั้งจูมล่าไม่ได้"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="การตั้งค่าที่ทีมจูมล่าแนะนำ:"
-INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="การตั้งค่า PHP ที่เราแนะนำ เพื่อให้จูมล่าทำงานได้สมบูรณ์มากขึ้น<br />อย่างไรก็ตามหากคุณไม่สามารถแก้ไขค่าเหล่านี้ได้คุณยังสามารถใช้งานจูมล่าได้"
+INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="การตั้งค่า PHP ที่เราแนะนำ เพื่อให้จูมล่าทำงานได้สมบูรณ์มากขึ้น<br />อย่างไรก็ตามหากคุณไม่สามารถแก้ไขค่าเหล่านี้ได้ คุณยังสามารถใช้งานจูมล่าได้"
 INSTL_PRECHECK_DIRECTIVE="คำสั่ง"
 INSTL_PRECHECK_RECOMMENDED="แนะนำ"
 INSTL_PRECHECK_ACTUAL="ค่าปัจจุบัน"
@@ -41,26 +34,24 @@ INSTL_DATABASE_HOST_DESC="ซึ่งโดยปกติจะเป็น &q
 INSTL_DATABASE_HOST_LABEL="ชื่อโฮส"
 INSTL_DATABASE_NAME_DESC="หากคุณมีฐานข้อมูลเดียว คุณสามารถใช้คำนำหน้าตารางให้ต่างจากเดิมได้"
 INSTL_DATABASE_NAME_LABEL="ชื่อฐานข้อมูล"
-INSTL_DATABASE_NO_SCHEMA="ไม่มีโครงร่างที่ได้จากการออกแบบฐานข้อมูล (Database Schema)ใน ฐานข้อมูลชนิดนี้"
-INSTL_DATABASE_OLD_PROCESS_DESC="หากเลือก สำรองฐานข้อมูล ตารางข้อมูลที่สำรองไว้เดิมจะถูกแทนที่ด้วยฐานข้อมูลใหม่"
+INSTL_DATABASE_NO_SCHEMA="ไม่มีโครงร่างที่ได้จากการออกแบบฐานข้อมูล (Database Schema) ในฐานข้อมูลชนิดนี้"
+INSTL_DATABASE_OLD_PROCESS_DESC="หากเลือก สำรองฐานข้อมูล ตารางข้อมูลที่สำรองไว้จะถูกแทนที่ด้วยฐานข้อมูลใหม่"
 INSTL_DATABASE_OLD_PROCESS_LABEL="หากเคยติดตั้งจูมล่าแล้ว"
 INSTL_DATABASE_PASSWORD_DESC="รหัสผ่านสำหรับการเข้าถึงฐานข้อมูล"
 INSTL_DATABASE_PASSWORD_LABEL="รหัสผ่าน"
-INSTL_DATABASE_PREFIX_DESC="ใส่คำนำหน้าตาราง โดยใช้ <b>จากที่จูมล่าสุ่มมาให้</b> หรือใส่ตัวอักษรภาษาอังกฤษไม่ต้องยาวมาก แค่ 3-4 ตัวก็พอ และจบด้วยเครื่องหมายขีดเส้นใต้ &quot;_&quot; อย่าใช้คำว่า &quot;bak_&quot; เด็ดขาดเพราะจูมล่าใช้ในการสำรองข้อมูลเดิม <b>และต้องแน่ใจว่า ไม่เคยใช้กับเว็บที่เคยติดตั้งไปแล้ว</b>"
+INSTL_DATABASE_PREFIX_DESC="ใส่คำนำหน้าตาราง โดยใช้ <b>จากที่จูมล่าสุ่มมาให้</b> หรือใส่ตัวอักษรภาษาอังกฤษไม่ต้องยาวมาก แค่ 3-4 ตัวก็พอ และจบด้วยเครื่องหมายขีดเส้นใต้ &quot;_&quot; อย่าใช้คำว่า &quot;bak_&quot; เด็ดขาดเพราะจูมล่าใช้ในการสำรองข้อมูล <b>และต้องแน่ใจว่า ไม่เคยใช้กับเว็บที่เคยติดตั้งไปแล้ว</b>"
 INSTL_DATABASE_PREFIX_LABEL="คำนำหน้าตาราง"
 INSTL_DATABASE_PREFIX_MSG="คำนำหน้าฐานข้อมูล ต้องเริ่มต้นด้วยตัวอักษร จากนั้นจะใส่ตัวเลขหรือเครื่องหมายใดๆ ก็ได้"
 INSTL_DATABASE_TYPE_DESC="ส่วนใหญ่จะเป็น &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="ชนิดของฐานข้อมูล"
-INSTL_DATABASE_USER_DESC="ใส่ชื่อผู้ใช้เช่น "_QQ_"root"_QQ_" หรือหากไม่ทราบให้ติดต่อผู้ดูแลโฮส"
+INSTL_DATABASE_USER_DESC="ใส่ชื่อผู้ใช้ เช่น "_QQ_"root"_QQ_" หรือหากไม่ทราบให้ติดต่อผู้ดูแลโฮส"
 INSTL_DATABASE_USER_LABEL="ชื่อผู้ใช้ฐานข้อมูล"
-INSTL_DATABASE_TITLE="ตั้งค่าการเชื่อมต่อฐานข้อมูล"
-INSTL_DATABASE_DESC="<p>การติดตั้งจูมล่าให้เชื่อมต่อกับฐานข้อมูลมี  ขั้นตอนง่ายๆ</p><p>1.ใส่ชื่อโฮสที่ติดตั้งจูมล่า</p><p>2.ใส่ชื่อผู้ใช้ฐานข้อมูล MySQLและรหัสผ่าน</p><p>3.ใส่คำนำหน้าตาราง หากต้องการติดตั้งจูมล่าหลายเว็บในฐานข้อมูลเดียว ต้องใส่คำนำหน้าตารางให้ต่างกัน</p><p>หากพบข้อความแจ้งว่า "_QQ_"ไม่สามารถติดต่อฐานข้อมูลได้"_QQ_", ให้ลองตรวจสอบว่า ชื่อผู้ใช้ฐานข้อมูล และรหัสผ่านนั้นถูกต้องหรือไม่</p>"
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="หาพาท FTP แบบอัตโนมัติ"
 INSTL_FTP="ตั้งค่า FTP"
-INSTL_FTP_DESC="<p>บาง Server ต้องใช้  FTP ในการติดตั้งเท่านั้น. หากคุณติดตั้งไม่สำเร็จกรุณาตรวจสอบกับผู้ดูแล Server </p><p>สำหรับเรื่องความปลอดภัยจูมล่าจะใช้  FTP ในการติดตั้งจูมล่าเท่านั้น และไม่ได้ใช้เพื่อการเข้าถึง Server</p><p><b>หมายเหตุ:</b> ถ้าคุณติดตั้งบน Server ที่ใช้ Windows , ในส่วนของ FTP  <strong>ไม่จำเป็นต้องใช้</strong></p>"
-INSTL_FTP_ENABLE_LABEL="เปิดการใช้  FTP"
+INSTL_FTP_DESC="<p>บาง Server ต้องใช้ FTP ในการติดตั้งเท่านั้น หากคุณติดตั้งไม่สำเร็จกรุณาตรวจสอบกับผู้ดูแล Server </p><p>สำหรับเรื่องความปลอดภัยจูมล่าจะใช้ FTP ในการติดตั้งจูมล่าเท่านั้น และไม่ได้ใช้เพื่อการเข้าถึง Server</p><p><b>หมายเหตุ:</b> ถ้าคุณติดตั้งบน Server ที่ใช้ Windows , ในส่วนของ FTP <strong>ไม่จำเป็นต้องใช้</strong></p>"
+INSTL_FTP_ENABLE_LABEL="เปิดการใช้ FTP"
 INSTL_FTP_HOST_LABEL="FTP โฮส"
 INSTL_FTP_PASSWORD_LABEL="รหัสผ่าน FTP"
 INSTL_FTP_PORT_LABEL="FTP พอร์ต"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP รูทพาท"
 INSTL_FTP_SAVE_LABEL="บันทึกรหัสผ่าน FTP"
 INSTL_FTP_TITLE="การตั้งค่า FTP (<strong class="_QQ_"red"_QQ_">ทางเลือก: ผู้ใช้ส่วนใหญ่สามารถข้ามขั้นตอนนี้ไปได้</strong>)"
 INSTL_FTP_USER_LABEL="ชื่อผู้ใช้ FTP"
-INSTL_SITE_NAME_LABEL="ชื่อเว็บ"
 INSTL_VERIFY_FTP_SETTINGS="ยืนยันการตั้งค่า FTP"
 INSTL_FTP_SETTINGS_CORRECT="ตั้งค่าได้"
 INSTL_FTP_USER_DESC="คำเตือน! แนะนำให้ว่างไว้ และใช้เฉพาะตอนที่คุณต้องการโอนถ่ายไฟล์เท่านั้น"
@@ -83,26 +73,26 @@ INSTL_ADMIN_PASSWORD_DESC="ตั้งรหัสผ่านผู้ดู
 INSTL_ADMIN_PASSWORD2_LABEL="ยืนยันรหัสผ่านผู้ดูแล"
 INSTL_ADMIN_USER_LABEL="ชื่อเข้าระบบของผู้ดูแล"
 INSTL_ADMIN_USER_DESC="ตั้งชื่อผู้ใช้ของคุณ สำหรับเข้าระบบของผู้ดูแลเว็บไซต์ได้"
-INSTL_SITE_NAME_TITLE="ชื่อเว็บ"
+INSTL_SITE_NAME_LABEL="ชื่อเว็บ"
 INSTL_SITE_NAME_DESC="ใส่ชื่อของเว็บ<br />เคล็ดลับ: คุณสามารถใส่คำอธิบายสั้นๆ ลงไปได้ด้วย เช่น ชื่อเว็บ บริการของเว็บสั้นๆ"
 INSTL_SITE_METADESC_LABEL="คำอธิบายเว็บ"
-INSTL_SITE_METADESC_TITLE_LABEL="ใส่คำอธิบายเว็บสั้นๆ ว่าเว็บคุณให้บริการอะไร เพื่อให้ระบบค้นหาเข้าใจเว็บคุณ "
+INSTL_SITE_METADESC_TITLE_LABEL="ใส่คำอธิบายเว็บสั้นๆ ว่าเว็บคุณให้บริการอะไร เพื่อให้ระบบค้นหาเข้าใจเว็บคุณ"
 INSTL_SITE_OFFLINE_LABEL="ออฟไลน์เว็บไซต์"
 INSTL_SITE_OFFLINE_TITLE_LABEL="ทำการออฟไลน์เว็บไซต์เอาไว้หลังทำการติดตั้งเสร็จ หลังจากนั้นค่อยไปเปิดออนไลน์ได้ที่การตั้งค่าหลักของเว็บไซต์"
 INSTL_SITE_INSTALL_SAMPLE_LABEL="ติดตั้งข้อมูลตัวอย่าง"
 INSTL_SITE_INSTALL_SAMPLE_DESC="การติดตั้งข้อมูลตัวอย่างเหมาะสำหรับมือใหม่หัดใช้จูมล่า ระบบจะติดตั้งข้อมูลตัวอย่างทั้งหมดลงไป"
 INSTL_SITE_INSTALL_SAMPLE_NONE="ไม่ติดตั้ง (<strong>เหมาะสำหรับการใช้ทำเว็บไซต์ที่ต้องการใช้การแสดงหลายภาษา</strong>)"
 INSTL_SAMPLE_BLOG_SET="ข้อมูลตัวอย่าง บล็อก ภาษาอังกฤษ (GB)"
-INSTL_SAMPLE_BROCHURE_SET="ข้อมูลตัวอย่าง  โบรชัวร์ ภาษาอังกฤษ (GB)"
+INSTL_SAMPLE_BROCHURE_SET="ข้อมูลตัวอย่าง โบรชัวร์ ภาษาอังกฤษ (GB)"
 INSTL_SAMPLE_DATA_SET="ข้อมูลตัวอย่าง จากทีมงาน จูมล่าภาษาอังกฤษ (GB)"
 INSTL_SAMPLE_LEARN_SET="ข้อมูลตัวอย่าง เอาไว้ศึกษา จูมล่าภาษาอังกฤษ (GB)"
 INSTL_SAMPLE_TESTING_SET="ข้อมูลตัวอย่าง ทดสอบ ภาษาอังกฤษ (GB)"
-INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ติดตั้งจูมล่า โดยมีเพียงแค่เมนู และโมดูลล๊อกอินเข้าสู่ระบบ โดยที่ไม่มีเนื้อหาต่างๆ เลย."
-INSTL_SAMPLE_BLOG_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหา และการแสดงผลแบบบล็อก มีโมดูลแสดงเนื้อหาที่เกี่ยวข้อง โมดูลเนื้อหายอดนิยม."
-INSTL_SAMPLE_BROCHURE_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาเป็นหน้าๆ (จะมีเมนู หน้าแรก, เกี่ยวกับเรา, ข่าวสาร, ติดต่อเรา) และโมดูลค้นหา, Custom HTML, โมดูลล๊อกอิน."
-INSTL_SAMPLE_DATA_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาหนึ่งหน้า (มีเมนูลิงก์เดียว) และโมดูลที่แสดงเนื้อหาล่าสุด, โมดูลล๊อกอิน."
-INSTL_SAMPLE_LEARN_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาตัวอย่าง โดยจะมีเนื้อหาเกี่ยวกับวิธีการใช้งานจูมล่า."
-INSTL_SAMPLE_TESTING_SET_DESC="ติดตั้งจูมล่า โดยมีลิงก์เมนูทั้งหมด เพื่อช่วยให้ทดสอบการทำงานของจูมล่าได้."
+INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="ติดตั้งจูมล่า โดยมีเพียงแค่เมนู และโมดูลล๊อกอินเข้าสู่ระบบ โดยที่ไม่มีเนื้อหาต่างๆ เลย"
+INSTL_SAMPLE_BLOG_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหา และการแสดงผลแบบบล็อก มีโมดูลแสดงเนื้อหาที่เกี่ยวข้อง โมดูลเนื้อหายอดนิยม"
+INSTL_SAMPLE_BROCHURE_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาเป็นหน้าๆ (จะมีเมนู หน้าแรก, เกี่ยวกับเรา, ข่าวสาร, ติดต่อเรา) และโมดูลค้นหา, Custom HTML, โมดูลล๊อกอิน"
+INSTL_SAMPLE_DATA_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาหนึ่งหน้า (มีเมนูลิงก์เดียว) และโมดูลที่แสดงเนื้อหาล่าสุด, โมดูลล๊อกอิน"
+INSTL_SAMPLE_LEARN_SET_DESC="ติดตั้งจูมล่า โดยมีเนื้อหาตัวอย่าง โดยจะมีเนื้อหาเกี่ยวกับวิธีการใช้งานจูมล่า"
+INSTL_SAMPLE_TESTING_SET_DESC="ติดตั้งจูมล่า โดยมีลิงก์เมนูทั้งหมด เพื่อช่วยให้ทดสอบการทำงานของจูมล่าได้"
 
 ;Summary view
 INSTL_FINALISATION="บทสรุป"
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="ด้านล่างนี้ คุณจะเห็
 INSTL_EMAIL_NOT_SENT="ไม่สามารถส่งอีเมลได้"
 
 ;Complete view
-INSTL_COMPLETE="เสร็จสิ้น"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="ข้อมูลสำหรับผู้ดูแล"
-INSTL_COMPLETE_DESC1="คลิกปุ่ม ดูหน้าเว็บ เพื่อไปดูหน้าเว็บของคุณ หรือคลิกปุ่ม ผู้ดูแลระบบ เพื่อเข้าสู่ส่วนของผู้ดูแลเว็บ"
-INSTL_COMPLETE_DESC2="ในเว็บช่วยเหลือของจูมล่าคุณสามารถศึกษาวิธีการติดตั้งจูมล่าได้ง่ายๆ หรือคุณต้องการติดตั้งภาษาเพิ่มเติมก็หาได้เช่นกัน"
-INSTL_COMPLETE_DESC3="คลิกที่ข้อความลิงก์ด้านขวามือ เพื่อเปิดหน้าช่วยเหลือ"
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="โฟลเดอร์ installation ถูกลบแล้ว"
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="โฟลเดอร์ installation ไม่สามารถลบได้ กรุณาไปลบโฟลเดอร์ INSTALLATION ออกเอง"
 INSTL_COMPLETE_FOLDER_REMOVED="โฟลเดอร์ installation ถูกลบแล้ว"
@@ -149,7 +135,8 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="ภาษา"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="รุ่น"
 INSTL_LANGUAGES_DESC="อินเตอร์เฟซของจูมล่าสามารถใช้ได้กับหลายภาษา คลิกเลือกภาษาที่คุณต้องการในช่องทำเครื่องหมาย และติดตั้งได้โดยคลิกที่ปุ่มต่อไป<br/>หมายเหตุ: การดำเนินการนี้จะใช้เวลาประมาณ 10 วินาทีสำหรับการดาวน์โหลด และติดตั้งทุกภาษา เพื่อหลีกเลี่ยงการหมดเวลา หรือใช้เวลานานเกินไป กรุณาเลือกได้ไม่เกิน 3 ภาษาในการติดตั้ง"
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="การดำเนินการนี้จะใช้เวลาถึง 10 วินาทีต่อภาษาถึงจะเสร็จสมบูรณ์<br />โปรดรอสักครู่ในขณะที่เรากำลังดาวน์โหลด และติดตั้งภาษา..."
-INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="โปรดเลือกภาษา ถ้าคุณไม่จำเป็นต้องติดตั้งภาษาอื่น ๆ ให้กดปุ่ม 'ย้อนกลับ'"
+INSTL_LANGUAGES_MORE_LANGUAGES="กดปุ่ม 'ย้อนกลับ' ถ้าคุณต้องการติดตั้งภาษาอื่น ๆ"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="คุณไม่ได้เลือกภาษาที่ต้องการติดตั้ง ถ้าคุณต้องการติดตั้งภาษาอื่น ๆ ให้กดปุ่ม 'ย้อนกลับ' และเลือกภาษาที่แสดงในรายการ"
 INSTL_LANGUAGES_WARNING_NO_INTERNET="จูมล่าไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ภาษาได้ กรุณาเสร็จสิ้นกระบวนการติดตั้ง"
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="หมายเหตุ: คุณสามารถที่จะติดตั้งภาษาได้ในภายหลัง โดยเข้าไปติดตั้งผ่านด้านผู้ดูแลของจูมล่า"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="กลับสู่ขั้นตอนการติดตั้งล่าสุด"
@@ -164,7 +151,7 @@ INSTL_DEFAULTLANGUAGE_ADMIN_COULDNT_SET_DEFAULT="จูมล่าไม่ส
 INSTL_DEFAULTLANGUAGE_ADMIN_SET_DEFAULT="จูมล่าทำการตั้งค่า %s เป็นภาษาพื้นฐานในด้านผู้ดูแลระบบ"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_SELECT="เลือก"
 INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_LANGUAGE="ภาษา"
-INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="แทก"
+INSTL_DEFAULTLANGUAGE_COLUMN_HEADER_TAG="แท็ก"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_CONTENT_LANGUAGE="จูมล่าไม่สามารถที่จะสร้างเนื้อหาภาษา %s โดยอัตโนมัติได้"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU="จูมล่าไม่สามารถที่จะสร้างเมนู %s โดยอัตโนมัติได้"
 INSTL_DEFAULTLANGUAGE_COULD_NOT_CREATE_MENU_ITEM="จูมล่าไม่สามารถที่จะสร้างเมนูลิงก์หน้าหลัก %s โดยอัตโนมัติได้"
@@ -183,24 +170,21 @@ INSTL_DEFAULTLANGUAGE_FRONTEND="ภาษาหลักของหน้าเ
 INSTL_DEFAULTLANGUAGE_FRONTEND_COULDNT_SET_DEFAULT="จูมล่าไม่สามารถตั้งค่าภาษาเป็นภาษาหลัก ภาษาอังกฤษจะถูกใช้เป็นภาษาหลักในด้านหน้าเว็บไซต์"
 INSTL_DEFAULTLANGUAGE_FRONTEND_SET_DEFAULT="จูมล่าทำการตั้งค่า %s เป็นภาษาหลักในด้านหน้าเว็บไซต์"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="ติดตั้งเนื้อหาเป็นภาษาท้องถิ่น"
-INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="ถ้าเปิดใช้งาน, จูมล่าจะสร้างหนึ่งหมวดหมู่เนื้อหาต่อหนึ่งภาษาที่ติดตั้งโดยอัตโนมัติ. เช่นเดียวกัน, หนึ่งเนื้อหาเด่นแบบจำลองจะถูกสร้างขึ้นเมื่อในแต่ละหมวดหมู่ถูกสร้างขึ้นมา"
+INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="ถ้าเปิดใช้งาน, จูมล่าจะสร้างหนึ่งหมวดหมู่เนื้อหาต่อหนึ่งภาษาที่ติดตั้งโดยอัตโนมัติ เช่นเดียวกัน, หนึ่งเนื้อหาเด่นแบบจำลองจะถูกสร้างขึ้นเมื่อในแต่ละหมวดหมู่ถูกสร้างขึ้นมา"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="มีหลายภาษา"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="ในส่วนนี้จะช่วยให้คุณสามารถเปิดใช้งาน Joomla! ในคุณสมบัติหลายภาษาโดยอัตโนมัติ"
-INSTL_DEFAULTLANGUAGE_NOTE="หมายเหตุ: เมื่อคุณกดปุ่มต่อไป คุณจะถูกพากลับไปยังหน้าสุดท้ายของขั้นตอนการติดตั้ง คือ คุณจะต้องทำการลบโฟลเดอร์ installation ออกไป"
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="เลือกภาษาเริ่มต้นของคุณ"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="คุณสามารถที่จะติดตั้งภาษาได้ในภายหลัง โดยเข้าไปติดตั้งผ่านด้านผู้ดูแลของจูมล่า"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
-INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Thai ไทย (ภาษาไทย)"
+INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="ภาษาไทย (ไทย)"
 
 ;Database Model
 INSTL_DATABASE_COULD_NOT_CONNECT="ไม่สามารถติดต่อฐานฐานข้อมูลได้ รหัสที่แจ้งกลับมา: %s"
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="ไม่สามารถรีเฟสแคชสำหรับส่วนเสริมได้: %s"
 INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="เกิดข้อผิดพลาดในการสำรองฐานข้อมูล"
-INSTL_DATABASE_ERROR_CREATE="เกิดข้อผิดพลาดขณะพยายามสร้างฐานข้อมูล %s.<br />ชื่อผู้ใช้ฐานข้อมูลนี้อาจไม่สามารถสร้างฐานข้อมูลได้ คุณควรสร้างฐานข้อมูลก่อนหรือติดต่อผู้ดูแลระบบ"
+INSTL_DATABASE_ERROR_CREATE="เกิดข้อผิดพลาดขณะพยายามสร้างฐานข้อมูล %s<br />ชื่อผู้ใช้ฐานข้อมูลนี้อาจไม่สามารถสร้างฐานข้อมูลได้ คุณควรสร้างฐานข้อมูลก่อนหรือติดต่อผู้ดูแลระบบ"
 INSTL_DATABASE_ERROR_DELETE="เกิดข้อผิดพลาดการลบฐานข้อมูล"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="มีข้อผิดพลาดกับหมายเลขรุ่นของสกรีมา"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="ลบทิ้ง"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="สำรองฐานข้อมูล"
 INSTL_DATABASE_FIX_TOO_LONG="การใส่คำนำหน้าฐานข้อมูลจำกัดไม่เกิน 15 ตัวอักษร"
@@ -211,10 +195,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="คุณต้องใช้ SQL Server
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="คุณต้องใช้ SQL Server 2008 R2 (10.50.1600.1) หรือสูงกว่าในการติดตั้ง รุ่นที่คุณใช้คือ: %s"
 INSTL_DATABASE_INVALID_TYPE="โปรดเลือกชนิดของฐานข้อมูล"
 INSTL_DATABASE_NAME_TOO_LONG="ชื่อฐานข้อมูล MySQL จะต้องไม่เกิน 64 ตัวอักษร"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="คำนำหน้าตาราง MySQL ต้องเริ่มต้นด้วยตัวอักษร ตัวเลขหรือขีดล่าง"
 INSTL_DATABASE_INVALID_NAME="MySQL รุ่นก่อน 5.1.6 ต้องใช้ "_QQ_"คำพิเศษ"_QQ_"  รุ่นที่คุณใช้คือ: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL ชื่อฐานข้อมูลและชื่อตารางไม่สามารถใช่หรือลงท้ายด้วยช่องว่างได้"
-INSTL_DATABASE_NAME_INVALID_CHAR="MySQL ไม่สามารถทำงานได้ พบ NUL ASCII(0x00)."
+INSTL_DATABASE_NAME_INVALID_CHAR="MySQL ไม่สามารถทำงานได้ พบ NULL ASCII(0x00)"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="ไฟล์ %s ไม่มีอยู่"
 
 ;controllers
@@ -246,18 +229,14 @@ INSTL_FTP_NOSYST="ฟังก์ชัน "_QQ_"SYST"_QQ_" ล้มเหล
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="ไม่สามารถตรวจจับอัตโนมัติโฟลเดอร์หลักได้"
 
 ;others
-INSTL_ADVANCED_SETTINGS="การตั้งค่าขั้นสูง"
-INSTL_BASIC_SETTINGS="การตั้งค่าพื้นฐาน"
-INSTL_CONFPROBLEM="ไฟล์หรือไดเรกทอรีของคุณไม่สามารถเขียนได้หรือมีปัญหาในการสร้างไฟล์การกำหนดค่า คุณจะต้องอัปโหลด Code ต่อไปนี้ด้วยตัวเอง คลิกในพื้นที่ข้อความเพื่อไฮไลต์ Code ทั้งหมดแล้ววางลงในโปรแกรม Text Edittor แล้วบันทึกเป็น ชื่อ'configuration.php'และอัปโหลดไปยังโฟลเดอร์ที่ติดตั้งจูมล่า"
+INSTL_CONFPROBLEM="ไฟล์หรือไดเรกทอรีของคุณไม่สามารถเขียนได้หรือมีปัญหาในการสร้างไฟล์การกำหนดค่า คุณจะต้องอัปโหลด Code ต่อไปนี้ด้วยตัวเอง คลิกในพื้นที่ข้อความเพื่อไฮไลต์ Code ทั้งหมดแล้ววางลงในโปรแกรม Text Edittor แล้วบันทึกเป็น ชื่อ 'configuration.php' และอัปโหลดไปยังโฟลเดอร์ที่ติดตั้งจูมล่า"
 INSTL_DATABASE_SUPPORT="สนับสนุนฐานข้อมูล:"
 INSTL_DISPLAY_ERRORS="Display Errors"
 INSTL_ERROR_DB="เกิดข้อผิดพลาดเรื่องขนาดฐานข้อมูล: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="ไม่สามารถเริ่มต้นค่าสคีมาฐานข้อมูลได้"
 INSTL_FILE_UPLOADS="File Uploads"
 INSTL_GNU_GPL_LICENSE="สัญญาอนุญาตสาธารณะทั่วไปของ GNU"
-INSTL_INSTALLATION="การติดตั้ง"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Support"
-INSTL_LICENSE="ลิขสิทธิ์"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC Off"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language is Default"
@@ -279,12 +258,11 @@ INSTL_PROCESS_BUSY="กำลังดำเนินการ กรุณา
 
 ;Global strings
 JADMINISTRATOR="ผู้ดูแลระบบ"
-JADVANCED="ขั้นสูง"
 JCHECK_AGAIN="ตรวจสอบอีกครั้ง"
 JERROR="มีข้อผิดพลาด"
 JEMAIL="อีเมล"
-JGLOBAL_ISFREESOFTWARE="%s เป็นซอฟต์แวร์โอเพนซอร์สภายใต้เงื่อนไข %s."
-JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="ชุดภาษาใช้กับจูมล่ารุ่นนี้ไม่ได้. สตริงบางส่วนอาจจะหายไป."
+JGLOBAL_ISFREESOFTWARE="%s เป็นซอฟต์แวร์โอเพนซอร์สภายใต้เงื่อนไข %s"
+JGLOBAL_LANGUAGE_VERSION_NOT_PLATFORM="ชุดภาษาใช้กับจูมล่ารุ่นนี้ไม่ได้ สตริงบางส่วนอาจจะหายไป"
 JGLOBAL_SELECT_AN_OPTION="เลือกตัวเลือก"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="ไม่มีผลลัพธ์"
 JGLOBAL_SELECT_SOME_OPTIONS="เลือกตัวเลือกบางตัว"
@@ -305,12 +283,12 @@ JLIB_DATABASE_ERROR_DATABASE="เกิดข้อผิดพลาดขึ
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="ไม่สามารถใช้งานฐานข้อมูล: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="เซสชันของคุณหมดอายุแล้วโปรดโหลดหน้าเว็บใหม่"
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="การคัดลอก ล้มเหลว"
-JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: พาทที่ระบุไว้ ไม่มีโฟลเดอร์. พาท: %s"
+JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: พาทที่ระบุไว้ ไม่มีโฟลเดอร์ พาท: %s"
 JLIB_FORM_FIELD_INVALID="ข้อมูลในฟิลด์ไม่ถูกต้อง:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="ข้อมูลในฟิลด์ไม่ถูกต้อง: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="ต้องใส่: %s"
-JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: การคัดลอกไฟล์ล้มเหลวจาก %1$s ไปยัง %2$s."
-JLIB_INSTALLER_NOT_ERROR="หากมีข้อผิดที่เกี่ยวข้องกับการติดตั้งไฟล์ภาษาของ TinyMCE ซึ่งจะไม่มีผลกระทบต่อการติดตั้งของไฟล์ภาษา. เพราะบางแพ็คเกจภาษาถูกสร้างขึ้นก่อนที่จะมี Joomla! 3.2.0 อาจเป็นเพราะพยายามที่จะติดตั้งไฟล์ภาษาของ TinyMCE แยกต่างหาก. ซึ่งตอนนี้ได้ถูกรวมอยู่ในคอร์หลักนี้แล้ว โดยที่ไม่จำเป็นต้องมีการติดตั้งตามลงไป."
+JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: การคัดลอกไฟล์ล้มเหลวจาก %1$s ไปยัง %2$s"
+JLIB_INSTALLER_NOT_ERROR="หากมีข้อผิดที่เกี่ยวข้องกับการติดตั้งไฟล์ภาษาของ TinyMCE ซึ่งจะไม่มีผลกระทบต่อการติดตั้งของไฟล์ภาษา เพราะบางแพ็คเกจภาษาถูกสร้างขึ้นก่อนที่จะมี Joomla! 3.2.0 อาจเป็นเพราะพยายามที่จะติดตั้งไฟล์ภาษาของ TinyMCE แยกต่างหาก ซึ่งตอนนี้ได้ถูกรวมอยู่ในคอร์หลักนี้แล้ว โดยที่ไม่จำเป็นต้องมีการติดตั้งตามลงไป"
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: ไม่สามารถติดต่อฐานข้อมูลได้ <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/th-TH/th-TH.xml b/installation/language/th-TH/th-TH.xml
index 1b0f3f1..3d43908 100644
--- a/installation/language/th-TH/th-TH.xml
+++ b/installation/language/th-TH/th-TH.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Thai Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Thai installation language for Joomla 3.0</description>
 	<files>
diff --git a/installation/language/tr-TR/tr-TR.ini b/installation/language/tr-TR/tr-TR.ini
index a22f211..4c6eea5 100644
--- a/installation/language/tr-TR/tr-TR.ini
+++ b/installation/language/tr-TR/tr-TR.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="Son"
 INSTL_STEP_DATABASE_LABEL="Veritabanı"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="Varsayılan Dili Seçin"
 INSTL_STEP_FTP_LABEL="FTP"
-INSTL_STEP_LANGUAGE_LABEL="Dil"
 INSTL_STEP_LANGUAGES_LABEL="Kurulum Dilleri"
-INSTL_STEP_LICENSE_LABEL="Lisans"
-INSTL_STEP_PREINSTALL_LABEL="Kurulum Öncesi Denetim"
 INSTL_STEP_SITE_LABEL="Yapılandırma"
 INSTL_STEP_SUMMARY_LABEL="Gözden Geçirme"
-INSTL_STEPS_TITLE="Adımlar"
 
 ;Dil görünümü
-INSTL_LANGUAGE_TITLE="Dil Seçimi"
-INSTL_SELECT_LANGUAGE_DESC="Lütfen Joomla! kurulum adımlarında kullanacağınız dili seçiniz:"
 INSTL_SELECT_LANGUAGE_TITLE="Dili Seçin"
 INSTL_WARNJAVASCRIPT="Uyarı! Joomla! kurulumunun doğru yapılabilmesi için JavaScript mümkün kılınmış olmalı."
 INSTL_WARNJSON="Joomla kurulabilmesi için PHP kurulumunuzda JSON etkinleştirilmelidir."
 
 ;Kurulum öncesi kontrol görünümü
 INSTL_PRECHECK_TITLE="Kurulum Öncesi Kontrol"
-INSTL_PRECHECK_FOR_VERSION="%s İçin Kurulum Öncesi Kontrol:"
 INSTL_PRECHECK_DESC="Desteklenmeyen (<strong class="_QQ_"red"_QQ_">Hayır</strong> şeklinde belirtilmiş) öğeler varsa lütfen düzeltmek için gerekli işlemi yapın. Eksiklik durumunda Joomla! özellikleri doğru çalışmayabilir."
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="Önerilen ayarlar:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="Listedeki tavsiye edilen PHP ayarları, tam bir Joomla! uyumluluğu için gereklidir.<br />Bununla birlikte Joomla! bütünüyle uyumluluk olmasa bile çalışacaktır."
@@ -35,7 +28,7 @@ INSTL_PRECHECK_DIRECTIVE="Yönerge"
 INSTL_PRECHECK_RECOMMENDED="Önerilen"
 INSTL_PRECHECK_ACTUAL="Durum"
 
-;Verirabanı görünümü
+;Veritabanı görünümü
 INSTL_DATABASE="Veritabanı Yapılandırması"
 INSTL_DATABASE_HOST_DESC="Genelde &quot;localhost&quot;"
 INSTL_DATABASE_HOST_LABEL="Sunucu Adı"
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="Muhtemelen &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="Veritabanı Türü"
 INSTL_DATABASE_USER_DESC="Bazen "_QQ_"root"_QQ_" ya da sağlayıcınız tarafından verilen bir kullanıcı adı olabilir."
 INSTL_DATABASE_USER_LABEL="Kullanıcı Adı"
-INSTL_DATABASE_TITLE="Bağlantı Ayarları"
-INSTL_DATABASE_DESC="<p>Bir Joomla! sitesi tüm verileri veritabanında depolar. Bu kurulum programı ekranı, veritabanı oluşturmak için gerekli bilgileri verir. </p><p>Joomla! sitenizi uzak sunucuda kuruyorsanız, barınma alanınızdan bu bilgileri almanız gerekir. </p><p> Bazı web sağlayıcılar, kurulum öncesi bir veritabanı oluşturmanızı gereki kılar. Eğer "_QQ_"Veritabanına bağlanılamadı"_QQ_" şeklinde bir mesaj alırsanız, veritabanı kullanıcı adı ve parolanızın doğruluunu kontrol edin. Mesajı almaya devam ediyorsanız, yer sağlayıcınızla irtibat kurarak Joomla!kurulumundan evvel veritabanı oluşturmanız gerekip gerekmediğini kontrol edin.</p>"
 
 ;Dosya sistemi görünümü
 INSTL_AUTOFIND_FTP_PATH="FTP Dizinini Algıla"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP Kök Dizini"
 INSTL_FTP_SAVE_LABEL="FTP Parolasını Kaydet"
 INSTL_FTP_TITLE="FTP Yapılandırması  (<strong class="_QQ_"red"_QQ_">Tercihe bağlı - Çoğu kullanıcı bu adımı kullanmadan geçebilir. Bunun için Sonraki düğmesini kullanın.</strong>)"
 INSTL_FTP_USER_LABEL="FTP Kullanıcı Adı"
-INSTL_SITE_NAME_LABEL="Site İsmi"
 INSTL_VERIFY_FTP_SETTINGS="FTP Ayarlarını Doğrula"
 INSTL_FTP_SETTINGS_CORRECT="Ayarlar doğru"
 INSTL_FTP_USER_DESC="Uyarı! Bu alanı boş bırakıp dosya transferi esnasında kullanıcı adını girmeniz önerilir."
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="Süper yönetici için bir parola belirleyin ve aşa
 INSTL_ADMIN_PASSWORD2_LABEL="Yönetici Parolası Doğrulama"
 INSTL_ADMIN_USER_LABEL="Yönetici Kullanıcı Adı"
 INSTL_ADMIN_USER_DESC="Süper yönetici hesabınız için kullanıcı adı belirleyin."
-INSTL_SITE_NAME_TITLE="Site İsmi"
+INSTL_SITE_NAME_LABEL="Site İsmi"
 INSTL_SITE_NAME_DESC="Sitenizin ismini giriniz."
 INSTL_SITE_METADESC_LABEL="Meta Açıklaması"
 INSTL_SITE_METADESC_TITLE_LABEL="Arama motorları tarafından da kullanılabilecek, tüm web sitesinin açıklamasını girin. Genel olarak en fazla 20 kelime içermesi uygundur."
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="Aşağıda yeni kurulan siteniz için yapılandırma ayarla
 INSTL_EMAIL_NOT_SENT="e-Posta gönderilemedi."
 
 ;Tamamlama görünümü
-INSTL_COMPLETE="Bitti"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="Yönetim Merkezi Giriş Detayları"
-INSTL_COMPLETE_DESC1="Site düğmesine tıklayarak Joomla! Web sitenizi görebilir ya da Yönetim düğmesini kullanarak yönetici oturumu açabilirsiniz."
-INSTL_COMPLETE_DESC2="Joomla! Topluluk Sitesinde, kullanılabilir dillerin bir listenin yanı sıra, joomla.org üzerinde çeşitli dillerle ilişkili kaynakları da bulabilirsiniz."
-INSTL_COMPLETE_DESC3="Sağdaki düğmeye tıklayarak Topluluk Sitesini yeni pencerede açın."
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="Kurulum klasörü zaten silindi."
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="Kurulum klasörü silinemedi. Lütfen klasörü elle silin."
 INSTL_COMPLETE_FOLDER_REMOVED="Kurulum klasörü başarıyla kaldırıldı."
@@ -149,6 +135,7 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="Dil"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="Sürüm"
 INSTL_LANGUAGES_DESC="Joomla arayüzü birkaç farklı dil imkanı sunmaktadır. Kutucukları tıklatarak tercih ettiğiniz dilleri seçiniz ve Sonraki düğmesine tıklatarak kurunuz.<br/>Not: bu işlemde her bir dil için yaklaşık 5 saniye indirme ve kurma süresi vardır. Lütfen zaman aşımı olmaması için üç dilden fazla seçim yapmayınız."
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="Bu işlemde her bir dilin kurulumu için yaklaşık on saniye süre gerekir.<br />Lütfen biz dilleri indirip kurarken bekleyiniz..."
+INSTL_LANGUAGES_MORE_LANGUAGES="Eğer daha fazla dil yüklemek istiyorsanız, 'Önceki' düğmesine tıklayınız."
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="Lütfen bir dil seçin. Eğer başka bir dil kurmak istemiyorsanız 'Önceki' düğmesine tıklatınız."
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla! dil sunucusuna bağlanamadı. Lütfen kurulum işlemini tamamlayınız."
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="Not: Daha sonra Joomla! yönetimini kullanarak dilleri kurabilirsiniz."
@@ -186,11 +173,9 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="Yerek içeriği kur"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="Eğer etkinse, Joomla otomatik olarak yüklü olan her dil için bir içerik kategorisi oluşturur. Ayrıca, her kategoride rastgele içeriğe sahip bir öne çıkan makale oluşturulacaktır."
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="Çok Dilli"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="Bu bölüm Joomla! çok dilli seçeneğini otomatik olarak etkinleştirmenizi sağlar."
-INSTL_DEFAULTLANGUAGE_NOTE="Not: Sonraki düğmesine bastığınızda kurulum işleminde kaldığınız son adıma dönülecek ve kurulum klasörünü kaldırmanız istenilecektir."
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="Varsayılan dilinizi seçin"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="Joomla! Yönetim alanını kullanarak dilleri daha sonra da kurabilirsiniz."
 
-; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Español
+; ÇEVİRMENLER İÇİN ÖNEMLİ NOT: Bu satırı düz olarak çevirmeyiniz. Onun yerine dilin yerel ismini ekleyiniz. Örneğin Turkish, Türkçe olacak.
 INSTL_DEFAULTLANGUAGE_NATIVE_LANGUAGE_NAME="Türkçe (TR)"
 
 ;Veritabanı Modeli
@@ -200,7 +185,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="Veritabanı yedeklemesinde bazı hatalar meydana geldi."
 INSTL_DATABASE_ERROR_CREATE="%s veritabanı oluşturulmaya çalışılırken bir hata meydana geldi.<br/>Kullanıcı veritabanı oluşturmak için yeterli yetkiye sahip olmayabilir. Joomla! kurulumundan önce veritabanını ayrı ayrı oluşturmanız gerekebilir."
 INSTL_DATABASE_ERROR_DELETE="Veritabanı silinirken bazı hatalar meydana geldi."
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="Şema sürüm numarası başlatma hatası"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="Kaldır"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="Yedekle"
 INSTL_DATABASE_FIX_TOO_LONG="MySQL tablo ön eki en fazla 15 karakter olabilir."
@@ -211,7 +195,6 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="Kuruluma devam etmek için SQL Server 200
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="Kuruluma devam etmek için SQL Server 2008 R2 (10.50.1600.1) veya daha üstü bir sürüme ihtiyacınız var. Sizin sürümünüz: %s"
 INSTL_DATABASE_INVALID_TYPE="Lütfen veritabanı türünü seçin."
 INSTL_DATABASE_NAME_TOO_LONG="MySQL veritabanı adı an fazla 64 karakter olabilir."
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL tablo ön eki bir harf ile başlamalı ve sadece harf, sayı veya alt çizgi ile devam etmeli."
 INSTL_DATABASE_INVALID_NAME="MySQL 5.1.6 öncesi sürümler isimlerde noktalamalar ve diğer "_QQ_"özel"_QQ_" karakterleri içerememektedir. Sizin sürümünüz: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL veritabanı adı ve tablo adları boşluk ile başlayamaz, bitemez."
 INSTL_DATABASE_NAME_INVALID_CHAR="Bir boş ASCII(0x00) içerebilen MySQL tanımlayıcısı yok."
@@ -246,8 +229,6 @@ INSTL_FTP_NOSYST=""_QQ_"SYST"_QQ_" özelliği başarısız."
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="FTP kök dizini otomatik algılanamadı."
 
 ;diğerleri
-INSTL_ADVANCED_SETTINGS="Gelişmiş Ayarlar"
-INSTL_BASIC_SETTINGS="Temel Ayarlar"
 INSTL_CONFPROBLEM="Yapılandırma dosyanız veya bulunduğu dizin yazılamıyor ya da yapılandırma dosyasının oluşturulması ile ilgili bir problem var. Aşağıdaki kodu elle yüklemelisiniz. Metin alanına tıklayarak tüm kodu seçive bunu yeni bir metin belgesine yapıştırın. Dosya adını 'configuration.php' şeklinde kaydederek site dizinine yükleyin."
 INSTL_DATABASE_SUPPORT="Veritabanı Desteği:"
 INSTL_DISPLAY_ERRORS="Hata Görüntüleme"
@@ -255,9 +236,7 @@ INSTL_ERROR_DB="Veritabanı yerleştirilirken bazı hatalar meydana geldi: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="Veritabanı şeması başlatılamadı."
 INSTL_FILE_UPLOADS="Dosya Yüklemeleri"
 INSTL_GNU_GPL_LICENSE="GNU Genel Kamu Lisansı"
-INSTL_INSTALLATION="Kurulum"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON Desteği"
-INSTL_LICENSE="Lisans"
 INSTL_MAGIC_QUOTES_GPC="Sihirli Tırnaklar GPC"
 INSTL_MAGIC_QUOTES_RUNTIME="Sihirli Tırnaklar Çalışma Anı"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Dili Varsayılan"
@@ -279,7 +258,6 @@ INSTL_PROCESS_BUSY="İşlem yürütülüyor. Lütfen bekleyin..."
 
 ;Genel diziler
 JADMINISTRATOR="Yönetici"
-JADVANCED="Gelişmiş"
 JCHECK_AGAIN="Tekrar Kontrol Et"
 JERROR="Hata"
 JEMAIL="e-Posta"
@@ -310,6 +288,7 @@ JLIB_FORM_FIELD_INVALID="Geçersiz alan:&#160;"
 JLIB_FORM_VALIDATE_FIELD_INVALID="Geçersiz alan: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="Gerekli alan: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: Dosyaların %1$s konumundan %2$s konumuna kopyalanması başarısız."
+JLIB_INSTALLER_NOT_ERROR="Eğer hata TinyMCE dil dosyaları ile ilgiliyse dil kurulumuna herhangi bir etkisi olmaz. Joomla! 3.2.0 sürümünden önceki bazı dil paketleri ayrı TinyMCE dil dosyaları kurmaya çalışır. Artık bu dosyalar ana kurulumda bulunduğu için ayrıca kurulmasına gerek kalmamaktadır."
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: Veritabanına bağlanılamadı <br />joomla.library: %1$s - %2$s"
 
 ; Dil hata ayıklama için çeviriler
@@ -330,4 +309,4 @@ ORACLE="Oracle"
 POSTGRESQL="PostgreSQL"
 SQLAZURE="Microsoft SQL Azure"
 SQLITE="SQLite"
-SQLSRV="Microsoft SQL Server"
+SQLSRV="Microsoft SQL Server"
\ No newline at end of file
diff --git a/installation/language/tr-TR/tr-TR.xml b/installation/language/tr-TR/tr-TR.xml
index e46d044..12af4af 100644
--- a/installation/language/tr-TR/tr-TR.xml
+++ b/installation/language/tr-TR/tr-TR.xml
@@ -8,7 +8,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>Turkish installation file</description>
 	<files>
diff --git a/installation/language/ug-CN/ug-CN.ini b/installation/language/ug-CN/ug-CN.ini
index 6959e6c..7f5afe6 100644
--- a/installation/language/ug-CN/ug-CN.ini
+++ b/installation/language/ug-CN/ug-CN.ini
@@ -1,6 +1,6 @@
 ; $Id: ug-CN.ini 2013-10-08 Akber Tursun, Abdulla Bisir and Osmanjan Hesen $
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/installation/language/ug-CN/ug-CN.xml b/installation/language/ug-CN/ug-CN.xml
index ec93182..e6b016d 100644
--- a/installation/language/ug-CN/ug-CN.xml
+++ b/installation/language/ug-CN/ug-CN.xml
@@ -4,7 +4,7 @@
 	<version>3.2.0</version>
 	<creationDate>2012.10.28</creationDate>
 	<author>Joomla! Uyghur Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>!Joomla 3.0 قاچىلاش پىروگراممسىنىڭ ئۇيغۇرچە تەرجىمىسى</description>
 	<files>
diff --git a/installation/language/uk-UA/uk-UA.ini b/installation/language/uk-UA/uk-UA.ini
index 5e14055..52e3652 100644
--- a/installation/language/uk-UA/uk-UA.ini
+++ b/installation/language/uk-UA/uk-UA.ini
@@ -1,7 +1,7 @@
-; version 3.2.0 2013-10-08 17:33:53 ~0
-; author Joomla! Ukraine
-; copyright 2005 - 2013 (C) Open Source Matters. 2006 - 2013 (C) Joomla! Ukraine. All rights reserved.
-; license version 2 or later; see LICENSE.txt
+; Joomla! Project
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt
+; Note : All ini files need to be saved as UTF-8
 
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/installation/language/uk-UA/uk-UA.xml b/installation/language/uk-UA/uk-UA.xml
index 7b53393..389903f 100644
--- a/installation/language/uk-UA/uk-UA.xml
+++ b/installation/language/uk-UA/uk-UA.xml
@@ -6,7 +6,7 @@
 	<version>3.2.0</version>
 	<creationDate>16.09.2012</creationDate>
 	<author>Joomla! Ukraine</author>
-	<copyright>2005 - 2013 (C) Open Source Matters. All rights reserved.</copyright>
+	<copyright>2005 - 2014 (C) Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
  	<description>Ukrainian Localization for Joomla! 3.0 Installation</description>
 	<files>
diff --git a/installation/language/vi-VN/vi-VN.xml b/installation/language/vi-VN/vi-VN.xml
index ed83010..ade1197 100644
--- a/installation/language/vi-VN/vi-VN.xml
+++ b/installation/language/vi-VN/vi-VN.xml
@@ -4,7 +4,7 @@
 	<version>3.2.0</version>
 	<creationDate>September 2012</creationDate>
 	<author>Joomla Viet Nam Translation Team</author>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/zh-CN/zh-CN.xml b/installation/language/zh-CN/zh-CN.xml
index 9da87f4..3d0aa5d 100644
--- a/installation/language/zh-CN/zh-CN.xml
+++ b/installation/language/zh-CN/zh-CN.xml
@@ -7,7 +7,7 @@
 	<creationDate>2011.1.11</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/language/zh-TW/zh-TW.ini b/installation/language/zh-TW/zh-TW.ini
index a2c49e3..6126afb 100644
--- a/installation/language/zh-TW/zh-TW.ini
+++ b/installation/language/zh-TW/zh-TW.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt
 ; Note : All ini files need to be saved as UTF-8
 
@@ -10,24 +10,17 @@ INSTL_STEP_COMPLETE_LABEL="完成"
 INSTL_STEP_DATABASE_LABEL="資料庫"
 INSTL_STEP_DEFAULTLANGUAGE_LABEL="選擇預設語言"
 INSTL_STEP_FTP_LABEL="FTP設定"
-INSTL_STEP_LANGUAGE_LABEL="語言"
 INSTL_STEP_LANGUAGES_LABEL="安裝語言"
-INSTL_STEP_LICENSE_LABEL="授權規定"
-INSTL_STEP_PREINSTALL_LABEL="安裝前檢查"
 INSTL_STEP_SITE_LABEL="設定"
 INSTL_STEP_SUMMARY_LABEL="預覽"
-INSTL_STEPS_TITLE="步驟"
 
 ;Language view
-INSTL_LANGUAGE_TITLE="選擇語言"
-INSTL_SELECT_LANGUAGE_DESC="請選擇要在Joomla!安裝過程中使用的語言:"
 INSTL_SELECT_LANGUAGE_TITLE="選擇語言"
 INSTL_WARNJAVASCRIPT="警告! 安裝Joomla!需要啟用JavaScript"
 INSTL_WARNJSON="你的PHP環境需要啟用JSON支援才能進行Joomla!安裝"
 
 ;Preinstall view
 INSTL_PRECHECK_TITLE="安裝前檢查"
-INSTL_PRECHECK_FOR_VERSION="安裝前檢查，針對 %s:"
 INSTL_PRECHECK_DESC="如果以下這些項目目前有不支援的情況 (被標記為<strong class="_QQ_"red"_QQ_">否</strong>)，請先進行校正他們。 <br />如果無法符合以下的系統需求，你的Joomla!安裝程式將可能無法安裝。"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_TITLE="建議的設定值:"
 INSTL_PRECHECK_RECOMMENDED_SETTINGS_DESC="這些建議的PHP設定值是為了確保能完整相容於Joomla!。<br />雖然，Joomla!仍然可以在不完全符合這些建議設定值時執行。"
@@ -53,8 +46,6 @@ INSTL_DATABASE_TYPE_DESC="這大概會是 &quot;MySQLi&quot;"
 INSTL_DATABASE_TYPE_LABEL="資料庫類型"
 INSTL_DATABASE_USER_DESC="這可能是"_QQ_"root"_QQ_"或主機商給的帳號"
 INSTL_DATABASE_USER_LABEL="帳號"
-INSTL_DATABASE_TITLE="連線設定"
-INSTL_DATABASE_DESC="<p>Joomla!網站儲存所有的資料在資料庫中。這個畫面含有安裝程式所需要建立資料庫的必要資訊。</p><p> 如果你在遠端的網站伺服器上安裝Joomla!，你需要和你的主機商取得這些資訊。</p><p>有些網站主機需要在你安裝Joomla!之前就要先建立好資料庫。如果你得到 "_QQ_"無法連接資料庫"_QQ_"的訊息，檢查你的帳號及密碼是否有輸入正確。如果你還是得到這個訊息，檢查你的主機是不是要在安裝Joomla!前就要先建立好資料庫。</p>" 
 
 ;FTP view
 INSTL_AUTOFIND_FTP_PATH="自動尋找FTP路徑"
@@ -68,7 +59,6 @@ INSTL_FTP_ROOT_LABEL="FTP根路徑"
 INSTL_FTP_SAVE_LABEL="儲存FTP密碼"
 INSTL_FTP_TITLE="FTP設定(<strong class="_QQ_"red"_QQ_">可選擇的 - 大部份的使用者會略過這個步驟 - 點按下一步來略過</strong>)"
 INSTL_FTP_USER_LABEL="FTP 帳號"
-INSTL_SITE_NAME_LABEL="網站名稱"
 INSTL_VERIFY_FTP_SETTINGS="驗証FTP設定"
 INSTL_FTP_SETTINGS_CORRECT="設定正確"
 INSTL_FTP_USER_DESC="警告！建議保留空白以及每次當要傳輸檔案時都輸入你的FTP帳號。"
@@ -83,7 +73,7 @@ INSTL_ADMIN_PASSWORD_DESC="設定你的超級管理員帳號的密碼，以及
 INSTL_ADMIN_PASSWORD2_LABEL="管理區確認密碼"
 INSTL_ADMIN_USER_LABEL="管理帳號"
 INSTL_ADMIN_USER_DESC="設定超級管理員的帳號。"
-INSTL_SITE_NAME_TITLE="網站名稱"
+INSTL_SITE_NAME_LABEL="網站名稱"
 INSTL_SITE_NAME_DESC="輸入你的Joomla!網站名稱"
 INSTL_SITE_METADESC_LABEL="敘述"
 INSTL_SITE_METADESC_TITLE_LABEL="輸入可以一段足以描述整個網站架構或宗旨的說明文字，以供搜尋引擎參考。這段內容最好可以在 20 個字以內。"
@@ -97,14 +87,14 @@ INSTL_SAMPLE_BROCHURE_SET="小冊子英文(GB)範例資料"
 INSTL_SAMPLE_DATA_SET="預設英文(GB)範例資料"
 INSTL_SAMPLE_LEARN_SET="學習Joomla英文(GB)範例資料"
 INSTL_SAMPLE_TESTING_SET="測試用英文(GB)範例資料"
-
-;Summary view
 INSTL_SITE_INSTALL_SAMPLE_NONE_DESC="安裝Joomla，加上一個選單和登入表單，但不加入任何的內容。"
 INSTL_SAMPLE_BLOG_SET_DESC="安裝Joomla，加入一些文章和部落格相關模組，例如較舊的文章、部落格摘要、最多閱讀的文章。"
 INSTL_SAMPLE_BROCHURE_SET_DESC="安裝Joomla，加入一些頁面(一個包含首頁、關於我們、新聞、聯絡我們的選單)，以及模組例如搜尋、自訂HTML、登入表單。"
 INSTL_SAMPLE_DATA_SET_DESC="安裝Joomla，加入一個頁面(一個選單包含一個連結)，以及模組例如最新文章、登入表單。"
 INSTL_SAMPLE_LEARN_SET_DESC="安裝Joomla，加入說明Joomla是如何運作的範例文章。"
 INSTL_SAMPLE_TESTING_SET_DESC="安裝Joomla，加入所以可能的選單項目，用於協助測試Joomla。"
+
+;Summary view
 INSTL_FINALISATION="最終確認"
 INSTL_SUMMARY_INSTALL="安裝"
 INSTL_SUMMARY_EMAIL_LABEL="Email設定"
@@ -127,11 +117,7 @@ INSTL_EMAIL_HEADING="在下方你可以看到剛剛建立的Joomla!網站的設
 INSTL_EMAIL_NOT_SENT="無法寄送Email"
 
 ;Complete view
-INSTL_COMPLETE="完成"
 INSTL_COMPLETE_ADMINISTRATION_LOGIN_DETAILS="管理區登入詳細資訊"
-INSTL_COMPLETE_DESC1="點按網站按鈕來觀看你的Joomla!網站，或管理區按鈕帶你進入管理區登入頁面。"
-INSTL_COMPLETE_DESC2="在Joomla!社群網站中，你也可以找到所有目前提供的語言包連結列表，以及在joomla.org家族網站中的語言相關資源。"
-INSTL_COMPLETE_DESC3="點按在右邊的按鈕，可以在新的視窗中開啟社群網站。"
 INSTL_COMPLETE_ERROR_FOLDER_ALREADY_REMOVED="安裝資料夾已被刪除。"
 INSTL_COMPLETE_ERROR_FOLDER_DELETE="安裝資料夾無法被刪除。請手動刪除這個資料夾。"
 INSTL_COMPLETE_FOLDER_REMOVED="安裝資料夾已成功刪除"
@@ -149,7 +135,10 @@ INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE="語言"
 INSTL_LANGUAGES_COLUMN_HEADER_VERSION="版本"
 INSTL_LANGUAGES_DESC="Joomla操作介面目前有提供許多語言。點按勾選盒來選擇你想要用的語言，然後點按下一步按鈕安裝它們。<br/>註: 每個語言將會花費約10秒鐘進行下載和安裝的程序。為避免造成下載超時，請不要選擇超過3種語言。"
 INSTL_LANGUAGES_MESSAGE_PLEASE_WAIT="每個語言將會花費超過10秒完成程序<br />請稍等一下，現在將進行下載和安裝語言..."
+INSTL_LANGUAGES_MORE_LANGUAGES="如果你想要安裝更多語言，請按下 '上一步' "
 INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="請選擇一個語言。如果你不需要安裝其他語言，請點按'上一步'按鈕"
+INSTL_LANGUAGES_NO_LANGUAGE_SELECTED="沒有選擇任何一個要安裝的語言。如果你要安裝更多語言，請按下 '上一步'按鈕，然後在清單中選擇所需的語言。"
+
 INSTL_LANGUAGES_WARNING_NO_INTERNET="Joomla!無法連線到語言伺服器。請先結束安裝步驟。"
 INSTL_LANGUAGES_WARNING_NO_INTERNET2="註：你之後可以用Joomla!管理區安裝語言"
 INSTL_LANGUAGES_WARNING_BACK_BUTTON="回到最後一個安裝步驟"
@@ -186,8 +175,6 @@ INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT="安裝本地化內容"
 INSTL_DEFAULTLANGUAGE_INSTALL_LOCALISED_CONTENT_DESC="如果啟用的話，Joomla將會自動地為每一個安裝的語言建立一個內容分類。此外也會在每個分類中建立一個精選範例文章。"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_TITLE="多國語言"
 INSTL_DEFAULTLANGUAGE_MULTILANGUAGE_DESC="這個區域允許你自動地啟用Joomla!的多國語言功能"
-INSTL_DEFAULTLANGUAGE_NOTE="註: 當你點按下一步按鈕後，你將導向安裝步驟的最後頁面，在那頁面將會指示你刪除安裝的資料夾。"
-INSTL_DEFAULTLANGUAGE_TABLE_HEADER="選擇你的預設語言"
 INSTL_DEFAULTLANGUAGE_TRY_LATER="你之後可以用Joomla!管理區安裝它"
 
 ; IMPORTANT NOTE FOR TRANSLATORS: Do not literally translate this line, instead add the localised name of the language. For example Spanish will be Espa簽ol
@@ -200,7 +187,6 @@ INSTL_DATABASE_EMPTY_NAME=""
 INSTL_DATABASE_ERROR_BACKINGUP="備份資料庫時發生錯誤。"
 INSTL_DATABASE_ERROR_CREATE="當嘗試建立資料庫 %s 時發生錯誤。<br />這個帳號可能沒有足夠的建立資料庫的權限。 必要的資料庫可能需要在你安裝Joomla!前先另外建立好。"
 INSTL_DATABASE_ERROR_DELETE="刪除資料表時發生錯誤。"
-INSTL_DATABASE_ERROR_INITIALISE_SCHEMA="初始化資料庫綱要(schema)版本編號發生錯誤"
 INSTL_DATABASE_FIELD_VALUE_REMOVE="移除"
 INSTL_DATABASE_FIELD_VALUE_BACKUP="備份"
 INSTL_DATABASE_FIX_TOO_LONG="MySQL資料表前綴字最大長度為15字元。"
@@ -211,10 +197,9 @@ INSTL_DATABASE_INVALID_SQLSRV_VERSION="你需要SQL Server 2008 R2 (10.50.1600.1
 INSTL_DATABASE_INVALID_SQLZURE_VERSION="你需要SQL Server 2008 R2 (10.50.1600.1) 或更高版本才能繼續安裝。你目前的版本是: %s"
 INSTL_DATABASE_INVALID_TYPE="請選擇資料庫類型"
 INSTL_DATABASE_NAME_TOO_LONG="MySQL資料庫名稱最大長度為64字元。"
-INSTL_DATABASE_PREFIX_INVALID_CHARS="MySQL資料表前綴字必需以字元開頭，而且接下來只能用字元、數字或底線。"
 INSTL_DATABASE_INVALID_NAME="MySQL在5.1.6版本之前可能無法在名稱中包含週期，或其他"_QQ_"特別"_QQ_"字元。你目前使用的版本是: %s"
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL資料庫名稱和資料表名稱有可能以空白開頭或結尾。"
-INSTL_DATABASE_NAME_INVALID_CHAR="沒有MySQL識別子可以包含NUL ASCII(0x00)。"
+INSTL_DATABASE_NAME_INVALID_CHAR="沒有MySQL識別子可以包含NULL ASCII(0x00)。"
 INSTL_DATABASE_FILE_DOES_NOT_EXIST="檔案 %s 不存在"
 
 ;controllers
@@ -246,8 +231,6 @@ INSTL_FTP_NOSYST="指令 "_QQ_"SYST"_QQ_" 執行失敗。"
 INSTL_FTP_UNABLE_DETECT_ROOT_FOLDER="無法自動偵測FTP根目錄。"
 
 ;others
-INSTL_ADVANCED_SETTINGS="進階設定"
-INSTL_BASIC_SETTINGS="基本設定"
 INSTL_CONFPROBLEM="你的設定檔案或目錄目前是無法寫入的，或是建立設定檔案時發生問題。你將需要手動上傳以下的程式碼。 點一下文字區域來選擇所有的程式碼，然後貼到一個新的文字檔案。命名這個檔案為'configuration.php'，然後上傳到你的網站根目錄中。"
 INSTL_DATABASE_SUPPORT="資料庫支援："
 INSTL_DISPLAY_ERRORS="顯示錯誤"
@@ -255,9 +238,7 @@ INSTL_ERROR_DB="增加資料庫資料時，發生錯誤: %s"
 INSTL_ERROR_INITIALISE_SCHEMA="無法初始化資料庫綱要(schema)"
 INSTL_FILE_UPLOADS="檔案上傳"
 INSTL_GNU_GPL_LICENSE="GNU General Public License"
-INSTL_INSTALLATION="安裝"
 INSTL_JSON_SUPPORT_AVAILABLE="JSON支援"
-INSTL_LICENSE="授權規定"
 INSTL_MAGIC_QUOTES_GPC="Magic Quotes GPC關閉"
 INSTL_MAGIC_QUOTES_RUNTIME="Magic Quotes Runtime"
 INSTL_MB_LANGUAGE_IS_DEFAULT="MB Language為預設"
@@ -279,7 +260,6 @@ INSTL_PROCESS_BUSY="進程正在進行中。請稍後..."
 
 ;Global strings
 JADMINISTRATOR="管理區"
-JADVANCED="進階功能"
 JCHECK_AGAIN="重新檢查"
 JERROR="錯誤"
 JEMAIL="Email"
@@ -300,16 +280,17 @@ JUSERNAME="帳號"
 JYES="是"
 
 ; Framework strings necessary when no lang pack is available
-JLIB_DATABASE_ERROR_DATABASE="有一個資料庫錯誤發生"
 JLIB_DATABASE_ERROR_CONNECT_MYSQL="無法連接MySQL."
+JLIB_DATABASE_ERROR_DATABASE="有一個資料庫錯誤發生"
 JLIB_DATABASE_ERROR_LOAD_DATABASE_DRIVER="無法載入資料庫驅動程式: %s"
 JLIB_ENVIRONMENT_SESSION_EXPIRED="你的連線階段已經過期，請重新整理這個頁面."
 JLIB_FILESYSTEM_ERROR_COPY_FAILED="複製失敗"
 JLIB_FILESYSTEM_ERROR_PATH_IS_NOT_A_FOLDER_FILES="JFolder: :files: 路徑不是一個資料夾. 路徑: %s"
 JLIB_FORM_FIELD_INVALID="不合法的欄位:&#160;"
+JLIB_FORM_VALIDATE_FIELD_INVALID="不合法的欄位: %s"
 JLIB_FORM_VALIDATE_FIELD_REQUIRED="必填欄位: %s"
 JLIB_INSTALLER_ERROR_FAIL_COPY_FILE="JInstaller: :Install: 無法複製檔案從 %1$s 到 %2$s."
-JLIB_FORM_VALIDATE_FIELD_INVALID="不合法的欄位: %s"
+JLIB_INSTALLER_NOT_ERROR="如果錯誤是和TinyMCE語言檔案有關，這並不會影響到語言檔的安裝。有些給Joomla! 3.2.0版本之前的語言包，會試著安裝額外的TinyMCE語言檔。但現在已經包含在核心主程式中，所以不需要再安裝。"
 JLIB_UTIL_ERROR_CONNECT_DATABASE="JDatabase: :getInstance: 無法連接到資料庫 <br />joomla.library: %1$s - %2$s"
 
 ; Strings for the language debugger
diff --git a/installation/language/zh-TW/zh-TW.xml b/installation/language/zh-TW/zh-TW.xml
index 5001b92..77bc381 100644
--- a/installation/language/zh-TW/zh-TW.xml
+++ b/installation/language/zh-TW/zh-TW.xml
@@ -8,7 +8,7 @@
 	<author>Joomla! Taiwan</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description></description>
 	<files>
diff --git a/installation/model/configuration.php b/installation/model/configuration.php
index f4d93f8..83cbbf5 100644
--- a/installation/model/configuration.php
+++ b/installation/model/configuration.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/model/database.php b/installation/model/database.php
index 72f503b..92eb580 100644
--- a/installation/model/database.php
+++ b/installation/model/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -135,7 +135,7 @@ public function initialise($options)
 		// Validate database table prefix.
 		if (!preg_match('#^[a-zA-Z]+[a-zA-Z0-9_]*$#', $options->db_prefix))
 		{
-			$app->enqueueMessage(JText::_('INSTL_DATABASE_PREFIX_INVALID_CHARS'), 'notice');
+			$app->enqueueMessage(JText::_('INSTL_DATABASE_PREFIX_MSG'), 'notice');
 			return false;
 		}
 
diff --git a/installation/model/fields/language.php b/installation/model/fields/language.php
index a9fc871..0a8fb4c 100644
--- a/installation/model/fields/language.php
+++ b/installation/model/fields/language.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/model/fields/prefix.php b/installation/model/fields/prefix.php
index f759d13..d64ca11 100644
--- a/installation/model/fields/prefix.php
+++ b/installation/model/fields/prefix.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/model/fields/sample.php b/installation/model/fields/sample.php
index fc5bcab..8267a18 100644
--- a/installation/model/fields/sample.php
+++ b/installation/model/fields/sample.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/model/ftp.php b/installation/model/ftp.php
index fb93e00..d339fe4 100644
--- a/installation/model/ftp.php
+++ b/installation/model/ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/model/languages.php b/installation/model/languages.php
index 213661a..4761dee 100644
--- a/installation/model/languages.php
+++ b/installation/model/languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -549,7 +549,14 @@ public function enablePlugin($pluginName)
 		// Store language filter plugin parameters
 		if ($pluginName == 'plg_system_languagefilter')
 		{
-			$params = '{"detect_browser":"0","automatic_change":"1","item_associations":"1","remove_default_prefix":"0","lang_cookie":"0","alternate_meta":"1"}';
+			$params = '{'
+					. '"detect_browser":"0",'
+					. '"automatic_change":"1",'
+					. '"item_associations":"1",'
+					. '"remove_default_prefix":"0",'
+					. '"lang_cookie":"0",'
+					. '"alternate_meta":"1"'
+				. '}';
 			$query
 				->clear()
 				->update('#__extensions')
diff --git a/installation/model/rules/prefix.php b/installation/model/rules/prefix.php
index 19a712b..c16c420 100644
--- a/installation/model/rules/prefix.php
+++ b/installation/model/rules/prefix.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/model/setup.php b/installation/model/setup.php
index 843de0d..7b48902 100644
--- a/installation/model/setup.php
+++ b/installation/model/setup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/response/json.php b/installation/response/json.php
index 4b463d5..7eaa02f 100644
--- a/installation/response/json.php
+++ b/installation/response/json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  Response
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index 9de87f4..1ee6850 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -556,7 +556,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (17, 'com_newsfeeds', 'component', 'com_newsfeeds', '', 1, 1, 1, 0, '{"name":"com_newsfeeds","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_NEWSFEEDS_XML_DESCRIPTION","group":""}', '{"show_feed_image":"1","show_feed_description":"1","show_item_description":"1","feed_word_count":"0","show_headings":"1","show_name":"1","show_articles":"0","show_link":"1","show_description":"1","show_description_image":"1","display_num":"","show_pagination_limit":"1","show_pagination":"1","show_pagination_results":"1","show_cat_items":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (18, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, '{"name":"com_plugins","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_PLUGINS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '{"name":"com_search","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_SEARCH_XML_DESCRIPTION","group":""}', '{"enabled":"0","show_date":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(20, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '{"name":"com_templates","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TEMPLATES_XML_DESCRIPTION","group":""}', '{"template_positions_display":"0","upload_limit":"2","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(20, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '{"name":"com_templates","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TEMPLATES_XML_DESCRIPTION","group":""}', '{"template_positions_display":"1","upload_limit":"2","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (21, 'com_weblinks', 'component', 'com_weblinks', '', 1, 1, 1, 0, '{"name":"com_weblinks","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_WEBLINKS_XML_DESCRIPTION","group":""}', '{"show_comp_description":"1","comp_description":"","show_link_hits":"1","show_link_description":"1","show_other_cats":"0","show_headings":"0","show_numbers":"0","show_report":"1","count_clicks":"1","target":"0","link_icons":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (22, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '{"name":"com_content","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CONTENT_XML_DESCRIPTION","group":""}', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","info_block_position":"0","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"0","readmore_limit":"100","show_tags":"1","show_icons":"1","show_print_icon":"1","show_email_icon":"1","show_hits":"1","show_noauth":"0","urls_position":"0","show_publishing_options":"1","show_article_options":"1","save_history":"0","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_heading_title_text":"1","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0","feed_show_readmore":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (23, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '{"name":"com_config","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CONFIG_XML_DESCRIPTION","group":""}', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"13":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -571,7 +571,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (100, 'PHPMailer', 'library', 'phpmailer', '', 0, 1, 1, 1, '{"name":"PHPMailer","type":"library","creationDate":"2001","author":"PHPMailer","copyright":"(c) 2001-2003, Brent R. Matzelle, (c) 2004-2009, Andy Prevost. All Rights Reserved., (c) 2010-2013, Jim Jagielski. All Rights Reserved.","authorEmail":"jimjag@gmail.com","authorUrl":"https:\\/\\/github.com\\/PHPMailer\\/PHPMailer","version":"5.2.6","description":"LIB_PHPMAILER_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (101, 'SimplePie', 'library', 'simplepie', '', 0, 1, 1, 1, '{"name":"SimplePie","type":"library","creationDate":"2004","author":"SimplePie","copyright":"Copyright (c) 2004-2009, Ryan Parman and Geoffrey Sneddon","authorEmail":"","authorUrl":"http:\\/\\/simplepie.org\\/","version":"1.2","description":"LIB_SIMPLEPIE_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '{"name":"phputf8","type":"library","creationDate":"2006","author":"Harry Fuecks","copyright":"Copyright various authors","authorEmail":"hfuecks@gmail.com","authorUrl":"http:\\/\\/sourceforge.net\\/projects\\/phputf8","version":"0.5","description":"LIB_PHPUTF8_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '{"name":"Joomla! Platform","type":"library","creationDate":"2008","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"http:\\/\\/www.joomla.org","version":"13.1","description":"LIB_JOOMLA_XML_DESCRIPTION","group":""}', '{"mediaversion":"bc168c8b2dfe77ff3f6a16ed97e7bd72"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '{"name":"Joomla! Platform","type":"library","creationDate":"2008","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"http:\\/\\/www.joomla.org","version":"13.1","description":"LIB_JOOMLA_XML_DESCRIPTION","group":""}', '{"mediaversion":"d8d3867ed63756672f3a0911a9b5d1de"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '{"name":"IDNA Convert","type":"library","creationDate":"2004","author":"phlyLabs","copyright":"2004-2011 phlyLabs Berlin, http:\\/\\/phlylabs.de","authorEmail":"phlymail@phlylabs.de","authorUrl":"http:\\/\\/phlylabs.de","version":"0.8.0","description":"LIB_IDNA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"name":"FOF","type":"library","creationDate":"2013-12-14","author":"Nicholas K. Dionysopoulos \\/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\\/\\/www.akeebabackup.com","version":"2.1.1","description":"LIB_FOF_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (200, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '{"name":"mod_articles_archive","type":"module","creationDate":"July 2006","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters.\\n\\t\\tAll rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_ARTICLES_ARCHIVE_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -671,11 +671,13 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '{"name":"English (United Kingdom)","type":"language","creationDate":"2013-03-07","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.1","description":"en-GB site language","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '{"name":"English (United Kingdom)","type":"language","creationDate":"2013-03-07","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.1","description":"en-GB administrator language","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '{"name":"files_joomla","type":"file","creationDate":"December 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.1","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '{"name":"files_joomla","type":"file","creationDate":"December 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.2","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (10000, 't3_blank', 'template', 't3_blank', '', 0, 1, 1, 0, '{"name":"t3_blank","type":"template","creationDate":"23 Jan 2014","author":"JoomlArt.com","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.t3-framework.org","version":"2.1.0","description":"\\n\\t\\t\\n\\t\\t<div align=\\"center\\">\\n\\t\\t\\t<div class=\\"alert alert-success\\" style=\\"background-color:#DFF0D8;border-color:#D6E9C6;color: #468847;padding: 1px 0;\\">\\n\\t\\t\\t\\t<a href=\\"http:\\/\\/t3-framework.org\\/\\"><img src=\\"http:\\/\\/joomlart.s3.amazonaws.com\\/images\\/jat3v3-documents\\/message-installation\\/logo.png\\" alt=\\"some_text\\" width=\\"300\\" height=\\"99\\"><\\/a>\\n\\t\\t\\t\\t<h4><a href=\\"http:\\/\\/t3-framework.org\\/\\" title=\\"\\">Home<\\/a> | <a href=\\"http:\\/\\/demo.t3-framework.org\\/\\" title=\\"\\">Demo<\\/a> | <a href=\\"http:\\/\\/t3-framework.org\\/documentation\\" title=\\"\\">Document<\\/a> | <a href=\\"https:\\/\\/github.com\\/t3framework\\/t3\\/blob\\/master\\/CHANGELOG.md\\" title=\\"\\">Changelog<\\/a><\\/h4>\\n\\t\\t\\t\\t<p> <\\/p>\\n\\t\\t\\t\\t<span style=\\"color:#FF0000\\">Note: T3 blank requires T3 plugin to be installed and enabled.<\\/span><p><\\/p>\\n\\t\\t\\t\\t<p>Copyright 2004 - 2013 <a href=\'http:\\/\\/www.joomlart.com\\/\' title=\'Visit Joomlart.com!\'>JoomlArt.com<\\/a>.<\\/p>\\n\\t\\t\\t<\\/div>\\n\\t\\t\\t<style>table.adminform{width: 100%;}<\\/style>\\n\\t\\t<\\/div>\\n\\t\\t\\n\\t","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (10001, 'T3 Framework', 'plugin', 't3', 'system', 0, 1, 1, 0, '{"name":"T3 Framework","type":"plugin","creationDate":"23 Jan 2014","author":"JoomlArt.com","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"info@joomlart.com","authorUrl":"http:\\/\\/www.t3-framework.org","version":"2.1.0","description":"\\n\\t\\n\\t<div align=\\"center\\">\\n\\t\\t<div class=\\"alert alert-success\\" style=\\"background-color:#DFF0D8;border-color:#D6E9C6;color: #468847;padding: 1px 0;\\">\\n\\t\\t\\t\\t<a href=\\"http:\\/\\/t3-framework.org\\/\\"><img src=\\"http:\\/\\/joomlart.s3.amazonaws.com\\/images\\/jat3v3-documents\\/message-installation\\/logo.png\\" alt=\\"some_text\\" width=\\"300\\" height=\\"99\\"><\\/a>\\n\\t\\t\\t\\t<h4><a href=\\"http:\\/\\/t3-framework.org\\/\\" title=\\"\\">Home<\\/a> | <a href=\\"http:\\/\\/demo.t3-framework.org\\/\\" title=\\"\\">Demo<\\/a> | <a href=\\"http:\\/\\/t3-framework.org\\/documentation\\" title=\\"\\">Document<\\/a> | <a href=\\"https:\\/\\/github.com\\/t3framework\\/t3\\/blob\\/master\\/CHANGELOG.md\\" title=\\"\\">Changelog<\\/a><\\/h4>\\n\\t\\t<p> <\\/p>\\n\\t\\t<p>Copyright 2004 - 2013 <a href=\'http:\\/\\/www.joomlart.com\\/\' title=\'Visit Joomlart.com!\'>JoomlArt.com<\\/a>.<\\/p>\\n\\t\\t<\\/div>\\n     <style>table.adminform{width: 100%;}<\\/style>\\n\\t <\\/div>\\n\\t\\t\\n\\t","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (10002, 't3_bs3_blank', 'template', 't3_bs3_blank', '', 0, 1, 1, 0, '{"name":"t3_bs3_blank","type":"template","creationDate":"23 Jan 2014","author":"JoomlArt.com","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.t3-framework.org","version":"2.1.0","description":"\\n\\t\\t\\n\\t\\t<div align=\\"center\\">\\n\\t\\t\\t<div class=\\"alert alert-success\\" style=\\"background-color:#DFF0D8;border-color:#D6E9C6;color: #468847;padding: 1px 0;\\">\\n\\t\\t\\t\\t<a href=\\"http:\\/\\/t3-framework.org\\/\\"><img src=\\"http:\\/\\/joomlart.s3.amazonaws.com\\/images\\/jat3v3-documents\\/message-installation\\/logo.png\\" alt=\\"some_text\\" width=\\"300\\" height=\\"99\\"><\\/a>\\n\\t\\t\\t\\t<h4><a href=\\"http:\\/\\/t3-framework.org\\/\\" title=\\"\\">Home<\\/a> | <a href=\\"http:\\/\\/demo.t3-framework.org\\/\\" title=\\"\\">Demo<\\/a> | <a href=\\"http:\\/\\/t3-framework.org\\/documentation\\" title=\\"\\">Document<\\/a> | <a href=\\"https:\\/\\/github.com\\/t3framework\\/t3\\/blob\\/master\\/CHANGELOG.md\\" title=\\"\\">Changelog<\\/a><\\/h4>\\n\\t\\t\\t\\t<p> <\\/p>\\n\\t\\t\\t\\t<span style=\\"color:#FF0000\\">Note: T3 blank requires T3 plugin to be installed and enabled.<\\/span><p><\\/p>\\n\\t\\t\\t\\t<p>Copyright 2004 - 2013 <a href=\'http:\\/\\/www.joomlart.com\\/\' title=\'Visit Joomlart.com!\'>JoomlArt.com<\\/a>.<\\/p>\\n\\t\\t\\t<\\/div>\\n\\t\\t\\t<style>table.adminform{width: 100%;}<\\/style>\\n\\t\\t<\\/div>\\n\\t\\t\\n\\t","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(10003, 'com_jaextmanager', 'component', 'com_jaextmanager', '', 1, 1, 1, 0, '{"name":"com_jaextmanager","type":"component","creationDate":"May 2013","author":"JoomlArt","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.joomlart.com","version":"2.5.7","description":"JA Extension Manager Component","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(10003, 'com_jaextmanager', 'component', 'com_jaextmanager', '', 1, 1, 1, 0, '{"name":"com_jaextmanager","type":"component","creationDate":"May 2013","author":"JoomlArt","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.joomlart.com","version":"2.5.7","description":"JA Extension Manager Component","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(10004, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 0, 1, 0, '{"name":"plg_content_contact","type":"plugin","creationDate":"January 2014","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.2","description":"PLG_CONTENT_CONTACT_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(10005, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 0, '{"name":"PHPass","type":"library","creationDate":"2004-2006","author":"Solar Designer","copyright":"","authorEmail":"solar@openwall.com","authorUrl":"http:\\/\\/www.openwall.com\\/phpass\\/","version":"0.3","description":"LIB_PHPASS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
 
 DROP TABLE IF EXISTS `#__finder_filters`;
 CREATE TABLE `#__finder_filters` (
@@ -1958,16 +1960,17 @@ CREATE TABLE `#__update_sites` (
   `location` text NOT NULL,
   `enabled` int(11) DEFAULT '0',
   `last_check_timestamp` bigint(20) DEFAULT '0',
+  `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_site_id`)
 ) ENGINE=InnoDB  COMMENT='Update Sites';
 
-INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES
-(1, 'Joomla Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 1390472558),
-(2, 'Joomla Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 1390472558),
-(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 1390472558),
-(4, '', 'collection', 'http://update.joomlart.com/service/tracking/list.xml', 1, 1390472558),
-(5, 'WebInstaller Update Site', 'extension', 'http://appscdn.joomla.org/webapps/jedapps/webinstaller.xml', 1, 1390472558);
-INSERT IGNORE INTO `#__update_sites` VALUES
+INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`, `extra_query`) VALUES
+(1, 'Joomla Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 1391758315, ''),
+(2, 'Joomla Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 1391758315, ''),
+(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 1391758315, ''),
+(4, '', 'collection', 'http://update.joomlart.com/service/tracking/list.xml', 1, 1391758315, ''),
+(5, 'WebInstaller Update Site', 'extension', 'http://appscdn.joomla.org/webapps/jedapps/webinstaller.xml', 1, 1391758315, '');
+INSERT IGNORE INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES
 (1, 'Joomla Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 0),
 (2, 'Joomla Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0),
 (3,'Accredited Joomla! Translations','collection','http://update.joomla.org/language/translationlist.xml', 1 ,0);
@@ -1993,10 +1996,11 @@ CREATE TABLE `#__updates` (
   `type` varchar(20) DEFAULT '',
   `folder` varchar(20) DEFAULT '',
   `client_id` tinyint(3) DEFAULT '0',
-  `version` varchar(10) DEFAULT '',
+  `version` varchar(32) DEFAULT '',
   `data` text NOT NULL,
   `detailsurl` text NOT NULL,
   `infourl` text NOT NULL,
+  `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_id`)
 ) ENGINE=InnoDB  COMMENT='Available Updates';
 
diff --git a/installation/sql/mysql/sample_data.sql b/installation/sql/mysql/sample_data.sql
index fb86cc4..97f58f0 100644
--- a/installation/sql/mysql/sample_data.sql
+++ b/installation/sql/mysql/sample_data.sql
@@ -571,7 +571,7 @@ INSERT INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext`, `full
 (21, 119, 'Getting Help', 'getting-help', '<p><img class="image-left" src="administrator/templates/hathor/images/header/icon-48-help_header.png" border="0" /> There are lots of places you can get help with Joomla!. In many places in your site administrator you will see the help icon. Click on this for more information about the options and functions of items on your screen. Other places to get help are:</p>\r\n<ul>\r\n<li><a href="http://forum.joomla.org">Support Forums</a></li>\r\n<li><a href="http://docs.joomla.org">Documentation</a></li>\r\n<li><a href="http://resources.joomla.org">Professionals</a></li>\r\n<li><a href="http://shop.joomla.org/amazoncom-bookstores.html">Books</a></li>\r\n</ul>', '', 1, 19, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_readmore":"","show_print_icon":"","show_email_icon":"","show_hits":"","page_title":"","alternative_readmore":"","layout":""}', 1, 8, '', '', 1, 0, '', 0, '*', ''),
 (22, 120, 'Getting Started', 'getting-started', '<p>It\'s easy to get started creating your website. Knowing some of the basics will help.</p>\r\n<h3>What is a Content Management System?</h3>\r\n<p>A content management system is software that allows you to create and manage webpages easily by separating the creation of your content from the mechanics required to present it on the web.</p>\r\n<p>In this site, the content is stored in a <em>database</em>. The look and feel are created by a <em>template</em>. The Joomla! software brings together the template and the content to create web pages.</p>\r\n<h3>Site and Administrator</h3>\r\n<p>Your site actually has two separate sites. The site (also called the front end) is what visitors to your site will see. The administrator (also called the back end) is only used by people managing your site. You can access the administrator by clicking the "Site Administrator" link on the "This Site" menu or by adding /administrator to the end of you domain name.</p>\r\n<p>Log in to the administrator using the username and password created during the installation of Joomla.</p>\r\n<h3>Logging in</h3>\r\n<p>To login to the front end of your site use the login form or the login menu link on the "This Site" menu. Use the user name and password that were created as part of the installation process. Once logged-in you will be able to create and edit articles.</p>\r\n<p>In managing your site, you will be able to create content that only logged-in users are able to see.</p>\r\n<h3>Creating an article</h3>\r\n<p>Once you are logged-in, a new menu will be visible. To create a new article, click on the "submit article" link on that menu.</p>\r\n<p>The new article interface gives you a lot of options, but all you need to do is add a title and put something in the content area. To make it easy to find, set the state to published and put it in the Joomla category.</p>\r\n<div>You can edit an existing article by clicking on the edit icon (this only displays to users who have the right to edit).</div>\r\n<h3>Learn more</h3>\r\n<p>There is much more to learn about how to use Joomla! to create the web site you envision. You can learn much more at the <a href="http://docs.joomla.org">Joomla! documentation site</a> and on the<a href="http://forum.joomla.org"> Joomla! forums</a>.</p>', '', 1, 19, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 9, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
 (23, 121, 'Happy Orange Orchard', 'happy-orange-orchard', '<p>At our orchard we grow the world\'s best oranges as well as other citrus fruit such as lemons and grapefruit. Our family has been tending this orchard for generations.</p>', '', 1, 30, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '', '', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_readmore":"","show_print_icon":"","show_email_icon":"","show_hits":"","page_title":"","alternative_readmore":"","layout":""}', 1, 2, '', '', 1, 0, '', 0, '*', ''),
-(24, 122, 'Joomla! Testing', 'joomla', '<p>Thanks for helping us to test Joomla!</p>\r\n<p>We\'re getting ready for the release of Joomla 3.0 and we appreciate you helping us find and fix problems as we work.</p>\r\n<p>If you haven\'t done testing before here are some tips.</p>\r\n<ul>\r\n<li>Don\'t delete the installation folder when you finish installing! While we\'re working we turn that security feature off to make it easier to test.</li>\r\n<li>Go to global configuration and set Error Reporting to Development (that\'s on the server tab) and enable both debugging and language debugging (those are on the system tab). Don\'t worry when you see ** around words --that means Joomla translation is doing its job.</li>\r\n</ul>\r\n<p>How to test</p>\r\n<ul>\r\n<li>First, do the things you normally do and see if you spot any problems.</li>\r\n<li>Look at all of the front end views and record any problems</li>\r\n<li>Look at all the back end views and report any problems</li>\r\n<li>See more ideas below</li>\r\n</ul>\r\n<p>What to look for</p>\r\n<ul>\r\n<li>Any error messages that say things like Fatal Error or Strict or similar things that indicate that something is not working correctly.</li>\r\n<li>Untranslated strings. You will know these because they look like this: ?STRING_HERE?</li>\r\n<li>Problems of rendering--items not aligned correctly, missing or wrong images, pages that just don\'t look right.</li>\r\n<li>Unexpected behavior--anything that is working differently than it did in 2.5. </li>\r\n</ul>\r\n<p>Report problems</p>\r\n<p>If you find a problem please report it to the <a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&amp;tracker_id=8103" target="_blank">CMS Issue Tracker</a>. You will need to register for a joomlacode.org account if you don\'t have one.</p>\r\n<p> More Testing Ideas</p>\r\n<ul>\r\n<li>Pick one module or view and test all of the parameters. </li>\r\n<li>Install an extension and see if anything breaks (report to the developer unless you are positive it is a core bug).</li>\r\n<li>Turn on caching with different options</li>\r\n<li>Try different session options</li>\r\n<li>Install a language and test all the layouts.</li>\r\n<li>Try different environments (like  different servers which may have different version of PHP) or try you have IIS  with MySQLi or SqlSrv.  With millions of users Joomla needs to be ready for unusual environments.</li>\r\n<li>Try with SEF URLS on or off and also with Apache rewrite on or off (if you are on Apache).</li>\r\n<li>Try different combinations of browsers (Chrome, IE, FireFox, Opera to start) and  operating systems (Mac, Windows, Linux). </li>\r\n<li>Yes grammar and spelling errors are bugs too -- just keep in mind that we use British spelling.</li>\r\n<li>Visit the <a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&amp;tracker_id=8549" target="_blank">Feature Tracker</a> and test a new feature.</li>\r\n</ul>\r\n<p> </p>', '', 1, 19, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":null,"urlatext":"","targeta":"","urlb":null,"urlbtext":"","targetb":"","urlc":null,"urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","urls_position":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 2, '', '', 1, 1532, '{"robots":"","author":"","rights":"","xreference":""}', 1, '*', ''),
+(24, 122, 'Joomla! Testing', 'joomla', '<p>Thanks for helping us to test Joomla!</p>\r\n<p>We\'re getting ready for the release of Joomla 3.0 and we appreciate you helping us find and fix problems as we work.</p>\r\n<p>If you haven\'t done testing before here are some tips.</p>\r\n<ul>\r\n<li>Don\'t delete the installation folder when you finish installing! While we\'re working we turn that security feature off to make it easier to test.</li>\r\n<li>Go to global configuration and set Error Reporting to Development (that\'s on the server tab) and enable both debugging and language debugging (those are on the system tab). Don\'t worry when you see ** around words --that means Joomla translation is doing its job.</li>\r\n</ul>\r\n<p>How to test</p>\r\n<ul>\r\n<li>First, do the things you normally do and see if you spot any problems.</li>\r\n<li>Look at all of the front end views and record any problems</li>\r\n<li>Look at all the back end views and report any problems</li>\r\n<li>See more ideas below</li>\r\n</ul>\r\n<p>What to look for</p>\r\n<ul>\r\n<li>Any error messages that say things like Fatal Error or Strict or similar things that indicate that something is not working correctly.</li>\r\n<li>Untranslated strings. You will know these because they look like this: ?STRING_HERE?</li>\r\n<li>Problems of rendering--items not aligned correctly, missing or wrong images, pages that just don\'t look right.</li>\r\n<li>Unexpected behavior--anything that is working differently than it did in 2.5. </li>\r\n</ul>\r\n<p>Report problems</p>\r\n<p>If you find a problem please report it to the <a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&amp;tracker_id=8103" target="_blank">CMS Issue Tracker</a>. You will need to register for a joomlacode.org account if you don\'t have one.</p>\r\n<p> More Testing Ideas</p>\r\n<ul>\r\n<li>Pick one module or view and test all of the parameters. </li>\r\n<li>Install an extension and see if anything breaks (report to the developer unless you are positive it is a core bug).</li>\r\n<li>Turn on caching with different options</li>\r\n<li>Try different session options</li>\r\n<li>Install a language and test all the layouts.</li>\r\n<li>Try different environments (like  different servers which may have different version of PHP) or try you have IIS  with MySQLi or SqlSrv.  With millions of users Joomla needs to be ready for unusual environments.</li>\r\n<li>Try with SEF URLS on or off and also with Apache rewrite on or off (if you are on Apache).</li>\r\n<li>Try different combinations of browsers (Chrome, IE, FireFox, Opera to start) and  operating systems (Mac, Windows, Linux). </li>\r\n<li>Yes grammar and spelling errors are bugs too -- just keep in mind that we use British spelling.</li>\r\n<li>Visit the <a href="http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&amp;tracker_id=8549" target="_blank">Feature Tracker</a> and test a new feature.</li>\r\n</ul>\r\n<p> </p>', '', 1, 19, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":null,"urlatext":"","targeta":"","urlb":null,"urlbtext":"","targetb":"","urlc":null,"urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","urls_position":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 2, '', '', 1, 1533, '{"robots":"","author":"","rights":"","xreference":""}', 1, '*', ''),
 (25, 123, 'Koala', 'koala', '<p> </p>\r\n<p> </p>\r\n<p> </p>\r\n<p> </p>\r\n<p> </p>\r\n', '\r\n<p> </p>', 1, 72, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"images\\/sampledata\\/parks\\/animals\\/180px_koala_ag1.jpg","float_intro":"","image_intro_alt":"Koala  Thumbnail","image_intro_caption":"","image_fulltext":"images\\/sampledata\\/parks\\/animals\\/800px_koala_ag1.jpg","float_fulltext":"","image_fulltext_alt":"Koala Climbing Tree","image_fulltext_caption":"Source: http:\\/\\/commons.wikimedia.org\\/wiki\\/File:Koala-ag1.jpg Author: Arnaud Gaillard License: Creative Commons Share Alike Attribution Generic 1.0"}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 2, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', '');
 INSERT INTO `#__content` (`id`, `asset_id`, `title`, `alias`, `introtext`, `fulltext`, `state`, `catid`, `created`, `created_by`, `created_by_alias`, `modified`, `modified_by`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `images`, `urls`, `attribs`, `version`, `ordering`, `metakey`, `metadesc`, `access`, `hits`, `metadata`, `featured`, `language`, `xreference`) VALUES
 (26, 124, 'Language Switcher', 'language-switcher', '<p>The language switcher module allows you to take advantage of the language tags that are available when content, modules and menu links are created.</p>\r\n<p>This module displays a list of available Content Languages for switching between them.</p>\r\n<p>When switching languages, it redirects to the Home page, or associated menu item, defined for the chosen language. Thereafter, the navigation will be the one defined for that language.</p>\r\n<p><strong>The language filter plugin must be enabled for this module to work properly.</strong></p>\r\n<p><strong></strong> <a href="http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help31:Extensions_Module_Manager_Language_Switcher" title="Language Switcher Module">Help</a></p>\r\n<p>To view an example of the language switch moduler module, go to the site administrator and enable the language filter plugin and the language switcher module labelled "language switcher" and visit the fruit shop or park sample sites. Then follow<a href="http://docs.joomla.org/Language_Switcher_Tutorial"> the instructions in this tutorial</a>.</p>', '', 1, 67, '2011-01-01 00:00:01', 42, 'Joomla', '0000-00-00 00:00:00', 0, 0, '0000-00-00 00:00:00', '2011-01-01 00:00:01', '0000-00-00 00:00:00', '{"image_intro":"","float_intro":"","image_intro_alt":"","image_intro_caption":"","image_fulltext":"","float_fulltext":"","image_fulltext_alt":"","image_fulltext_caption":""}', '{"urla":"","urlatext":"","targeta":"","urlb":"","urlbtext":"","targetb":"","urlc":"","urlctext":"","targetc":""}', '{"show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_vote":"","show_hits":"","show_noauth":"","alternative_readmore":"","article_layout":"","show_publishing_options":"","show_article_options":"","show_urls_images_backend":"","show_urls_images_frontend":""}', 1, 3, '', '', 1, 0, '{"robots":"","author":"","rights":"","xreference":""}', 0, '*', ''),
@@ -775,7 +775,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (17, 'com_newsfeeds', 'component', 'com_newsfeeds', '', 1, 1, 1, 0, '{"name":"com_newsfeeds","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_NEWSFEEDS_XML_DESCRIPTION","group":""}', '{"show_feed_image":"1","show_feed_description":"1","show_item_description":"1","feed_word_count":"0","show_headings":"1","show_name":"1","show_articles":"0","show_link":"1","show_description":"1","show_description_image":"1","display_num":"","show_pagination_limit":"1","show_pagination":"1","show_pagination_results":"1","show_cat_items":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (18, 'com_plugins', 'component', 'com_plugins', '', 1, 1, 1, 1, '{"name":"com_plugins","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_PLUGINS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (19, 'com_search', 'component', 'com_search', '', 1, 1, 1, 0, '{"name":"com_search","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_SEARCH_XML_DESCRIPTION","group":""}', '{"enabled":"0","show_date":"1"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(20, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '{"name":"com_templates","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TEMPLATES_XML_DESCRIPTION","group":""}', '{"template_positions_display":"0","upload_limit":"2","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(20, 'com_templates', 'component', 'com_templates', '', 1, 1, 1, 1, '{"name":"com_templates","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_TEMPLATES_XML_DESCRIPTION","group":""}', '{"template_positions_display":"1","upload_limit":"2","image_formats":"gif,bmp,jpg,jpeg,png","source_formats":"txt,less,ini,xml,js,php,css","font_formats":"woff,ttf,otf","compressed_formats":"zip"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (21, 'com_weblinks', 'component', 'com_weblinks', '', 1, 1, 1, 0, '{"name":"com_weblinks","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\n\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_WEBLINKS_XML_DESCRIPTION","group":""}', '{"show_comp_description":"1","comp_description":"","show_link_hits":"1","show_link_description":"1","show_other_cats":"0","show_headings":"0","show_numbers":"0","show_report":"1","count_clicks":"1","target":"0","link_icons":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (22, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '{"name":"com_content","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.\\t","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CONTENT_XML_DESCRIPTION","group":""}', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","info_block_position":"0","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"0","readmore_limit":"100","show_tags":"1","show_icons":"1","show_print_icon":"1","show_email_icon":"1","show_hits":"1","show_noauth":"0","urls_position":"0","show_publishing_options":"1","show_article_options":"1","save_history":"0","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_heading_title_text":"1","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0","feed_show_readmore":"0"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (23, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '{"name":"com_config","type":"component","creationDate":"April 2006","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"COM_CONFIG_XML_DESCRIPTION","group":""}', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"13":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -790,7 +790,7 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (100, 'PHPMailer', 'library', 'phpmailer', '', 0, 1, 1, 1, '{"name":"PHPMailer","type":"library","creationDate":"2001","author":"PHPMailer","copyright":"(c) 2001-2003, Brent R. Matzelle, (c) 2004-2009, Andy Prevost. All Rights Reserved., (c) 2010-2013, Jim Jagielski. All Rights Reserved.","authorEmail":"jimjag@gmail.com","authorUrl":"https:\\/\\/github.com\\/PHPMailer\\/PHPMailer","version":"5.2.6","description":"LIB_PHPMAILER_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (101, 'SimplePie', 'library', 'simplepie', '', 0, 1, 1, 1, '{"name":"SimplePie","type":"library","creationDate":"2004","author":"SimplePie","copyright":"Copyright (c) 2004-2009, Ryan Parman and Geoffrey Sneddon","authorEmail":"","authorUrl":"http:\\/\\/simplepie.org\\/","version":"1.2","description":"LIB_SIMPLEPIE_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '{"name":"phputf8","type":"library","creationDate":"2006","author":"Harry Fuecks","copyright":"Copyright various authors","authorEmail":"hfuecks@gmail.com","authorUrl":"http:\\/\\/sourceforge.net\\/projects\\/phputf8","version":"0.5","description":"LIB_PHPUTF8_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '{"name":"Joomla! Platform","type":"library","creationDate":"2008","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"http:\\/\\/www.joomla.org","version":"13.1","description":"LIB_JOOMLA_XML_DESCRIPTION","group":""}', '{"mediaversion":"bc168c8b2dfe77ff3f6a16ed97e7bd72"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '{"name":"Joomla! Platform","type":"library","creationDate":"2008","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"http:\\/\\/www.joomla.org","version":"13.1","description":"LIB_JOOMLA_XML_DESCRIPTION","group":""}', '{"mediaversion":"d8d3867ed63756672f3a0911a9b5d1de"}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '{"name":"IDNA Convert","type":"library","creationDate":"2004","author":"phlyLabs","copyright":"2004-2011 phlyLabs Berlin, http:\\/\\/phlylabs.de","authorEmail":"phlymail@phlylabs.de","authorUrl":"http:\\/\\/phlylabs.de","version":"0.8.0","description":"LIB_IDNA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '{"name":"FOF","type":"library","creationDate":"2013-12-14","author":"Nicholas K. Dionysopoulos \\/ Akeeba Ltd","copyright":"(C)2011-2013 Nicholas K. Dionysopoulos","authorEmail":"nicholas@akeebabackup.com","authorUrl":"https:\\/\\/www.akeebabackup.com","version":"2.1.1","description":"LIB_FOF_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (200, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '{"name":"mod_articles_archive","type":"module","creationDate":"July 2006","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters.\\n\\t\\tAll rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.0.0","description":"MOD_ARTICLES_ARCHIVE_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
@@ -890,11 +890,13 @@ INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`
 (507, 'isis', 'template', 'isis', '', 1, 1, 1, 0, '{"name":"isis","type":"template","creationDate":"3\\/30\\/2012","author":"Kyle Ledbetter","copyright":"Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"","version":"1.0","description":"TPL_ISIS_XML_DESCRIPTION","group":""}', '{"templateColor":"","logoFile":""}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (600, 'English (United Kingdom)', 'language', 'en-GB', '', 0, 1, 1, 1, '{"name":"English (United Kingdom)","type":"language","creationDate":"2013-03-07","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.1","description":"en-GB site language","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (601, 'English (United Kingdom)', 'language', 'en-GB', '', 1, 1, 1, 1, '{"name":"English (United Kingdom)","type":"language","creationDate":"2013-03-07","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.1","description":"en-GB administrator language","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '{"name":"files_joomla","type":"file","creationDate":"December 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.1","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(700, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '{"name":"files_joomla","type":"file","creationDate":"December 2013","author":"Joomla! Project","copyright":"(C) 2005 - 2013 Open Source Matters. All rights reserved","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.2","description":"FILES_JOOMLA_XML_DESCRIPTION","group":""}', '', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (10000, 't3_blank', 'template', 't3_blank', '', 0, 1, 1, 0, '{"name":"t3_blank","type":"template","creationDate":"23 Jan 2014","author":"JoomlArt.com","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.t3-framework.org","version":"2.1.0","description":"\\n\\t\\t\\n\\t\\t<div align=\\"center\\">\\n\\t\\t\\t<div class=\\"alert alert-success\\" style=\\"background-color:#DFF0D8;border-color:#D6E9C6;color: #468847;padding: 1px 0;\\">\\n\\t\\t\\t\\t<a href=\\"http:\\/\\/t3-framework.org\\/\\"><img src=\\"http:\\/\\/joomlart.s3.amazonaws.com\\/images\\/jat3v3-documents\\/message-installation\\/logo.png\\" alt=\\"some_text\\" width=\\"300\\" height=\\"99\\"><\\/a>\\n\\t\\t\\t\\t<h4><a href=\\"http:\\/\\/t3-framework.org\\/\\" title=\\"\\">Home<\\/a> | <a href=\\"http:\\/\\/demo.t3-framework.org\\/\\" title=\\"\\">Demo<\\/a> | <a href=\\"http:\\/\\/t3-framework.org\\/documentation\\" title=\\"\\">Document<\\/a> | <a href=\\"https:\\/\\/github.com\\/t3framework\\/t3\\/blob\\/master\\/CHANGELOG.md\\" title=\\"\\">Changelog<\\/a><\\/h4>\\n\\t\\t\\t\\t<p> <\\/p>\\n\\t\\t\\t\\t<span style=\\"color:#FF0000\\">Note: T3 blank requires T3 plugin to be installed and enabled.<\\/span><p><\\/p>\\n\\t\\t\\t\\t<p>Copyright 2004 - 2013 <a href=\'http:\\/\\/www.joomlart.com\\/\' title=\'Visit Joomlart.com!\'>JoomlArt.com<\\/a>.<\\/p>\\n\\t\\t\\t<\\/div>\\n\\t\\t\\t<style>table.adminform{width: 100%;}<\\/style>\\n\\t\\t<\\/div>\\n\\t\\t\\n\\t","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (10001, 'T3 Framework', 'plugin', 't3', 'system', 0, 1, 1, 0, '{"name":"T3 Framework","type":"plugin","creationDate":"23 Jan 2014","author":"JoomlArt.com","copyright":"Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.","authorEmail":"info@joomlart.com","authorUrl":"http:\\/\\/www.t3-framework.org","version":"2.1.0","description":"\\n\\t\\n\\t<div align=\\"center\\">\\n\\t\\t<div class=\\"alert alert-success\\" style=\\"background-color:#DFF0D8;border-color:#D6E9C6;color: #468847;padding: 1px 0;\\">\\n\\t\\t\\t\\t<a href=\\"http:\\/\\/t3-framework.org\\/\\"><img src=\\"http:\\/\\/joomlart.s3.amazonaws.com\\/images\\/jat3v3-documents\\/message-installation\\/logo.png\\" alt=\\"some_text\\" width=\\"300\\" height=\\"99\\"><\\/a>\\n\\t\\t\\t\\t<h4><a href=\\"http:\\/\\/t3-framework.org\\/\\" title=\\"\\">Home<\\/a> | <a href=\\"http:\\/\\/demo.t3-framework.org\\/\\" title=\\"\\">Demo<\\/a> | <a href=\\"http:\\/\\/t3-framework.org\\/documentation\\" title=\\"\\">Document<\\/a> | <a href=\\"https:\\/\\/github.com\\/t3framework\\/t3\\/blob\\/master\\/CHANGELOG.md\\" title=\\"\\">Changelog<\\/a><\\/h4>\\n\\t\\t<p> <\\/p>\\n\\t\\t<p>Copyright 2004 - 2013 <a href=\'http:\\/\\/www.joomlart.com\\/\' title=\'Visit Joomlart.com!\'>JoomlArt.com<\\/a>.<\\/p>\\n\\t\\t<\\/div>\\n     <style>table.adminform{width: 100%;}<\\/style>\\n\\t <\\/div>\\n\\t\\t\\n\\t","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
 (10002, 't3_bs3_blank', 'template', 't3_bs3_blank', '', 0, 1, 1, 0, '{"name":"t3_bs3_blank","type":"template","creationDate":"23 Jan 2014","author":"JoomlArt.com","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.t3-framework.org","version":"2.1.0","description":"\\n\\t\\t\\n\\t\\t<div align=\\"center\\">\\n\\t\\t\\t<div class=\\"alert alert-success\\" style=\\"background-color:#DFF0D8;border-color:#D6E9C6;color: #468847;padding: 1px 0;\\">\\n\\t\\t\\t\\t<a href=\\"http:\\/\\/t3-framework.org\\/\\"><img src=\\"http:\\/\\/joomlart.s3.amazonaws.com\\/images\\/jat3v3-documents\\/message-installation\\/logo.png\\" alt=\\"some_text\\" width=\\"300\\" height=\\"99\\"><\\/a>\\n\\t\\t\\t\\t<h4><a href=\\"http:\\/\\/t3-framework.org\\/\\" title=\\"\\">Home<\\/a> | <a href=\\"http:\\/\\/demo.t3-framework.org\\/\\" title=\\"\\">Demo<\\/a> | <a href=\\"http:\\/\\/t3-framework.org\\/documentation\\" title=\\"\\">Document<\\/a> | <a href=\\"https:\\/\\/github.com\\/t3framework\\/t3\\/blob\\/master\\/CHANGELOG.md\\" title=\\"\\">Changelog<\\/a><\\/h4>\\n\\t\\t\\t\\t<p> <\\/p>\\n\\t\\t\\t\\t<span style=\\"color:#FF0000\\">Note: T3 blank requires T3 plugin to be installed and enabled.<\\/span><p><\\/p>\\n\\t\\t\\t\\t<p>Copyright 2004 - 2013 <a href=\'http:\\/\\/www.joomlart.com\\/\' title=\'Visit Joomlart.com!\'>JoomlArt.com<\\/a>.<\\/p>\\n\\t\\t\\t<\\/div>\\n\\t\\t\\t<style>table.adminform{width: 100%;}<\\/style>\\n\\t\\t<\\/div>\\n\\t\\t\\n\\t","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
-(10003, 'com_jaextmanager', 'component', 'com_jaextmanager', '', 1, 1, 1, 0, '{"name":"com_jaextmanager","type":"component","creationDate":"May 2013","author":"JoomlArt","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.joomlart.com","version":"2.5.7","description":"JA Extension Manager Component","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+(10003, 'com_jaextmanager', 'component', 'com_jaextmanager', '', 1, 1, 1, 0, '{"name":"com_jaextmanager","type":"component","creationDate":"May 2013","author":"JoomlArt","copyright":"Copyright (C), J.O.O.M Solutions Co., Ltd. All Rights Reserved.","authorEmail":"webmaster@joomlart.com","authorUrl":"http:\\/\\/www.joomlart.com","version":"2.5.7","description":"JA Extension Manager Component","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(10004, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 0, 1, 0, '{"name":"plg_content_contact","type":"plugin","creationDate":"January 2014","author":"Joomla! Project","copyright":"Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.","authorEmail":"admin@joomla.org","authorUrl":"www.joomla.org","version":"3.2.2","description":"PLG_CONTENT_CONTACT_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0),
+(10005, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 0, '{"name":"PHPass","type":"library","creationDate":"2004-2006","author":"Solar Designer","copyright":"","authorEmail":"solar@openwall.com","authorUrl":"http:\\/\\/www.openwall.com\\/phpass\\/","version":"0.3","description":"LIB_PHPASS_XML_DESCRIPTION","group":""}', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
 
 DROP TABLE IF EXISTS `#__finder_filters`;
 CREATE TABLE `#__finder_filters` (
@@ -2187,7 +2189,7 @@ CREATE TABLE `#__schemas` (
 ) ENGINE=InnoDB;
 
 INSERT INTO `#__schemas` (`extension_id`, `version_id`) VALUES
-(700, '3.2.1');
+(700, '3.2.2-2014-01-23');
 
 DROP TABLE IF EXISTS `#__session`;
 CREATE TABLE `#__session` (
@@ -2361,16 +2363,17 @@ CREATE TABLE `#__update_sites` (
   `location` text NOT NULL,
   `enabled` int(11) DEFAULT '0',
   `last_check_timestamp` bigint(20) DEFAULT '0',
+  `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_site_id`)
 ) ENGINE=InnoDB  COMMENT='Update Sites';
 
-INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES
-(1, 'Joomla Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 1390472558),
-(2, 'Joomla Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 1390472558),
-(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 1390472558),
-(4, '', 'collection', 'http://update.joomlart.com/service/tracking/list.xml', 1, 1390472558),
-(5, 'WebInstaller Update Site', 'extension', 'http://appscdn.joomla.org/webapps/jedapps/webinstaller.xml', 1, 1390472558);
-INSERT IGNORE INTO `#__update_sites` VALUES
+INSERT INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`, `extra_query`) VALUES
+(1, 'Joomla Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 1391758315, ''),
+(2, 'Joomla Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 1391758315, ''),
+(3, 'Accredited Joomla! Translations', 'collection', 'http://update.joomla.org/language/translationlist_3.xml', 1, 1391758315, ''),
+(4, '', 'collection', 'http://update.joomlart.com/service/tracking/list.xml', 1, 1391758315, ''),
+(5, 'WebInstaller Update Site', 'extension', 'http://appscdn.joomla.org/webapps/jedapps/webinstaller.xml', 1, 1391758315, '');
+INSERT IGNORE INTO `#__update_sites` (`update_site_id`, `name`, `type`, `location`, `enabled`, `last_check_timestamp`) VALUES
 (1, 'Joomla Core', 'collection', 'http://update.joomla.org/core/list.xml', 1, 0),
 (2, 'Joomla Extension Directory', 'collection', 'http://update.joomla.org/jed/list.xml', 1, 0),
 (3,'Accredited Joomla! Translations','collection','http://update.joomla.org/language/translationlist.xml', 1 ,0);
@@ -2396,10 +2399,11 @@ CREATE TABLE `#__updates` (
   `type` varchar(20) DEFAULT '',
   `folder` varchar(20) DEFAULT '',
   `client_id` tinyint(3) DEFAULT '0',
-  `version` varchar(10) DEFAULT '',
+  `version` varchar(32) DEFAULT '',
   `data` text NOT NULL,
   `detailsurl` text NOT NULL,
   `infourl` text NOT NULL,
+  `extra_query` varchar(1000) DEFAULT '',
   PRIMARY KEY (`update_id`)
 ) ENGINE=InnoDB  COMMENT='Available Updates';
 
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index cdccdfa..1ebf634 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -231,13 +231,13 @@ COMMENT ON COLUMN "#__categories"."metadata" IS 'JSON encoded metadata propertie
 -- Dumping data for table #__categories
 --
 INSERT INTO "#__categories" ("id", "asset_id", "parent_id", "lft", "rgt", "level", "path", "extension", "title", "alias", "note", "description", "published", "checked_out", "checked_out_time", "access", "params", "metadesc", "metakey", "metadata", "created_user_id", "created_time", "modified_user_id", "modified_time", "hits", "language", "version") VALUES
-(1, 0, 0, 0, 13, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{}', '', '', '', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
-(2, 27, 1, 1, 2, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
-(3, 28, 1, 3, 4, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
-(4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
-(5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
-(6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
-(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1);
+(1, 0, 0, 0, 13, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{}', '', '', '{}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
+(2, 27, 1, 1, 2, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
+(3, 28, 1, 3, 4, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
+(4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
+(5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
+(6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1),
+(7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1970-01-01 00:00:00', 0, '*', 1);
 
 --
 -- Table: #__contact_details
@@ -498,7 +498,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (22, 'com_content', 'component', 'com_content', '', 1, 1, 0, 1, '', '{"article_layout":"_:default","show_title":"1","link_titles":"1","show_intro":"1","show_category":"1","link_category":"1","show_parent_category":"0","link_parent_category":"0","show_author":"1","link_author":"0","show_create_date":"0","show_modify_date":"0","show_publish_date":"1","show_item_navigation":"1","show_vote":"0","show_readmore":"1","show_readmore_title":"1","readmore_limit":"100","show_icons":"1","show_print_icon":"1","show_email_icon":"1","show_hits":"1","show_noauth":"0","show_publishing_options":"1","show_article_options":"1","save_history":"1","history_limit":10,"show_urls_images_frontend":"0","show_urls_images_backend":"1","targeta":0,"targetb":0,"targetc":0,"float_intro":"left","float_fulltext":"left","category_layout":"_:blog","show_category_title":"0","show_description":"0","show_description_image":"0","maxLevel":"1","show_empty_categories":"0","show_no_articles":"1","show_subcat_desc":"1","show_cat_num_articles":"0","show_base_description":"1","maxLevelcat":"-1","show_empty_categories_cat":"0","show_subcat_desc_cat":"1","show_cat_num_articles_cat":"1","num_leading_articles":"1","num_intro_articles":"4","num_columns":"2","num_links":"4","multi_column_order":"0","show_subcategory_content":"0","show_pagination_limit":"1","filter_field":"hide","show_headings":"1","list_show_date":"0","date_format":"","list_show_hits":"1","list_show_author":"1","orderby_pri":"order","orderby_sec":"rdate","order_date":"published","show_pagination":"2","show_pagination_results":"1","show_feed_link":"1","feed_summary":"0"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (23, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filters":{"1":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"6":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"7":{"filter_type":"NONE","filter_tags":"","filter_attributes":""},"2":{"filter_type":"NH","filter_tags":"","filter_attributes":""},"3":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"4":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"5":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"10":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"12":{"filter_type":"BL","filter_tags":"","filter_attributes":""},"8":{"filter_type":"NONE","filter_tags":"","filter_attributes":""}}}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (24, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(25, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"1","new_usertype":"2","guest_usergroup":"13","sendpassword":"1","useractivation":"1","mail_to_admin":"0","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(25, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"1","new_usertype":"2","guest_usergroup":"9","sendpassword":"1","useractivation":"1","mail_to_admin":"0","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (27, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_advanced":"1","expand_advanced":"0","show_date_filters":"0","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stemmer":"snowball"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (28, 'com_joomlaupdate', 'component', 'com_joomlaupdate', '', 1, 1, 0, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (29, 'com_tags', 'component', 'com_tags', '', 1, 1, 1, 1, '', '{"tag_layout":"_:default","save_history":"1","history_limit":5,"show_tag_title":"0","tag_list_show_tag_image":"0","tag_list_show_tag_description":"0","tag_list_image":"","show_tag_num_items":"0","tag_list_orderby":"title","tag_list_orderby_direction":"ASC","show_headings":"0","tag_list_show_date":"0","tag_list_show_item_image":"0","tag_list_show_item_description":"0","tag_list_item_maximum_characters":0,"return_any_or_all":"1","include_children":"0","maximum":200,"tag_list_language_filter":"all","tags_layout":"_:default","all_tags_orderby":"title","all_tags_orderby_direction":"ASC","all_tags_show_tag_image":"0","all_tags_show_tag_descripion":"0","all_tags_tag_maximum_characters":20,"all_tags_show_tag_hits":"0","filter_field":"1","show_pagination_limit":"1","show_pagination":"2","show_pagination_results":"1","tag_field_ajax_mode":"1","show_feed_link":"1"}', '', '', 0, '1970-01-01 00:00:00', 0, 0),
@@ -513,7 +513,8 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (102, 'phputf8', 'library', 'phputf8', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
-(105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
+(106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
 
 -- Modules
 -- Site
@@ -568,6 +569,7 @@ INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder"
 (400, 'plg_authentication_gmail', 'plugin', 'gmail', 'authentication', 0, 0, 1, 0, '', '{"applysuffix":"0","suffix":"","verifypeer":"1","user_blacklist":""}', '', '', 0, '1970-01-01 00:00:00', 1, 0),
 (401, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0),
 (402, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', '', 0, '1970-01-01 00:00:00', 3, 0),
+(403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1970-01-01 00:00:00', 1, 0),
 (404, 'plg_content_emailcloak', 'plugin', 'emailcloak', 'content', 0, 1, 1, 0, '', '{"mode":"1"}', '', '', 0, '1970-01-01 00:00:00', 1, 0),
 (406, 'plg_content_loadmodule', 'plugin', 'loadmodule', 'content', 0, 1, 1, 0, '', '{"style":"xhtml"}', '', '', 0, '2011-09-18 15:22:50', 0, 0),
 (407, 'plg_content_pagebreak', 'plugin', 'pagebreak', 'content', 0, 1, 1, 0, '', '{"title":"1","multipage_toc":"1","showall":"1"}', '', '', 0, '1970-01-01 00:00:00', 4, 0),
@@ -1139,7 +1141,7 @@ CREATE INDEX "#__languages_idx_access" ON "#__languages" ("access");
 -- Dumping data for table #__languages
 --
 INSERT INTO "#__languages" ("lang_id", "lang_code", "title", "title_native", "sef", "image", "description", "metakey", "metadesc", "sitename", "published", "access", "ordering") VALUES
-(1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en', '', '', '', '', 1, 0, 1);
+(1, 'en-GB', 'English (UK)', 'English (UK)', 'en', 'en', '', '', '', '', 1, 1, 1);
 
 --
 -- Table: #__menu
@@ -1224,10 +1226,10 @@ INSERT INTO "#__menu" ("id", "menutype", "title", "alias", "note", "path", "link
 (19, 'menu', 'com_weblinks_links', 'Links', '', 'Weblinks/Links', 'index.php?option=com_weblinks', 'component', 0, 18, 2, 21, 0, '1970-01-01 00:00:00', 0, 0, 'class:weblinks', 0, '', 34, 35, 0, '*', 1),
 (20, 'menu', 'com_weblinks_categories', 'Categories', '', 'Weblinks/Categories', 'index.php?option=com_categories&extension=com_weblinks', 'component', 0, 18, 2, 6, 0, '1970-01-01 00:00:00', 0, 0, 'class:weblinks-cat', 0, '', 36, 37, 0, '*', 1),
 (21, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, '1970-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 39, 40, 0, '*', 1),
-(22, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1),
+(22, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1970-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1),
 (23, 'main', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1970-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 43, 44, 0, '', 1),
 (24, 'main', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1970-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1),
-(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","multi_column_order":"1","show_pagination":"2","show_pagination_results":"1","show_noauth":"","article-allow_ratings":"","article-allow_comments":"","show_feed_link":"1","feed_summary":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 47, 48, 1, '*', 0);
+(101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1970-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 47, 48, 1, '*', 0);
 
 SELECT nextval('#__menu_id_seq');
 SELECT setval('#__menu_id_seq', 102, false);
@@ -1453,7 +1455,8 @@ COMMENT ON COLUMN "#__postinstall_messages"."version_introduced" IS 'Version whe
 INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled") VALUES
 (700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_BODY', 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_ACTION', 'plg_twofactorauth_totp', 1, 'action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_action', 'site://plugins/twofactorauth/totp/postinstall/actions.php', 'twofactorauth_postinstall_condition', '3.2.0', 1),
 (700, 'COM_CPANEL_MSG_EACCELERATOR_TITLE', 'COM_CPANEL_MSG_EACCELERATOR_BODY', 'COM_CPANEL_MSG_EACCELERATOR_BUTTON', 'com_cpanel', 1, 'action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_condition', '3.2.0', 1),
-(700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1);
+(700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1),
+(700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1);
 
 --
 -- Table: #__redirect_links
@@ -1546,7 +1549,7 @@ CREATE INDEX "#__tags_idx_language" ON "#__tags" ("language");
 -- Dumping data for table #__tags
 --
 INSERT INTO "#__tags" ("id", "parent_id", "lft", "rgt", "level", "path", "title", "alias", "note", "description", "published", "checked_out", "checked_out_time", "access", "params", "metadesc", "metakey", "metadata", "created_user_id", "created_time", "created_by_alias", "modified_user_id", "modified_time", "images", "urls", "hits", "language", "version") VALUES
-(1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '1970-01-01 00:00:00', 1, '{}', '', '', '', 42, '2011-01-01 00:00:01', '', 0, '1970-01-01 00:00:00', '', '',  0, '*', 1);
+(1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '1970-01-01 00:00:00', 1, '', '', '', '', 42, '2011-01-01 00:00:01', '', 0, '1970-01-01 00:00:00', '', '',  0, '*', 1);
 
 --
 -- Table: #__template_styles
@@ -1680,10 +1683,11 @@ CREATE TABLE "#__updates" (
   "type" varchar(20) DEFAULT '',
   "folder" varchar(20) DEFAULT '',
   "client_id" smallint DEFAULT 0,
-  "version" varchar(10) DEFAULT '',
+  "version" varchar(32) DEFAULT '',
   "data" text DEFAULT '' NOT NULL,
   "detailsurl" text NOT NULL,
   "infourl" text NOT NULL,
+  "extra_query" varchar(1000) DEFAULT '',
   PRIMARY KEY ("update_id")
 );
 
@@ -1699,6 +1703,7 @@ CREATE TABLE "#__update_sites" (
   "location" text NOT NULL,
   "enabled" bigint DEFAULT 0,
   "last_check_timestamp" bigint DEFAULT 0,
+  "extra_query" varchar(1000) DEFAULT '',
   PRIMARY KEY ("update_site_id")
 );
 
diff --git a/installation/sql/sqlazure/joomla.sql b/installation/sql/sqlazure/joomla.sql
index 934c68f..1dc7301 100644
--- a/installation/sql/sqlazure/joomla.sql
+++ b/installation/sql/sqlazure/joomla.sql
@@ -390,19 +390,19 @@ CREATE NONCLUSTERED INDEX [idx_asset_id] ON [#__categories]
 SET IDENTITY_INSERT [#__categories]  ON;
 
 INSERT INTO [#__categories] (id, asset_id, parent_id, lft, rgt, level, path, extension, title, alias, note, description, published, checked_out, checked_out_time, access, params, metadesc, metakey, metadata, created_user_id, created_time, modified_user_id, modified_time, hits, language, version)
-SELECT 1, 0, 0, 0, 13, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{}', '', '', '', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
+SELECT 1, 0, 0, 0, 13, 0, '', 'system', 'ROOT', 'root', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{}', '', '', '{}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
 UNION ALL
-SELECT 2, 27, 1, 1, 2, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
+SELECT 2, 27, 1, 1, 2, 1, 'uncategorised', 'com_content', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
 UNION ALL
-SELECT 3, 28, 1, 3, 4, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":"","foobar":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
+SELECT 3, 28, 1, 3, 4, 1, 'uncategorised', 'com_banners', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
 UNION ALL
-SELECT 4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
+SELECT 4, 29, 1, 5, 6, 1, 'uncategorised', 'com_contact', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
 UNION ALL
-SELECT 5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
+SELECT 5, 30, 1, 7, 8, 1, 'uncategorised', 'com_newsfeeds', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
 UNION ALL
-SELECT 6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
+SELECT 6, 31, 1, 9, 10, 1, 'uncategorised', 'com_weblinks', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1
 UNION ALL
-SELECT 7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"target":"","image":""}', '', '', '{"page_title":"","author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1;
+SELECT 7, 32, 1, 11, 12, 1, 'uncategorised', 'com_users', 'Uncategorised', 'uncategorised', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{"category_layout":"","image":""}', '', '', '{"author":"","robots":""}', 42, '2011-01-01 00:00:01', 0, '1900-01-01 00:00:00', 0, '*', 1;
 
 SET IDENTITY_INSERT [#__categories]  OFF;
 
@@ -817,7 +817,7 @@ SELECT 23, 'com_config', 'component', 'com_config', '', 1, 1, 0, 1, '', '{"filte
 UNION ALL
 SELECT 24, 'com_redirect', 'component', 'com_redirect', '', 1, 1, 0, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
-SELECT 25, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"1","new_usertype":"2","guest_usergroup":"13","sendpassword":"1","useractivation":"1","mail_to_admin":"0","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '1900-01-01 00:00:00', 0, 0
+SELECT 25, 'com_users', 'component', 'com_users', '', 1, 1, 0, 1, '', '{"allowUserRegistration":"1","new_usertype":"2","guest_usergroup":"9","sendpassword":"1","useractivation":"1","mail_to_admin":"0","captcha":"","frontend_userparams":"1","site_language":"0","change_login_name":"0","reset_count":"10","reset_time":"1","minimum_length":"4","minimum_integers":"0","minimum_symbols":"0","minimum_uppercase":"0","save_history":"1","history_limit":5,"mailSubjectPrefix":"","mailBodySuffix":""}', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
 SELECT 27, 'com_finder', 'component', 'com_finder', '', 1, 1, 0, 0, '', '{"show_description":"1","description_length":255,"allow_empty_query":"0","show_url":"1","show_advanced":"1","expand_advanced":"0","show_date_filters":"0","highlight_terms":"1","opensearch_name":"","opensearch_description":"","batch_size":"50","memory_table_limit":30000,"title_multiplier":"1.7","text_multiplier":"0.7","meta_multiplier":"1.2","path_multiplier":"2.0","misc_multiplier":"0.3","stemmer":"snowball"}', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
@@ -842,7 +842,9 @@ SELECT 103, 'Joomla! Platform', 'library', 'joomla', '', 0, 1, 1, 1, '', '', '',
 UNION ALL
 SELECT 104, 'IDNA Convert', 'library', 'idna_convert', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
 UNION ALL
-SELECT 105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+SELECT 105, 'FOF', 'library', 'fof', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
+UNION ALL
+SELECT 106, 'PHPass', 'library', 'phpass', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
 
 INSERT [#__extensions] ([extension_id], [name], [type], [element], [folder], [client_id], [enabled], [access], [protected], [manifest_cache], [params], [custom_data], [system_data], [checked_out], [checked_out_time], [ordering], [state])
 SELECT 200, 'mod_articles_archive', 'module', 'mod_articles_archive', '', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0
@@ -935,6 +937,8 @@ SELECT 401, 'plg_authentication_joomla', 'plugin', 'joomla', 'authentication', 0
 UNION ALL
 SELECT 402, 'plg_authentication_ldap', 'plugin', 'ldap', 'authentication', 0, 0, 1, 0, '', '{"host":"","port":"389","use_ldapV3":"0","negotiate_tls":"0","no_referrals":"0","auth_method":"bind","base_dn":"","search_string":"","users_dn":"","username":"admin","password":"bobby7","ldap_fullname":"fullName","ldap_email":"mail","ldap_uid":"uid"}', '', '', 0, '1900-01-01 00:00:00', 3, 0
 UNION ALL
+SELECT 403, 'plg_content_contact', 'plugin', 'contact', 'content', 0, 1, 1, 0, '', '', '', '', 0, '1900-01-01 00:00:00', 1, 0
+UNION ALL
 SELECT 404, 'plg_content_emailcloak', 'plugin', 'emailcloak', 'content', 0, 1, 1, 0, '', '{"mode":"1"}', '', '', 0, '1900-01-01 00:00:00', 1, 0
 UNION ALL
 SELECT 406, 'plg_content_loadmodule', 'plugin', 'loadmodule', 'content', 0, 1, 1, 0, '', '{"style":"xhtml"}', '', '', 0, '1900-01-01 00:00:00', 0, 0
@@ -1902,7 +1906,7 @@ CREATE UNIQUE INDEX [idx_access] ON [#__languages]
 SET IDENTITY_INSERT [#__languages]  ON;
 
 INSERT INTO [#__languages] ([lang_id], [lang_code], [title], [title_native], [sef], [image], [description], [metakey], [metadesc], [sitename], [published], [access], [ordering])
-VALUES (1, 'en-GB  ', 'English (UK)', 'English (UK)', 'en', 'en', '', '', '', '', 1, 0, 1);
+VALUES (1, 'en-GB  ', 'English (UK)', 'English (UK)', 'en', 'en', '', '', '', '', 1, 1, 1);
 
 SET IDENTITY_INSERT [#__languages]  OFF;
 
@@ -2040,13 +2044,13 @@ SELECT 20, 'menu', 'com_weblinks_categories', 'Categories', '', 'Weblinks/Catego
 UNION ALL
 SELECT 21, 'menu', 'com_finder', 'Smart Search', '', 'Smart Search', 'index.php?option=com_finder', 'component', 0, 1, 1, 27, 0, '1900-01-01 00:00:00', 0, 0, 'class:finder', 0, '', 39, 40, 0, '*', 1
 UNION ALL
-SELECT 22, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 32, 0, '1900-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1
+SELECT 22, 'menu', 'com_joomlaupdate', 'Joomla! Update', '', 'Joomla! Update', 'index.php?option=com_joomlaupdate', 'component', 1, 1, 1, 28, 0, '1900-01-01 00:00:00', 0, 0, 'class:joomlaupdate', 0, '', 41, 42, 0, '*', 1
 UNION ALL
 SELECT 23, 'menu', 'com_tags', 'Tags', '', 'Tags', 'index.php?option=com_tags', 'component', 0, 1, 1, 29, 0, '1900-01-01 00:00:00', 0, 1, 'class:tags', 0, '', 43, 44, 0, '*', 1
 UNION ALL
 SELECT 24, 'menu', 'com_postinstall', 'Post-installation messages', '', 'Post-installation messages', 'index.php?option=com_postinstall', 'component', 0, 1, 1, 32, 0, '1900-01-01 00:00:00', 0, 1, 'class:postinstall', 0, '', 45, 46, 0, '*', 1
 UNION ALL
-SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1900-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","orderby_pri":"","orderby_sec":"front","order_date":"","multi_column_order":"1","show_pagination":"2","show_pagination_results":"1","show_noauth":"","article-allow_ratings":"","article-allow_comments":"","show_feed_link":"1","feed_summary":"","show_title":"","link_titles":"","show_intro":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_readmore":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","show_page_heading":1,"page_title":"","page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 47, 48, 1, '*', 0;
+SELECT 101, 'mainmenu', 'Home', 'home', '', 'home', 'index.php?option=com_content&view=featured', 'component', 1, 1, 1, 22, 0, '1900-01-01 00:00:00', 0, 1, '', 0, '{"featured_categories":[""],"layout_type":"blog","num_leading_articles":"1","num_intro_articles":"3","num_columns":"3","num_links":"0","multi_column_order":"1","orderby_pri":"","orderby_sec":"front","order_date":"","show_pagination":"2","show_pagination_results":"1","show_title":"","link_titles":"","show_intro":"","info_block_position":"","show_category":"","link_category":"","show_parent_category":"","link_parent_category":"","show_author":"","link_author":"","show_create_date":"","show_modify_date":"","show_publish_date":"","show_item_navigation":"","show_vote":"","show_readmore":"","show_readmore_title":"","show_icons":"","show_print_icon":"","show_email_icon":"","show_hits":"","show_noauth":"","show_feed_link":"1","feed_summary":"","menu-anchor_title":"","menu-anchor_css":"","menu_image":"","menu_text":1,"page_title":"","show_page_heading":1,"page_heading":"","pageclass_sfx":"","menu-meta_description":"","menu-meta_keywords":"","robots":"","secure":0}', 47, 48, 1, '*', 0;
 
 SET IDENTITY_INSERT [#__menu]  OFF;
 
@@ -2359,7 +2363,9 @@ SELECT 700, 'PLG_TWOFACTORAUTH_TOTP_POSTINSTALL_TITLE', 'PLG_TWOFACTORAUTH_TOTP_
 UNION ALL
 SELECT 700, 'COM_CPANEL_MSG_EACCELERATOR_TITLE', 'COM_CPANEL_MSG_EACCELERATOR_BODY', 'COM_CPANEL_MSG_EACCELERATOR_BUTTON', 'com_cpanel', 1, 'action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_action', 'admin://components/com_admin/postinstall/eaccelerator.php', 'admin_postinstall_eaccelerator_condition', '3.2.0', 1
 UNION ALL
-SELECT 700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1;
+SELECT 700, 'COM_CPANEL_WELCOME_BEGINNERS_TITLE', 'COM_CPANEL_WELCOME_BEGINNERS_MESSAGE', '', 'com_cpanel', 1, 'message', '', '', '', '', '3.2.0', 1
+UNION ALL
+SELECT 700, 'COM_CPANEL_MSG_PHPVERSION_TITLE', 'COM_CPANEL_MSG_PHPVERSION_BODY', '', 'com_cpanel', 1, 'message', '', '', 'admin://components/com_admin/postinstall/phpversion.php', 'admin_postinstall_phpversion_condition', '3.2.2', 1;
 
 /****** Object:  Table [#__redirect_links] ******/
 SET QUOTED_IDENTIFIER ON;
@@ -2509,7 +2515,7 @@ CREATE NONCLUSTERED INDEX [idx_language] ON [#__tags]
 SET IDENTITY_INSERT [#__tags]  ON;
 
 INSERT INTO [#__tags] ([id], [parent_id], [lft], [rgt], [level], [path], [title], [alias], [note], [description], [published], [checked_out], [checked_out_time], [access], [params], [metadesc], [metakey], [metadata], [created_user_id], [created_time], [created_by_alias], [modified_user_id], [modified_time], [images], [urls], [hits], [language], [version], [publish_up], [publish_down])
-SELECT 1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '1900-01-01 00:00:00', 1, '{}', '', '', '', 0, '2011-01-01 00:00:01', '', 0, '1900-01-01 00:00:00', '', '', 0, '*', 1, '1900-01-01 00:00:00', '1900-01-01 00:00:00';
+SELECT 1, 0, 0, 1, 0, '', 'ROOT', 'root', '', '', 1, 0, '1900-01-01 00:00:00', 1, '', '', '', '', 0, '2011-01-01 00:00:01', '', 0, '1900-01-01 00:00:00', '', '', 0, '*', 1, '1900-01-01 00:00:00', '1900-01-01 00:00:00';
 
 SET IDENTITY_INSERT [#__tags]  OFF;
 
@@ -2730,6 +2736,7 @@ CREATE TABLE [#__update_sites](
 	[location] [nvarchar](max) NOT NULL,
 	[enabled] [int] NULL DEFAULT 0,
 	[last_check_timestamp] [int] NULL DEFAULT 0,
+	[extra_query] [nvarchar](1000) NULL DEFAULT '',
  CONSTRAINT [PK_#__update_sites_update_site_id] PRIMARY KEY CLUSTERED
 (
 	[update_site_id] ASC
@@ -2780,10 +2787,11 @@ CREATE TABLE [#__updates](
 	[type] [nvarchar](20) DEFAULT '',
 	[folder] [nvarchar](20) DEFAULT '',
 	[client_id] [smallint] DEFAULT 0,
-	[version] [nvarchar](10) DEFAULT '',
+	[version] [nvarchar](32) DEFAULT '',
 	[data] [nvarchar](max) NOT NULL DEFAULT '',
 	[detailsurl] [nvarchar](max) NOT NULL,
 	[infourl] [nvarchar](max) NOT NULL,
+	[extra_query] [nvarchar](1000) NULL DEFAULT '',
  CONSTRAINT [PK_#__updates_update_id] PRIMARY KEY CLUSTERED
 (
 	[update_id] ASC
diff --git a/installation/template/body.php b/installation/template/body.php
index 7ca0a7d..e186f23 100644
--- a/installation/template/body.php
+++ b/installation/template/body.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/template/css/template.css b/installation/template/css/template.css
index 30e1227..2367018 100644
--- a/installation/template/css/template.css
+++ b/installation/template/css/template.css
@@ -122,3 +122,8 @@
 .list-item-subtitle {
 	margin-bottom:9px;
 }
+/* Javascript Warning */
+#javascript-warning {
+	text-align: center;
+	font-size: 16px;
+}
diff --git a/installation/template/css/template_rtl.css b/installation/template/css/template_rtl.css
index b1c1f1c..91a3daf 100644
--- a/installation/template/css/template_rtl.css
+++ b/installation/template/css/template_rtl.css
@@ -1,8 +1,13 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 body{
 	direction: rtl;
 }
+/* Javascript Warning */
+#javascript-warning {
+	text-align: center;
+	font-size: 16px;
+}
\ No newline at end of file
diff --git a/installation/template/index.php b/installation/template/index.php
index 622a50d..f0fb1c0 100644
--- a/installation/template/index.php
+++ b/installation/template/index.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -59,6 +59,13 @@
 		<!-- Container -->
 		<div class="container">
 			<jdoc:include type="message" />
+			<div id="javascript-warning">
+				<noscript>
+					<div class="alert alert-error">
+						<?php echo JText::_('INSTL_WARNJAVASCRIPT'); ?>
+					</div>
+				</noscript>
+			</div>
 			<div id="container-installation">
 				<jdoc:include type="component" />
 			</div>
diff --git a/installation/template/js/installation.js b/installation/template/js/installation.js
index b5f3e4a..04ef38a 100644
--- a/installation/template/js/installation.js
+++ b/installation/template/js/installation.js
@@ -1,7 +1,7 @@
 /**
  * @package     Joomla.Installation
  * @subpackage  JavaScript
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/complete/html.php b/installation/view/complete/html.php
index 3d4e099..d4fe37e 100644
--- a/installation/view/complete/html.php
+++ b/installation/view/complete/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/complete/tmpl/default.php b/installation/view/complete/tmpl/default.php
index 064b109..180436a 100644
--- a/installation/view/complete/tmpl/default.php
+++ b/installation/view/complete/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/database/tmpl/default.php b/installation/view/database/tmpl/default.php
index 6e8ee87..57245cc 100644
--- a/installation/view/database/tmpl/default.php
+++ b/installation/view/database/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/default.php b/installation/view/default.php
index 012ac1c..266f0c9 100644
--- a/installation/view/default.php
+++ b/installation/view/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/defaultlanguage/html.php b/installation/view/defaultlanguage/html.php
index f5bb418..27d0858 100644
--- a/installation/view/defaultlanguage/html.php
+++ b/installation/view/defaultlanguage/html.php
@@ -4,7 +4,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/defaultlanguage/tmpl/default.php b/installation/view/defaultlanguage/tmpl/default.php
index d0cfd52..3f1af88 100644
--- a/installation/view/defaultlanguage/tmpl/default.php
+++ b/installation/view/defaultlanguage/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/ftp/tmpl/default.php b/installation/view/ftp/tmpl/default.php
index ad54ec8..60c409a 100644
--- a/installation/view/ftp/tmpl/default.php
+++ b/installation/view/ftp/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/install/html.php b/installation/view/install/html.php
index 6f2c489..226f680 100644
--- a/installation/view/install/html.php
+++ b/installation/view/install/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/install/tmpl/default.php b/installation/view/install/tmpl/default.php
index 1fde761..1c919c8 100644
--- a/installation/view/install/tmpl/default.php
+++ b/installation/view/install/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/languages/html.php b/installation/view/languages/html.php
index f85606c..b9ebd36 100644
--- a/installation/view/languages/html.php
+++ b/installation/view/languages/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/languages/tmpl/default.php b/installation/view/languages/tmpl/default.php
index 20ea6a8..7372b36 100644
--- a/installation/view/languages/tmpl/default.php
+++ b/installation/view/languages/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,13 +14,13 @@
 $version = new JVersion;
 ?>
 <script type="text/javascript">
-    function installLanguages() {
-        var $ = jQuery.noConflict();
-        $(install_languages_desc).hide();
-        $(wait_installing).show();
-        $(wait_installing_spinner).show();
-        Install.submitform();
-    }
+	function installLanguages() {
+		var $ = jQuery.noConflict();
+		$('#install_languages_desc').hide();
+		$('#wait_installing').show();
+		$('#wait_installing_spinner').show();
+		Install.submitform();
+	}
 </script>
 
 <?php echo JHtml::_('installation.stepbarlanguages'); ?>
diff --git a/installation/view/preinstall/html.php b/installation/view/preinstall/html.php
index 0dfce60..6dec487 100644
--- a/installation/view/preinstall/html.php
+++ b/installation/view/preinstall/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/preinstall/tmpl/default.php b/installation/view/preinstall/tmpl/default.php
index 845f125..7931eeb 100644
--- a/installation/view/preinstall/tmpl/default.php
+++ b/installation/view/preinstall/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 ?>
 <div class="btn-toolbar">
 	<div class="btn-group pull-right">
-		<a href="#" class="btn btn-primary" onclick="Install.submitform();" title="<?php echo JText::_('JCheck_Again'); ?>"><i class="icon-refresh icon-white"></i> <?php echo JText::_('JCheck_Again'); ?></a>
+		<a href="#" class="btn btn-primary" onclick="Install.submitform();" title="<?php echo JText::_('JCHECK_AGAIN'); ?>"><i class="icon-refresh icon-white"></i> <?php echo JText::_('JCHECK_AGAIN'); ?></a>
 	</div>
 </div>
 <form action="index.php" method="post" id="languageForm" class="form-horizontal">
diff --git a/installation/view/remove/html.php b/installation/view/remove/html.php
index 1500e8f..7e70201 100644
--- a/installation/view/remove/html.php
+++ b/installation/view/remove/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/remove/tmpl/default.php b/installation/view/remove/tmpl/default.php
index 50a2b6e..acaf61c 100644
--- a/installation/view/remove/tmpl/default.php
+++ b/installation/view/remove/tmpl/default.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Installation
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/site/tmpl/default.php b/installation/view/site/tmpl/default.php
index a974b96..7ec9638 100644
--- a/installation/view/site/tmpl/default.php
+++ b/installation/view/site/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/summary/html.php b/installation/view/summary/html.php
index 8fffd6a..e00b562 100644
--- a/installation/view/summary/html.php
+++ b/installation/view/summary/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/installation/view/summary/tmpl/default.php b/installation/view/summary/tmpl/default.php
index bcbcfe0..317bb68 100644
--- a/installation/view/summary/tmpl/default.php
+++ b/installation/view/summary/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Installation
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/joomla.xml b/joomla.xml
index 189f971..18fbd12 100644
--- a/joomla.xml
+++ b/joomla.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<extension version="3.1" type="file" method="upgrade">
+<extension version="3.2" type="file" method="upgrade">
 	<name>files_joomla</name>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.2.1</version>
-	<creationDate>December 2013</creationDate>
+	<version>3.2.2</version>
+	<creationDate>February 2014</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 
 	<scriptfile>administrator/components/com_admin/script.php</scriptfile>
diff --git a/language/en-GB/en-GB.com_ajax.ini b/language/en-GB/en-GB.com_ajax.ini
index 5f7d016..f2e00f9 100644
--- a/language/en-GB/en-GB.com_ajax.ini
+++ b/language/en-GB/en-GB.com_ajax.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.com_config.ini b/language/en-GB/en-GB.com_config.ini
index 2151760..bac7b99 100644
--- a/language/en-GB/en-GB.com_config.ini
+++ b/language/en-GB/en-GB.com_config.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_contact.ini b/language/en-GB/en-GB.com_contact.ini
index 0cc21d3..cc0d6b6 100644
--- a/language/en-GB/en-GB.com_contact.ini
+++ b/language/en-GB/en-GB.com_contact.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.com_content.ini b/language/en-GB/en-GB.com_content.ini
index af153e7..ccf8a25 100644
--- a/language/en-GB/en-GB.com_content.ini
+++ b/language/en-GB/en-GB.com_content.ini
@@ -1,11 +1,12 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
 COM_CONTENT_ACCESS_DELETE_DESC="Inherited state for <strong>delete actions</strong> on this article and the calculated state based on the menu selection."
 COM_CONTENT_ACCESS_EDITSTATE_DESC="Inherited state for <strong>edit state actions</strong> on this article and the calculated state based on the menu selection."
 COM_CONTENT_ACCESS_EDIT_DESC="Inherited state for <strong>edit actions</strong> on this article and the calculated state based on the menu selection."
+COM_CONTENT_ARTICLE_CONTENT="Content"
 COM_CONTENT_ARTICLE_HITS="Hits: %s"
 COM_CONTENT_ARTICLE_INFO="Details"
 COM_CONTENT_ARTICLE_VOTE_SUCCESS="Thank You for rating this Article."
@@ -78,4 +79,4 @@ COM_CONTENT_FLOAT_FULLTEXT_LABEL="Full text image float"
 COM_CONTENT_LEFT="Left"
 COM_CONTENT_RIGHT="Right"
 COM_CONTENT_FIELD_URL_LINK_TEXT_LABEL="Link Text"
-COM_CONTENT_IMAGES_AND_URLS="Images and Links"
\ No newline at end of file
+COM_CONTENT_IMAGES_AND_URLS="Images and Links"
diff --git a/language/en-GB/en-GB.com_finder.ini b/language/en-GB/en-GB.com_finder.ini
index 3af9e5b..40d17d3 100644
--- a/language/en-GB/en-GB.com_finder.ini
+++ b/language/en-GB/en-GB.com_finder.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_mailto.ini b/language/en-GB/en-GB.com_mailto.ini
index c9b1c86..2a19a8e 100644
--- a/language/en-GB/en-GB.com_mailto.ini
+++ b/language/en-GB/en-GB.com_mailto.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.com_media.ini b/language/en-GB/en-GB.com_media.ini
index dc4392a..5a0b928 100644
--- a/language/en-GB/en-GB.com_media.ini
+++ b/language/en-GB/en-GB.com_media.ini
@@ -1,13 +1,14 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
-COM_MEDIA_ALIGN="Align"
-COM_MEDIA_ALIGN_DESC="If 'Not Set', the alignment is defined by the class '.img_caption.none'. Usually to get the image centred on the page."
+COM_MEDIA_ALIGN="Image Float"
+COM_MEDIA_ALIGN_DESC="This will apply the classes 'pull-left', 'pull-center' or 'pull-right' to the '<figure>' or '<img>' element"
 COM_MEDIA_BROWSE_FILES="Browse files"
 COM_MEDIA_CAPTION="Caption"
-COM_MEDIA_CAPTION_DESC="If set to 'Yes', the Image Title will be used as caption."
+COM_MEDIA_CAPTION_CLASS_LABEL="Caption Class"
+COM_MEDIA_CAPTION_CLASS_DESC="This will apply the entered class to the '<figcaption>' element. For example: 'text-left', 'text-right', 'text-center'"
 COM_MEDIA_CLEAR_LIST="Clear List"
 COM_MEDIA_CONFIGURATION="Media Manager Options"
 COM_MEDIA_CREATE_FOLDER="Create Folder"
diff --git a/language/en-GB/en-GB.com_messages.ini b/language/en-GB/en-GB.com_messages.ini
index 3ec0f91..145121e 100644
--- a/language/en-GB/en-GB.com_messages.ini
+++ b/language/en-GB/en-GB.com_messages.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.com_newsfeeds.ini b/language/en-GB/en-GB.com_newsfeeds.ini
index 7e39dc8..d3e1b0c 100644
--- a/language/en-GB/en-GB.com_newsfeeds.ini
+++ b/language/en-GB/en-GB.com_newsfeeds.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.com_search.ini b/language/en-GB/en-GB.com_search.ini
index 04d4c65..a8cae35 100644
--- a/language/en-GB/en-GB.com_search.ini
+++ b/language/en-GB/en-GB.com_search.ini
@@ -1,5 +1,5 @@
 ; author Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; license GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.com_tags.ini b/language/en-GB/en-GB.com_tags.ini
index e3ebffc..d721a2a 100644
--- a/language/en-GB/en-GB.com_tags.ini
+++ b/language/en-GB/en-GB.com_tags.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.com_users.ini b/language/en-GB/en-GB.com_users.ini
index 1a7316b..7b18921 100644
--- a/language/en-GB/en-GB.com_users.ini
+++ b/language/en-GB/en-GB.com_users.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -61,7 +61,7 @@ COM_USERS_MSG_SPACES_IN_PASSWORD="Password must not contain spaces."
 COM_USERS_OPTIONAL="(optional)"
 COM_USERS_OR="or"
 COM_USERS_PROFILE="User Profile"
-COM_USERS_PROFILE_BIND_FAILED="Could not bind profile data: $s"
+COM_USERS_PROFILE_BIND_FAILED="Could not bind profile data: %s"
 COM_USERS_PROFILE_CORE_LEGEND="Profile"
 COM_USERS_PROFILE_CUSTOM_LEGEND="Custom Profile"
 COM_USERS_PROFILE_DEFAULT_LABEL="Edit Your Profile"
diff --git a/language/en-GB/en-GB.com_weblinks.ini b/language/en-GB/en-GB.com_weblinks.ini
index 2fa7de6..bd495ec 100644
--- a/language/en-GB/en-GB.com_weblinks.ini
+++ b/language/en-GB/en-GB.com_weblinks.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.com_wrapper.ini b/language/en-GB/en-GB.com_wrapper.ini
index cadbc56..4cc2b1b 100644
--- a/language/en-GB/en-GB.com_wrapper.ini
+++ b/language/en-GB/en-GB.com_wrapper.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.files_joomla.sys.ini b/language/en-GB/en-GB.files_joomla.sys.ini
index 247652c..c41f39e 100644
--- a/language/en-GB/en-GB.files_joomla.sys.ini
+++ b/language/en-GB/en-GB.files_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.finder_cli.ini b/language/en-GB/en-GB.finder_cli.ini
index b3d19a6..cd66ae5 100644
--- a/language/en-GB/en-GB.finder_cli.ini
+++ b/language/en-GB/en-GB.finder_cli.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
index d368119..fcab9e6 100644
--- a/language/en-GB/en-GB.ini
+++ b/language/en-GB/en-GB.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
@@ -58,6 +58,7 @@ JDETAILS="Details"
 JDISABLED="Disabled"
 JEDITOR="Editor"
 JENABLED="Enabled"
+JEXPIRED="Expired"
 JFALSE="False"
 JFEATURED="Featured"
 JHIDE="Hide"
@@ -68,6 +69,7 @@ JNEW="New"
 JNEXT="Next"
 JNO="No"
 JNONE="None"
+JNOTPUBLISHEDYET="Not published yet"
 JNOTICE="Notice"
 JOFF="Off"
 JOFFLINE_MESSAGE="This site is down for maintenance.<br /> Please check back again soon."
diff --git a/language/en-GB/en-GB.lib_fof.sys.ini b/language/en-GB/en-GB.lib_fof.sys.ini
index 5bbdff3..7a2ecf9 100644
--- a/language/en-GB/en-GB.lib_fof.sys.ini
+++ b/language/en-GB/en-GB.lib_fof.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.lib_idna_convert.sys.ini b/language/en-GB/en-GB.lib_idna_convert.sys.ini
index d605787..42bb74c 100644
--- a/language/en-GB/en-GB.lib_idna_convert.sys.ini
+++ b/language/en-GB/en-GB.lib_idna_convert.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini
index 4e45f47..9472970 100644
--- a/language/en-GB/en-GB.lib_joomla.ini
+++ b/language/en-GB/en-GB.lib_joomla.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -487,6 +487,7 @@ JLIB_INSTALLER_ABORT_TPL_INSTALL_COPY_SETUP="Template Install: Could not copy se
 JLIB_INSTALLER_ABORT_TPL_INSTALL_FAILED_CREATE_DIRECTORY="Template Install: Failed to create directory: %s"
 JLIB_INSTALLER_ABORT_TPL_INSTALL_ROLLBACK="Template Install: %s"
 JLIB_INSTALLER_ABORT_TPL_INSTALL_UNKNOWN_CLIENT="Template Install: Unknown client type [%s]"
+JLIB_INSTALLER_AVAILABLE_UPDATE_PHP_VERSION="For the extension %1$s version %2$s is available, but it requires at least PHP version %3$s while your system only has %4$s"
 JLIB_INSTALLER_PURGED_UPDATES="Purged updates"
 JLIB_INSTALLER_FAILED_TO_PURGE_UPDATES="Failed to purge updates"
 JLIB_INSTALLER_DEFAULT_STYLE="%s - Default"
diff --git a/language/en-GB/en-GB.lib_joomla.sys.ini b/language/en-GB/en-GB.lib_joomla.sys.ini
index 5d60487..6f0199d 100644
--- a/language/en-GB/en-GB.lib_joomla.sys.ini
+++ b/language/en-GB/en-GB.lib_joomla.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.lib_phpass.sys.ini b/language/en-GB/en-GB.lib_phpass.sys.ini
new file mode 100644
index 0000000..69e178d
--- /dev/null
+++ b/language/en-GB/en-GB.lib_phpass.sys.ini
@@ -0,0 +1,6 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8 - No BOM
+
+LIB_PHPASS_XML_DESCRIPTION="PHPass is a portable password hashing framework for use in PHP applications. The preferred (most secure) hashing method supported by phpass is the OpenBSD-style bcrypt (known in PHP as CRYPT_BLOWFISH), with a fallback to BSDI-style extended DES-based hashes (known in PHP as CRYPT_EXT_DES), and a last resort fallback to an MD5-based variable iteration count password hashing method implemented in phpass itself."
diff --git a/language/en-GB/en-GB.lib_phpmailer.sys.ini b/language/en-GB/en-GB.lib_phpmailer.sys.ini
index f6310ed..3dcfa18 100644
--- a/language/en-GB/en-GB.lib_phpmailer.sys.ini
+++ b/language/en-GB/en-GB.lib_phpmailer.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.lib_phputf8.sys.ini b/language/en-GB/en-GB.lib_phputf8.sys.ini
index 7a2d6fc..37e0be2 100644
--- a/language/en-GB/en-GB.lib_phputf8.sys.ini
+++ b/language/en-GB/en-GB.lib_phputf8.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.lib_simplepie.sys.ini b/language/en-GB/en-GB.lib_simplepie.sys.ini
index 9a6140d..91cedaf 100644
--- a/language/en-GB/en-GB.lib_simplepie.sys.ini
+++ b/language/en-GB/en-GB.lib_simplepie.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.localise.php b/language/en-GB/en-GB.localise.php
index fc4b343..34f9c9e 100644
--- a/language/en-GB/en-GB.localise.php
+++ b/language/en-GB/en-GB.localise.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Language
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/language/en-GB/en-GB.mod_articles_archive.ini b/language/en-GB/en-GB.mod_articles_archive.ini
index f3b4604..f1bb884 100644
--- a/language/en-GB/en-GB.mod_articles_archive.ini
+++ b/language/en-GB/en-GB.mod_articles_archive.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_archive.sys.ini b/language/en-GB/en-GB.mod_articles_archive.sys.ini
index ac958f3..f82168d 100644
--- a/language/en-GB/en-GB.mod_articles_archive.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_archive.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_categories.ini b/language/en-GB/en-GB.mod_articles_categories.ini
index 3e70309..24dd971 100644
--- a/language/en-GB/en-GB.mod_articles_categories.ini
+++ b/language/en-GB/en-GB.mod_articles_categories.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_categories.sys.ini b/language/en-GB/en-GB.mod_articles_categories.sys.ini
index 17367b3..eac62d8 100644
--- a/language/en-GB/en-GB.mod_articles_categories.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_categories.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_category.ini b/language/en-GB/en-GB.mod_articles_category.ini
index be4e666..a93c9ba 100644
--- a/language/en-GB/en-GB.mod_articles_category.ini
+++ b/language/en-GB/en-GB.mod_articles_category.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_category.sys.ini b/language/en-GB/en-GB.mod_articles_category.sys.ini
index 83fc458..ee85b7e 100644
--- a/language/en-GB/en-GB.mod_articles_category.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_category.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_latest.ini b/language/en-GB/en-GB.mod_articles_latest.ini
index 5a0bddd..a2faa0a 100644
--- a/language/en-GB/en-GB.mod_articles_latest.ini
+++ b/language/en-GB/en-GB.mod_articles_latest.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_latest.sys.ini b/language/en-GB/en-GB.mod_articles_latest.sys.ini
index 1bb620b..da5ee7f 100644
--- a/language/en-GB/en-GB.mod_articles_latest.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_latest.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_news.ini b/language/en-GB/en-GB.mod_articles_news.ini
index 202f163..a43af31 100644
--- a/language/en-GB/en-GB.mod_articles_news.ini
+++ b/language/en-GB/en-GB.mod_articles_news.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_news.sys.ini b/language/en-GB/en-GB.mod_articles_news.sys.ini
index a34e697..ab030c2 100644
--- a/language/en-GB/en-GB.mod_articles_news.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_news.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_popular.ini b/language/en-GB/en-GB.mod_articles_popular.ini
index 8024fc6..e8f3a02 100644
--- a/language/en-GB/en-GB.mod_articles_popular.ini
+++ b/language/en-GB/en-GB.mod_articles_popular.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_articles_popular.sys.ini b/language/en-GB/en-GB.mod_articles_popular.sys.ini
index ca268b4..86cbe96 100644
--- a/language/en-GB/en-GB.mod_articles_popular.sys.ini
+++ b/language/en-GB/en-GB.mod_articles_popular.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_banners.ini b/language/en-GB/en-GB.mod_banners.ini
index 14c904f..470565d 100644
--- a/language/en-GB/en-GB.mod_banners.ini
+++ b/language/en-GB/en-GB.mod_banners.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_banners.sys.ini b/language/en-GB/en-GB.mod_banners.sys.ini
index 6ae6c5b..d685f74 100644
--- a/language/en-GB/en-GB.mod_banners.sys.ini
+++ b/language/en-GB/en-GB.mod_banners.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_breadcrumbs.ini b/language/en-GB/en-GB.mod_breadcrumbs.ini
index 256336a..03a20c7 100644
--- a/language/en-GB/en-GB.mod_breadcrumbs.ini
+++ b/language/en-GB/en-GB.mod_breadcrumbs.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
index 9d8a534..c935e24 100644
--- a/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
+++ b/language/en-GB/en-GB.mod_breadcrumbs.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_custom.ini b/language/en-GB/en-GB.mod_custom.ini
index d229dd2..963abf3 100644
--- a/language/en-GB/en-GB.mod_custom.ini
+++ b/language/en-GB/en-GB.mod_custom.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_custom.sys.ini b/language/en-GB/en-GB.mod_custom.sys.ini
index c48fd97..b2be41e 100644
--- a/language/en-GB/en-GB.mod_custom.sys.ini
+++ b/language/en-GB/en-GB.mod_custom.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_feed.ini b/language/en-GB/en-GB.mod_feed.ini
index b5f86d6..a596773 100644
--- a/language/en-GB/en-GB.mod_feed.ini
+++ b/language/en-GB/en-GB.mod_feed.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_feed.sys.ini b/language/en-GB/en-GB.mod_feed.sys.ini
index e49d6be..532ce61 100644
--- a/language/en-GB/en-GB.mod_feed.sys.ini
+++ b/language/en-GB/en-GB.mod_feed.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_finder.ini b/language/en-GB/en-GB.mod_finder.ini
index cdf434c..9e404b8 100644
--- a/language/en-GB/en-GB.mod_finder.ini
+++ b/language/en-GB/en-GB.mod_finder.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
@@ -21,7 +21,7 @@ MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_DESCRIPTION="The width of the search fie
 MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_LABEL="Search Field Size"
 MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_DESCRIPTION="The position of the search label relative to the search field."
 MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_LABEL="Label Position"
-MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_DESCRIPTION="Assign an ItemID for the display of the search results if there is no com_finder menu and a specific display is desired. The ItemId may be chosen among those available through the Menu Manager. If you do not know what this means, you may not need it."
+MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_DESCRIPTION="Assign an ItemID by selecting a menu item in the list for the display of the search results if there is no com_finder menu item and a specific display is desired. If you do not know what this means, you may not need it."
 MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_LABEL="Set ItemID"
 MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_DESCRIPTION="Toggle whether a button should be displayed for the search form."
 MOD_FINDER_FIELDSET_ADVANCED_SHOW_BUTTON_LABEL="Search Button"
@@ -41,4 +41,5 @@ MOD_FINDER_FIELD_OPENSEARCH_TEXT_LABEL="OpenSearch title"
 MOD_FINDER_SEARCHBUTTON_TEXT="Search"
 MOD_FINDER_SEARCH_BUTTON="Go"
 MOD_FINDER_SEARCH_VALUE="Search..."
+MOD_FINDER_SELECT_MENU_ITEMID="Select a menu item"
 MOD_FINDER_XML_DESCRIPTION="This is a Smart Search module."
diff --git a/language/en-GB/en-GB.mod_finder.sys.ini b/language/en-GB/en-GB.mod_finder.sys.ini
index 0345221..f484e8d 100644
--- a/language/en-GB/en-GB.mod_finder.sys.ini
+++ b/language/en-GB/en-GB.mod_finder.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/language/en-GB/en-GB.mod_footer.ini b/language/en-GB/en-GB.mod_footer.ini
index ba36748..c044630 100644
--- a/language/en-GB/en-GB.mod_footer.ini
+++ b/language/en-GB/en-GB.mod_footer.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 ; Note : %date% will be auto replaced by current year !Don't translate
diff --git a/language/en-GB/en-GB.mod_footer.sys.ini b/language/en-GB/en-GB.mod_footer.sys.ini
index d97106b..5479b85 100644
--- a/language/en-GB/en-GB.mod_footer.sys.ini
+++ b/language/en-GB/en-GB.mod_footer.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 ; Note : %date% will be auto replaced by current year !Don't translate
diff --git a/language/en-GB/en-GB.mod_languages.ini b/language/en-GB/en-GB.mod_languages.ini
index 868b921..0021b1a 100644
--- a/language/en-GB/en-GB.mod_languages.ini
+++ b/language/en-GB/en-GB.mod_languages.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_languages.sys.ini b/language/en-GB/en-GB.mod_languages.sys.ini
index a5a0ee7..e88ed35 100644
--- a/language/en-GB/en-GB.mod_languages.sys.ini
+++ b/language/en-GB/en-GB.mod_languages.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_login.ini b/language/en-GB/en-GB.mod_login.ini
index df8276a..7f5587e 100644
--- a/language/en-GB/en-GB.mod_login.ini
+++ b/language/en-GB/en-GB.mod_login.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_login.sys.ini b/language/en-GB/en-GB.mod_login.sys.ini
index 64eeece..b0bdfe6 100644
--- a/language/en-GB/en-GB.mod_login.sys.ini
+++ b/language/en-GB/en-GB.mod_login.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_menu.ini b/language/en-GB/en-GB.mod_menu.ini
index ed7352e..5e7ac36 100644
--- a/language/en-GB/en-GB.mod_menu.ini
+++ b/language/en-GB/en-GB.mod_menu.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_menu.sys.ini b/language/en-GB/en-GB.mod_menu.sys.ini
index 4b01e3a..ddffbe5 100644
--- a/language/en-GB/en-GB.mod_menu.sys.ini
+++ b/language/en-GB/en-GB.mod_menu.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_random_image.ini b/language/en-GB/en-GB.mod_random_image.ini
index a80442b..da02c8b 100644
--- a/language/en-GB/en-GB.mod_random_image.ini
+++ b/language/en-GB/en-GB.mod_random_image.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_random_image.sys.ini b/language/en-GB/en-GB.mod_random_image.sys.ini
index 84eeee3..1e22b6b 100644
--- a/language/en-GB/en-GB.mod_random_image.sys.ini
+++ b/language/en-GB/en-GB.mod_random_image.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_related_items.ini b/language/en-GB/en-GB.mod_related_items.ini
index 58fb7b0..465c9c7 100644
--- a/language/en-GB/en-GB.mod_related_items.ini
+++ b/language/en-GB/en-GB.mod_related_items.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_related_items.sys.ini b/language/en-GB/en-GB.mod_related_items.sys.ini
index 4485efd..67c2fc0 100644
--- a/language/en-GB/en-GB.mod_related_items.sys.ini
+++ b/language/en-GB/en-GB.mod_related_items.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_search.ini b/language/en-GB/en-GB.mod_search.ini
index bcdc97f..b8cc2aa 100644
--- a/language/en-GB/en-GB.mod_search.ini
+++ b/language/en-GB/en-GB.mod_search.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_search.sys.ini b/language/en-GB/en-GB.mod_search.sys.ini
index 0ccee29..5deeecf 100644
--- a/language/en-GB/en-GB.mod_search.sys.ini
+++ b/language/en-GB/en-GB.mod_search.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_stats.ini b/language/en-GB/en-GB.mod_stats.ini
index dd44ac3..01e3660 100644
--- a/language/en-GB/en-GB.mod_stats.ini
+++ b/language/en-GB/en-GB.mod_stats.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_stats.sys.ini b/language/en-GB/en-GB.mod_stats.sys.ini
index 3848ba4..b2d1698 100644
--- a/language/en-GB/en-GB.mod_stats.sys.ini
+++ b/language/en-GB/en-GB.mod_stats.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_syndicate.ini b/language/en-GB/en-GB.mod_syndicate.ini
index 35c6207..ef0cef6 100644
--- a/language/en-GB/en-GB.mod_syndicate.ini
+++ b/language/en-GB/en-GB.mod_syndicate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_syndicate.sys.ini b/language/en-GB/en-GB.mod_syndicate.sys.ini
index 86a88c2..c939781 100644
--- a/language/en-GB/en-GB.mod_syndicate.sys.ini
+++ b/language/en-GB/en-GB.mod_syndicate.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_tags_popular.ini b/language/en-GB/en-GB.mod_tags_popular.ini
index 8ea3fcd..8d77332 100644
--- a/language/en-GB/en-GB.mod_tags_popular.ini
+++ b/language/en-GB/en-GB.mod_tags_popular.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_tags_popular.sys.ini b/language/en-GB/en-GB.mod_tags_popular.sys.ini
index 8c15311..098a362 100644
--- a/language/en-GB/en-GB.mod_tags_popular.sys.ini
+++ b/language/en-GB/en-GB.mod_tags_popular.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_tags_similar.ini b/language/en-GB/en-GB.mod_tags_similar.ini
index 9d43247..d6a991a 100644
--- a/language/en-GB/en-GB.mod_tags_similar.ini
+++ b/language/en-GB/en-GB.mod_tags_similar.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_tags_similar.sys.ini b/language/en-GB/en-GB.mod_tags_similar.sys.ini
index 6e1542a..f630345 100644
--- a/language/en-GB/en-GB.mod_tags_similar.sys.ini
+++ b/language/en-GB/en-GB.mod_tags_similar.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_users_latest.ini b/language/en-GB/en-GB.mod_users_latest.ini
index 7b18f7f..6f90329 100644
--- a/language/en-GB/en-GB.mod_users_latest.ini
+++ b/language/en-GB/en-GB.mod_users_latest.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_users_latest.sys.ini b/language/en-GB/en-GB.mod_users_latest.sys.ini
index 0fe666e..b60ff6c 100644
--- a/language/en-GB/en-GB.mod_users_latest.sys.ini
+++ b/language/en-GB/en-GB.mod_users_latest.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_weblinks.ini b/language/en-GB/en-GB.mod_weblinks.ini
index c941e43..0d9fbac 100644
--- a/language/en-GB/en-GB.mod_weblinks.ini
+++ b/language/en-GB/en-GB.mod_weblinks.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_weblinks.sys.ini b/language/en-GB/en-GB.mod_weblinks.sys.ini
index 0c5e244..91f09c7 100644
--- a/language/en-GB/en-GB.mod_weblinks.sys.ini
+++ b/language/en-GB/en-GB.mod_weblinks.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_whosonline.ini b/language/en-GB/en-GB.mod_whosonline.ini
index f09baf9..bdae71c 100644
--- a/language/en-GB/en-GB.mod_whosonline.ini
+++ b/language/en-GB/en-GB.mod_whosonline.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 MOD_WHOSONLINE="Who's Online"
diff --git a/language/en-GB/en-GB.mod_whosonline.sys.ini b/language/en-GB/en-GB.mod_whosonline.sys.ini
index 50dc1d1..f8fd9eb 100644
--- a/language/en-GB/en-GB.mod_whosonline.sys.ini
+++ b/language/en-GB/en-GB.mod_whosonline.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_wrapper.ini b/language/en-GB/en-GB.mod_wrapper.ini
index 30e5dd9..05d25ea 100644
--- a/language/en-GB/en-GB.mod_wrapper.ini
+++ b/language/en-GB/en-GB.mod_wrapper.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.mod_wrapper.sys.ini b/language/en-GB/en-GB.mod_wrapper.sys.ini
index 47a3975..4b0477d 100644
--- a/language/en-GB/en-GB.mod_wrapper.sys.ini
+++ b/language/en-GB/en-GB.mod_wrapper.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.tpl_beez3.ini b/language/en-GB/en-GB.tpl_beez3.ini
index 89e7531..2f057d9 100644
--- a/language/en-GB/en-GB.tpl_beez3.ini
+++ b/language/en-GB/en-GB.tpl_beez3.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.tpl_beez3.sys.ini b/language/en-GB/en-GB.tpl_beez3.sys.ini
index 2e84ef7..e3ba10c 100644
--- a/language/en-GB/en-GB.tpl_beez3.sys.ini
+++ b/language/en-GB/en-GB.tpl_beez3.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.tpl_protostar.ini b/language/en-GB/en-GB.tpl_protostar.ini
index f186fd8..7e1ebcd 100644
--- a/language/en-GB/en-GB.tpl_protostar.ini
+++ b/language/en-GB/en-GB.tpl_protostar.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.tpl_protostar.sys.ini b/language/en-GB/en-GB.tpl_protostar.sys.ini
index c5811c4..4b270dd 100644
--- a/language/en-GB/en-GB.tpl_protostar.sys.ini
+++ b/language/en-GB/en-GB.tpl_protostar.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/language/en-GB/en-GB.xml b/language/en-GB/en-GB.xml
index fa4413c..12ad49d 100644
--- a/language/en-GB/en-GB.xml
+++ b/language/en-GB/en-GB.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.2" client="site">
 	<name>English (United Kingdom)</name>
-	<version>3.2.1</version>
+	<version>3.2.2</version>
 	<creationDate>2013-03-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-GB site language</description>
 	<metadata>
diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml
index 5911254..7ed3744 100644
--- a/language/en-GB/install.xml
+++ b/language/en-GB/install.xml
@@ -2,12 +2,12 @@
 <extension version="3.2" client="site" type="language" method="upgrade">
 	<name>English (United Kingdom)</name>
 	<tag>en-GB</tag>
-	<version>3.2.1</version>
+	<version>3.2.2</version>
 	<creationDate>2013-03-07</creationDate>
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>en-GB site language</description>
 	<files>
@@ -32,6 +32,7 @@
 		<filename>en-GB.lib_idna_convert.sys.ini</filename>
 		<filename>en-GB.lib_joomla.ini</filename>
 		<filename>en-GB.lib_joomla.sys.ini</filename>
+		<filename>en-GB.lib_phpass.sys.ini</filename>
 		<filename>en-GB.lib_phpmailer.sys.ini</filename>
 		<filename>en-GB.lib_phputf8.sys.ini</filename>
 		<filename>en-GB.lib_simplepie.sys.ini</filename>
diff --git a/layouts/joomla/content/associations.php b/layouts/joomla/content/associations.php
index 4828aae..b6c3695 100644
--- a/layouts/joomla/content/associations.php
+++ b/layouts/joomla/content/associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/blog_style_default_item_title.php b/layouts/joomla/content/blog_style_default_item_title.php
index 1692c12..7b85c45 100644
--- a/layouts/joomla/content/blog_style_default_item_title.php
+++ b/layouts/joomla/content/blog_style_default_item_title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -33,5 +33,11 @@
 			<?php if ($displayData->state == 0) : ?>
 				<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
 			<?php endif; ?>
+			<?php if (strtotime($displayData->publish_up) > strtotime(JFactory::getDate())) : ?>
+				<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+			<?php endif; ?>
+			<?php if ((strtotime($displayData->publish_down) < strtotime(JFactory::getDate())) && $displayData->publish_down != '0000-00-00 00:00:00') : ?>
+				<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+		<?php endif; ?>
 		</div>
 	<?php endif; ?>
diff --git a/layouts/joomla/content/blog_style_default_links.php b/layouts/joomla/content/blog_style_default_links.php
index b443f0f..873e502 100644
--- a/layouts/joomla/content/blog_style_default_links.php
+++ b/layouts/joomla/content/blog_style_default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/categories_default.php b/layouts/joomla/content/categories_default.php
index a485d0f..2de373b 100644
--- a/layouts/joomla/content/categories_default.php
+++ b/layouts/joomla/content/categories_default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/categories_default_items.php b/layouts/joomla/content/categories_default_items.php
index 61464ea..d8bb18e 100644
--- a/layouts/joomla/content/categories_default_items.php
+++ b/layouts/joomla/content/categories_default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/category_default.php b/layouts/joomla/content/category_default.php
index f100fc6..8be45cc 100644
--- a/layouts/joomla/content/category_default.php
+++ b/layouts/joomla/content/category_default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php
index 8321a29..3009b6f 100644
--- a/layouts/joomla/content/icons.php
+++ b/layouts/joomla/content/icons.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 47bbb22..d61ded2 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -3,22 +3,19 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('JPATH_BASE') or die;
 
 ?>
-			<dd class="createdby">
-				<?php $author = $displayData['item']->author; ?>
-				<?php $author = ($displayData['item']->created_by_alias ? $displayData['item']->created_by_alias : $author); ?>
-				<?php if (!empty($displayData['item']->contactid ) && $displayData['params']->get('link_author') == true) : ?>
-					<?php
-					echo JText::sprintf('COM_CONTENT_WRITTEN_BY',
-						JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id='.$displayData['item']->contactid), $author)
-					); ?>
-				<?php else :?>
-					<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
-				<?php endif; ?>
-			</dd>
\ No newline at end of file
+<dd class="createdby">
+	<?php $author = $displayData['item']->author; ?>
+	<?php $author = ($displayData['item']->created_by_alias ? $displayData['item']->created_by_alias : $author); ?>
+	<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $displayData['item']->contact_link, $author)); ?>
+	<?php else :?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+	<?php endif; ?>
+</dd>
diff --git a/layouts/joomla/content/info_block/block.php b/layouts/joomla/content/info_block/block.php
index f562490..a9102d9 100644
--- a/layouts/joomla/content/info_block/block.php
+++ b/layouts/joomla/content/info_block/block.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php
index 6bfab43..69ba8b7 100644
--- a/layouts/joomla/content/info_block/category.php
+++ b/layouts/joomla/content/info_block/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/create_date.php b/layouts/joomla/content/info_block/create_date.php
index d311b65..3dcffe3 100644
--- a/layouts/joomla/content/info_block/create_date.php
+++ b/layouts/joomla/content/info_block/create_date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/hits.php b/layouts/joomla/content/info_block/hits.php
index 9233f85..2ed5fe8 100644
--- a/layouts/joomla/content/info_block/hits.php
+++ b/layouts/joomla/content/info_block/hits.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/modify_date.php b/layouts/joomla/content/info_block/modify_date.php
index 7ca57c0..1aabd33 100644
--- a/layouts/joomla/content/info_block/modify_date.php
+++ b/layouts/joomla/content/info_block/modify_date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/parent_category.php b/layouts/joomla/content/info_block/parent_category.php
index 1379180..7d31df9 100644
--- a/layouts/joomla/content/info_block/parent_category.php
+++ b/layouts/joomla/content/info_block/parent_category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/info_block/publish_date.php b/layouts/joomla/content/info_block/publish_date.php
index e09989e..057e7dc 100644
--- a/layouts/joomla/content/info_block/publish_date.php
+++ b/layouts/joomla/content/info_block/publish_date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/intro_image.php b/layouts/joomla/content/intro_image.php
index d570040..fbb2f6a 100644
--- a/layouts/joomla/content/intro_image.php
+++ b/layouts/joomla/content/intro_image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/options_default.php b/layouts/joomla/content/options_default.php
index c4c394d..c80ac8e 100644
--- a/layouts/joomla/content/options_default.php
+++ b/layouts/joomla/content/options_default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
index 0987407..7fbf495 100644
--- a/layouts/joomla/content/tags.php
+++ b/layouts/joomla/content/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Cms
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/associations.php b/layouts/joomla/edit/associations.php
index e685b61..cdf9832 100644
--- a/layouts/joomla/edit/associations.php
+++ b/layouts/joomla/edit/associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/details.php b/layouts/joomla/edit/details.php
index a16a5bc..27cec29 100644
--- a/layouts/joomla/edit/details.php
+++ b/layouts/joomla/edit/details.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * @deprecated  3.2
diff --git a/layouts/joomla/edit/fieldset.php b/layouts/joomla/edit/fieldset.php
index 1e98f00..952305b 100644
--- a/layouts/joomla/edit/fieldset.php
+++ b/layouts/joomla/edit/fieldset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/frontediting_modules.php b/layouts/joomla/edit/frontediting_modules.php
index 8550d93..86a2c61 100644
--- a/layouts/joomla/edit/frontediting_modules.php
+++ b/layouts/joomla/edit/frontediting_modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/global.php b/layouts/joomla/edit/global.php
index 4545457..983e7e3 100644
--- a/layouts/joomla/edit/global.php
+++ b/layouts/joomla/edit/global.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/item_title.php b/layouts/joomla/edit/item_title.php
index e2c0ef6..1930253 100644
--- a/layouts/joomla/edit/item_title.php
+++ b/layouts/joomla/edit/item_title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Cms
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * @deprecated  3.2
diff --git a/layouts/joomla/edit/metadata.php b/layouts/joomla/edit/metadata.php
index 644e74e..02d5631 100644
--- a/layouts/joomla/edit/metadata.php
+++ b/layouts/joomla/edit/metadata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/params.php b/layouts/joomla/edit/params.php
index ceb6374..527b21f 100644
--- a/layouts/joomla/edit/params.php
+++ b/layouts/joomla/edit/params.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/publishingdata.php b/layouts/joomla/edit/publishingdata.php
index e759897..e737578 100644
--- a/layouts/joomla/edit/publishingdata.php
+++ b/layouts/joomla/edit/publishingdata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/edit/title_alias.php b/layouts/joomla/edit/title_alias.php
index 8d49108..93fd0fb 100644
--- a/layouts/joomla/edit/title_alias.php
+++ b/layouts/joomla/edit/title_alias.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Cms
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupclose.php b/layouts/joomla/links/groupclose.php
index 2941721..1f2eb2b 100644
--- a/layouts/joomla/links/groupclose.php
+++ b/layouts/joomla/links/groupclose.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupopen.php b/layouts/joomla/links/groupopen.php
index e48e478..d51482c 100644
--- a/layouts/joomla/links/groupopen.php
+++ b/layouts/joomla/links/groupopen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupsclose.php b/layouts/joomla/links/groupsclose.php
index 6ec787d..1f8eb24 100644
--- a/layouts/joomla/links/groupsclose.php
+++ b/layouts/joomla/links/groupsclose.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupseparator.php b/layouts/joomla/links/groupseparator.php
index a13997e..f661627 100644
--- a/layouts/joomla/links/groupseparator.php
+++ b/layouts/joomla/links/groupseparator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/groupsopen.php b/layouts/joomla/links/groupsopen.php
index 118cf2f..5a74c90 100644
--- a/layouts/joomla/links/groupsopen.php
+++ b/layouts/joomla/links/groupsopen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/links/link.php b/layouts/joomla/links/link.php
index 597315c..402a2cd 100644
--- a/layouts/joomla/links/link.php
+++ b/layouts/joomla/links/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/quickicons/icon.php b/layouts/joomla/quickicons/icon.php
index 0ff6cf8..caae785 100644
--- a/layouts/joomla/quickicons/icon.php
+++ b/layouts/joomla/quickicons/icon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default.php b/layouts/joomla/searchtools/default.php
index bfaabae..4082d26 100644
--- a/layouts/joomla/searchtools/default.php
+++ b/layouts/joomla/searchtools/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default/bar.php b/layouts/joomla/searchtools/default/bar.php
index 4cf68f4..b971bd0 100644
--- a/layouts/joomla/searchtools/default/bar.php
+++ b/layouts/joomla/searchtools/default/bar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -29,7 +29,7 @@
 <?php if (!empty($filters['filter_search'])) : ?>
 	<?php if ($searchButton) : ?>
 		<label for="filter_search" class="element-invisible">
-			<?php echo JText::_('COM_CONTENT_FILTER_SEARCH_DESC'); ?>
+			<?php echo JText::_('JSEARCH_FILTER'); ?>
 		</label>
 		<div class="btn-wrapper input-append">
 			<?php echo $filters['filter_search']->input; ?>
diff --git a/layouts/joomla/searchtools/default/filters.php b/layouts/joomla/searchtools/default/filters.php
index 54e7a15..e8b356d 100644
--- a/layouts/joomla/searchtools/default/filters.php
+++ b/layouts/joomla/searchtools/default/filters.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/default/list.php b/layouts/joomla/searchtools/default/list.php
index edbfe98..5350f6d 100644
--- a/layouts/joomla/searchtools/default/list.php
+++ b/layouts/joomla/searchtools/default/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/searchtools/grid/sort.php b/layouts/joomla/searchtools/grid/sort.php
index ff0e595..045c030 100644
--- a/layouts/joomla/searchtools/grid/sort.php
+++ b/layouts/joomla/searchtools/grid/sort.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/sidebars/submenu.php b/layouts/joomla/sidebars/submenu.php
index 40babac..99088f9 100644
--- a/layouts/joomla/sidebars/submenu.php
+++ b/layouts/joomla/sidebars/submenu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/tinymce/buttons.php b/layouts/joomla/tinymce/buttons.php
index 1097b4c..04ae3cc 100644
--- a/layouts/joomla/tinymce/buttons.php
+++ b/layouts/joomla/tinymce/buttons.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/tinymce/buttons/button.php b/layouts/joomla/tinymce/buttons/button.php
index 9661aac..7d9d024 100644
--- a/layouts/joomla/tinymce/buttons/button.php
+++ b/layouts/joomla/tinymce/buttons/button.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/tinymce/textarea.php b/layouts/joomla/tinymce/textarea.php
index d93a266..d91cb79 100644
--- a/layouts/joomla/tinymce/textarea.php
+++ b/layouts/joomla/tinymce/textarea.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/tinymce/togglebutton.php b/layouts/joomla/tinymce/togglebutton.php
index 79121a3..f15b359 100644
--- a/layouts/joomla/tinymce/togglebutton.php
+++ b/layouts/joomla/tinymce/togglebutton.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/base.php b/layouts/joomla/toolbar/base.php
index a6f682e..1f0bb5d 100644
--- a/layouts/joomla/toolbar/base.php
+++ b/layouts/joomla/toolbar/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/batch.php b/layouts/joomla/toolbar/batch.php
index d1c85eb..65fd2d6 100644
--- a/layouts/joomla/toolbar/batch.php
+++ b/layouts/joomla/toolbar/batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/confirm.php b/layouts/joomla/toolbar/confirm.php
index 8c23246..cc63357 100644
--- a/layouts/joomla/toolbar/confirm.php
+++ b/layouts/joomla/toolbar/confirm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/containerclose.php b/layouts/joomla/toolbar/containerclose.php
index 6ec787d..1f8eb24 100644
--- a/layouts/joomla/toolbar/containerclose.php
+++ b/layouts/joomla/toolbar/containerclose.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/containeropen.php b/layouts/joomla/toolbar/containeropen.php
index bd6c528..196ecae 100644
--- a/layouts/joomla/toolbar/containeropen.php
+++ b/layouts/joomla/toolbar/containeropen.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/help.php b/layouts/joomla/toolbar/help.php
index b2e719d..5c377c5 100644
--- a/layouts/joomla/toolbar/help.php
+++ b/layouts/joomla/toolbar/help.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/iconclass.php b/layouts/joomla/toolbar/iconclass.php
index 90b0245..9785851 100644
--- a/layouts/joomla/toolbar/iconclass.php
+++ b/layouts/joomla/toolbar/iconclass.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/link.php b/layouts/joomla/toolbar/link.php
index 7d809d2..eba13cc 100644
--- a/layouts/joomla/toolbar/link.php
+++ b/layouts/joomla/toolbar/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/popup.php b/layouts/joomla/toolbar/popup.php
index 1acf19c..5c76d9b 100644
--- a/layouts/joomla/toolbar/popup.php
+++ b/layouts/joomla/toolbar/popup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/separator.php b/layouts/joomla/toolbar/separator.php
index a0d79c8..e8bbb4c 100644
--- a/layouts/joomla/toolbar/separator.php
+++ b/layouts/joomla/toolbar/separator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/slider.php b/layouts/joomla/toolbar/slider.php
index a43b69f..a639f9a 100644
--- a/layouts/joomla/toolbar/slider.php
+++ b/layouts/joomla/toolbar/slider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/standard.php b/layouts/joomla/toolbar/standard.php
index 948fb3b..8f5a0f5 100644
--- a/layouts/joomla/toolbar/standard.php
+++ b/layouts/joomla/toolbar/standard.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/title.php b/layouts/joomla/toolbar/title.php
index 408aa2e..b1e24e8 100644
--- a/layouts/joomla/toolbar/title.php
+++ b/layouts/joomla/toolbar/title.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/joomla/toolbar/versions.php b/layouts/joomla/toolbar/versions.php
index cb653c2..6add897 100644
--- a/layouts/joomla/toolbar/versions.php
+++ b/layouts/joomla/toolbar/versions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/addtab.php b/layouts/libraries/cms/html/bootstrap/addtab.php
index d2eec5e..1412206 100644
--- a/layouts/libraries/cms/html/bootstrap/addtab.php
+++ b/layouts/libraries/cms/html/bootstrap/addtab.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/addtabscript.php b/layouts/libraries/cms/html/bootstrap/addtabscript.php
index 1571a7c..e2c50cf 100644
--- a/layouts/libraries/cms/html/bootstrap/addtabscript.php
+++ b/layouts/libraries/cms/html/bootstrap/addtabscript.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/endtab.php b/layouts/libraries/cms/html/bootstrap/endtab.php
index db3779a..370f8ce 100644
--- a/layouts/libraries/cms/html/bootstrap/endtab.php
+++ b/layouts/libraries/cms/html/bootstrap/endtab.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/endtabset.php b/layouts/libraries/cms/html/bootstrap/endtabset.php
index db3779a..370f8ce 100644
--- a/layouts/libraries/cms/html/bootstrap/endtabset.php
+++ b/layouts/libraries/cms/html/bootstrap/endtabset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/starttabset.php b/layouts/libraries/cms/html/bootstrap/starttabset.php
index b9a7cbf..50d8963 100644
--- a/layouts/libraries/cms/html/bootstrap/starttabset.php
+++ b/layouts/libraries/cms/html/bootstrap/starttabset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/layouts/libraries/cms/html/bootstrap/starttabsetscript.php b/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
index 06c7d78..238cdd7 100644
--- a/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
+++ b/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms.php b/libraries/cms.php
index aada2f2..ca29a6e 100644
--- a/libraries/cms.php
+++ b/libraries/cms.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Libraries
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/application/administrator.php b/libraries/cms/application/administrator.php
index b5b60bf..fb9841d 100644
--- a/libraries/cms/application/administrator.php
+++ b/libraries/cms/application/administrator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index 17a0521..bb1a4d7 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/application/helper.php b/libraries/cms/application/helper.php
index fe17be2..1988158 100644
--- a/libraries/cms/application/helper.php
+++ b/libraries/cms/application/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -53,6 +53,7 @@ public static function getComponentName($default = null)
 		}
 
 		$input->set('option', $option);
+
 		return $option;
 	}
 
@@ -211,6 +212,7 @@ public static function addClientInfo($client)
 	public static function parseXMLInstallFile($path)
 	{
 		JLog::add('JApplicationHelper::parseXMLInstallFile is deprecated. Use JInstaller::parseXMLInstallFile instead.', JLog::WARNING, 'deprecated');
+
 		return JInstaller::parseXMLInstallFile($path);
 	}
 
@@ -246,6 +248,7 @@ public static function parseXMLLangMetaFile($path)
 		if ($xml->getName() != 'metafile')
 		{
 			unset($xml);
+
 			return false;
 		}
 
diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
index ae36934..2a436fa 100644
--- a/libraries/cms/application/site.php
+++ b/libraries/cms/application/site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -281,6 +281,7 @@ public function getParams($option = null)
 		static $params = array();
 
 		$hash = '__default';
+
 		if (!empty($option))
 		{
 			$hash = $option;
@@ -315,6 +316,7 @@ public function getParams($option = null)
 			{
 				$description = $this->get('MetaDesc');
 			}
+
 			$rights = $this->get('MetaRights');
 			$robots = $this->get('robots');
 
diff --git a/libraries/cms/captcha/captcha.php b/libraries/cms/captcha/captcha.php
index eb57b63..9138a40 100644
--- a/libraries/cms/captcha/captcha.php
+++ b/libraries/cms/captcha/captcha.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Captcha
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -104,6 +104,7 @@ public static function getInstance($captcha, array $options = array())
 			catch (RuntimeException $e)
 			{
 				JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
 				return null;
 			}
 		}
@@ -132,6 +133,7 @@ public function initialise($id)
 		catch (Exception $e)
 		{
 			JFactory::getApplication()->enqueueMessage($e->getMessage(), 'error');
+
 			return false;
 		}
 
@@ -220,10 +222,12 @@ private function _load(array $options = array())
 
 		// Get the plugin
 		$plugin = JPluginHelper::getPlugin('captcha', $this->_name);
+
 		if (!$plugin)
 		{
 			throw new RuntimeException(JText::sprintf('JLIB_CAPTCHA_ERROR_PLUGIN_NOT_FOUND', $name));
 		}
+
 		$params = new JRegistry($plugin->params);
 		$plugin->params = $params;
 
diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
index f028a07..b222112 100644
--- a/libraries/cms/component/helper.php
+++ b/libraries/cms/component/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Component
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -229,6 +229,7 @@ public static function filterText($text)
 				{
 					$filter->tagBlacklist = $customListTags;
 				}
+
 				if ($customListAttributes)
 				{
 					$filter->attrBlacklist = $customListAttributes;
diff --git a/libraries/cms/editor/editor.php b/libraries/cms/editor/editor.php
index ddfe6d4..32f8b14 100644
--- a/libraries/cms/editor/editor.php
+++ b/libraries/cms/editor/editor.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Editor
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -316,6 +316,7 @@ public function display($name, $html, $width, $height, $col, $row, $buttons = tr
 				$return .= $result;
 			}
 		}
+
 		return $return;
 	}
 
@@ -489,9 +490,11 @@ protected function _loadEditor($config = array())
 		if (!is_file($path))
 		{
 			$path = JPATH_PLUGINS . '/editors/' . $name . '/' . $name . '.php';
+
 			if (!is_file($path))
 			{
 				JLog::add(JText::_('JLIB_HTML_EDITOR_CANNOT_LOAD'), JLog::WARNING, 'jerror');
+
 				return false;
 			}
 		}
diff --git a/libraries/cms/error/page.php b/libraries/cms/error/page.php
index 5ee2cf5..730d6e8 100644
--- a/libraries/cms/error/page.php
+++ b/libraries/cms/error/page.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Error
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,6 +53,7 @@ public static function render(Exception $error)
 			{
 				ob_end_clean();
 			}
+
 			$document->setTitle(JText::_('Error') . ': ' . $error->getCode());
 			$data = $document->render(
 				false,
diff --git a/libraries/cms/form/field/author.php b/libraries/cms/form/field/author.php
index a1f4d50..178880c 100644
--- a/libraries/cms/form/field/author.php
+++ b/libraries/cms/form/field/author.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/chromestyle.php b/libraries/cms/form/field/chromestyle.php
index ac37707..ce86c15 100644
--- a/libraries/cms/form/field/chromestyle.php
+++ b/libraries/cms/form/field/chromestyle.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -141,7 +141,7 @@ protected function getTemplates()
 		// Set the query and load the templates.
 		$db->setQuery($query);
 		$templates = $db->loadObjectList('element');
+
 		return $templates;
 	}
-
 }
diff --git a/libraries/cms/form/field/contenthistory.php b/libraries/cms/form/field/contenthistory.php
index 8439173..0bb72a6 100644
--- a/libraries/cms/form/field/contenthistory.php
+++ b/libraries/cms/form/field/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/contentlanguage.php b/libraries/cms/form/field/contentlanguage.php
index 1e7cb8c..dc1f6b4 100644
--- a/libraries/cms/form/field/contentlanguage.php
+++ b/libraries/cms/form/field/contentlanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/contenttype.php b/libraries/cms/form/field/contenttype.php
index 9975025..9c8ac4d 100644
--- a/libraries/cms/form/field/contenttype.php
+++ b/libraries/cms/form/field/contenttype.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/editor.php b/libraries/cms/form/field/editor.php
index be4452d..6f79de5 100644
--- a/libraries/cms/form/field/editor.php
+++ b/libraries/cms/form/field/editor.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/headertag.php b/libraries/cms/form/field/headertag.php
index 700cb81..f261d04 100644
--- a/libraries/cms/form/field/headertag.php
+++ b/libraries/cms/form/field/headertag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/helpsite.php b/libraries/cms/form/field/helpsite.php
index 55aa76d..8177c01 100644
--- a/libraries/cms/form/field/helpsite.php
+++ b/libraries/cms/form/field/helpsite.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -59,7 +59,14 @@ protected function getInput()
 		);
 
 		$html = parent::getInput();
-		$button = '<button type="button" class="btn btn-small" id="helpsite-refresh" rel="' . $this->id . '"><span>' . JText::_('JGLOBAL_HELPREFRESH_BUTTON') . '</span></button>';
+		$button = '<button
+						type="button"
+						class="btn btn-small"
+						id="helpsite-refresh"
+						rel="' . $this->id . '"
+					>
+					<span>' . JText::_('JGLOBAL_HELPREFRESH_BUTTON') . '</span>
+					</button>';
 
 		return $html . $button;
 	}
diff --git a/libraries/cms/form/field/limitbox.php b/libraries/cms/form/field/limitbox.php
index ec7782f..fa2b57b 100644
--- a/libraries/cms/form/field/limitbox.php
+++ b/libraries/cms/form/field/limitbox.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/media.php b/libraries/cms/form/field/media.php
index 04c3c6d..674fcc8 100644
--- a/libraries/cms/form/field/media.php
+++ b/libraries/cms/form/field/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/menu.php b/libraries/cms/form/field/menu.php
index f37e797..dd223c3 100644
--- a/libraries/cms/form/field/menu.php
+++ b/libraries/cms/form/field/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/menuitem.php b/libraries/cms/form/field/menuitem.php
index cad6fe5..e122d5b 100644
--- a/libraries/cms/form/field/menuitem.php
+++ b/libraries/cms/form/field/menuitem.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/moduleorder.php b/libraries/cms/form/field/moduleorder.php
index b5529ad..9eed9e3 100644
--- a/libraries/cms/form/field/moduleorder.php
+++ b/libraries/cms/form/field/moduleorder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/moduleposition.php b/libraries/cms/form/field/moduleposition.php
index ca4a8a3..287f265 100644
--- a/libraries/cms/form/field/moduleposition.php
+++ b/libraries/cms/form/field/moduleposition.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/moduletag.php b/libraries/cms/form/field/moduletag.php
index 86f1bd0..474988b 100644
--- a/libraries/cms/form/field/moduletag.php
+++ b/libraries/cms/form/field/moduletag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/ordering.php b/libraries/cms/form/field/ordering.php
index 886710f..5133401 100644
--- a/libraries/cms/form/field/ordering.php
+++ b/libraries/cms/form/field/ordering.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/registrationdaterange.php b/libraries/cms/form/field/registrationdaterange.php
index e2b1a74..7d9211e 100644
--- a/libraries/cms/form/field/registrationdaterange.php
+++ b/libraries/cms/form/field/registrationdaterange.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/status.php b/libraries/cms/form/field/status.php
index 79a0e89..5a3cff2 100644
--- a/libraries/cms/form/field/status.php
+++ b/libraries/cms/form/field/status.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/tag.php b/libraries/cms/form/field/tag.php
index 7b2f038..65f93ac 100644
--- a/libraries/cms/form/field/tag.php
+++ b/libraries/cms/form/field/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -167,6 +167,7 @@ protected function getOptions()
 		if ($this->form->getName() == 'com_tags.tag')
 		{
 			$id   = (int) $this->form->getValue('id', 0);
+
 			foreach ($options as $option)
 			{
 				if ($option->value == $id)
diff --git a/libraries/cms/form/field/templatestyle.php b/libraries/cms/form/field/templatestyle.php
index def5e52..52266b0 100644
--- a/libraries/cms/form/field/templatestyle.php
+++ b/libraries/cms/form/field/templatestyle.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/user.php b/libraries/cms/form/field/user.php
index 6a9fbfb..6e433a5 100644
--- a/libraries/cms/form/field/user.php
+++ b/libraries/cms/form/field/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/field/useractive.php b/libraries/cms/form/field/useractive.php
index 06f7e3f..8481678 100644
--- a/libraries/cms/form/field/useractive.php
+++ b/libraries/cms/form/field/useractive.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/usergrouplist.php b/libraries/cms/form/field/usergrouplist.php
index 9a0b154..3cafcd0 100644
--- a/libraries/cms/form/field/usergrouplist.php
+++ b/libraries/cms/form/field/usergrouplist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/field/userstate.php b/libraries/cms/form/field/userstate.php
index ae892f2..2cc19f2 100644
--- a/libraries/cms/form/field/userstate.php
+++ b/libraries/cms/form/field/userstate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/form/rule/captcha.php b/libraries/cms/form/rule/captcha.php
index 0267aaa..8231e08 100644
--- a/libraries/cms/form/rule/captcha.php
+++ b/libraries/cms/form/rule/captcha.php
@@ -52,6 +52,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, JRegistry
 		if (!$captcha->checkAnswer($value))
 		{
 			$error = $captcha->getError();
+
 			if ($error instanceof Exception)
 			{
 				return $error;
diff --git a/libraries/cms/form/rule/notequals.php b/libraries/cms/form/rule/notequals.php
index 35141b4..6bde740 100644
--- a/libraries/cms/form/rule/notequals.php
+++ b/libraries/cms/form/rule/notequals.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/form/rule/password.php b/libraries/cms/form/rule/password.php
index c28a4fd..263eb52 100644
--- a/libraries/cms/form/rule/password.php
+++ b/libraries/cms/form/rule/password.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/help/help.php b/libraries/cms/help/help.php
index 3f42f99..37f2d80 100644
--- a/libraries/cms/help/help.php
+++ b/libraries/cms/help/help.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Help
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/helper/content.php b/libraries/cms/helper/content.php
index 7953cea..e164f64 100644
--- a/libraries/cms/helper/content.php
+++ b/libraries/cms/helper/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Helper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -42,9 +42,13 @@ public static function addSubmenu($vName)
 	 * @return  JObject
 	 *
 	 * @since   3.1
+	 * @deprecated  3.2  Use JHelperContent::getActions() instead
 	 */
-	public static function getActions($categoryId = 0, $id = 0, $assetName = '')
+	public static function _getActions($categoryId = 0, $id = 0, $assetName = '')
 	{
+		// Log usage of deprecated function
+		JLog::add(__METHOD__ . '() is deprecated, use JHelperContent::getActions() with new arguments order instead.', JLog::WARNING, 'deprecated');
+
 		// Reverted a change for version 2.5.6
 		$user	= JFactory::getUser();
 		$result	= new JObject;
@@ -77,6 +81,51 @@ public static function getActions($categoryId = 0, $id = 0, $assetName = '')
 		return $result;
 	}
 
+	/**
+	 * Gets a list of the actions that can be performed.
+	 *
+	 * @param   string   $component  The component name.
+	 * @param   string   $section    The access section name.
+	 * @param   integer  $id         The item ID.
+	 *
+	 * @return  JObject
+	 *
+	 * @since   3.2
+	 */
+	public static function getActions($component = '', $section = '', $id = 0)
+	{
+		// Check for deprecated arguments order
+		if (is_int($component) || is_null($component))
+		{
+			$result = self::_getActions($component, $section, $id);
+
+			return $result;
+		}
+
+		$user	= JFactory::getUser();
+		$result	= new JObject;
+
+		$path = JPATH_ADMINISTRATOR . '/components/' . $component . '/access.xml';
+
+		if ($section && $id)
+		{
+			$assetName = $component . '.' . $section . '.' . (int) $id;
+		}
+		else
+		{
+			$assetName = $component;
+		}
+
+		$actions = JAccess::getActionsFromFile($path, "/access/section[@name='component']/");
+
+		foreach ($actions as $action)
+		{
+			$result->set($action->name, $user->authorise($action->name, $assetName));
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Gets the current language
 	 *
@@ -109,15 +158,15 @@ public static function getCurrentLanguage($detectBrowser = true)
 	}
 
 	/**
-	* Gets the associated language ID
-	*
-	* @param   string  $langCode  The language code to look up
-	*
-	* @return  integer  The language ID
-	*
-	* @since   3.1
-	* @note    JHelper::getLanguage() is the preferred method.
-	*/
+	 * Gets the associated language ID
+	 *
+	 * @param   string  $langCode  The language code to look up
+	 *
+	 * @return  integer  The language ID
+	 *
+	 * @since   3.1
+	 * @note    JHelper::getLanguage() is the preferred method.
+	 */
 	public static function getLanguageId($langCode)
 	{
 		$db    = JFactory::getDbo();
diff --git a/libraries/cms/helper/contenthistory.php b/libraries/cms/helper/contenthistory.php
index 192d423..b50c876 100644
--- a/libraries/cms/helper/contenthistory.php
+++ b/libraries/cms/helper/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Helper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/helper/helper.php b/libraries/cms/helper/helper.php
index b74e718..5f76943 100644
--- a/libraries/cms/helper/helper.php
+++ b/libraries/cms/helper/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Helper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index 53b78c0..12a1c52 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Helper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,6 +30,7 @@ class JHelperMedia
 	public function isImage($fileName)
 	{
 		static $imageTypes = 'xcf|odg|gif|jpg|png|bmp';
+
 		return preg_match("/\.(?:$imageTypes)$/i", $fileName);
 	}
 
diff --git a/libraries/cms/helper/route.php b/libraries/cms/helper/route.php
index c3c901f..a086268 100644
--- a/libraries/cms/helper/route.php
+++ b/libraries/cms/helper/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Helper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/helper/tags.php b/libraries/cms/helper/tags.php
index bc81cd0..f15a1a3 100644
--- a/libraries/cms/helper/tags.php
+++ b/libraries/cms/helper/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Helper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -234,7 +234,6 @@ public function createTagsFromField($tags)
 						}
 					}
 				}
-
 			}
 
 			// At this point $tags is an array of all tag ids
@@ -323,7 +322,6 @@ public function createTagsFromMetadata($metadata)
 						}
 					}
 				}
-
 			}
 
 			// At this point $tags is an array of all tag ids
diff --git a/libraries/cms/html/access.php b/libraries/cms/html/access.php
index fe2cebd..b57e2e2 100644
--- a/libraries/cms/html/access.php
+++ b/libraries/cms/html/access.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -164,6 +164,7 @@ public static function usergroups($name, $selected, $checkSuperAdmin = false)
 				{
 					$checked = in_array($item->id, $selected) ? ' checked="checked"' : '';
 				}
+
 				$rel = ($item->parent_id > 0) ? ' rel="' . $count . 'group_' . $item->parent_id . '"' : '';
 
 				// Build the HTML for the item.
diff --git a/libraries/cms/html/actionsdropdown.php b/libraries/cms/html/actionsdropdown.php
index e3f1448..5762a50 100644
--- a/libraries/cms/html/actionsdropdown.php
+++ b/libraries/cms/html/actionsdropdown.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/batch.php b/libraries/cms/html/batch.php
index 5c5950f..c50b14e 100644
--- a/libraries/cms/html/batch.php
+++ b/libraries/cms/html/batch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -76,7 +76,7 @@ public static function item($extension)
 			. '</div>'
 			. '<div id="batch-move-copy" class="control-group radio">'
 			. JHtml::_('select.radiolist', $options, 'batch[move_copy]', '', 'value', 'text', 'm')
-			. '</div><hr />';
+			. '</div>';
 	}
 
 	/**
@@ -116,6 +116,7 @@ public static function user($noUser = true)
 		JHtml::_('bootstrap.tooltip');
 
 		$optionNo = '';
+
 		if ($noUser)
 		{
 			$optionNo = '<option value="0">' . JText::_('JLIB_HTML_BATCH_USER_NOUSER') . '</option>';
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 85c07ef..b7a8144 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -87,7 +87,7 @@ public static function caption($selector = 'img.caption')
 		// Include jQuery
 		JHtml::_('jquery.framework');
 
-		JHtml::_('script', 'system/caption.js', true, true);
+		JHtml::_('script', 'system/caption.js', false, true);
 
 		// Attach caption to document
 		JFactory::getDocument()->addScriptDeclaration(
@@ -126,6 +126,7 @@ public static function formvalidation()
 		// Include MooTools More framework
 		static::framework('more');
 
+		JHtml::_('script', 'system/punycode.js', false, true);
 		JHtml::_('script', 'system/validate.js', false, true);
 		static::$loaded[__METHOD__] = true;
 	}
@@ -475,6 +476,7 @@ public static function calendar()
 		{
 			$document->addScriptDeclaration($translation);
 		}
+
 		static::$loaded[__METHOD__] = true;
 	}
 
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index 367d9e4..7da695f 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -330,18 +330,18 @@ public static function renderModal($selector = 'modal', $params = array(), $foot
 	 *
 	 * Use element's Title as popover content
 	 *
-	 * @param   string  $selector  Selector for the tooltip
-	 * @param   array   $params    An array of options for the tooltip.
-	 *                  Options for the tooltip can be:
-	 *                      animation  boolean          apply a css fade transition to the tooltip
-	 *                      html       boolean          Insert HTML into the tooltip. If false, jQuery's text method will be used to insert
+	 * @param   string  $selector  Selector for the popover
+	 * @param   array   $params    An array of options for the popover.
+	 *                  Options for the popover can be:
+	 *                      animation  boolean          apply a css fade transition to the popover
+	 *                      html       boolean          Insert HTML into the popover. If false, jQuery's text method will be used to insert
 	 *                                                  content into the dom.
-	 *                      placement  string|function  how to position the tooltip - top | bottom | left | right
-	 *                      selector   string           If a selector is provided, tooltip objects will be delegated to the specified targets.
-	 *                      trigger    string           how tooltip is triggered - hover | focus | manual
+	 *                      placement  string|function  how to position the popover - top | bottom | left | right
+	 *                      selector   string           If a selector is provided, popover objects will be delegated to the specified targets.
+	 *                      trigger    string           how popover is triggered - hover | focus | manual
 	 *                      title      string|function  default title value if `title` tag isn't present
 	 *                      content    string|function  default content value if `data-content` attribute isn't present
-	 *                      delay      number|object    delay showing and hiding the tooltip (ms) - does not apply to manual trigger type
+	 *                      delay      number|object    delay showing and hiding the popover (ms) - does not apply to manual trigger type
 	 *                                                  If a number is supplied, delay is applied to both hide/show
 	 *                                                  Object structure is: delay: { show: 500, hide: 100 }
 	 *                      container  string|boolean   Appends the popover to a specific element: { container: 'body' }
@@ -362,14 +362,14 @@ public static function popover($selector = '.hasPopover', $params = array())
 		static::framework();
 
 		$opt['animation'] = isset($params['animation']) ? $params['animation'] : null;
-		$opt['html'] = isset($params['html']) ? $params['html'] : true;
+		$opt['html']      = isset($params['html']) ? $params['html'] : true;
 		$opt['placement'] = isset($params['placement']) ? $params['placement'] : null;
-		$opt['selector'] = isset($params['selector']) ? $params['selector'] : null;
-		$opt['title'] = isset($params['title']) ? $params['title'] : null;
-		$opt['trigger'] = isset($params['trigger']) ? $params['trigger'] : 'hover focus';
-		$opt['content'] = isset($params['content']) ? $params['content'] : null;
-		$opt['delay'] = isset($params['delay']) ? $params['delay'] : null;
-		$opt['container'] = isset($params['container']) ? $params['container'] : "body";
+		$opt['selector']  = isset($params['selector']) ? $params['selector'] : null;
+		$opt['title']     = isset($params['title']) ? $params['title'] : null;
+		$opt['trigger']   = isset($params['trigger']) ? $params['trigger'] : 'hover focus';
+		$opt['content']   = isset($params['content']) ? $params['content'] : null;
+		$opt['delay']     = isset($params['delay']) ? $params['delay'] : null;
+		$opt['container'] = isset($params['container']) ? $params['container'] : 'body';
 
 		$options = JHtml::getJSObject($opt);
 
@@ -466,7 +466,7 @@ public static function tooltip($selector = '.hasTooltip', $params = array())
 			$opt['title']     = isset($params['title']) ? (string) $params['title'] : null;
 			$opt['trigger']   = isset($params['trigger']) ? (string) $params['trigger'] : null;
 			$opt['delay']     = isset($params['delay']) ? (int) $params['delay'] : null;
-			$opt['container'] = isset($params['container']) ? (int) $params['container'] : "body";
+			$opt['container'] = isset($params['container']) ? $params['container'] : 'body';
 			$opt['template']  = isset($params['template']) ? (string) $params['template'] : null;
 
 			$options = JHtml::getJSObject($opt);
@@ -752,6 +752,7 @@ public static function endTab()
 	public static function startPane($selector = 'myTab', $params = array())
 	{
 		$sig = md5(serialize(array($selector, $params)));
+
 		if (!isset(static::$loaded['JHtmlBootstrap::startTabSet'][$sig]))
 		{
 			// Include Bootstrap framework
diff --git a/libraries/cms/html/category.php b/libraries/cms/html/category.php
index 7900811..683656f 100644
--- a/libraries/cms/html/category.php
+++ b/libraries/cms/html/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -80,6 +80,7 @@ public static function options($extension, $config = array('filter.published' =>
 					{
 						$language = $db->quote($language);
 					}
+
 					$query->where('a.language IN (' . implode(',', $config['filter.language']) . ')');
 				}
 			}
diff --git a/libraries/cms/html/content.php b/libraries/cms/html/content.php
index 98fda3c..1e2bff5 100644
--- a/libraries/cms/html/content.php
+++ b/libraries/cms/html/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/contentlanguage.php b/libraries/cms/html/contentlanguage.php
index 33cee72..97867c3 100644
--- a/libraries/cms/html/contentlanguage.php
+++ b/libraries/cms/html/contentlanguage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -59,6 +59,7 @@ public static function existing($all = false, $translate = false)
 		if ($all)
 		{
 			$all_option = array(new JObject(array('value' => '*', 'text' => $translate ? JText::alt('JALL', 'language') : 'JALL_LANGUAGE')));
+
 			return array_merge($all_option, static::$items);
 		}
 		else
diff --git a/libraries/cms/html/date.php b/libraries/cms/html/date.php
index 225334f..2ea6f8a 100644
--- a/libraries/cms/html/date.php
+++ b/libraries/cms/html/date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/dropdown.php b/libraries/cms/html/dropdown.php
index 9b48701..db3586d 100644
--- a/libraries/cms/html/dropdown.php
+++ b/libraries/cms/html/dropdown.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -73,6 +73,7 @@ public static function init()
 
 		// Set static array
 		static::$loaded[__METHOD__] = true;
+
 		return;
 	}
 
@@ -98,6 +99,7 @@ public static function start()
 							<ul class="dropdown-menu">';
 		static::$dropDownList = $dropDownList;
 		static::$loaded[__METHOD__] = true;
+
 		return;
 	}
 
@@ -116,7 +118,6 @@ public static function render()
 		static::$loaded['JHtmlDropdown::start'] = false;
 
 		return $dropDownList;
-
 	}
 
 	/**
@@ -148,6 +149,7 @@ public static function edit($id, $prefix = '', $customLink = '')
 		$link = JRoute::_($link);
 
 		static::addCustomItem(JText::_('JACTION_EDIT'), $link);
+
 		return;
 	}
 
@@ -165,6 +167,7 @@ public static function publish($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'publish';
 		static::addCustomItem(JText::_('JTOOLBAR_PUBLISH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -182,6 +185,7 @@ public static function unpublish($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'unpublish';
 		static::addCustomItem(JText::_('JTOOLBAR_UNPUBLISH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -199,6 +203,7 @@ public static function featured($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'featured';
 		static::addCustomItem(JText::_('JFEATURED'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -216,6 +221,7 @@ public static function unfeatured($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'unfeatured';
 		static::addCustomItem(JText::_('JUNFEATURED'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -233,6 +239,7 @@ public static function archive($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'archive';
 		static::addCustomItem(JText::_('JTOOLBAR_ARCHIVE'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -250,6 +257,7 @@ public static function unarchive($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'unpublish';
 		static::addCustomItem(JText::_('JTOOLBAR_UNARCHIVE'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -267,6 +275,7 @@ public static function trash($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'trash';
 		static::addCustomItem(JText::_('JTOOLBAR_TRASH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -284,6 +293,7 @@ public static function untrash($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'publish';
 		static::addCustomItem(JText::_('JTOOLBAR_UNTRASH'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -301,6 +311,7 @@ public static function checkin($checkboxId, $prefix = '')
 	{
 		$task = $prefix . 'checkin';
 		static::addCustomItem(JText::_('JTOOLBAR_CHECKIN'), 'javascript:void(0)', 'onclick="contextAction(\'' . $checkboxId . '\', \'' . $task . '\')"');
+
 		return;
 	}
 
@@ -314,6 +325,7 @@ public static function checkin($checkboxId, $prefix = '')
 	public static function divider()
 	{
 		static::$dropDownList .= '<li class="divider"></li>';
+
 		return;
 	}
 
@@ -350,6 +362,7 @@ public static function addCustomItem($label, $link = 'javascript:void(0)', $link
 		$dropDownList .= $label;
 		$dropDownList .= '</a></li>';
 		static::$dropDownList = $dropDownList;
+
 		return;
 	}
 }
diff --git a/libraries/cms/html/email.php b/libraries/cms/html/email.php
index 90f6222..c9e7c67 100644
--- a/libraries/cms/html/email.php
+++ b/libraries/cms/html/email.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -71,6 +71,7 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true)
 				{
 					$replacement .= "\n var addy_text" . $rand . " = '" . $text . "';";
 				}
+
 				$replacement .= "\n document.write('<a ' + path + '\'' + prefix + ':' + addy" . $rand . " + '\'>');";
 				$replacement .= "\n document.write(addy_text" . $rand . ");";
 				$replacement .= "\n document.write('<\/a>');";
@@ -86,6 +87,7 @@ public static function cloak($mail, $mailto = true, $text = '', $email = true)
 		{
 			$replacement .= "\n document.write(addy" . $rand . ");";
 		}
+
 		$replacement .= "\n //-->";
 		$replacement .= '\n </script>';
 
diff --git a/libraries/cms/html/form.php b/libraries/cms/html/form.php
index 5bbf734..c4f102c 100644
--- a/libraries/cms/html/form.php
+++ b/libraries/cms/html/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/formbehavior.php b/libraries/cms/html/formbehavior.php
index bfbce82..269e84b 100644
--- a/libraries/cms/html/formbehavior.php
+++ b/libraries/cms/html/formbehavior.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php
index b5dae8c..2e9916a 100644
--- a/libraries/cms/html/grid.php
+++ b/libraries/cms/html/grid.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index d2c667a..ca56a66 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/icons.php b/libraries/cms/html/icons.php
index 193a9cb..282f0b6 100644
--- a/libraries/cms/html/icons.php
+++ b/libraries/cms/html/icons.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -30,10 +30,12 @@ abstract class JHtmlIcons
 	public static function buttons($buttons)
 	{
 		$html = array();
+
 		foreach ($buttons as $button)
 		{
 			$html[] = JHtml::_('icons.button', $button);
 		}
+
 		return implode($html);
 	}
 
@@ -75,6 +77,7 @@ public static function button($button)
 
 		// Instantiate a new JLayoutFile instance and render the layout
 		$layout = new JLayoutFile('joomla.quickicons.icon');
+
 		return $layout->render($button);
 	}
 }
diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php
index 14f88f3..2ff0653 100644
--- a/libraries/cms/html/jgrid.php
+++ b/libraries/cms/html/jgrid.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -66,7 +66,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 
 		if ($enabled)
 		{
-			$html[] = '<a class="btn btn-micro ' . ($active_class == "publish" ? 'active' : '') . ' ' . ($tip ? 'hasTooltip"' : '') . '"';
+			$html[] = '<a class="btn btn-micro' . ($active_class == 'publish' ? ' active' : '') . ($tip ? ' hasTooltip' : '') . '"';
 			$html[] = ' href="javascript:void(0);" onclick="return listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"';
 			$html[] = $tip ? ' title="' . $title . '"' : '';
 			$html[] = '>';
@@ -76,7 +76,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 		}
 		else
 		{
-			$html[] = '<a class="btn btn-micro disabled jgrid ' . ($tip ? 'hasTooltip' : '') . '"';
+			$html[] = '<a class="btn btn-micro disabled jgrid' . ($tip ? ' hasTooltip' : '') . '"';
 			$html[] = $tip ? ' title="' . $title . '"' : '';
 			$html[] = '>';
 
@@ -124,6 +124,7 @@ public static function state($states, $value, $i, $prefix = '', $enabled = true,
 			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
 			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
 		}
+
 		$state = JArrayHelper::getValue($states, (int) $value, $states[0]);
 		$task = array_key_exists('task', $state) ? $state['task'] : $state[0];
 		$text = array_key_exists('text', $state) ? $state['text'] : (array_key_exists(1, $state) ? $state[1] : '');
@@ -370,6 +371,7 @@ public static function orderUp($i, $task = 'orderup', $prefix = '', $text = 'JLI
 			$checkbox = array_key_exists('checkbox', $options) ? $options['checkbox'] : $checkbox;
 			$prefix = array_key_exists('prefix', $options) ? $options['prefix'] : '';
 		}
+
 		return static::action($i, $task, $prefix, $text, $text, $text, false, 'uparrow', 'uparrow_disabled', $enabled, true, $checkbox);
 	}
 
diff --git a/libraries/cms/html/jquery.php b/libraries/cms/html/jquery.php
index d26f79a..cfe4afd 100644
--- a/libraries/cms/html/jquery.php
+++ b/libraries/cms/html/jquery.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini b/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini
index 639f05d..343c9e0 100644
--- a/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini
+++ b/libraries/cms/html/language/en-GB/en-GB.jhtmldate.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/libraries/cms/html/links.php b/libraries/cms/html/links.php
index 65fc229..7a463f1 100644
--- a/libraries/cms/html/links.php
+++ b/libraries/cms/html/links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -65,6 +65,7 @@ public static function linksgroups($groupsOfLinks)
 
 		return implode($html);
 	}
+
 	/**
 	 * Method to generate html code for a list of links
 	 *
diff --git a/libraries/cms/html/list.php b/libraries/cms/html/list.php
index a617e82..92d9266 100644
--- a/libraries/cms/html/list.php
+++ b/libraries/cms/html/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/menu.php b/libraries/cms/html/menu.php
index 11613d1..a755f7a 100644
--- a/libraries/cms/html/menu.php
+++ b/libraries/cms/html/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/number.php b/libraries/cms/html/number.php
index 75d5027..f33460c 100644
--- a/libraries/cms/html/number.php
+++ b/libraries/cms/html/number.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/rules.php b/libraries/cms/html/rules.php
index c7f620f..c3957ff 100644
--- a/libraries/cms/html/rules.php
+++ b/libraries/cms/html/rules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -60,6 +60,7 @@ public static function assetFormWidget($actions, $assetId = null, $parent = null
 		{
 			$html[] = '				<th class="col' . ($i + 2) . '">' . JText::_($action->title) . '</th>';
 		}
+
 		$html[] = '			</tr>';
 
 		foreach ($groups as $i => $group)
@@ -73,6 +74,7 @@ public static function assetFormWidget($actions, $assetId = null, $parent = null
 					. ($assetId ? ($inherited->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])
 					: ($inheriting->allow($action->name, $group->identities) ? $images['allow'] : $images['deny'])) . '</td>';
 			}
+
 			$html[] = '			</tr>';
 		}
 
diff --git a/libraries/cms/html/searchtools.php b/libraries/cms/html/searchtools.php
index eeccd64..69224c4 100644
--- a/libraries/cms/html/searchtools.php
+++ b/libraries/cms/html/searchtools.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php
index d328571..088a9b2 100644
--- a/libraries/cms/html/select.php
+++ b/libraries/cms/html/select.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -27,7 +27,7 @@ abstract class JHtmlSelect
 	static protected $optionDefaults = array(
 		'option' => array('option.attr' => null, 'option.disable' => 'disable', 'option.id' => null, 'option.key' => 'value',
 			'option.key.toHtml' => true, 'option.label' => null, 'option.label.toHtml' => true, 'option.text' => 'text',
-			'option.text.toHtml' => true));
+			'option.text.toHtml' => true, 'option.class' => 'class', 'option.onclick' => 'onclick'));
 
 	/**
 	 * Generates a yes/no radio list.
@@ -610,6 +610,16 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
 				{
 					$extra .= ' disabled="disabled"';
 				}
+
+				if (isset($element->$options['option.class']) && $element->$options['option.class'])
+				{
+					$extra .= ' class="' . $element->$options['option.class'] . '"';
+				}
+
+				if (isset($element->$options['option.onclick']) && $element->$options['option.onclick'])
+				{
+					$extra .= ' onclick="' . $element->$options['option.onclick'] . '"';
+				}
 			}
 			else
 			{
diff --git a/libraries/cms/html/sidebar.php b/libraries/cms/html/sidebar.php
index 7550b33..49f732f 100644
--- a/libraries/cms/html/sidebar.php
+++ b/libraries/cms/html/sidebar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/sliders.php b/libraries/cms/html/sliders.php
index c6768d9..ae8970f 100644
--- a/libraries/cms/html/sliders.php
+++ b/libraries/cms/html/sliders.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/sortablelist.php b/libraries/cms/html/sortablelist.php
index 0f3b0ba..6916902 100644
--- a/libraries/cms/html/sortablelist.php
+++ b/libraries/cms/html/sortablelist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -69,6 +69,7 @@ public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderi
 
 		// Set static array
 		static::$loaded[__METHOD__] = true;
+
 		return;
 	}
 
@@ -102,6 +103,7 @@ public static function _proceedSaveOrderButton()
 				});
 			})(jQuery);"
 		);
+
 		return;
 	}
 }
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
index 36f7a9b..f43072f 100644
--- a/libraries/cms/html/string.php
+++ b/libraries/cms/html/string.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -141,24 +141,24 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 	}
 
 	/**
-	* Method to extend the truncate method to more complex situations
-	*
-	* The goal is to get the proper length plain text string with as much of
-	* the html intact as possible with all tags properly closed.
-	*
-	* @param   string   $html       The content of the introtext to be truncated
-	* @param   integer  $maxLength  The maximum number of characters to render
-	* @param   boolean  $noSplit    Don't split a word if that is where the cutoff occurs (default: true).
-	*
-	* @return  string  The truncated string. If the string is truncated an ellipsis
-	*                  (...) will be appended.
-	*
-	* @note    If a maximum length of 3 or less is selected and the text has more than
-	*          that number of characters an ellipsis will be displayed.
-	*          This method will not create valid HTML from malformed HTML.
-	*
-	* @since   3.1
-	*/
+	 * Method to extend the truncate method to more complex situations
+	 *
+	 * The goal is to get the proper length plain text string with as much of
+	 * the html intact as possible with all tags properly closed.
+	 *
+	 * @param   string   $html       The content of the introtext to be truncated
+	 * @param   integer  $maxLength  The maximum number of characters to render
+	 * @param   boolean  $noSplit    Don't split a word if that is where the cutoff occurs (default: true).
+	 *
+	 * @return  string  The truncated string. If the string is truncated an ellipsis
+	 *                  (...) will be appended.
+	 *
+	 * @note    If a maximum length of 3 or less is selected and the text has more than
+	 *          that number of characters an ellipsis will be displayed.
+	 *          This method will not create valid HTML from malformed HTML.
+	 *
+	 * @since   3.1
+	 */
 	public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 	{
 		// Start with some basic rules.
diff --git a/libraries/cms/html/tabs.php b/libraries/cms/html/tabs.php
index 6d46fa9..a10af35 100644
--- a/libraries/cms/html/tabs.php
+++ b/libraries/cms/html/tabs.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/html/tag.php b/libraries/cms/html/tag.php
index 8c4b217..ce72256 100644
--- a/libraries/cms/html/tag.php
+++ b/libraries/cms/html/tag.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -76,6 +76,7 @@ public static function options($config = array('filter.published' => array(0, 1)
 					{
 						$language = $db->quote($language);
 					}
+
 					$query->where('a.language IN (' . implode(',', $config['filter.language']) . ')');
 				}
 			}
@@ -146,6 +147,7 @@ public static function tags($config = array('filter.published' => array(0, 1)))
 			$item->title = str_repeat('- ', $repeat) . $item->title;
 			static::$items[$hash][] = JHtml::_('select.option', $item->id, $item->title);
 		}
+
 		return static::$items[$hash];
 	}
 
diff --git a/libraries/cms/html/tel.php b/libraries/cms/html/tel.php
index 5bca636..4ea0d17 100644
--- a/libraries/cms/html/tel.php
+++ b/libraries/cms/html/tel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -61,7 +61,6 @@ public static function tel($number, $displayplan)
 			$display[1] = $countrycode;
 			$display[2] = '.';
 			$display[3] = $number;
-
 		}
 		elseif ($displayplan == 'ARPA' || $displayplan == 'ENUM')
 		{
diff --git a/libraries/cms/html/user.php b/libraries/cms/html/user.php
index 77c90c7..acba0b9 100644
--- a/libraries/cms/html/user.php
+++ b/libraries/cms/html/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  HTML
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -57,6 +57,7 @@ public static function groups($includeSuperAdmin = false)
 					$filteredGroups[] = $group;
 				}
 			}
+
 			$groups = $filteredGroups;
 		}
 
diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
index 8159307..ce9032c 100644
--- a/libraries/cms/installer/adapter/component.php
+++ b/libraries/cms/installer/adapter/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -145,6 +145,7 @@ public function loadLanguage($path = null)
 				$source = $path . '/' . $folder;
 			}
 		}
+
 		$lang->load($extension . '.sys', $source, null, false, true) || $lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true);
 	}
 
@@ -251,6 +252,7 @@ public function install()
 						JLog::WARNING, 'jerror'
 					);
 				}
+
 				return false;
 			}
 		}
@@ -1514,8 +1516,8 @@ protected function _removeAdminMenus(&$row)
 			}
 			// Rebuild the whole tree
 			$table->rebuild();
-
 		}
+
 		return true;
 	}
 
@@ -1586,6 +1588,7 @@ public function discover()
 				$results[] = $extension;
 			}
 		}
+
 		return $results;
 	}
 
@@ -1724,7 +1727,6 @@ public function discover_install()
 
 		if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'preflight'))
 		{
-
 			if ($this->parent->manifestClass->preflight('discover_install', $this) === false)
 			{
 				// Install failed, rollback changes
@@ -1796,7 +1798,6 @@ public function discover_install()
 
 		if ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'install'))
 		{
-
 			if ($this->parent->manifestClass->install($this) === false)
 			{
 				// Install failed, rollback changes
diff --git a/libraries/cms/installer/adapter/file.php b/libraries/cms/installer/adapter/file.php
index 50de771..c1f6979 100644
--- a/libraries/cms/installer/adapter/file.php
+++ b/libraries/cms/installer/adapter/file.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -189,7 +189,6 @@ public function install()
 		{
 			if (!JFolder::exists($folder))
 			{
-
 				if (!$created = JFolder::create($folder))
 				{
 					JLog::add(JText::sprintf('JLIB_INSTALLER_ABORT_FILE_INSTALL_FAIL_SOURCE_DIRECTORY', $folder), JLog::WARNING, 'jerror');
@@ -208,7 +207,6 @@ public function install()
 					$this->parent->pushStep(array('type' => 'folder', 'path' => $folder));
 				}
 			}
-
 		}
 
 		// Now that we have file list, let's start copying them
@@ -593,7 +591,6 @@ public function uninstall($id)
 						if ($eFileName->getName() == 'folder')
 						{
 							$folderList[] = $targetFolder . '/' . $eFileName;
-
 						}
 						else
 						{
@@ -682,7 +679,6 @@ protected function extensionExistsInSystem($extension = null)
 		}
 
 		return true;
-
 	}
 
 	/**
@@ -776,7 +772,6 @@ protected function populateFilesAndFolderList()
 
 					array_push($this->fileList, $path);
 				}
-
 			}
 		}
 	}
diff --git a/libraries/cms/installer/adapter/language.php b/libraries/cms/installer/adapter/language.php
index b475140..2bc0015 100644
--- a/libraries/cms/installer/adapter/language.php
+++ b/libraries/cms/installer/adapter/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -52,6 +52,7 @@ public function install()
 				($this->parent->extension->client_id ? JPATH_ADMINISTRATOR : JPATH_SITE) . '/language/' . $this->parent->extension->element
 			);
 		}
+
 		$this->manifest = $this->parent->getManifest();
 
 		// Get the client application target
@@ -66,6 +67,7 @@ public function install()
 
 				return false;
 			}
+
 			$basePath = $client->path;
 			$clientId = $client->id;
 			$element = $this->manifest->files;
@@ -185,6 +187,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
 						JLog::WARNING, 'jerror'
 					);
 				}
+
 				return false;
 			}
 		}
@@ -222,6 +225,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
 
 			return false;
 		}
+
 		$this->parent->setOverwrite($overwrite);
 
 		// Get the language description
@@ -295,6 +299,7 @@ public function update()
 
 			return false;
 		}
+
 		$basePath = $client->path;
 		$clientId = $client->id;
 
@@ -356,6 +361,7 @@ public function update()
 
 			return false;
 		}
+
 		$this->parent->setOverwrite($overwrite);
 
 		// Get the language description and set it as message
@@ -396,6 +402,7 @@ public function update()
 			$row->set('client_id', $clientId);
 			$row->set('params', $this->parent->getParams());
 		}
+
 		$row->set('name', $this->get('name'));
 		$row->set('type', 'language');
 		$row->set('element', $this->get('tag'));
@@ -528,6 +535,7 @@ public function uninstall($eid)
 				$count++;
 			}
 		}
+
 		if (!empty($count))
 		{
 			JLog::add(JText::plural('JLIB_INSTALLER_NOTICE_LANG_RESET_USERS', $count), JLog::NOTICE, 'jerror');
@@ -568,6 +576,7 @@ public function discover()
 				$results[] = $extension;
 			}
 		}
+
 		foreach ($admin_languages as $language)
 		{
 			if (file_exists(JPATH_ADMINISTRATOR . '/language/' . $language . '/' . $language . '.xml'))
@@ -585,6 +594,7 @@ public function discover()
 				$results[] = $extension;
 			}
 		}
+
 		return $results;
 	}
 
diff --git a/libraries/cms/installer/adapter/library.php b/libraries/cms/installer/adapter/library.php
index 1ecdf34..9e61528 100644
--- a/libraries/cms/installer/adapter/library.php
+++ b/libraries/cms/installer/adapter/library.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -38,6 +38,7 @@ public function loadLanguage($path = null)
 		{
 			$this->parent->setPath('source', JPATH_PLATFORM . '/' . $this->parent->extension->element);
 		}
+
 		$this->manifest = $this->parent->getManifest();
 		$extension = 'lib_' . strtolower(JFilterInput::getInstance()->clean((string) $this->manifest->name, 'cmd'));
 		$name = strtolower((string) $this->manifest->libraryname);
@@ -212,6 +213,7 @@ public function install()
 
 			return false;
 		}
+
 		return $row->get('extension_id');
 	}
 
@@ -324,7 +326,6 @@ public function uninstall($id)
 
 			$this->parent->removeFiles($xml->files, -1);
 			JFile::delete($manifestFile);
-
 		}
 		else
 		{
@@ -387,6 +388,7 @@ public function discover()
 			$extension->set('params', '{}');
 			$results[] = $extension;
 		}
+
 		return $results;
 	}
 
diff --git a/libraries/cms/installer/adapter/module.php b/libraries/cms/installer/adapter/module.php
index 7f63c8f..e7840d6 100644
--- a/libraries/cms/installer/adapter/module.php
+++ b/libraries/cms/installer/adapter/module.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -213,6 +213,7 @@ public function install()
 				}
 			}
 		}
+
 		if (!empty($element))
 		{
 			$this->parent->setPath('extension_root', $basePath . '/modules/' . $element);
@@ -773,6 +774,7 @@ public function uninstall($id)
 
 			return false;
 		}
+
 		$this->parent->setPath('extension_root', $client->path . '/modules/' . $element);
 
 		$this->parent->setPath('source', $this->parent->getPath('extension_root'));
diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index 89dac7d..eb7437d 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -216,6 +216,7 @@ public function install()
 					// If it's an archive
 					$package = JInstallerHelper::unpack($file);
 				}
+
 				$tmpInstaller = new JInstaller;
 				$installResult = $tmpInstaller->{$this->route}($package['dir']);
 
@@ -237,6 +238,7 @@ public function install()
 						'result' => $installResult
 					);
 				}
+
 				$i++;
 			}
 		}
@@ -372,6 +374,7 @@ public function install()
 		{
 			$this->parent->set('extension_message', $msg);
 		}
+
 		return $row->extension_id;
 	}
 
@@ -428,7 +431,6 @@ public function uninstall($id)
 			JLog::add(JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_MISSINGMANIFEST'), JLog::WARNING, 'jerror');
 
 			return false;
-
 		}
 
 		$xml = simplexml_load_file($manifestFile);
@@ -528,6 +530,7 @@ public function uninstall($id)
 			{
 				JFolder::delete($folder);
 			}
+
 			$row->delete();
 		}
 		else
diff --git a/libraries/cms/installer/adapter/plugin.php b/libraries/cms/installer/adapter/plugin.php
index 0b957f7..d530883 100644
--- a/libraries/cms/installer/adapter/plugin.php
+++ b/libraries/cms/installer/adapter/plugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -87,6 +87,7 @@ public function loadLanguage($path = null)
 		{
 			$this->parent->setPath('source', JPATH_PLUGINS . '/' . $this->parent->extension->folder . '/' . $this->parent->extension->element);
 		}
+
 		$this->manifest = $this->parent->getManifest();
 		$element = $this->manifest->files;
 
@@ -106,6 +107,7 @@ public function loadLanguage($path = null)
 					}
 				}
 			}
+
 			if ($name)
 			{
 				$extension = "plg_${group}_${name}";
@@ -117,6 +119,7 @@ public function loadLanguage($path = null)
 				{
 					$source = "$path/$folder";
 				}
+
 				$lang->load($extension . '.sys', $source, null, false, true)
 					|| $lang->load($extension . '.sys', JPATH_ADMINISTRATOR, null, false, true);
 			}
@@ -181,6 +184,7 @@ public function install()
 				}
 			}
 		}
+
 		$group = (string) $xml->attributes()->group;
 
 		if (!empty($element) && !empty($group))
@@ -416,6 +420,7 @@ public function install()
 
 				return false;
 			}
+
 			$row->load($id);
 			$row->name = $this->get('name');
 			$row->manifest_cache = $this->parent->generateManifestCache();
@@ -781,6 +786,7 @@ public function discover()
 				$extension->set('params', '{}');
 				$results[] = $extension;
 			}
+
 			$folder_list = JFolder::folders(JPATH_SITE . '/plugins/' . $folder);
 
 			foreach ($folder_list as $plugin_folder)
@@ -813,6 +819,7 @@ public function discover()
 				}
 			}
 		}
+
 		return $results;
 	}
 
@@ -841,6 +848,7 @@ public function discover_install()
 		{
 			$manifestPath = $client->path . '/plugins/' . $this->parent->extension->folder . '/' . $this->parent->extension->element . '.xml';
 		}
+
 		$this->parent->manifest = $this->parent->isManifest($manifestPath);
 		$description = (string) $this->parent->manifest->description;
 
@@ -852,6 +860,7 @@ public function discover_install()
 		{
 			$this->parent->set('message', '');
 		}
+
 		$this->parent->setPath('manifest', $manifestPath);
 		$manifest_details = JInstaller::parseXMLInstallFile($manifestPath);
 		$this->parent->extension->manifest_cache = json_encode($manifest_details);
diff --git a/libraries/cms/installer/adapter/template.php b/libraries/cms/installer/adapter/template.php
index 297d7eb..15b4f6f 100644
--- a/libraries/cms/installer/adapter/template.php
+++ b/libraries/cms/installer/adapter/template.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -120,6 +120,7 @@ public function install()
 
 				return false;
 			}
+
 			$basePath = $client->path;
 			$clientId = $client->id;
 		}
@@ -497,6 +498,7 @@ public function discover()
 				// Ignore special system template
 				continue;
 			}
+
 			$manifest_details = JInstaller::parseXMLInstallFile(JPATH_SITE . "/templates/$template/templateDetails.xml");
 			$extension = JTable::getInstance('extension');
 			$extension->set('type', 'template');
diff --git a/libraries/cms/installer/extension.php b/libraries/cms/installer/extension.php
index 0becc9b..4143d0b 100644
--- a/libraries/cms/installer/extension.php
+++ b/libraries/cms/installer/extension.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -131,12 +131,14 @@ public function __construct(SimpleXMLElement $element = null)
 						$this->client_id = JApplicationHelper::getClientInfo($this->client, 1);
 						$this->client_id = $this->client_id->id;
 					}
+
 					if ($element->attributes()->group)
 					{
 						$this->group = (string) $element->attributes()->group;
 					}
 					break;
 			}
+
 			$this->filename = (string) $element;
 		}
 	}
diff --git a/libraries/cms/installer/helper.php b/libraries/cms/installer/helper.php
index 6dd4f2e..9894274 100644
--- a/libraries/cms/installer/helper.php
+++ b/libraries/cms/installer/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -122,6 +122,7 @@ public static function unpack($p_filename, $alwaysReturnArray = false)
 				$retval['extractdir'] = null;
 				$retval['packagefile'] = $archivename;
 				$retval['type'] = false;
+
 				return $retval;
 			}
 
@@ -243,6 +244,7 @@ public static function getFilenameFromURL($url)
 
 			return $parts[count($parts) - 1];
 		}
+
 		return false;
 	}
 
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 440d2d9..1ce18bc 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -909,7 +909,7 @@ public function parseSQLFiles($element)
 
 			if ($fCharset == 'utf8' && $fDriver == $dbDriver)
 			{
-				$sqlfile = $this->getPath('extension_root') . '/' . $file;
+				$sqlfile = $this->getPath('extension_root') . '/' . trim($file);
 
 				// Check that sql files exists before reading. Otherwise raise error for rollback
 				if (!file_exists($sqlfile))
diff --git a/libraries/cms/installer/manifest.php b/libraries/cms/installer/manifest.php
index 71468c9..d288c2f 100644
--- a/libraries/cms/installer/manifest.php
+++ b/libraries/cms/installer/manifest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/installer/manifest/library.php b/libraries/cms/installer/manifest/library.php
index f8d43f3..a66aba8 100644
--- a/libraries/cms/installer/manifest/library.php
+++ b/libraries/cms/installer/manifest/library.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/installer/manifest/package.php b/libraries/cms/installer/manifest/package.php
index 918d9c4..ea3b843 100644
--- a/libraries/cms/installer/manifest/package.php
+++ b/libraries/cms/installer/manifest/package.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Installer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/language/associations.php b/libraries/cms/language/associations.php
index 9e23909..a3bdcdc 100644
--- a/libraries/cms/language/associations.php
+++ b/libraries/cms/language/associations.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/language/multilang.php b/libraries/cms/language/multilang.php
index fc32c81..7509999 100644
--- a/libraries/cms/language/multilang.php
+++ b/libraries/cms/language/multilang.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -41,6 +41,7 @@ public static function isEnabled()
 		if ($app->isSite())
 		{
 			$enabled = $app->getLanguageFilter();
+
 			return $enabled;
 		}
 
diff --git a/libraries/cms/layout/base.php b/libraries/cms/layout/base.php
index ced284a..dd7f319 100644
--- a/libraries/cms/layout/base.php
+++ b/libraries/cms/layout/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php
index c58e864..b052779 100644
--- a/libraries/cms/layout/file.php
+++ b/libraries/cms/layout/file.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/layout/helper.php b/libraries/cms/layout/helper.php
index 97e35d3..e8ea900 100644
--- a/libraries/cms/layout/helper.php
+++ b/libraries/cms/layout/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/layout/layout.php b/libraries/cms/layout/layout.php
index 66601d9..499f7d0 100644
--- a/libraries/cms/layout/layout.php
+++ b/libraries/cms/layout/layout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Layout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/library/helper.php b/libraries/cms/library/helper.php
index 9e07989..be4e7c5 100644
--- a/libraries/cms/library/helper.php
+++ b/libraries/cms/library/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Library
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/menu/administrator.php b/libraries/cms/menu/administrator.php
index b6c50c1..4d64116 100644
--- a/libraries/cms/menu/administrator.php
+++ b/libraries/cms/menu/administrator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/menu/menu.php b/libraries/cms/menu/menu.php
index 5a98f57..3044c1e 100644
--- a/libraries/cms/menu/menu.php
+++ b/libraries/cms/menu/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/menu/site.php b/libraries/cms/menu/site.php
index 9ecde5c..1e1395f 100644
--- a/libraries/cms/menu/site.php
+++ b/libraries/cms/menu/site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -49,6 +49,7 @@ public function load()
 		catch (RuntimeException $e)
 		{
 			JError::raiseWarning(500, JText::sprintf('JERROR_LOADING_MENUS', $e->getMessage()));
+
 			return false;
 		}
 
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index 59d593f..09ae9cc 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Module
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -84,6 +84,7 @@ public static function &getModules($position)
 		$modules =& static::load();
 
 		$total = count($modules);
+
 		for ($i = 0; $i < $total; $i++)
 		{
 			if ($modules[$i]->position == $position)
@@ -200,6 +201,7 @@ public static function renderModule($module, $attribs = array())
 
 		// Check if the current module has a style param to override template module style
 		$paramsChromeStyle = $params->get('style');
+
 		if ($paramsChromeStyle)
 		{
 			$attribs['style'] = preg_replace('/^(system|' . $template . ')\-/i', '', $paramsChromeStyle);
@@ -364,12 +366,14 @@ protected static function &load()
 		catch (RuntimeException $e)
 		{
 			JLog::add(JText::sprintf('JLIB_APPLICATION_ERROR_MODULE_LOAD', $e->getMessage()), JLog::WARNING, 'jerror');
+
 			return $clean;
 		}
 
 		// Apply negative selections and eliminate duplicates
 		$negId = $Itemid ? -(int) $Itemid : false;
 		$dupes = array();
+
 		for ($i = 0, $n = count($modules); $i < $n; $i++)
 		{
 			$module = &$modules[$i];
@@ -385,6 +389,7 @@ protected static function &load()
 				{
 					unset($clean[$module->id]);
 				}
+
 				continue;
 			}
 
@@ -473,10 +478,12 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
 
 			case 'safeuri':
 				$secureid = null;
+
 				if (is_array($cacheparams->modeparams))
 				{
 					$uri = JRequest::get();
 					$safeuri = new stdClass;
+
 					foreach ($cacheparams->modeparams as $key => $value)
 					{
 						// Use int filter for id/catid to clean out spamy slugs
@@ -487,6 +494,7 @@ public static function moduleCache($module, $moduleparams, $cacheparams)
 						}
 					}
 				}
+
 				$secureid = md5(serialize(array($safeuri, $cacheparams->method, $moduleparams)));
 				$ret = $cache->get(
 					array($cacheparams->class, $cacheparams->method),
diff --git a/libraries/cms/pagination/object.php b/libraries/cms/pagination/object.php
index 2ff4afc..460a280 100644
--- a/libraries/cms/pagination/object.php
+++ b/libraries/cms/pagination/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Pagination
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/pagination/pagination.php b/libraries/cms/pagination/pagination.php
index 248bce2..32b045a 100644
--- a/libraries/cms/pagination/pagination.php
+++ b/libraries/cms/pagination/pagination.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Pagination
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/pathway/pathway.php b/libraries/cms/pathway/pathway.php
index 43fe11d..659ba17 100644
--- a/libraries/cms/pathway/pathway.php
+++ b/libraries/cms/pathway/pathway.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Pathway
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/pathway/site.php b/libraries/cms/pathway/site.php
index 9a61449..17d660f 100644
--- a/libraries/cms/pathway/site.php
+++ b/libraries/cms/pathway/site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Pathway
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -70,6 +70,7 @@ public function __construct($options = array())
 
 						default:
 							$router = $app::getRouter();
+
 							if ($router->getMode() == JROUTER_MODE_SEF)
 							{
 								$url = 'index.php?Itemid=' . $link->id;
diff --git a/libraries/cms/plugin/helper.php b/libraries/cms/plugin/helper.php
index bf78de0..17ddc2c 100644
--- a/libraries/cms/plugin/helper.php
+++ b/libraries/cms/plugin/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Plugin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php
index 10ff1a1..e983848 100644
--- a/libraries/cms/plugin/plugin.php
+++ b/libraries/cms/plugin/plugin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Plugin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/response/json.php b/libraries/cms/response/json.php
index 5f7abcd..a5ca507 100644
--- a/libraries/cms/response/json.php
+++ b/libraries/cms/response/json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Response
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/router/administrator.php b/libraries/cms/router/administrator.php
index 093e791..01d25dd 100644
--- a/libraries/cms/router/administrator.php
+++ b/libraries/cms/router/administrator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Router
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index 3cb2359..d740eae 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Router
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index 0fcd966..307d6fd 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Router
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/schema/changeitem.php b/libraries/cms/schema/changeitem.php
index beaf210..6bf399a 100644
--- a/libraries/cms/schema/changeitem.php
+++ b/libraries/cms/schema/changeitem.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Schema
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -193,10 +193,12 @@ abstract protected function buildCheckQuery();
 	public function check()
 	{
 		$this->checkStatus = -1;
+
 		if ($this->checkQuery)
 		{
 			$this->db->setQuery($this->checkQuery);
 			$rows = $this->db->loadObject();
+
 			if ($rows !== false)
 			{
 				if (count($rows) === $this->checkQueryExpected)
@@ -213,6 +215,7 @@ public function check()
 				$this->checkStatus = -2;
 			}
 		}
+
 		return $this->checkStatus;
 	}
 
@@ -229,6 +232,7 @@ public function fix()
 		{
 			// At this point we have a failed query
 			$this->db->setQuery($this->updateQuery);
+
 			if ($this->db->execute())
 			{
 				if ($this->check())
diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
index 5194ba5..1cbd50c 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/cms/schema/changeitem/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Schema
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -60,9 +60,11 @@ protected function buildCheckQuery()
 
 		// We can only make check queries for alter table and create table queries
 		$command = strtoupper($wordArray[0] . ' ' . $wordArray[1]);
+
 		if ($command === 'ALTER TABLE')
 		{
 			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
+
 			if ($alterCommand == 'ADD COLUMN')
 			{
 				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE field = ' . $this->fixQuote($wordArray[5]);
@@ -79,6 +81,7 @@ protected function buildCheckQuery()
 				{
 					$index = $this->fixQuote($wordArray[5]);
 				}
+
 				$result = 'SHOW INDEXES IN ' . $wordArray[2] . ' WHERE Key_name = ' . $index;
 				$this->queryType = 'ADD_INDEX';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
@@ -103,10 +106,12 @@ protected function buildCheckQuery()
 			{
 				// Kludge to fix problem with "integer unsigned"
 				$type = $this->fixQuote($wordArray[5]);
+
 				if (isset($wordArray[6]))
 				{
 					$type = $this->fixQuote($this->fixInteger($wordArray[5], $wordArray[6]));
 				}
+
 				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE field = ' . $this->fixQuote($wordArray[4]) . ' AND type = ' . $type;
 				$this->queryType = 'CHANGE_COLUMN_TYPE';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[4]), $type);
@@ -131,6 +136,7 @@ protected function buildCheckQuery()
 			{
 				$table = $wordArray[2];
 			}
+
 			$result = 'SHOW TABLES LIKE ' . $this->fixQuote($table);
 			$this->queryType = 'CREATE_TABLE';
 			$this->msgElements = array($this->fixQuote($table));
@@ -164,10 +170,12 @@ protected function buildCheckQuery()
 	private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
+
 		if (strtolower($type1) == "integer" && strtolower(substr($type2, 0, 8)) == 'unsigned')
 		{
 			$result = 'int(10) unsigned';
 		}
+
 		return $result;
 	}
 
@@ -187,6 +195,7 @@ private function fixQuote($string)
 		$string = str_replace('`', '', $string);
 		$string = str_replace(';', '', $string);
 		$string = str_replace('#__', $this->db->getPrefix(), $string);
+
 		return $this->db->quote($string);
 	}
 }
diff --git a/libraries/cms/schema/changeitem/postgresql.php b/libraries/cms/schema/changeitem/postgresql.php
index dc9721e..9528b3c 100644
--- a/libraries/cms/schema/changeitem/postgresql.php
+++ b/libraries/cms/schema/changeitem/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Schema
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -60,9 +60,11 @@ protected function buildCheckQuery()
 
 		// We can only make check queries for alter table and create table queries
 		$command = strtoupper($wordArray[0] . ' ' . $wordArray[1]);
+
 		if ($command === 'ALTER TABLE')
 		{
 			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
+
 			if ($alterCommand === 'ADD COLUMN')
 			{
 				$result = 'SELECT column_name FROM information_schema.columns WHERE table_name='
@@ -76,6 +78,7 @@ protected function buildCheckQuery()
 				if (strtoupper($wordArray[6]) == 'TYPE')
 				{
 					$type = '';
+
 					for ($i = 7; $i < count($wordArray); $i++)
 					{
 						$type .= $wordArray[$i] . ' ';
@@ -110,6 +113,7 @@ protected function buildCheckQuery()
 						// DROP NOT NULL
 						$isNullable = $this->fixQuote('YES');
 					}
+
 					$result = 'SELECT column_name, data_type, is_nullable FROM information_schema.columns WHERE table_name='
 						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
 						. ' AND is_nullable=' . $isNullable;
@@ -129,6 +133,7 @@ protected function buildCheckQuery()
 						// DROP DEFAULT
 						$isNullDef = 'IS NULL';
 					}
+
 					$result = 'SELECT column_name, data_type, column_default FROM information_schema.columns WHERE table_name='
 						. $this->fixQuote($wordArray[2]) . ' AND column_name=' . $this->fixQuote($wordArray[5])
 						. ' AND column_default ' . $isNullDef;
@@ -184,6 +189,7 @@ protected function buildCheckQuery()
 			{
 				$table = $this->fixQuote($wordArray[2]);
 			}
+
 			$result = 'SELECT table_name FROM information_schema.tables WHERE table_name=' . $table;
 			$this->queryType = 'CREATE_TABLE';
 			$this->checkQueryExpected = 1;
@@ -218,10 +224,12 @@ protected function buildCheckQuery()
 	private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
+
 		if (strtolower($type1) == 'integer' && strtolower(substr($type2, 0, 8)) == 'unsigned')
 		{
 			$result = 'unsigned int(10)';
 		}
+
 		return $result;
 	}
 
@@ -241,6 +249,7 @@ private function fixQuote($string)
 		$string = str_replace('"', '', $string);
 		$string = str_replace(';', '', $string);
 		$string = str_replace('#__', $this->db->getPrefix(), $string);
+
 		return $this->db->quote($string);
 	}
 }
diff --git a/libraries/cms/schema/changeitem/sqlsrv.php b/libraries/cms/schema/changeitem/sqlsrv.php
index 1bd71f7..eecc372 100644
--- a/libraries/cms/schema/changeitem/sqlsrv.php
+++ b/libraries/cms/schema/changeitem/sqlsrv.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Schema
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -60,9 +60,11 @@ protected function buildCheckQuery()
 
 		// We can only make check queries for alter table and create table queries
 		$command = strtoupper($wordArray[0] . ' ' . $wordArray[1]);
+
 		if ($command === 'ALTER TABLE')
 		{
 			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
+
 			if ($alterCommand == 'ADD')
 			{
 				$result = 'SELECT * FROM INFORMATION_SCHEMA.Columns ' . $wordArray[2] . ' WHERE COLUMN_NAME = ' . $this->fixQuote($wordArray[5]);
@@ -120,10 +122,12 @@ protected function buildCheckQuery()
 	private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
+
 		if (strtolower($type1) == 'integer' && strtolower(substr($type2, 0, 8)) == 'unsigned')
 		{
 			$result = 'int';
 		}
+
 		return $result;
 	}
 
@@ -143,6 +147,7 @@ private function fixQuote($string)
 		$string = str_replace('`', '', $string);
 		$string = str_replace(';', '', $string);
 		$string = str_replace('#__', $this->db->getPrefix(), $string);
+
 		return $this->db->quote($string);
 	}
 }
diff --git a/libraries/cms/schema/changeset.php b/libraries/cms/schema/changeset.php
index e5ea804..436e80e 100644
--- a/libraries/cms/schema/changeset.php
+++ b/libraries/cms/schema/changeset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Schema
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -61,6 +61,7 @@ public function __construct($db, $folder = null)
 		$this->folder = $folder;
 		$updateFiles = $this->getUpdateFiles();
 		$updateQueries = $this->getUpdateQueries($updateFiles);
+
 		foreach ($updateQueries as $obj)
 		{
 			$this->changeItems[] = JSchemaChangeitem::getInstance($db, $obj->file, $obj->updateQuery);
@@ -101,6 +102,7 @@ public static function getInstance($db, $folder)
 	public function check()
 	{
 		$errors = array();
+
 		foreach ($this->changeItems as $item)
 		{
 			if ($item->check() === -2)
@@ -109,6 +111,7 @@ public function check()
 				$errors[] = $item;
 			}
 		}
+
 		return $errors;
 	}
 
@@ -122,6 +125,7 @@ public function check()
 	public function fix()
 	{
 		$this->check();
+
 		foreach ($this->changeItems as $item)
 		{
 			$item->fix();
@@ -129,15 +133,16 @@ public function fix()
 	}
 
 	/**
-	* Returns an array of results for this set
-	*
-	* @return  array  associative array of changeitems grouped by unchecked, ok, error, and skipped
-	*
-	* @since   2.5
-	*/
+	 * Returns an array of results for this set
+	 *
+	 * @return  array  associative array of changeitems grouped by unchecked, ok, error, and skipped
+	 *
+	 * @since   2.5
+	 */
 	public function getStatus()
 	{
 		$result = array('unchecked' => array(), 'ok' => array(), 'error' => array(), 'skipped' => array());
+
 		foreach ($this->changeItems as $item)
 		{
 			switch ($item->checkStatus)
@@ -156,6 +161,7 @@ public function getStatus()
 					break;
 			}
 		}
+
 		return $result;
 	}
 
@@ -173,6 +179,7 @@ public function getSchema()
 	{
 		$updateFiles = $this->getUpdateFiles();
 		$result = new SplFileInfo(array_pop($updateFiles));
+
 		return $result->getBasename('.sql');
 	}
 
@@ -223,12 +230,14 @@ private function getUpdateQueries(array $sqlfiles)
 	{
 		// Hold results as array of objects
 		$result = array();
+
 		foreach ($sqlfiles as $file)
 		{
 			$buffer = file_get_contents($file);
 
 			// Create an array of queries from the sql file
 			$queries = JDatabaseDriver::splitSql($buffer);
+
 			foreach ($queries as $query)
 			{
 				if ($trimmedQuery = $this->trimQuery($query))
@@ -240,6 +249,7 @@ private function getUpdateQueries(array $sqlfiles)
 				}
 			}
 		}
+
 		return $result;
 	}
 
diff --git a/libraries/cms/search/helper.php b/libraries/cms/search/helper.php
index ddd5e41..6742ba4 100644
--- a/libraries/cms/search/helper.php
+++ b/libraries/cms/search/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index ef749e7..d6e869f 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/table/contenttype.php b/libraries/cms/table/contenttype.php
index 4676727..d692f95 100644
--- a/libraries/cms/table/contenttype.php
+++ b/libraries/cms/table/contenttype.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php
index 0fa207b..bb6e3ec 100644
--- a/libraries/cms/table/corecontent.php
+++ b/libraries/cms/table/corecontent.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -95,6 +95,7 @@ public function check()
 		if (trim($this->core_title) == '')
 		{
 			$this->setError(JText::_('LIB_CMS_WARNING_PROVIDE_VALID_NAME'));
+
 			return false;
 		}
 
@@ -164,6 +165,7 @@ public function check()
 	public function delete($pk = null)
 	{
 		$baseTable = JTable::getInstance('Ucm');
+
 		return parent::delete($pk) && $baseTable->delete($pk);
 	}
 
@@ -190,6 +192,7 @@ public function deleteByContentId($contentItemId = null)
 			->from($db->quoteName('#__ucm_content'))
 			->where($db->quoteName('core_content_item_id') . ' = ' . (int) $contentItemId);
 		$db->setQuery($query);
+
 		if ($ucmId = $db->loadResult())
 		{
 			return $this->delete($ucmId);
@@ -236,10 +239,10 @@ public function store($updateNulls = false)
 			}
 
 			$isNew = true;
-
 		}
 
 		$oldRules = $this->getRules();
+
 		if (empty($oldRules))
 		{
 			$this->setRules('{}');
@@ -325,6 +328,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 			else
 			{
 				$this->setError(JText::_('JLIB_DATABASE_ERROR_NO_ROWS_SELECTED'));
+
 				return false;
 			}
 		}
@@ -341,11 +345,13 @@ public function publish($pks = null, $state = 1, $userId = 0)
 
 		// Determine if there is checkin support for the table.
 		$checkin = false;
+
 		if (property_exists($this, 'core_checked_out_user_id') && property_exists($this, 'core_checked_out_time'))
 		{
 			$checkin = true;
 			$query->where(' (' . $this->_db->quoteName('core_checked_out_user_id') . ' = 0 OR ' . $this->_db->quoteName('core_checked_out_user_id') . ' = ' . (int) $userId . ')');
 		}
+
 		$this->_db->setQuery($query);
 
 		try
@@ -355,6 +361,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		catch (RuntimeException $e)
 		{
 			$this->setError($e->getMessage());
+
 			return false;
 		}
 
diff --git a/libraries/cms/table/ucm.php b/libraries/cms/table/ucm.php
index e4d857f..fcdb97e 100644
--- a/libraries/cms/table/ucm.php
+++ b/libraries/cms/table/ucm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/toolbar/button.php b/libraries/cms/toolbar/button.php
index 16a6742..265a885 100644
--- a/libraries/cms/toolbar/button.php
+++ b/libraries/cms/toolbar/button.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/confirm.php b/libraries/cms/toolbar/button/confirm.php
index 6b267f5..c34590c 100644
--- a/libraries/cms/toolbar/button/confirm.php
+++ b/libraries/cms/toolbar/button/confirm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/custom.php b/libraries/cms/toolbar/button/custom.php
index 049dfd6..c78b72c 100644
--- a/libraries/cms/toolbar/button/custom.php
+++ b/libraries/cms/toolbar/button/custom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/help.php b/libraries/cms/toolbar/button/help.php
index dde84d1..e2a2405 100644
--- a/libraries/cms/toolbar/button/help.php
+++ b/libraries/cms/toolbar/button/help.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/link.php b/libraries/cms/toolbar/button/link.php
index f3e046c..7ebee16 100644
--- a/libraries/cms/toolbar/button/link.php
+++ b/libraries/cms/toolbar/button/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/popup.php b/libraries/cms/toolbar/button/popup.php
index 3b50016..c296710 100644
--- a/libraries/cms/toolbar/button/popup.php
+++ b/libraries/cms/toolbar/button/popup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/separator.php b/libraries/cms/toolbar/button/separator.php
index 2c8df88..78a48a1 100644
--- a/libraries/cms/toolbar/button/separator.php
+++ b/libraries/cms/toolbar/button/separator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/slider.php b/libraries/cms/toolbar/button/slider.php
index 61a2981..15d49b3 100644
--- a/libraries/cms/toolbar/button/slider.php
+++ b/libraries/cms/toolbar/button/slider.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/button/standard.php b/libraries/cms/toolbar/button/standard.php
index 6e7c194..68c93d5 100644
--- a/libraries/cms/toolbar/button/standard.php
+++ b/libraries/cms/toolbar/button/standard.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/cms/toolbar/toolbar.php b/libraries/cms/toolbar/toolbar.php
index 6b9dc21..4eca621 100644
--- a/libraries/cms/toolbar/toolbar.php
+++ b/libraries/cms/toolbar/toolbar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Toolbar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -67,7 +67,6 @@ public function __construct($name = 'toolbar')
 
 		// Set base path to find buttons.
 		$this->_buttonPath[] = __DIR__ . '/button';
-
 	}
 
 	/**
@@ -102,6 +101,7 @@ public function appendButton()
 		// Push button onto the end of the toolbar array.
 		$btn = func_get_args();
 		array_push($this->_bar, $btn);
+
 		return true;
 	}
 
@@ -141,6 +141,7 @@ public function prependButton()
 		// Insert button into the front of the toolbar array.
 		$btn = func_get_args();
 		array_unshift($this->_bar, $btn);
+
 		return true;
 	}
 
@@ -195,6 +196,7 @@ public function renderButton(&$node)
 		{
 			return JText::sprintf('JLIB_HTML_BUTTON_NOT_DEFINED', $type);
 		}
+
 		return $button->render($node);
 	}
 
@@ -211,6 +213,7 @@ public function renderButton(&$node)
 	public function loadButtonType($type, $new = false)
 	{
 		$signature = md5($type);
+
 		if (isset($this->_buttons[$signature]) && $new === false)
 		{
 			return $this->_buttons[$signature];
@@ -219,6 +222,7 @@ public function loadButtonType($type, $new = false)
 		if (!class_exists('JToolbarButton'))
 		{
 			JLog::add(JText::_('JLIB_HTML_BUTTON_BASE_CLASS'), JLog::WARNING, 'jerror');
+
 			return false;
 		}
 
@@ -226,6 +230,7 @@ public function loadButtonType($type, $new = false)
 
 		// @deprecated 12.3 Remove the acceptance of legacy classes starting with JButton.
 		$buttonClassOld = 'JButton' . ucfirst($type);
+
 		if (!class_exists($buttonClass))
 		{
 			if (!class_exists($buttonClassOld))
@@ -242,6 +247,7 @@ public function loadButtonType($type, $new = false)
 				$file = JFilterInput::getInstance()->clean(str_replace('_', DIRECTORY_SEPARATOR, strtolower($type)) . '.php', 'path');
 
 				jimport('joomla.filesystem.path');
+
 				if ($buttonFile = JPath::find($dirs, $file))
 				{
 					include_once $buttonFile;
@@ -249,6 +255,7 @@ public function loadButtonType($type, $new = false)
 				else
 				{
 					JLog::add(JText::sprintf('JLIB_HTML_BUTTON_NO_LOAD', $buttonClass, $buttonFile), JLog::WARNING, 'jerror');
+
 					return false;
 				}
 			}
@@ -259,6 +266,7 @@ public function loadButtonType($type, $new = false)
 			// @todo remove code: return	JError::raiseError('SOME_ERROR_CODE', "Module file $buttonFile does not contain class $buttonClass.");
 			return false;
 		}
+
 		$this->_buttons[$signature] = new $buttonClass($this);
 
 		return $this->_buttons[$signature];
@@ -301,6 +309,5 @@ public function addButtonPath($path)
 			// Add to the top of the search dirs.
 			array_unshift($this->_buttonPath, $dir);
 		}
-
 	}
 }
diff --git a/libraries/cms/ucm/base.php b/libraries/cms/ucm/base.php
index 91ce874..d4e8aaf 100644
--- a/libraries/cms/ucm/base.php
+++ b/libraries/cms/ucm/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  UCM
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/ucm/content.php b/libraries/cms/ucm/content.php
index 94a99fe..efd5fdd 100644
--- a/libraries/cms/ucm/content.php
+++ b/libraries/cms/ucm/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  UCM
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/ucm/type.php b/libraries/cms/ucm/type.php
index 70ce541..f572ac1 100644
--- a/libraries/cms/ucm/type.php
+++ b/libraries/cms/ucm/type.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  UCM
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -61,19 +61,19 @@ class JUcmType implements JUcm
 	public $type;
 
 	/**
-	* The Database object
-	*
-	* @var    JDatabaseDriver
-	* @since  3.1
-	*/
+	 * The Database object
+	 *
+	 * @var    JDatabaseDriver
+	 * @since  3.1
+	 */
 	protected $db;
 
 	/**
-	* The alias for the content type
-	*
-	* @var	  string
-	* @since  3.1
-	*/
+	 * The alias for the content type
+	 *
+	 * @var	  string
+	 * @since  3.1
+	 */
 	protected $alias;
 
 	/**
@@ -178,7 +178,6 @@ public function getTypeByTable($tableName)
 		}
 
 		return false;
-
 	}
 
 	/**
diff --git a/libraries/cms/ucm/ucm.php b/libraries/cms/ucm/ucm.php
index 635971a..6d1a605 100644
--- a/libraries/cms/ucm/ucm.php
+++ b/libraries/cms/ucm/ucm.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  UCM
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index 75ebd3e..ba6ae0a 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Version
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -25,7 +25,7 @@ final class JVersion
 	public $RELEASE = '3.2';
 
 	/** @var  string  Maintenance version. */
-	public $DEV_LEVEL = '1';
+	public $DEV_LEVEL = '2';
 
 	/** @var  string  Development STATUS. */
 	public $DEV_STATUS = 'Stable';
@@ -37,16 +37,16 @@ final class JVersion
 	public $CODENAME = 'Ember';
 
 	/** @var  string  Release date. */
-	public $RELDATE = '18-December-2013';
+	public $RELDATE = '6-February-2014';
 
 	/** @var  string  Release time. */
-	public $RELTIME = '14:30';
+	public $RELTIME = '16:00';
 
 	/** @var  string  Release timezone. */
 	public $RELTZ = 'GMT';
 
 	/** @var  string  Copyright Notice. */
-	public $COPYRIGHT = 'Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.';
+	public $COPYRIGHT = 'Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.';
 
 	/** @var  string  Link text. */
 	public $URL = '<a href="http://www.joomla.org">Joomla!</a> is Free Software released under the GNU General Public License.';
diff --git a/libraries/compat/jsonserializable.php b/libraries/compat/jsonserializable.php
index c99d738..db42cd5 100644
--- a/libraries/compat/jsonserializable.php
+++ b/libraries/compat/jsonserializable.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Compat
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/framework/index.html b/libraries/framework/index.html
index e69de29..2efb97f 100644
--- a/libraries/framework/index.html
+++ b/libraries/framework/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/libraries/import.legacy.php b/libraries/import.legacy.php
index 79ea9ed..a61dba7 100644
--- a/libraries/import.legacy.php
+++ b/libraries/import.legacy.php
@@ -5,7 +5,7 @@
  *
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/import.php b/libraries/import.php
index 4ba6199..30a3c9a 100644
--- a/libraries/import.php
+++ b/libraries/import.php
@@ -5,7 +5,7 @@
  *
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/access/access.php b/libraries/joomla/access/access.php
index a658d35..5e2c00c 100644
--- a/libraries/joomla/access/access.php
+++ b/libraries/joomla/access/access.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Access
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/access/rule.php b/libraries/joomla/access/rule.php
index 5d09919..233e09d 100644
--- a/libraries/joomla/access/rule.php
+++ b/libraries/joomla/access/rule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Access
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/access/rules.php b/libraries/joomla/access/rules.php
index 7aec6c7..7a99dd5 100644
--- a/libraries/joomla/access/rules.php
+++ b/libraries/joomla/access/rules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Access
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/base.php b/libraries/joomla/application/base.php
index 12c380d..6af5e9b 100644
--- a/libraries/joomla/application/base.php
+++ b/libraries/joomla/application/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/cli.php b/libraries/joomla/application/cli.php
index 4267ccf..1e9cfd4 100644
--- a/libraries/joomla/application/cli.php
+++ b/libraries/joomla/application/cli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/daemon.php b/libraries/joomla/application/daemon.php
index 64b2d44..c3005e5 100644
--- a/libraries/joomla/application/daemon.php
+++ b/libraries/joomla/application/daemon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/route.php b/libraries/joomla/application/route.php
index 71c190b..19edb74 100644
--- a/libraries/joomla/application/route.php
+++ b/libraries/joomla/application/route.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/web.php b/libraries/joomla/application/web.php
index 98686a5..4ea61c6 100644
--- a/libraries/joomla/application/web.php
+++ b/libraries/joomla/application/web.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/web/client.php b/libraries/joomla/application/web/client.php
index 4c8972a..4fae638 100644
--- a/libraries/joomla/application/web/client.php
+++ b/libraries/joomla/application/web/client.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/web/router.php b/libraries/joomla/application/web/router.php
index d81f2de..145f3ae 100644
--- a/libraries/joomla/application/web/router.php
+++ b/libraries/joomla/application/web/router.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/web/router/base.php b/libraries/joomla/application/web/router/base.php
index a7e79d4..9bb2a0d 100644
--- a/libraries/joomla/application/web/router/base.php
+++ b/libraries/joomla/application/web/router/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/application/web/router/rest.php b/libraries/joomla/application/web/router/rest.php
index 912d7b9..04f6538 100644
--- a/libraries/joomla/application/web/router/rest.php
+++ b/libraries/joomla/application/web/router/rest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/archive/archive.php b/libraries/joomla/archive/archive.php
index 8cea830..21acbdd 100644
--- a/libraries/joomla/archive/archive.php
+++ b/libraries/joomla/archive/archive.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/archive/bzip2.php b/libraries/joomla/archive/bzip2.php
index 94924e4..ab558a4 100644
--- a/libraries/joomla/archive/bzip2.php
+++ b/libraries/joomla/archive/bzip2.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/archive/extractable.php b/libraries/joomla/archive/extractable.php
index 3573c45..39249fd 100644
--- a/libraries/joomla/archive/extractable.php
+++ b/libraries/joomla/archive/extractable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/archive/gzip.php b/libraries/joomla/archive/gzip.php
index 9fb9656..7a1c32e 100644
--- a/libraries/joomla/archive/gzip.php
+++ b/libraries/joomla/archive/gzip.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/archive/tar.php b/libraries/joomla/archive/tar.php
index 87428c0..967eaff 100644
--- a/libraries/joomla/archive/tar.php
+++ b/libraries/joomla/archive/tar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/archive/zip.php b/libraries/joomla/archive/zip.php
index 87d4a2c..fade173 100644
--- a/libraries/joomla/archive/zip.php
+++ b/libraries/joomla/archive/zip.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/base/adapter.php b/libraries/joomla/base/adapter.php
index bdf3388..e386cfd 100644
--- a/libraries/joomla/base/adapter.php
+++ b/libraries/joomla/base/adapter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/base/adapterinstance.php b/libraries/joomla/base/adapterinstance.php
index c222e75..f395af2 100644
--- a/libraries/joomla/base/adapterinstance.php
+++ b/libraries/joomla/base/adapterinstance.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/cache.php b/libraries/joomla/cache/cache.php
index 55dc4af..8a9f4a3 100644
--- a/libraries/joomla/cache/cache.php
+++ b/libraries/joomla/cache/cache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/controller.php b/libraries/joomla/cache/controller.php
index 52286e7..d53e2f1 100644
--- a/libraries/joomla/cache/controller.php
+++ b/libraries/joomla/cache/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/controller/callback.php b/libraries/joomla/cache/controller/callback.php
index 6f2e507..680ab0f 100644
--- a/libraries/joomla/cache/controller/callback.php
+++ b/libraries/joomla/cache/controller/callback.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/controller/output.php b/libraries/joomla/cache/controller/output.php
index 952b7d1..872bd92 100644
--- a/libraries/joomla/cache/controller/output.php
+++ b/libraries/joomla/cache/controller/output.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/controller/page.php b/libraries/joomla/cache/controller/page.php
index 0d94cf4..3406919 100644
--- a/libraries/joomla/cache/controller/page.php
+++ b/libraries/joomla/cache/controller/page.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/controller/view.php b/libraries/joomla/cache/controller/view.php
index 8d0aabb..33fa59a 100644
--- a/libraries/joomla/cache/controller/view.php
+++ b/libraries/joomla/cache/controller/view.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage.php b/libraries/joomla/cache/storage.php
index 0aef02f..3ff9e94 100644
--- a/libraries/joomla/cache/storage.php
+++ b/libraries/joomla/cache/storage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/apc.php b/libraries/joomla/cache/storage/apc.php
index 8709683..552c863 100644
--- a/libraries/joomla/cache/storage/apc.php
+++ b/libraries/joomla/cache/storage/apc.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/cachelite.php b/libraries/joomla/cache/storage/cachelite.php
index 1125841..f0801e5 100644
--- a/libraries/joomla/cache/storage/cachelite.php
+++ b/libraries/joomla/cache/storage/cachelite.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/file.php b/libraries/joomla/cache/storage/file.php
index db3737b..50e2535 100644
--- a/libraries/joomla/cache/storage/file.php
+++ b/libraries/joomla/cache/storage/file.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/helper.php b/libraries/joomla/cache/storage/helper.php
index d74f807..42fecf9 100644
--- a/libraries/joomla/cache/storage/helper.php
+++ b/libraries/joomla/cache/storage/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/memcache.php b/libraries/joomla/cache/storage/memcache.php
index 4fd42f1..1e5d38e 100644
--- a/libraries/joomla/cache/storage/memcache.php
+++ b/libraries/joomla/cache/storage/memcache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/memcached.php b/libraries/joomla/cache/storage/memcached.php
index aa2d4a7..a22dca1 100644
--- a/libraries/joomla/cache/storage/memcached.php
+++ b/libraries/joomla/cache/storage/memcached.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/wincache.php b/libraries/joomla/cache/storage/wincache.php
index a50e5f7..4d135c9 100644
--- a/libraries/joomla/cache/storage/wincache.php
+++ b/libraries/joomla/cache/storage/wincache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/cache/storage/xcache.php b/libraries/joomla/cache/storage/xcache.php
index a0f83bc..82e120d 100644
--- a/libraries/joomla/cache/storage/xcache.php
+++ b/libraries/joomla/cache/storage/xcache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/client/ftp.php b/libraries/joomla/client/ftp.php
index 9ea6ee6..e3d29d1 100644
--- a/libraries/joomla/client/ftp.php
+++ b/libraries/joomla/client/ftp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Client
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/client/helper.php b/libraries/joomla/client/helper.php
index 912d8d4..175845c 100644
--- a/libraries/joomla/client/helper.php
+++ b/libraries/joomla/client/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Client
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/client/ldap.php b/libraries/joomla/client/ldap.php
index 03e7b5f..7838e08 100644
--- a/libraries/joomla/client/ldap.php
+++ b/libraries/joomla/client/ldap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Client
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/controller/base.php b/libraries/joomla/controller/base.php
index 3f3cef9..5864293 100644
--- a/libraries/joomla/controller/base.php
+++ b/libraries/joomla/controller/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/controller/controller.php b/libraries/joomla/controller/controller.php
index 886d19f..6d30085 100644
--- a/libraries/joomla/controller/controller.php
+++ b/libraries/joomla/controller/controller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/crypt/password.php b/libraries/joomla/crypt/password.php
index 6d8f621..267ad4f 100644
--- a/libraries/joomla/crypt/password.php
+++ b/libraries/joomla/crypt/password.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Crypt
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/crypt/password/simple.php b/libraries/joomla/crypt/password/simple.php
index 2c478f1..59ba857 100644
--- a/libraries/joomla/crypt/password/simple.php
+++ b/libraries/joomla/crypt/password/simple.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Crypt
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/data/data.php b/libraries/joomla/data/data.php
index 3521e50..c988b80 100644
--- a/libraries/joomla/data/data.php
+++ b/libraries/joomla/data/data.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Data
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/data/dumpable.php b/libraries/joomla/data/dumpable.php
index 8c5d1da..e27c114 100644
--- a/libraries/joomla/data/dumpable.php
+++ b/libraries/joomla/data/dumpable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Data
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/database.php b/libraries/joomla/database/database.php
index e4c397a..a8ade2c 100644
--- a/libraries/joomla/database/database.php
+++ b/libraries/joomla/database/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
index cefca89..18b790b 100644
--- a/libraries/joomla/database/driver.php
+++ b/libraries/joomla/database/driver.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/mysql.php b/libraries/joomla/database/driver/mysql.php
index d95926f..3c07f33 100644
--- a/libraries/joomla/database/driver/mysql.php
+++ b/libraries/joomla/database/driver/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
index 8c60856..6d817dd 100644
--- a/libraries/joomla/database/driver/mysqli.php
+++ b/libraries/joomla/database/driver/mysqli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/oracle.php b/libraries/joomla/database/driver/oracle.php
index 604fa57..712fbf4 100644
--- a/libraries/joomla/database/driver/oracle.php
+++ b/libraries/joomla/database/driver/oracle.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/pdo.php b/libraries/joomla/database/driver/pdo.php
index 94cc2a3..aab088e 100644
--- a/libraries/joomla/database/driver/pdo.php
+++ b/libraries/joomla/database/driver/pdo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/postgresql.php b/libraries/joomla/database/driver/postgresql.php
index bab5669..2801fd3 100644
--- a/libraries/joomla/database/driver/postgresql.php
+++ b/libraries/joomla/database/driver/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/sqlazure.php b/libraries/joomla/database/driver/sqlazure.php
index ecbd089..b18f3a0 100644
--- a/libraries/joomla/database/driver/sqlazure.php
+++ b/libraries/joomla/database/driver/sqlazure.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/sqlite.php b/libraries/joomla/database/driver/sqlite.php
index b30cdb9..95c1991 100644
--- a/libraries/joomla/database/driver/sqlite.php
+++ b/libraries/joomla/database/driver/sqlite.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/driver/sqlsrv.php b/libraries/joomla/database/driver/sqlsrv.php
index c765489..d7b1c61 100644
--- a/libraries/joomla/database/driver/sqlsrv.php
+++ b/libraries/joomla/database/driver/sqlsrv.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/exporter.php b/libraries/joomla/database/exporter.php
index ab61f63..b90542a 100644
--- a/libraries/joomla/database/exporter.php
+++ b/libraries/joomla/database/exporter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/exporter/mysql.php b/libraries/joomla/database/exporter/mysql.php
index df76e12..809d6ff 100644
--- a/libraries/joomla/database/exporter/mysql.php
+++ b/libraries/joomla/database/exporter/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/exporter/mysqli.php b/libraries/joomla/database/exporter/mysqli.php
index 4288e69..5a10442 100644
--- a/libraries/joomla/database/exporter/mysqli.php
+++ b/libraries/joomla/database/exporter/mysqli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/exporter/postgresql.php b/libraries/joomla/database/exporter/postgresql.php
index 3c3d950..0e1e686 100644
--- a/libraries/joomla/database/exporter/postgresql.php
+++ b/libraries/joomla/database/exporter/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/factory.php b/libraries/joomla/database/factory.php
index 426137c..efa8c4b 100644
--- a/libraries/joomla/database/factory.php
+++ b/libraries/joomla/database/factory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/importer.php b/libraries/joomla/database/importer.php
index 464729f..0995d8c 100644
--- a/libraries/joomla/database/importer.php
+++ b/libraries/joomla/database/importer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/importer/mysql.php b/libraries/joomla/database/importer/mysql.php
index 0b4b271..b6ab17e 100644
--- a/libraries/joomla/database/importer/mysql.php
+++ b/libraries/joomla/database/importer/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/importer/mysqli.php b/libraries/joomla/database/importer/mysqli.php
index 6adb6e0..62b613e 100644
--- a/libraries/joomla/database/importer/mysqli.php
+++ b/libraries/joomla/database/importer/mysqli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/importer/postgresql.php b/libraries/joomla/database/importer/postgresql.php
index 8dd2b0c..c85cc41 100644
--- a/libraries/joomla/database/importer/postgresql.php
+++ b/libraries/joomla/database/importer/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator.php b/libraries/joomla/database/iterator.php
index f036d8f..f177004 100644
--- a/libraries/joomla/database/iterator.php
+++ b/libraries/joomla/database/iterator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/azure.php b/libraries/joomla/database/iterator/azure.php
index 8b0d710..f08bcd6 100644
--- a/libraries/joomla/database/iterator/azure.php
+++ b/libraries/joomla/database/iterator/azure.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/mysql.php b/libraries/joomla/database/iterator/mysql.php
index d6955e7..fc4fd34 100644
--- a/libraries/joomla/database/iterator/mysql.php
+++ b/libraries/joomla/database/iterator/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/mysqli.php b/libraries/joomla/database/iterator/mysqli.php
index 1f3f1d0..987b174 100644
--- a/libraries/joomla/database/iterator/mysqli.php
+++ b/libraries/joomla/database/iterator/mysqli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/oracle.php b/libraries/joomla/database/iterator/oracle.php
index 17d886b..0bf6efb 100644
--- a/libraries/joomla/database/iterator/oracle.php
+++ b/libraries/joomla/database/iterator/oracle.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/pdo.php b/libraries/joomla/database/iterator/pdo.php
index 84c3085..223390d 100644
--- a/libraries/joomla/database/iterator/pdo.php
+++ b/libraries/joomla/database/iterator/pdo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/postgresql.php b/libraries/joomla/database/iterator/postgresql.php
index 4722637..a0cfd16 100644
--- a/libraries/joomla/database/iterator/postgresql.php
+++ b/libraries/joomla/database/iterator/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/sqlite.php b/libraries/joomla/database/iterator/sqlite.php
index 31a24cc..8de8c87 100644
--- a/libraries/joomla/database/iterator/sqlite.php
+++ b/libraries/joomla/database/iterator/sqlite.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/iterator/sqlsrv.php b/libraries/joomla/database/iterator/sqlsrv.php
index 8fd2369..1cc2ca0 100644
--- a/libraries/joomla/database/iterator/sqlsrv.php
+++ b/libraries/joomla/database/iterator/sqlsrv.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query.php b/libraries/joomla/database/query.php
index b889092..73082f9 100644
--- a/libraries/joomla/database/query.php
+++ b/libraries/joomla/database/query.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/limitable.php b/libraries/joomla/database/query/limitable.php
index c5823c4..2b444cb 100644
--- a/libraries/joomla/database/query/limitable.php
+++ b/libraries/joomla/database/query/limitable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/mysql.php b/libraries/joomla/database/query/mysql.php
index 5cc7d76..4216b15 100644
--- a/libraries/joomla/database/query/mysql.php
+++ b/libraries/joomla/database/query/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/mysqli.php b/libraries/joomla/database/query/mysqli.php
index 7e123d2..00b6952 100644
--- a/libraries/joomla/database/query/mysqli.php
+++ b/libraries/joomla/database/query/mysqli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/oracle.php b/libraries/joomla/database/query/oracle.php
index 18b8fee..221e36a 100644
--- a/libraries/joomla/database/query/oracle.php
+++ b/libraries/joomla/database/query/oracle.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/pdo.php b/libraries/joomla/database/query/pdo.php
index 4b9daa4..ed7a0d3 100644
--- a/libraries/joomla/database/query/pdo.php
+++ b/libraries/joomla/database/query/pdo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/postgresql.php b/libraries/joomla/database/query/postgresql.php
index 482e3c3..e195ba5 100644
--- a/libraries/joomla/database/query/postgresql.php
+++ b/libraries/joomla/database/query/postgresql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/preparable.php b/libraries/joomla/database/query/preparable.php
index 164ba1f..12a542d 100644
--- a/libraries/joomla/database/query/preparable.php
+++ b/libraries/joomla/database/query/preparable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/sqlazure.php b/libraries/joomla/database/query/sqlazure.php
index 34b915c..c012efe 100644
--- a/libraries/joomla/database/query/sqlazure.php
+++ b/libraries/joomla/database/query/sqlazure.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/sqlite.php b/libraries/joomla/database/query/sqlite.php
index 02a853b..32b414f 100644
--- a/libraries/joomla/database/query/sqlite.php
+++ b/libraries/joomla/database/query/sqlite.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/database/query/sqlsrv.php b/libraries/joomla/database/query/sqlsrv.php
index f3297d0..029ed2a 100644
--- a/libraries/joomla/database/query/sqlsrv.php
+++ b/libraries/joomla/database/query/sqlsrv.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/date/date.php b/libraries/joomla/date/date.php
index 36b4aa4..1a6691d 100644
--- a/libraries/joomla/date/date.php
+++ b/libraries/joomla/date/date.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Date
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/document.php b/libraries/joomla/document/document.php
index 2cd55fa..25ded87 100644
--- a/libraries/joomla/document/document.php
+++ b/libraries/joomla/document/document.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/error/error.php b/libraries/joomla/document/error/error.php
index 1ceb768..17416d1 100644
--- a/libraries/joomla/document/error/error.php
+++ b/libraries/joomla/document/error/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/feed/feed.php b/libraries/joomla/document/feed/feed.php
index 4c5a24e..a3ce470 100644
--- a/libraries/joomla/document/feed/feed.php
+++ b/libraries/joomla/document/feed/feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/feed/renderer/atom.php b/libraries/joomla/document/feed/renderer/atom.php
index 8cd8c2a..fe57157 100644
--- a/libraries/joomla/document/feed/renderer/atom.php
+++ b/libraries/joomla/document/feed/renderer/atom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/feed/renderer/rss.php b/libraries/joomla/document/feed/renderer/rss.php
index f9c3afe..42bfbe5 100644
--- a/libraries/joomla/document/feed/renderer/rss.php
+++ b/libraries/joomla/document/feed/renderer/rss.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/html/html.php b/libraries/joomla/document/html/html.php
index 1010cc5..9b03c79 100644
--- a/libraries/joomla/document/html/html.php
+++ b/libraries/joomla/document/html/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/html/renderer/component.php b/libraries/joomla/document/html/renderer/component.php
index 1ed5767..2d2274b 100644
--- a/libraries/joomla/document/html/renderer/component.php
+++ b/libraries/joomla/document/html/renderer/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/html/renderer/head.php b/libraries/joomla/document/html/renderer/head.php
index 2fd9c41..f0007ff 100644
--- a/libraries/joomla/document/html/renderer/head.php
+++ b/libraries/joomla/document/html/renderer/head.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/html/renderer/message.php b/libraries/joomla/document/html/renderer/message.php
index 5576648..33f2499 100644
--- a/libraries/joomla/document/html/renderer/message.php
+++ b/libraries/joomla/document/html/renderer/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/html/renderer/module.php b/libraries/joomla/document/html/renderer/module.php
index 09ff1a4..afa0ce0 100644
--- a/libraries/joomla/document/html/renderer/module.php
+++ b/libraries/joomla/document/html/renderer/module.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/html/renderer/modules.php b/libraries/joomla/document/html/renderer/modules.php
index 94f159c..bbbaa67 100644
--- a/libraries/joomla/document/html/renderer/modules.php
+++ b/libraries/joomla/document/html/renderer/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/image/image.php b/libraries/joomla/document/image/image.php
index 52f8ff4..3ed74d3 100644
--- a/libraries/joomla/document/image/image.php
+++ b/libraries/joomla/document/image/image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/json/json.php b/libraries/joomla/document/json/json.php
index cb9631e..f48fe61 100644
--- a/libraries/joomla/document/json/json.php
+++ b/libraries/joomla/document/json/json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/opensearch/opensearch.php b/libraries/joomla/document/opensearch/opensearch.php
index 28d6a82..8d19cd4 100644
--- a/libraries/joomla/document/opensearch/opensearch.php
+++ b/libraries/joomla/document/opensearch/opensearch.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/joomla/document/raw/raw.php b/libraries/joomla/document/raw/raw.php
index c48a4ff..61de428 100644
--- a/libraries/joomla/document/raw/raw.php
+++ b/libraries/joomla/document/raw/raw.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/renderer.php b/libraries/joomla/document/renderer.php
index e62803a..35efb09 100644
--- a/libraries/joomla/document/renderer.php
+++ b/libraries/joomla/document/renderer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/document/xml/xml.php b/libraries/joomla/document/xml/xml.php
index c4c257b..034daf7 100644
--- a/libraries/joomla/document/xml/xml.php
+++ b/libraries/joomla/document/xml/xml.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Document
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/environment/browser.php b/libraries/joomla/environment/browser.php
index 4d38391..c4ea371 100644
--- a/libraries/joomla/environment/browser.php
+++ b/libraries/joomla/environment/browser.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Environment
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/event/dispatcher.php b/libraries/joomla/event/dispatcher.php
index ee9feb4..260f4b7 100644
--- a/libraries/joomla/event/dispatcher.php
+++ b/libraries/joomla/event/dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Event
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/event/event.php b/libraries/joomla/event/event.php
index 2e56822..fe9f1de 100644
--- a/libraries/joomla/event/event.php
+++ b/libraries/joomla/event/event.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Event
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/album.php b/libraries/joomla/facebook/album.php
index 894086f..36a961c 100644
--- a/libraries/joomla/facebook/album.php
+++ b/libraries/joomla/facebook/album.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/checkin.php b/libraries/joomla/facebook/checkin.php
index a4d6a06..553c647 100644
--- a/libraries/joomla/facebook/checkin.php
+++ b/libraries/joomla/facebook/checkin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/comment.php b/libraries/joomla/facebook/comment.php
index 0056be0..aff67cd 100644
--- a/libraries/joomla/facebook/comment.php
+++ b/libraries/joomla/facebook/comment.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/event.php b/libraries/joomla/facebook/event.php
index d42bda0..fdcadcf 100644
--- a/libraries/joomla/facebook/event.php
+++ b/libraries/joomla/facebook/event.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/facebook.php b/libraries/joomla/facebook/facebook.php
index 0f7ba5f..bd4ab6f 100644
--- a/libraries/joomla/facebook/facebook.php
+++ b/libraries/joomla/facebook/facebook.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/group.php b/libraries/joomla/facebook/group.php
index 7dc50e7..ae82b83 100644
--- a/libraries/joomla/facebook/group.php
+++ b/libraries/joomla/facebook/group.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/link.php b/libraries/joomla/facebook/link.php
index 9a0ccdf..3dffcf7 100644
--- a/libraries/joomla/facebook/link.php
+++ b/libraries/joomla/facebook/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/note.php b/libraries/joomla/facebook/note.php
index b701f78..bf7d73e 100644
--- a/libraries/joomla/facebook/note.php
+++ b/libraries/joomla/facebook/note.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/oauth.php b/libraries/joomla/facebook/oauth.php
index e9c607a..6592f01 100644
--- a/libraries/joomla/facebook/oauth.php
+++ b/libraries/joomla/facebook/oauth.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/object.php b/libraries/joomla/facebook/object.php
index 7d8c929..b67fb05 100644
--- a/libraries/joomla/facebook/object.php
+++ b/libraries/joomla/facebook/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/photo.php b/libraries/joomla/facebook/photo.php
index f88f997..612a6d0 100644
--- a/libraries/joomla/facebook/photo.php
+++ b/libraries/joomla/facebook/photo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/post.php b/libraries/joomla/facebook/post.php
index 3f88020..54a09db 100644
--- a/libraries/joomla/facebook/post.php
+++ b/libraries/joomla/facebook/post.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/status.php b/libraries/joomla/facebook/status.php
index d462dd4..7e7ae60 100644
--- a/libraries/joomla/facebook/status.php
+++ b/libraries/joomla/facebook/status.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/user.php b/libraries/joomla/facebook/user.php
index 57aa727..37932de 100644
--- a/libraries/joomla/facebook/user.php
+++ b/libraries/joomla/facebook/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/facebook/video.php b/libraries/joomla/facebook/video.php
index 0c3b80b..a634adf 100644
--- a/libraries/joomla/facebook/video.php
+++ b/libraries/joomla/facebook/video.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Facebook
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/factory.php b/libraries/joomla/factory.php
index 93d0d7d..98ed7ee 100644
--- a/libraries/joomla/factory.php
+++ b/libraries/joomla/factory.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/entry.php b/libraries/joomla/feed/entry.php
index 694ad11..702c30b 100644
--- a/libraries/joomla/feed/entry.php
+++ b/libraries/joomla/feed/entry.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/factory.php b/libraries/joomla/feed/factory.php
index 0aacdd8..dc98e81 100644
--- a/libraries/joomla/feed/factory.php
+++ b/libraries/joomla/feed/factory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/feed.php b/libraries/joomla/feed/feed.php
index 2b0eb06..7617f6d 100644
--- a/libraries/joomla/feed/feed.php
+++ b/libraries/joomla/feed/feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/link.php b/libraries/joomla/feed/link.php
index 07b37e7..db3c268 100644
--- a/libraries/joomla/feed/link.php
+++ b/libraries/joomla/feed/link.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/parser.php b/libraries/joomla/feed/parser.php
index 0e61ed2..13c2353 100644
--- a/libraries/joomla/feed/parser.php
+++ b/libraries/joomla/feed/parser.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/parser/atom.php b/libraries/joomla/feed/parser/atom.php
index 5f282c3..08e12f7 100644
--- a/libraries/joomla/feed/parser/atom.php
+++ b/libraries/joomla/feed/parser/atom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/parser/namespace.php b/libraries/joomla/feed/parser/namespace.php
index f08d85d..92a125c 100644
--- a/libraries/joomla/feed/parser/namespace.php
+++ b/libraries/joomla/feed/parser/namespace.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/parser/rss.php b/libraries/joomla/feed/parser/rss.php
index bdc814a..b430b91 100644
--- a/libraries/joomla/feed/parser/rss.php
+++ b/libraries/joomla/feed/parser/rss.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/parser/rss/itunes.php b/libraries/joomla/feed/parser/rss/itunes.php
index f40ff39..1dcb824 100644
--- a/libraries/joomla/feed/parser/rss/itunes.php
+++ b/libraries/joomla/feed/parser/rss/itunes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/parser/rss/media.php b/libraries/joomla/feed/parser/rss/media.php
index b82676a..b58b33f 100644
--- a/libraries/joomla/feed/parser/rss/media.php
+++ b/libraries/joomla/feed/parser/rss/media.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/feed/person.php b/libraries/joomla/feed/person.php
index 4ea25c6..0d06082 100644
--- a/libraries/joomla/feed/person.php
+++ b/libraries/joomla/feed/person.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filesystem/file.php b/libraries/joomla/filesystem/file.php
index 29e67d7..06d8ec5 100644
--- a/libraries/joomla/filesystem/file.php
+++ b/libraries/joomla/filesystem/file.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filesystem/folder.php b/libraries/joomla/filesystem/folder.php
index 11b4385..78266a6 100644
--- a/libraries/joomla/filesystem/folder.php
+++ b/libraries/joomla/filesystem/folder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filesystem/helper.php b/libraries/joomla/filesystem/helper.php
index c3acbec..baf9384 100644
--- a/libraries/joomla/filesystem/helper.php
+++ b/libraries/joomla/filesystem/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini b/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
index 59c1320..d3a5050 100644
--- a/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
+++ b/libraries/joomla/filesystem/meta/language/en-GB/en-GB.lib_joomla_filesystem_patcher.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/libraries/joomla/filesystem/patcher.php b/libraries/joomla/filesystem/patcher.php
index 225bb30..ecf2a77 100644
--- a/libraries/joomla/filesystem/patcher.php
+++ b/libraries/joomla/filesystem/patcher.php
@@ -4,7 +4,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filesystem/path.php b/libraries/joomla/filesystem/path.php
index f96035a..df1d398 100644
--- a/libraries/joomla/filesystem/path.php
+++ b/libraries/joomla/filesystem/path.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -194,7 +194,7 @@ public static function check($path)
 	 */
 	public static function clean($path, $ds = DIRECTORY_SEPARATOR)
 	{
-		if (!is_string($path))
+		if (!is_string($path) && !empty($path))
 		{
 			throw new UnexpectedValueException('JPath::clean: $path is not a string.');
 		}
diff --git a/libraries/joomla/filesystem/stream.php b/libraries/joomla/filesystem/stream.php
index 62ebf54..d30074e 100644
--- a/libraries/joomla/filesystem/stream.php
+++ b/libraries/joomla/filesystem/stream.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filesystem/streams/string.php b/libraries/joomla/filesystem/streams/string.php
index f2a2a2f..6f01055 100644
--- a/libraries/joomla/filesystem/streams/string.php
+++ b/libraries/joomla/filesystem/streams/string.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filesystem/support/stringcontroller.php b/libraries/joomla/filesystem/support/stringcontroller.php
index 4fb3628..380f0f5 100644
--- a/libraries/joomla/filesystem/support/stringcontroller.php
+++ b/libraries/joomla/filesystem/support/stringcontroller.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  FileSystem
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filter/input.php b/libraries/joomla/filter/input.php
index c6547fe..0b7e5c2 100644
--- a/libraries/joomla/filter/input.php
+++ b/libraries/joomla/filter/input.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Filter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/filter/output.php b/libraries/joomla/filter/output.php
index 41b2c76..62f8f1f 100644
--- a/libraries/joomla/filter/output.php
+++ b/libraries/joomla/filter/output.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Filter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/field.php b/libraries/joomla/form/field.php
index fd60563..be8c27e 100644
--- a/libraries/joomla/form/field.php
+++ b/libraries/joomla/form/field.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -273,19 +273,19 @@ abstract class JFormField
 	protected $labelclass;
 
 	/**
-	* The javascript onchange of the form field.
-	*
-	* @var    string
-	* @since  3.2
-	*/
+	 * The javascript onchange of the form field.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
 	protected $onchange;
 
 	/**
-	* The javascript onclick of the form field.
-	*
-	* @var    string
-	* @since  3.2
-	*/
+	 * The javascript onclick of the form field.
+	 *
+	 * @var    string
+	 * @since  3.2
+	 */
 	protected $onclick;
 
 	/**
@@ -471,6 +471,16 @@ public function __set($name, $value)
 				$this->$name = !($value === 'false' || $value === 'off' || $value === '0');
 				break;
 
+			case 'translate_label':
+				$value = (string) $value;
+				$this->translateLabel = $this->translateLabel && !($value === 'false' || $value === 'off' || $value === '0');
+				break;
+
+			case 'translate_description':
+				$value = (string) $value;
+				$this->translateDescription = $this->translateDescription && !($value === 'false' || $value === 'off' || $value === '0');
+				break;
+
 			case 'size':
 				$this->$name = (int) $value;
 				break;
@@ -539,7 +549,8 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 			'multiple', 'name', 'id', 'hint', 'class', 'description', 'labelclass', 'onchange',
 			'onclick', 'validate', 'pattern', 'default', 'required',
 			'disabled', 'readonly', 'autofocus', 'hidden', 'autocomplete', 'spellcheck',
-			'translateHint', 'translateLabel', 'translateDescription', 'size');
+			'translateHint', 'translateLabel','translate_label', 'translateDescription',
+			'translate_description' ,'size');
 
 		$this->default = isset($element['value']) ? (string) $element['value'] : $this->default;
 
@@ -700,8 +711,10 @@ protected function getLabel()
 		// If a description is specified, use it to build a tooltip.
 		if (!empty($this->description))
 		{
+			// Don't translate discription if specified in the field xml.
+			$description = $this->translateDescription ? JText::_($this->description) : $this->description;
 			JHtml::_('bootstrap.tooltip');
-			$label .= ' title="' . JHtml::tooltipText(trim($text, ':'), JText::_($this->description), 0) . '"';
+			$label .= ' title="' . JHtml::tooltipText(trim($text, ':'), $description, 0) . '"';
 		}
 
 		// Add the label text and closing tag.
diff --git a/libraries/joomla/form/fields/accesslevel.php b/libraries/joomla/form/fields/accesslevel.php
index bd0bbf2..ac05fe1 100644
--- a/libraries/joomla/form/fields/accesslevel.php
+++ b/libraries/joomla/form/fields/accesslevel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/cachehandler.php b/libraries/joomla/form/fields/cachehandler.php
index ed9b333..2bfbbc0 100644
--- a/libraries/joomla/form/fields/cachehandler.php
+++ b/libraries/joomla/form/fields/cachehandler.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/calendar.php b/libraries/joomla/form/fields/calendar.php
index 9ec6d7c..0ff6b37 100644
--- a/libraries/joomla/form/fields/calendar.php
+++ b/libraries/joomla/form/fields/calendar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/checkbox.php b/libraries/joomla/form/fields/checkbox.php
index 28b456c..773fb1a 100644
--- a/libraries/joomla/form/fields/checkbox.php
+++ b/libraries/joomla/form/fields/checkbox.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/checkboxes.php b/libraries/joomla/form/fields/checkboxes.php
index 47656e1..9fd805c 100644
--- a/libraries/joomla/form/fields/checkboxes.php
+++ b/libraries/joomla/form/fields/checkboxes.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -127,7 +127,7 @@ protected function getInput()
 		$html = array();
 
 		// Initialize some field attributes.
-		$class          = !empty($this->class) ? ' class=checkboxes "' . $this->class . '"' : ' class="checkboxes"';
+		$class          = !empty($this->class) ? ' class="checkboxes ' . $this->class . '"' : ' class="checkboxes"';
 		$checkedOptions = explode(',', (string) $this->checkedOptions);
 		$required       = $this->required ? ' required aria-required="true"' : '';
 		$autofocus      = $this->autofocus ? ' autofocus' : '';
diff --git a/libraries/joomla/form/fields/color.php b/libraries/joomla/form/fields/color.php
index e57a843..5860f78 100644
--- a/libraries/joomla/form/fields/color.php
+++ b/libraries/joomla/form/fields/color.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/combo.php b/libraries/joomla/form/fields/combo.php
index 6c07348..29efcd6 100644
--- a/libraries/joomla/form/fields/combo.php
+++ b/libraries/joomla/form/fields/combo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/databaseconnection.php b/libraries/joomla/form/fields/databaseconnection.php
index 9f3e933..f5a8e80 100644
--- a/libraries/joomla/form/fields/databaseconnection.php
+++ b/libraries/joomla/form/fields/databaseconnection.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/email.php b/libraries/joomla/form/fields/email.php
index 5d3501a..15d0be1 100644
--- a/libraries/joomla/form/fields/email.php
+++ b/libraries/joomla/form/fields/email.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/file.php b/libraries/joomla/form/fields/file.php
index bfbe25f..40f84ed 100644
--- a/libraries/joomla/form/fields/file.php
+++ b/libraries/joomla/form/fields/file.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/filelist.php b/libraries/joomla/form/fields/filelist.php
index 18846d2..0e6511d 100644
--- a/libraries/joomla/form/fields/filelist.php
+++ b/libraries/joomla/form/fields/filelist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/folderlist.php b/libraries/joomla/form/fields/folderlist.php
index 5c9252c..5f823c2 100644
--- a/libraries/joomla/form/fields/folderlist.php
+++ b/libraries/joomla/form/fields/folderlist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/groupedlist.php b/libraries/joomla/form/fields/groupedlist.php
index 60f2007..93485ba 100644
--- a/libraries/joomla/form/fields/groupedlist.php
+++ b/libraries/joomla/form/fields/groupedlist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/hidden.php b/libraries/joomla/form/fields/hidden.php
index 2780085..4bb5a14 100644
--- a/libraries/joomla/form/fields/hidden.php
+++ b/libraries/joomla/form/fields/hidden.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/imagelist.php b/libraries/joomla/form/fields/imagelist.php
index f76eb9b..87378c4 100644
--- a/libraries/joomla/form/fields/imagelist.php
+++ b/libraries/joomla/form/fields/imagelist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -39,10 +39,7 @@ class JFormFieldImageList extends JFormFieldFileList
 	protected function getOptions()
 	{
 		// Define the image file type filter.
-		$filter = '\.png$|\.gif$|\.jpg$|\.bmp$|\.ico$|\.jpeg$|\.psd$|\.eps$';
-
-		// Set the form field element attribute for file type filter.
-		$this->element->addAttribute('filter', $filter);
+		$this->filter = '\.png$|\.gif$|\.jpg$|\.bmp$|\.ico$|\.jpeg$|\.psd$|\.eps$';
 
 		// Get the field options.
 		return parent::getOptions();
diff --git a/libraries/joomla/form/fields/integer.php b/libraries/joomla/form/fields/integer.php
index bfaa2e9..8fc6087 100644
--- a/libraries/joomla/form/fields/integer.php
+++ b/libraries/joomla/form/fields/integer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/language.php b/libraries/joomla/form/fields/language.php
index 72a9541..638f8b6 100644
--- a/libraries/joomla/form/fields/language.php
+++ b/libraries/joomla/form/fields/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/list.php b/libraries/joomla/form/fields/list.php
index 66e397a..351235d 100644
--- a/libraries/joomla/form/fields/list.php
+++ b/libraries/joomla/form/fields/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/meter.php b/libraries/joomla/form/fields/meter.php
index 32960d9..710ff04 100644
--- a/libraries/joomla/form/fields/meter.php
+++ b/libraries/joomla/form/fields/meter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/note.php b/libraries/joomla/form/fields/note.php
index 94a08d7..3683351 100644
--- a/libraries/joomla/form/fields/note.php
+++ b/libraries/joomla/form/fields/note.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/number.php b/libraries/joomla/form/fields/number.php
index b36a8cf..7c1c2f8 100644
--- a/libraries/joomla/form/fields/number.php
+++ b/libraries/joomla/form/fields/number.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/password.php b/libraries/joomla/form/fields/password.php
index a44aa27..ed3b7e9 100644
--- a/libraries/joomla/form/fields/password.php
+++ b/libraries/joomla/form/fields/password.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php
index bf092a2..1c575fb 100644
--- a/libraries/joomla/form/fields/plugins.php
+++ b/libraries/joomla/form/fields/plugins.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/predefinedlist.php b/libraries/joomla/form/fields/predefinedlist.php
index 25bc8ce..b878be3 100644
--- a/libraries/joomla/form/fields/predefinedlist.php
+++ b/libraries/joomla/form/fields/predefinedlist.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/radio.php b/libraries/joomla/form/fields/radio.php
index 3c6376d..4248295 100644
--- a/libraries/joomla/form/fields/radio.php
+++ b/libraries/joomla/form/fields/radio.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/range.php b/libraries/joomla/form/fields/range.php
index 36f5383..2a38a37 100644
--- a/libraries/joomla/form/fields/range.php
+++ b/libraries/joomla/form/fields/range.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/repeatable.php b/libraries/joomla/form/fields/repeatable.php
index 086b1f0..42c4017 100644
--- a/libraries/joomla/form/fields/repeatable.php
+++ b/libraries/joomla/form/fields/repeatable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/rules.php b/libraries/joomla/form/fields/rules.php
index 2ba44b2..96de1bd 100644
--- a/libraries/joomla/form/fields/rules.php
+++ b/libraries/joomla/form/fields/rules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/sessionhandler.php b/libraries/joomla/form/fields/sessionhandler.php
index 34ede03..7fe8cf9 100644
--- a/libraries/joomla/form/fields/sessionhandler.php
+++ b/libraries/joomla/form/fields/sessionhandler.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/spacer.php b/libraries/joomla/form/fields/spacer.php
index 9b5d410..def57fa 100644
--- a/libraries/joomla/form/fields/spacer.php
+++ b/libraries/joomla/form/fields/spacer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/sql.php b/libraries/joomla/form/fields/sql.php
index 98e25a5..38be7d7 100644
--- a/libraries/joomla/form/fields/sql.php
+++ b/libraries/joomla/form/fields/sql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/tel.php b/libraries/joomla/form/fields/tel.php
index 63a9a1a..ade4ed5 100644
--- a/libraries/joomla/form/fields/tel.php
+++ b/libraries/joomla/form/fields/tel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/text.php b/libraries/joomla/form/fields/text.php
index 4ae57de..6344f33 100644
--- a/libraries/joomla/form/fields/text.php
+++ b/libraries/joomla/form/fields/text.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/textarea.php b/libraries/joomla/form/fields/textarea.php
index 6776ee1..0bf009e 100644
--- a/libraries/joomla/form/fields/textarea.php
+++ b/libraries/joomla/form/fields/textarea.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/timezone.php b/libraries/joomla/form/fields/timezone.php
index d6b66e5..0c94aac 100644
--- a/libraries/joomla/form/fields/timezone.php
+++ b/libraries/joomla/form/fields/timezone.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/url.php b/libraries/joomla/form/fields/url.php
index bbc4f7d..162ce71 100644
--- a/libraries/joomla/form/fields/url.php
+++ b/libraries/joomla/form/fields/url.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/fields/usergroup.php b/libraries/joomla/form/fields/usergroup.php
index 93614f8..2bae762 100644
--- a/libraries/joomla/form/fields/usergroup.php
+++ b/libraries/joomla/form/fields/usergroup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/form.php b/libraries/joomla/form/form.php
index 1a36d96..26d3dfe 100644
--- a/libraries/joomla/form/form.php
+++ b/libraries/joomla/form/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/helper.php b/libraries/joomla/form/helper.php
index e471e76..f64a22e 100644
--- a/libraries/joomla/form/helper.php
+++ b/libraries/joomla/form/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule.php b/libraries/joomla/form/rule.php
index 504bc59..ddb3e55 100644
--- a/libraries/joomla/form/rule.php
+++ b/libraries/joomla/form/rule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/boolean.php b/libraries/joomla/form/rule/boolean.php
index 680bf3b..71b4e7f 100644
--- a/libraries/joomla/form/rule/boolean.php
+++ b/libraries/joomla/form/rule/boolean.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/color.php b/libraries/joomla/form/rule/color.php
index 63af92a..2f34dc6 100644
--- a/libraries/joomla/form/rule/color.php
+++ b/libraries/joomla/form/rule/color.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/email.php b/libraries/joomla/form/rule/email.php
index d564647..adc4cd6 100644
--- a/libraries/joomla/form/rule/email.php
+++ b/libraries/joomla/form/rule/email.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/equals.php b/libraries/joomla/form/rule/equals.php
index 3f1cf83..353558d 100644
--- a/libraries/joomla/form/rule/equals.php
+++ b/libraries/joomla/form/rule/equals.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/options.php b/libraries/joomla/form/rule/options.php
index edd9bb6..a7e7c67 100644
--- a/libraries/joomla/form/rule/options.php
+++ b/libraries/joomla/form/rule/options.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Platform
  * @subpackage  Form
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/joomla/form/rule/rules.php b/libraries/joomla/form/rule/rules.php
index af9094f..b7691e1 100644
--- a/libraries/joomla/form/rule/rules.php
+++ b/libraries/joomla/form/rule/rules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/tel.php b/libraries/joomla/form/rule/tel.php
index d751534..315503f 100644
--- a/libraries/joomla/form/rule/tel.php
+++ b/libraries/joomla/form/rule/tel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/url.php b/libraries/joomla/form/rule/url.php
index 1d397ae..e7af1a2 100644
--- a/libraries/joomla/form/rule/url.php
+++ b/libraries/joomla/form/rule/url.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/form/rule/username.php b/libraries/joomla/form/rule/username.php
index e9e1155..cfe2346 100644
--- a/libraries/joomla/form/rule/username.php
+++ b/libraries/joomla/form/rule/username.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/account.php b/libraries/joomla/github/account.php
index 517d0fb..a507ab1 100644
--- a/libraries/joomla/github/account.php
+++ b/libraries/joomla/github/account.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/commits.php b/libraries/joomla/github/commits.php
index 445be8d..0c59f46 100644
--- a/libraries/joomla/github/commits.php
+++ b/libraries/joomla/github/commits.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/forks.php b/libraries/joomla/github/forks.php
index 34e93d9..14e068b 100644
--- a/libraries/joomla/github/forks.php
+++ b/libraries/joomla/github/forks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/gists.php b/libraries/joomla/github/gists.php
index 35669fa..c68c2c2 100644
--- a/libraries/joomla/github/gists.php
+++ b/libraries/joomla/github/gists.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/github.php b/libraries/joomla/github/github.php
index cecbf87..9179d2e 100644
--- a/libraries/joomla/github/github.php
+++ b/libraries/joomla/github/github.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/hooks.php b/libraries/joomla/github/hooks.php
index 0ee99e9..829572d 100644
--- a/libraries/joomla/github/hooks.php
+++ b/libraries/joomla/github/hooks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/http.php b/libraries/joomla/github/http.php
index d5864e9..e6406c3 100644
--- a/libraries/joomla/github/http.php
+++ b/libraries/joomla/github/http.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/issues.php b/libraries/joomla/github/issues.php
index 945c28c..a69a355 100644
--- a/libraries/joomla/github/issues.php
+++ b/libraries/joomla/github/issues.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/meta.php b/libraries/joomla/github/meta.php
index 01c9400..b4a6f0b 100644
--- a/libraries/joomla/github/meta.php
+++ b/libraries/joomla/github/meta.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/milestones.php b/libraries/joomla/github/milestones.php
index 629b813..85946dc 100644
--- a/libraries/joomla/github/milestones.php
+++ b/libraries/joomla/github/milestones.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/object.php b/libraries/joomla/github/object.php
index c5464b8..f492c2d 100644
--- a/libraries/joomla/github/object.php
+++ b/libraries/joomla/github/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/pulls.php b/libraries/joomla/github/pulls.php
index 75f9333..86af1cb 100644
--- a/libraries/joomla/github/pulls.php
+++ b/libraries/joomla/github/pulls.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/refs.php b/libraries/joomla/github/refs.php
index f7c9694..87d79b1 100644
--- a/libraries/joomla/github/refs.php
+++ b/libraries/joomla/github/refs.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/statuses.php b/libraries/joomla/github/statuses.php
index d27938e..bc7808c 100644
--- a/libraries/joomla/github/statuses.php
+++ b/libraries/joomla/github/statuses.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/github/users.php b/libraries/joomla/github/users.php
index 3b3418c..3c14df6 100644
--- a/libraries/joomla/github/users.php
+++ b/libraries/joomla/github/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  GitHub
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/auth.php b/libraries/joomla/google/auth.php
index 115da8e..709e771 100644
--- a/libraries/joomla/google/auth.php
+++ b/libraries/joomla/google/auth.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/auth/oauth2.php b/libraries/joomla/google/auth/oauth2.php
index 81ff71b..947670c 100644
--- a/libraries/joomla/google/auth/oauth2.php
+++ b/libraries/joomla/google/auth/oauth2.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data.php b/libraries/joomla/google/data.php
index 07775d4..2c84b38 100644
--- a/libraries/joomla/google/data.php
+++ b/libraries/joomla/google/data.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/adsense.php b/libraries/joomla/google/data/adsense.php
index 3c7b8f2..2f2a31c 100644
--- a/libraries/joomla/google/data/adsense.php
+++ b/libraries/joomla/google/data/adsense.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/calendar.php b/libraries/joomla/google/data/calendar.php
index ea6105d..e8e1341 100644
--- a/libraries/joomla/google/data/calendar.php
+++ b/libraries/joomla/google/data/calendar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/picasa.php b/libraries/joomla/google/data/picasa.php
index fb5a68d..f89e83e 100644
--- a/libraries/joomla/google/data/picasa.php
+++ b/libraries/joomla/google/data/picasa.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/picasa/album.php b/libraries/joomla/google/data/picasa/album.php
index a8a1c1d..042144b 100644
--- a/libraries/joomla/google/data/picasa/album.php
+++ b/libraries/joomla/google/data/picasa/album.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/picasa/photo.php b/libraries/joomla/google/data/picasa/photo.php
index f83a8b1..66fefc9 100644
--- a/libraries/joomla/google/data/picasa/photo.php
+++ b/libraries/joomla/google/data/picasa/photo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/plus.php b/libraries/joomla/google/data/plus.php
index 89a9b89..4e8c8a0 100644
--- a/libraries/joomla/google/data/plus.php
+++ b/libraries/joomla/google/data/plus.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/plus/activities.php b/libraries/joomla/google/data/plus/activities.php
index d1b9f53..e01feae 100644
--- a/libraries/joomla/google/data/plus/activities.php
+++ b/libraries/joomla/google/data/plus/activities.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/plus/comments.php b/libraries/joomla/google/data/plus/comments.php
index 99ec78b..1da0263 100644
--- a/libraries/joomla/google/data/plus/comments.php
+++ b/libraries/joomla/google/data/plus/comments.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/data/plus/people.php b/libraries/joomla/google/data/plus/people.php
index 56ab825..2bd3db0 100644
--- a/libraries/joomla/google/data/plus/people.php
+++ b/libraries/joomla/google/data/plus/people.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/embed.php b/libraries/joomla/google/embed.php
index 7db12e0..54ea5bd 100644
--- a/libraries/joomla/google/embed.php
+++ b/libraries/joomla/google/embed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/embed/analytics.php b/libraries/joomla/google/embed/analytics.php
index b387f7b..d591246 100644
--- a/libraries/joomla/google/embed/analytics.php
+++ b/libraries/joomla/google/embed/analytics.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/embed/maps.php b/libraries/joomla/google/embed/maps.php
index a1c7674..8ff2d4d 100644
--- a/libraries/joomla/google/embed/maps.php
+++ b/libraries/joomla/google/embed/maps.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/google/google.php b/libraries/joomla/google/google.php
index 0905361..5d95929 100644
--- a/libraries/joomla/google/google.php
+++ b/libraries/joomla/google/google.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Google
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/grid/grid.php b/libraries/joomla/grid/grid.php
index 93f6c5b..948bed0 100644
--- a/libraries/joomla/grid/grid.php
+++ b/libraries/joomla/grid/grid.php
@@ -5,7 +5,7 @@
  * @package     Joomla.Platform
  * @subpackage  Grid
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/http/factory.php b/libraries/joomla/http/factory.php
index d520338..bfb31cf 100644
--- a/libraries/joomla/http/factory.php
+++ b/libraries/joomla/http/factory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTTP
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/http/http.php b/libraries/joomla/http/http.php
index 2a03a6e..367b941 100644
--- a/libraries/joomla/http/http.php
+++ b/libraries/joomla/http/http.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTTP
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/http/response.php b/libraries/joomla/http/response.php
index e9ad415..793210b 100644
--- a/libraries/joomla/http/response.php
+++ b/libraries/joomla/http/response.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTTP
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/http/transport.php b/libraries/joomla/http/transport.php
index 3c614c5..c0b5aee 100644
--- a/libraries/joomla/http/transport.php
+++ b/libraries/joomla/http/transport.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTTP
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/http/transport/curl.php b/libraries/joomla/http/transport/curl.php
index 38d0ff4..07560ba 100644
--- a/libraries/joomla/http/transport/curl.php
+++ b/libraries/joomla/http/transport/curl.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTTP
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/http/transport/socket.php b/libraries/joomla/http/transport/socket.php
index 6d85082..f32a520 100644
--- a/libraries/joomla/http/transport/socket.php
+++ b/libraries/joomla/http/transport/socket.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTTP
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/http/transport/stream.php b/libraries/joomla/http/transport/stream.php
index 7187b47..d76ae57 100644
--- a/libraries/joomla/http/transport/stream.php
+++ b/libraries/joomla/http/transport/stream.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  HTTP
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter.php b/libraries/joomla/image/filter.php
index 070f3a1..f4d802e 100644
--- a/libraries/joomla/image/filter.php
+++ b/libraries/joomla/image/filter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/brightness.php b/libraries/joomla/image/filter/brightness.php
index 2cf5039..76cad9a 100644
--- a/libraries/joomla/image/filter/brightness.php
+++ b/libraries/joomla/image/filter/brightness.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/contrast.php b/libraries/joomla/image/filter/contrast.php
index 85de6f2..e918e03 100644
--- a/libraries/joomla/image/filter/contrast.php
+++ b/libraries/joomla/image/filter/contrast.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/edgedetect.php b/libraries/joomla/image/filter/edgedetect.php
index 2e2bed7..c9418dd 100644
--- a/libraries/joomla/image/filter/edgedetect.php
+++ b/libraries/joomla/image/filter/edgedetect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/emboss.php b/libraries/joomla/image/filter/emboss.php
index 1936a2a..643bf45 100644
--- a/libraries/joomla/image/filter/emboss.php
+++ b/libraries/joomla/image/filter/emboss.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/grayscale.php b/libraries/joomla/image/filter/grayscale.php
index 9ffbcd1..09b5ff8 100644
--- a/libraries/joomla/image/filter/grayscale.php
+++ b/libraries/joomla/image/filter/grayscale.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/negate.php b/libraries/joomla/image/filter/negate.php
index 3f488fb..7b5bcf6 100644
--- a/libraries/joomla/image/filter/negate.php
+++ b/libraries/joomla/image/filter/negate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/sketchy.php b/libraries/joomla/image/filter/sketchy.php
index 744920b..00e12d8 100644
--- a/libraries/joomla/image/filter/sketchy.php
+++ b/libraries/joomla/image/filter/sketchy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/filter/smooth.php b/libraries/joomla/image/filter/smooth.php
index 211c892..9b8dc5e 100644
--- a/libraries/joomla/image/filter/smooth.php
+++ b/libraries/joomla/image/filter/smooth.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/image/image.php b/libraries/joomla/image/image.php
index 7865242..c48f141 100644
--- a/libraries/joomla/image/image.php
+++ b/libraries/joomla/image/image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/input/cli.php b/libraries/joomla/input/cli.php
index 012976b..c4b8804 100644
--- a/libraries/joomla/input/cli.php
+++ b/libraries/joomla/input/cli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Input
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/input/cookie.php b/libraries/joomla/input/cookie.php
index d88894d..4815af3 100644
--- a/libraries/joomla/input/cookie.php
+++ b/libraries/joomla/input/cookie.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Input
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/input/files.php b/libraries/joomla/input/files.php
index 3a819d3..d4c8a12 100644
--- a/libraries/joomla/input/files.php
+++ b/libraries/joomla/input/files.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Input
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/input/input.php b/libraries/joomla/input/input.php
index b0e3911..ac065c0 100644
--- a/libraries/joomla/input/input.php
+++ b/libraries/joomla/input/input.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Input
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/input/json.php b/libraries/joomla/input/json.php
index 9aba274..5b431f0 100644
--- a/libraries/joomla/input/json.php
+++ b/libraries/joomla/input/json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Input
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/keychain/keychain.php b/libraries/joomla/keychain/keychain.php
index cedf57b..c2acea1 100644
--- a/libraries/joomla/keychain/keychain.php
+++ b/libraries/joomla/keychain/keychain.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Keychain
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/language/helper.php b/libraries/joomla/language/helper.php
index 3cca026..609b1cb 100644
--- a/libraries/joomla/language/helper.php
+++ b/libraries/joomla/language/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/language/language.php b/libraries/joomla/language/language.php
index b0cb4f6..ee48981 100644
--- a/libraries/joomla/language/language.php
+++ b/libraries/joomla/language/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/language/stemmer.php b/libraries/joomla/language/stemmer.php
index 021981a..67be78b 100644
--- a/libraries/joomla/language/stemmer.php
+++ b/libraries/joomla/language/stemmer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/language/stemmer/porteren.php b/libraries/joomla/language/stemmer/porteren.php
index 7892e70..ae2f094 100644
--- a/libraries/joomla/language/stemmer/porteren.php
+++ b/libraries/joomla/language/stemmer/porteren.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @copyright   Copyright (C) 2005 Richard Heyes (http://www.phpguru.org/). All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
diff --git a/libraries/joomla/language/text.php b/libraries/joomla/language/text.php
index 250da2d..47f308a 100644
--- a/libraries/joomla/language/text.php
+++ b/libraries/joomla/language/text.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/language/transliterate.php b/libraries/joomla/language/transliterate.php
index de4ee30..72d5432 100644
--- a/libraries/joomla/language/transliterate.php
+++ b/libraries/joomla/language/transliterate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Language
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/communications.php b/libraries/joomla/linkedin/communications.php
index 9fb6bf4..1ee1cad 100644
--- a/libraries/joomla/linkedin/communications.php
+++ b/libraries/joomla/linkedin/communications.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/companies.php b/libraries/joomla/linkedin/companies.php
index 71c85e9..2877a9b 100644
--- a/libraries/joomla/linkedin/companies.php
+++ b/libraries/joomla/linkedin/companies.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/groups.php b/libraries/joomla/linkedin/groups.php
index ee38972..5681b0f 100644
--- a/libraries/joomla/linkedin/groups.php
+++ b/libraries/joomla/linkedin/groups.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/jobs.php b/libraries/joomla/linkedin/jobs.php
index ca6c93a..41cfd7f 100644
--- a/libraries/joomla/linkedin/jobs.php
+++ b/libraries/joomla/linkedin/jobs.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/linkedin.php b/libraries/joomla/linkedin/linkedin.php
index e7024f3..9931ac7 100644
--- a/libraries/joomla/linkedin/linkedin.php
+++ b/libraries/joomla/linkedin/linkedin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/oauth.php b/libraries/joomla/linkedin/oauth.php
index 56b1ee5..5f5feeb 100644
--- a/libraries/joomla/linkedin/oauth.php
+++ b/libraries/joomla/linkedin/oauth.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/object.php b/libraries/joomla/linkedin/object.php
index e7d3500..7d6ac57 100644
--- a/libraries/joomla/linkedin/object.php
+++ b/libraries/joomla/linkedin/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/people.php b/libraries/joomla/linkedin/people.php
index 111fb6a..970d7df 100644
--- a/libraries/joomla/linkedin/people.php
+++ b/libraries/joomla/linkedin/people.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/linkedin/stream.php b/libraries/joomla/linkedin/stream.php
index 848df2a..82b241a 100644
--- a/libraries/joomla/linkedin/stream.php
+++ b/libraries/joomla/linkedin/stream.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Linkedin
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/entry.php b/libraries/joomla/log/entry.php
index 2c97540..4c2e9b2 100644
--- a/libraries/joomla/log/entry.php
+++ b/libraries/joomla/log/entry.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/log.php b/libraries/joomla/log/log.php
index 3173864..638febf 100644
--- a/libraries/joomla/log/log.php
+++ b/libraries/joomla/log/log.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger.php b/libraries/joomla/log/logger.php
index 0503a4a..d561696 100644
--- a/libraries/joomla/log/logger.php
+++ b/libraries/joomla/log/logger.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger/callback.php b/libraries/joomla/log/logger/callback.php
index 508d3e7..9b9fe58 100644
--- a/libraries/joomla/log/logger/callback.php
+++ b/libraries/joomla/log/logger/callback.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger/database.php b/libraries/joomla/log/logger/database.php
index 8ff6a6e..b8708a4 100644
--- a/libraries/joomla/log/logger/database.php
+++ b/libraries/joomla/log/logger/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger/echo.php b/libraries/joomla/log/logger/echo.php
index 3ea5d67..9406a10 100644
--- a/libraries/joomla/log/logger/echo.php
+++ b/libraries/joomla/log/logger/echo.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger/formattedtext.php b/libraries/joomla/log/logger/formattedtext.php
index 4fa372a..55c06e6 100644
--- a/libraries/joomla/log/logger/formattedtext.php
+++ b/libraries/joomla/log/logger/formattedtext.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger/messagequeue.php b/libraries/joomla/log/logger/messagequeue.php
index 9c070f2..ef087fc 100644
--- a/libraries/joomla/log/logger/messagequeue.php
+++ b/libraries/joomla/log/logger/messagequeue.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger/syslog.php b/libraries/joomla/log/logger/syslog.php
index 0fea7f2..c8b2da4 100644
--- a/libraries/joomla/log/logger/syslog.php
+++ b/libraries/joomla/log/logger/syslog.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/log/logger/w3c.php b/libraries/joomla/log/logger/w3c.php
index 1590027..2071764 100644
--- a/libraries/joomla/log/logger/w3c.php
+++ b/libraries/joomla/log/logger/w3c.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mail/helper.php b/libraries/joomla/mail/helper.php
index 190fe28..5f38d72 100644
--- a/libraries/joomla/mail/helper.php
+++ b/libraries/joomla/mail/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Mail
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mail/mail.php b/libraries/joomla/mail/mail.php
index 75802b0..823324d 100644
--- a/libraries/joomla/mail/mail.php
+++ b/libraries/joomla/mail/mail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Mail
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/categories.php b/libraries/joomla/mediawiki/categories.php
index cd1872c..b9aa3bf 100644
--- a/libraries/joomla/mediawiki/categories.php
+++ b/libraries/joomla/mediawiki/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -19,20 +19,20 @@
 class JMediawikiCategories extends JMediawikiObject
 {
 	/**
-     * Method to list all categories the page(s) belong to.
-     *
-     * @param   array    $titles        Page titles to retrieve categories.
-     * @param   array    $clprop        List of additional properties to get.
-     * @param   array    $clshow        Type of categories to show.
-     * @param   integer  $cllimit       Number of categories to return.
-     * @param   boolean  $clcontinue    Continue when more results are available.
-     * @param   array    $clcategories  Only list these categories.
-     * @param   string   $cldir         Direction of listing.
-     *
-     * @return  object
-     *
-     * @since   12.1
-     */
+	 * Method to list all categories the page(s) belong to.
+	 *
+	 * @param   array    $titles        Page titles to retrieve categories.
+	 * @param   array    $clprop        List of additional properties to get.
+	 * @param   array    $clshow        Type of categories to show.
+	 * @param   integer  $cllimit       Number of categories to return.
+	 * @param   boolean  $clcontinue    Continue when more results are available.
+	 * @param   array    $clcategories  Only list these categories.
+	 * @param   string   $cldir         Direction of listing.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.1
+	 */
 	public function getCategories(array $titles, array $clprop = null, array $clshow = null, $cllimit = null, $clcontinue = false,
 		array $clcategories = null, $cldir = null)
 	{
@@ -79,14 +79,14 @@ public function getCategories(array $titles, array $clprop = null, array $clshow
 	}
 
 	/**
-     * Method to get information about all categories used.
-     *
-     * @param   array  $titles  Page titles to retrieve categories.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get information about all categories used.
+	 *
+	 * @param   array  $titles  Page titles to retrieve categories.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getCategoriesUsed(array $titles)
 	{
 		// Build the request
@@ -102,15 +102,15 @@ public function getCategoriesUsed(array $titles)
 	}
 
 	/**
-     * Method to get information about the given categories.
-     *
-     * @param   array    $titles      Page titles to retrieve categories.
-     * @param   boolean  $clcontinue  Continue when more results are available.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get information about the given categories.
+	 *
+	 * @param   array    $titles      Page titles to retrieve categories.
+	 * @param   boolean  $clcontinue  Continue when more results are available.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getCategoriesInfo(array $titles, $clcontinue = false)
 	{
 		// Build the request.
@@ -131,21 +131,147 @@ public function getCategoriesInfo(array $titles, $clcontinue = false)
 	}
 
 	/**
-     * Method to enumerate all categories.
-     *
-     * @param   string   $acfrom    The category to start enumerating from.
-     * @param   string   $acto      The category to stop enumerating at.
-     * @param   string   $acprefix  Search for all category titles that begin with this value.
-     * @param   string   $acdir     Direction to sort in.
-     * @param   integer  $acmin     Minimum number of category members.
-     * @param   integer  $acmax     Maximum number of category members.
-     * @param   integer  $aclimit   How many categories to return.
-     * @param   array    $acprop    Which properties to get.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to get information about the pages within a category
+	 *
+	 * @param   string  $cmtitle               The category title, must contain 'Category:' prefix, cannot be used together with $cmpageid
+	 * @param   string  $cmpageid              The category's page ID, cannot be used together with $cmtitle
+	 * @param   string  $cmlimit               Maximum number of pages to retrieve
+	 * @param   array   $cmprop                Array of properties to retrieve
+	 * @param   array   $cmnamespace           Namespaces to retrieve pages from
+	 * @param   array   $cmtype                Array of category members to include, ignored if $cmsort is set to 'timestamp'
+	 * @param   string  $cmstart               Timestamp to start listing from, only used if $cmsort is set to 'timestamp'
+	 * @param   string  $cmend                 Timestamp to end listing at, only used if $cmsort is set to 'timestamp'
+	 * @param   string  $cmstartsortkey        Hexadecimal key to start listing from, only used if $cmsort is set to 'sortkey'
+	 * @param   string  $cmendsortkey          Hexadecimal key to end listing at, only used if $cmsort is set to 'sortkey'
+	 * @param   string  $cmstartsortkeyprefix  Hexadecimal key prefix to start listing from, only used if $cmsort is set to 'sortkey',
+	 *                                         overrides $cmstartsortkey
+	 * @param   string  $cmendsortkeyprefix    Hexadecimal key prefix to end listing before, only used if $cmsort is set to 'sortkey',
+	 *                                         overrides $cmendsortkey
+	 * @param   string  $cmsort                Property to sort by
+	 * @param   string  $cmdir                 Direction to sort in
+	 * @param   string  $cmcontinue            Used to continue a previous request
+	 *
+	 * @return  object
+	 *
+	 * @since   3.2.2 (CMS)
+	 * @throws  RuntimeException
+	 */
+	public function getCategoryMembers($cmtitle = null, $cmpageid = null, $cmlimit = null, array $cmprop = null, array $cmnamespace = null,
+		array $cmtype = null, $cmstart = null, $cmend = null, $cmstartsortkey = null, $cmendsortkey = null, $cmstartsortkeyprefix = null,
+		$cmendsortkeyprefix = null, $cmsort = null, $cmdir = null, $cmcontinue = null)
+	{
+		// Build the request.
+		$path = '?action=query&list=categorymembers';
+
+		// Make sure both $cmtitle and $cmpageid are not set
+		if (isset($cmtitle) && isset($cmpageid))
+		{
+			throw new RuntimeException('Both the $cmtitle and $cmpageid parameters cannot be set, please only use one of the two.');
+		}
+
+		if (isset($cmtitle))
+		{
+			// Verify that the Category: prefix exists
+			if (strpos($cmtitle, 'Category:') !== 0)
+			{
+				throw new RuntimeException('The $cmtitle parameter must include the Category: prefix.');
+			}
+
+			$path .= '&cmtitle=' . $cmtitle;
+		}
+
+		if (isset($cmpageid))
+		{
+			$path .= '&cmpageid=' . $cmpageid;
+		}
+
+		if (isset($cmlimit))
+		{
+			$path .= '&cmlimit=' . $cmlimit;
+		}
+
+		if (isset($cmprop))
+		{
+			$path .= '&cmprop=' . $this->buildParameter($cmprop);
+		}
+
+		if (isset($cmnamespace))
+		{
+			$path .= '&cmnamespace=' . $this->buildParameter($cmnamespace);
+		}
+
+		if (isset($cmtype))
+		{
+			$path .= '&cmtype=' . $this->buildParameter($cmtype);
+		}
+
+		if (isset($cmstart))
+		{
+			$path .= '&cmstart=' . $cmstart;
+		}
+
+		if (isset($cmend))
+		{
+			$path .= '&cmend=' . $cmend;
+		}
+
+		if (isset($cmstartsortkey))
+		{
+			$path .= '&cmstartsortkey=' . $cmstartsortkey;
+		}
+
+		if (isset($cmendsortkey))
+		{
+			$path .= '&cmendsortkey=' . $cmendsortkey;
+		}
+
+		if (isset($cmstartsortkeyprefix))
+		{
+			$path .= '&cmstartsortkeyprefix=' . $cmstartsortkeyprefix;
+		}
+
+		if (isset($cmendsortkeyprefix))
+		{
+			$path .= '&cmendsortkeyprefix=' . $cmendsortkeyprefix;
+		}
+
+		if (isset($cmsort))
+		{
+			$path .= '&cmsort=' . $cmsort;
+		}
+
+		if (isset($cmdir))
+		{
+			$path .= '&cmdir=' . $cmdir;
+		}
+
+		if (isset($cmcontinue))
+		{
+			$path .= '&cmcontinue=' . $cmcontinue;
+		}
+
+		// Send the request.
+		$response = $this->client->get($this->fetchUrl($path));
+
+		return $this->validateResponse($response);
+	}
+
+	/**
+	 * Method to enumerate all categories.
+	 *
+	 * @param   string   $acfrom    The category to start enumerating from.
+	 * @param   string   $acto      The category to stop enumerating at.
+	 * @param   string   $acprefix  Search for all category titles that begin with this value.
+	 * @param   string   $acdir     Direction to sort in.
+	 * @param   integer  $acmin     Minimum number of category members.
+	 * @param   integer  $acmax     Maximum number of category members.
+	 * @param   integer  $aclimit   How many categories to return.
+	 * @param   array    $acprop    Which properties to get.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function enumerateCategories($acfrom = null, $acto = null, $acprefix = null, $acdir = null, $acmin = null,
 		$acmax = null, $aclimit = null, array $acprop = null)
 	{
@@ -204,15 +330,15 @@ public function enumerateCategories($acfrom = null, $acto = null, $acprefix = nu
 	}
 
 	/**
-     * Method to list change tags.
-     *
-     * @param   array   $tgprop   List of properties to get.
-     * @param   string  $tglimit  The maximum number of tags to limit.
-     *
-     * @return  object
-     *
-     * @since   12.3
-     */
+	 * Method to list change tags.
+	 *
+	 * @param   array   $tgprop   List of properties to get.
+	 * @param   string  $tglimit  The maximum number of tags to limit.
+	 *
+	 * @return  object
+	 *
+	 * @since   12.3
+	 */
 	public function getChangeTags(array $tgprop = null, $tglimit = null)
 	{
 		// Build the request.
diff --git a/libraries/joomla/mediawiki/http.php b/libraries/joomla/mediawiki/http.php
index 5b56102..8636e2a 100644
--- a/libraries/joomla/mediawiki/http.php
+++ b/libraries/joomla/mediawiki/http.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/images.php b/libraries/joomla/mediawiki/images.php
index d51bee2..4786da4 100644
--- a/libraries/joomla/mediawiki/images.php
+++ b/libraries/joomla/mediawiki/images.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/links.php b/libraries/joomla/mediawiki/links.php
index a7050a5..79c2d8a 100644
--- a/libraries/joomla/mediawiki/links.php
+++ b/libraries/joomla/mediawiki/links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/mediawiki.php b/libraries/joomla/mediawiki/mediawiki.php
index 510bc27..979ebe1 100644
--- a/libraries/joomla/mediawiki/mediawiki.php
+++ b/libraries/joomla/mediawiki/mediawiki.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/object.php b/libraries/joomla/mediawiki/object.php
index f881a76..1450225 100644
--- a/libraries/joomla/mediawiki/object.php
+++ b/libraries/joomla/mediawiki/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/pages.php b/libraries/joomla/mediawiki/pages.php
index 68a77aa..70c0cc3 100644
--- a/libraries/joomla/mediawiki/pages.php
+++ b/libraries/joomla/mediawiki/pages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/search.php b/libraries/joomla/mediawiki/search.php
index 74ad414..63cc0c7 100644
--- a/libraries/joomla/mediawiki/search.php
+++ b/libraries/joomla/mediawiki/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/sites.php b/libraries/joomla/mediawiki/sites.php
index f1126af..c588cb3 100644
--- a/libraries/joomla/mediawiki/sites.php
+++ b/libraries/joomla/mediawiki/sites.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/mediawiki/users.php b/libraries/joomla/mediawiki/users.php
index 114dee4..eb86cea 100644
--- a/libraries/joomla/mediawiki/users.php
+++ b/libraries/joomla/mediawiki/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  MediaWiki
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/microdata/microdata.php b/libraries/joomla/microdata/microdata.php
index 6fdab2a..7745d38 100644
--- a/libraries/joomla/microdata/microdata.php
+++ b/libraries/joomla/microdata/microdata.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Microdata
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/model/base.php b/libraries/joomla/model/base.php
index 11d056d..6a51300 100644
--- a/libraries/joomla/model/base.php
+++ b/libraries/joomla/model/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/model/database.php b/libraries/joomla/model/database.php
index 86ad510..bafae4a 100644
--- a/libraries/joomla/model/database.php
+++ b/libraries/joomla/model/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/model/model.php b/libraries/joomla/model/model.php
index 0e76931..2a2d056 100644
--- a/libraries/joomla/model/model.php
+++ b/libraries/joomla/model/model.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/oauth1/client.php b/libraries/joomla/oauth1/client.php
index 28256ba..a5801f0 100644
--- a/libraries/joomla/oauth1/client.php
+++ b/libraries/joomla/oauth1/client.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  OAuth1
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/oauth2/client.php b/libraries/joomla/oauth2/client.php
index 5d938eb..cccda92 100644
--- a/libraries/joomla/oauth2/client.php
+++ b/libraries/joomla/oauth2/client.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  OAuth2
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/object/object.php b/libraries/joomla/object/object.php
index e6ec627..8ce16d6 100644
--- a/libraries/joomla/object/object.php
+++ b/libraries/joomla/object/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Object
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/observable/interface.php b/libraries/joomla/observable/interface.php
index 6b15531..b88ec92 100644
--- a/libraries/joomla/observable/interface.php
+++ b/libraries/joomla/observable/interface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Observer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/observer/interface.php b/libraries/joomla/observer/interface.php
index 6c04f49..46f0ddf 100644
--- a/libraries/joomla/observer/interface.php
+++ b/libraries/joomla/observer/interface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Observer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/observer/mapper.php b/libraries/joomla/observer/mapper.php
index e7f628b..d816b23 100644
--- a/libraries/joomla/observer/mapper.php
+++ b/libraries/joomla/observer/mapper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Observer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/observer/updater.php b/libraries/joomla/observer/updater.php
index 46dbcf6..345bba3 100644
--- a/libraries/joomla/observer/updater.php
+++ b/libraries/joomla/observer/updater.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Observer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/observer/updater/interface.php b/libraries/joomla/observer/updater/interface.php
index ac70091..025278e 100644
--- a/libraries/joomla/observer/updater/interface.php
+++ b/libraries/joomla/observer/updater/interface.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Observer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/changesets.php b/libraries/joomla/openstreetmap/changesets.php
index 8834d5c..83e5433 100644
--- a/libraries/joomla/openstreetmap/changesets.php
+++ b/libraries/joomla/openstreetmap/changesets.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/elements.php b/libraries/joomla/openstreetmap/elements.php
index 0b3fba2..2daff1d 100644
--- a/libraries/joomla/openstreetmap/elements.php
+++ b/libraries/joomla/openstreetmap/elements.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/gps.php b/libraries/joomla/openstreetmap/gps.php
index c3b19bb..4c9d310 100644
--- a/libraries/joomla/openstreetmap/gps.php
+++ b/libraries/joomla/openstreetmap/gps.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/info.php b/libraries/joomla/openstreetmap/info.php
index 67ccf43..b3ba060 100644
--- a/libraries/joomla/openstreetmap/info.php
+++ b/libraries/joomla/openstreetmap/info.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/oauth.php b/libraries/joomla/openstreetmap/oauth.php
index 48a98de..0c43fc9 100644
--- a/libraries/joomla/openstreetmap/oauth.php
+++ b/libraries/joomla/openstreetmap/oauth.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/object.php b/libraries/joomla/openstreetmap/object.php
index 7194e3b..cb26d39 100644
--- a/libraries/joomla/openstreetmap/object.php
+++ b/libraries/joomla/openstreetmap/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/openstreetmap.php b/libraries/joomla/openstreetmap/openstreetmap.php
index a29f42f..f009475 100644
--- a/libraries/joomla/openstreetmap/openstreetmap.php
+++ b/libraries/joomla/openstreetmap/openstreetmap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/openstreetmap/user.php b/libraries/joomla/openstreetmap/user.php
index 3640bf4..8798dae 100644
--- a/libraries/joomla/openstreetmap/user.php
+++ b/libraries/joomla/openstreetmap/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Openstreetmap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/profiler/profiler.php b/libraries/joomla/profiler/profiler.php
index 6744ce0..e38fe59 100644
--- a/libraries/joomla/profiler/profiler.php
+++ b/libraries/joomla/profiler/profiler.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Profiler
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/registry/format.php b/libraries/joomla/registry/format.php
index e1d3e9d..3c4aa32 100644
--- a/libraries/joomla/registry/format.php
+++ b/libraries/joomla/registry/format.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Registry
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/registry/format/ini.php b/libraries/joomla/registry/format/ini.php
index b54c63f..58a675b 100644
--- a/libraries/joomla/registry/format/ini.php
+++ b/libraries/joomla/registry/format/ini.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Registry
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/registry/format/json.php b/libraries/joomla/registry/format/json.php
index 78853a2..93ef2d5 100644
--- a/libraries/joomla/registry/format/json.php
+++ b/libraries/joomla/registry/format/json.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Registry
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/registry/format/php.php b/libraries/joomla/registry/format/php.php
index f82ec59..199eeae 100644
--- a/libraries/joomla/registry/format/php.php
+++ b/libraries/joomla/registry/format/php.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Registry
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/registry/format/xml.php b/libraries/joomla/registry/format/xml.php
index f3e0a10..c2bcaca 100644
--- a/libraries/joomla/registry/format/xml.php
+++ b/libraries/joomla/registry/format/xml.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Registry
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/registry/registry.php b/libraries/joomla/registry/registry.php
index 9795706..3e716ef 100644
--- a/libraries/joomla/registry/registry.php
+++ b/libraries/joomla/registry/registry.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Registry
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/session.php b/libraries/joomla/session/session.php
index 4d93cf6..8151814 100644
--- a/libraries/joomla/session/session.php
+++ b/libraries/joomla/session/session.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage.php b/libraries/joomla/session/storage.php
index 7b600e1..18aad91 100644
--- a/libraries/joomla/session/storage.php
+++ b/libraries/joomla/session/storage.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage/apc.php b/libraries/joomla/session/storage/apc.php
index e45a60b..5ac8297 100644
--- a/libraries/joomla/session/storage/apc.php
+++ b/libraries/joomla/session/storage/apc.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage/database.php b/libraries/joomla/session/storage/database.php
index ea03818..073a5d4 100644
--- a/libraries/joomla/session/storage/database.php
+++ b/libraries/joomla/session/storage/database.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage/memcache.php b/libraries/joomla/session/storage/memcache.php
index 633e794..ccfc7ae 100644
--- a/libraries/joomla/session/storage/memcache.php
+++ b/libraries/joomla/session/storage/memcache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage/memcached.php b/libraries/joomla/session/storage/memcached.php
index 5fd1859..261b327 100644
--- a/libraries/joomla/session/storage/memcached.php
+++ b/libraries/joomla/session/storage/memcached.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage/none.php b/libraries/joomla/session/storage/none.php
index c65daca..21be354 100644
--- a/libraries/joomla/session/storage/none.php
+++ b/libraries/joomla/session/storage/none.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage/wincache.php b/libraries/joomla/session/storage/wincache.php
index 526ce53..56c6f32 100644
--- a/libraries/joomla/session/storage/wincache.php
+++ b/libraries/joomla/session/storage/wincache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/session/storage/xcache.php b/libraries/joomla/session/storage/xcache.php
index 8685d96..b6447b6 100644
--- a/libraries/joomla/session/storage/xcache.php
+++ b/libraries/joomla/session/storage/xcache.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Session
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/string/normalise.php b/libraries/joomla/string/normalise.php
index 8269d23..5361b29 100644
--- a/libraries/joomla/string/normalise.php
+++ b/libraries/joomla/string/normalise.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  String
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/string/punycode.php b/libraries/joomla/string/punycode.php
index 74ec3c5..126491c 100644
--- a/libraries/joomla/string/punycode.php
+++ b/libraries/joomla/string/punycode.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  String
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/string/string.php b/libraries/joomla/string/string.php
index d5a5a9b..a8f62d1 100644
--- a/libraries/joomla/string/string.php
+++ b/libraries/joomla/string/string.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  String
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/asset.php b/libraries/joomla/table/asset.php
index 6754753..cec3be5 100644
--- a/libraries/joomla/table/asset.php
+++ b/libraries/joomla/table/asset.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/extension.php b/libraries/joomla/table/extension.php
index 5bc21d9..2cd6ae8 100644
--- a/libraries/joomla/table/extension.php
+++ b/libraries/joomla/table/extension.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/language.php b/libraries/joomla/table/language.php
index db946c2..70b109a 100644
--- a/libraries/joomla/table/language.php
+++ b/libraries/joomla/table/language.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/nested.php b/libraries/joomla/table/nested.php
index d7773cc..f57d7c1 100644
--- a/libraries/joomla/table/nested.php
+++ b/libraries/joomla/table/nested.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/observer.php b/libraries/joomla/table/observer.php
index b591048..2e0b34c 100644
--- a/libraries/joomla/table/observer.php
+++ b/libraries/joomla/table/observer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/observer/contenthistory.php b/libraries/joomla/table/observer/contenthistory.php
index 4037482..dd8203a 100644
--- a/libraries/joomla/table/observer/contenthistory.php
+++ b/libraries/joomla/table/observer/contenthistory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/observer/tags.php b/libraries/joomla/table/observer/tags.php
index 15929e1..8f3f14f 100644
--- a/libraries/joomla/table/observer/tags.php
+++ b/libraries/joomla/table/observer/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/table.php b/libraries/joomla/table/table.php
index 4590dfe..c2a9bf2 100644
--- a/libraries/joomla/table/table.php
+++ b/libraries/joomla/table/table.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/update.php b/libraries/joomla/table/update.php
index 0e71f11..6e931e3 100644
--- a/libraries/joomla/table/update.php
+++ b/libraries/joomla/table/update.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/user.php b/libraries/joomla/table/user.php
index 79582c1..e09520e 100644
--- a/libraries/joomla/table/user.php
+++ b/libraries/joomla/table/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/usergroup.php b/libraries/joomla/table/usergroup.php
index fae18d7..d98813e 100644
--- a/libraries/joomla/table/usergroup.php
+++ b/libraries/joomla/table/usergroup.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/table/viewlevel.php b/libraries/joomla/table/viewlevel.php
index 95eced5..4751ff6 100644
--- a/libraries/joomla/table/viewlevel.php
+++ b/libraries/joomla/table/viewlevel.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/block.php b/libraries/joomla/twitter/block.php
index 37e863d..e095331 100644
--- a/libraries/joomla/twitter/block.php
+++ b/libraries/joomla/twitter/block.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/directmessages.php b/libraries/joomla/twitter/directmessages.php
index f4bd3cb..064b16c 100644
--- a/libraries/joomla/twitter/directmessages.php
+++ b/libraries/joomla/twitter/directmessages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/favorites.php b/libraries/joomla/twitter/favorites.php
index aa496a2..3edc5e9 100644
--- a/libraries/joomla/twitter/favorites.php
+++ b/libraries/joomla/twitter/favorites.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/friends.php b/libraries/joomla/twitter/friends.php
index 62a7ce6..33847ce 100644
--- a/libraries/joomla/twitter/friends.php
+++ b/libraries/joomla/twitter/friends.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/help.php b/libraries/joomla/twitter/help.php
index d441101..2cbd357 100644
--- a/libraries/joomla/twitter/help.php
+++ b/libraries/joomla/twitter/help.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/lists.php b/libraries/joomla/twitter/lists.php
index 7da7314..021af90 100644
--- a/libraries/joomla/twitter/lists.php
+++ b/libraries/joomla/twitter/lists.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/oauth.php b/libraries/joomla/twitter/oauth.php
index d4ce610..9267f20 100644
--- a/libraries/joomla/twitter/oauth.php
+++ b/libraries/joomla/twitter/oauth.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/object.php b/libraries/joomla/twitter/object.php
index 9338e3a..4a81220 100644
--- a/libraries/joomla/twitter/object.php
+++ b/libraries/joomla/twitter/object.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/places.php b/libraries/joomla/twitter/places.php
index 587c3c8..d26097e 100644
--- a/libraries/joomla/twitter/places.php
+++ b/libraries/joomla/twitter/places.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/profile.php b/libraries/joomla/twitter/profile.php
index c80837e..7d6c1af 100644
--- a/libraries/joomla/twitter/profile.php
+++ b/libraries/joomla/twitter/profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/search.php b/libraries/joomla/twitter/search.php
index a38ca2b..c907b0e 100644
--- a/libraries/joomla/twitter/search.php
+++ b/libraries/joomla/twitter/search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/statuses.php b/libraries/joomla/twitter/statuses.php
index 7ba1954..0eba794 100644
--- a/libraries/joomla/twitter/statuses.php
+++ b/libraries/joomla/twitter/statuses.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/trends.php b/libraries/joomla/twitter/trends.php
index ecca288..2d957e5 100644
--- a/libraries/joomla/twitter/trends.php
+++ b/libraries/joomla/twitter/trends.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/twitter.php b/libraries/joomla/twitter/twitter.php
index f799452..7a11d5b 100644
--- a/libraries/joomla/twitter/twitter.php
+++ b/libraries/joomla/twitter/twitter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/twitter/users.php b/libraries/joomla/twitter/users.php
index ff84ddd..5d1d3a6 100644
--- a/libraries/joomla/twitter/users.php
+++ b/libraries/joomla/twitter/users.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Twitter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/updater/adapters/collection.php b/libraries/joomla/updater/adapters/collection.php
index b12b236..e45a603 100644
--- a/libraries/joomla/updater/adapters/collection.php
+++ b/libraries/joomla/updater/adapters/collection.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Updater
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/updater/adapters/extension.php b/libraries/joomla/updater/adapters/extension.php
index e2e296f..a734126 100644
--- a/libraries/joomla/updater/adapters/extension.php
+++ b/libraries/joomla/updater/adapters/extension.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Updater
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -65,6 +65,10 @@ protected function _startElement($parser, $name, $attrs = array())
 				{
 					$this->currentUpdate->targetplatform = $attrs;
 				}
+				if ($name == 'PHP_MINIMUM')
+				{
+					$this->currentUpdate->php_minimum = '';
+				}
 				break;
 		}
 	}
@@ -99,18 +103,44 @@ protected function _endElement($parser, $name)
 					&& ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || $ver->DEV_LEVEL >= $this->currentUpdate->targetplatform->min_dev_level)
 					&& ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || $ver->DEV_LEVEL <= $this->currentUpdate->targetplatform->max_dev_level))
 				{
-					// Target platform isn't a valid field in the update table so unset it to prevent J! from trying to store it
-					unset($this->currentUpdate ->targetplatform);
-					if (isset($this->latest))
+					// Check if PHP version supported via <php_minimum> tag, assume true if tag isn't present
+					if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum, '>='))
 					{
-						if (version_compare($this->currentUpdate ->version, $this->latest->version, '>') == 1)
-						{
-							$this->latest = $this->currentUpdate;
-						}
+						$phpMatch = true;
 					}
 					else
 					{
-						$this->latest = $this->currentUpdate;
+						// Notify the user of the potential update
+						$msg = JText::sprintf(
+							'JLIB_INSTALLER_AVAILABLE_UPDATE_PHP_VERSION',
+							$this->currentUpdate->name,
+							$this->currentUpdate->version,
+							$this->currentUpdate->php_minimum,
+							PHP_VERSION
+						);
+
+						JFactory::getApplication()->enqueueMessage($msg, 'warning');
+
+						$phpMatch = false;
+					}
+
+					// Target platform and php_minimum aren't valid fields in the update table so unset them to prevent J! from trying to store them
+					unset($this->currentUpdate->targetplatform);
+					unset($this->currentUpdate->php_minimum);
+
+					if ($phpMatch)
+					{
+						if (isset($this->latest))
+						{
+							if (version_compare($this->currentUpdate->version, $this->latest->version, '>') == 1)
+							{
+								$this->latest = $this->currentUpdate;
+							}
+						}
+						else
+						{
+							$this->latest = $this->currentUpdate;
+						}
 					}
 				}
 				break;
@@ -144,6 +174,11 @@ protected function _characterData($parser, $data)
 			$tag = strtolower($tag);
 			$this->currentUpdate->$tag .= $data;
 		}
+
+		if ($tag == 'PHP_MINIMUM')
+		{
+			$this->currentUpdate->php_minimum = $data;
+		}
 	}
 
 	/**
diff --git a/libraries/joomla/updater/update.php b/libraries/joomla/updater/update.php
index 8101712..44fb96a 100644
--- a/libraries/joomla/updater/update.php
+++ b/libraries/joomla/updater/update.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Updater
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -138,6 +138,14 @@ class JUpdate extends JObject
 	 */
 	protected $targetplatform;
 
+	/**
+	 * Extra query for download URLs
+	 *
+	 * @var    string
+	 * @since  13.1
+	 */
+	protected $extra_query;
+
 	/**
 	 * Resource handle for the XML Parser
 	 *
@@ -283,16 +291,29 @@ public function _endElement($parser, $name)
 					&& ((!isset($this->currentUpdate->targetplatform->min_dev_level)) || $ver->DEV_LEVEL >= $this->currentUpdate->targetplatform->min_dev_level)
 					&& ((!isset($this->currentUpdate->targetplatform->max_dev_level)) || $ver->DEV_LEVEL <= $this->currentUpdate->targetplatform->max_dev_level))
 				{
-					if (isset($this->latest))
+					// Check if PHP version supported via <php_minimum> tag, assume true if tag isn't present
+					if (!isset($this->currentUpdate->php_minimum) || version_compare(PHP_VERSION, $this->currentUpdate->php_minimum->_data, '>='))
 					{
-						if (version_compare($this->currentUpdate->version->_data, $this->latest->version->_data, '>') == 1)
-						{
-							$this->latest = $this->currentUpdate;
-						}
+						$phpMatch = true;
 					}
 					else
 					{
-						$this->latest = $this->currentUpdate;
+						$phpMatch = false;
+					}
+
+					if ($phpMatch)
+					{
+						if (isset($this->latest))
+						{
+							if (version_compare($this->currentUpdate->version->_data, $this->latest->version->_data, '>') == 1)
+							{
+								$this->latest = $this->currentUpdate;
+							}
+						}
+						else
+						{
+							$this->latest = $this->currentUpdate;
+						}
 					}
 				}
 				break;
diff --git a/libraries/joomla/updater/updateadapter.php b/libraries/joomla/updater/updateadapter.php
index 7ed2952..f46f0de 100644
--- a/libraries/joomla/updater/updateadapter.php
+++ b/libraries/joomla/updater/updateadapter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Updater
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/updater/updater.php b/libraries/joomla/updater/updater.php
index abceeed..64e969f 100644
--- a/libraries/joomla/updater/updater.php
+++ b/libraries/joomla/updater/updater.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Updater
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -70,18 +70,17 @@ public static function getInstance()
 	 */
 	public function findUpdates($eid = 0, $cacheTimeout = 0)
 	{
-
 		$db = $this->getDBO();
 		$retval = false;
 
 		// Push it into an array
 		if (!is_array($eid))
 		{
-			$query = 'SELECT DISTINCT update_site_id, type, location, last_check_timestamp FROM #__update_sites WHERE enabled = 1';
+			$query = 'SELECT DISTINCT update_site_id, type, location, last_check_timestamp, extra_query FROM #__update_sites WHERE enabled = 1';
 		}
 		else
 		{
-			$query = 'SELECT DISTINCT update_site_id, type, location, last_check_timestamp FROM #__update_sites' .
+			$query = 'SELECT DISTINCT update_site_id, type, location, last_check_timestamp, extra_query FROM #__update_sites' .
 				' WHERE update_site_id IN' .
 				'  (SELECT update_site_id FROM #__update_sites_extensions WHERE extension_id IN (' . implode(',', $eid) . '))';
 		}
@@ -116,11 +115,13 @@ public function findUpdates($eid = 0, $cacheTimeout = 0)
 					$results = JArrayHelper::arrayUnique(array_merge($results, $update_result['update_sites']));
 					$result_count = count($results);
 				}
+
 				if (array_key_exists('updates', $update_result) && count($update_result['updates']))
 				{
 					for ($k = 0, $count = count($update_result['updates']); $k < $count; $k++)
 					{
 						$current_update = &$update_result['updates'][$k];
+						$current_update->extra_query = $result['extra_query'];
 						$update = JTable::getInstance('update');
 						$extension = JTable::getInstance('extension');
 						$uid = $update
@@ -140,6 +141,7 @@ public function findUpdates($eid = 0, $cacheTimeout = 0)
 								'folder' => strtolower($current_update->get('folder'))
 							)
 						);
+
 						if (!$uid)
 						{
 							// Set the extension id
diff --git a/libraries/joomla/uri/uri.php b/libraries/joomla/uri/uri.php
index 2e1b4be..1469d84 100644
--- a/libraries/joomla/uri/uri.php
+++ b/libraries/joomla/uri/uri.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Uri
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/user/authentication.php b/libraries/joomla/user/authentication.php
index cfc1920..9ac3000 100644
--- a/libraries/joomla/user/authentication.php
+++ b/libraries/joomla/user/authentication.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  User
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/user/helper.php b/libraries/joomla/user/helper.php
index df68ac9..f7b38f7 100644
--- a/libraries/joomla/user/helper.php
+++ b/libraries/joomla/user/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  User
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/user/user.php b/libraries/joomla/user/user.php
index 3d1750f..52c3e05 100644
--- a/libraries/joomla/user/user.php
+++ b/libraries/joomla/user/user.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  User
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/utilities/arrayhelper.php b/libraries/joomla/utilities/arrayhelper.php
index 84b7484..8c4b185 100644
--- a/libraries/joomla/utilities/arrayhelper.php
+++ b/libraries/joomla/utilities/arrayhelper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Utilities
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/utilities/buffer.php b/libraries/joomla/utilities/buffer.php
index 28f086e..6f61cb9 100644
--- a/libraries/joomla/utilities/buffer.php
+++ b/libraries/joomla/utilities/buffer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Utilities
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/utilities/utility.php b/libraries/joomla/utilities/utility.php
index 5544d03..03d45a2 100644
--- a/libraries/joomla/utilities/utility.php
+++ b/libraries/joomla/utilities/utility.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Utilities
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/view/base.php b/libraries/joomla/view/base.php
index b976498..2b3a922 100644
--- a/libraries/joomla/view/base.php
+++ b/libraries/joomla/view/base.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/view/html.php b/libraries/joomla/view/html.php
index effc7c5..29441b9 100644
--- a/libraries/joomla/view/html.php
+++ b/libraries/joomla/view/html.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/joomla/view/view.php b/libraries/joomla/view/view.php
index 21d0800..b3abcb2 100644
--- a/libraries/joomla/view/view.php
+++ b/libraries/joomla/view/view.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/access/rule.php b/libraries/legacy/access/rule.php
index 906ef4b..7870d4b 100644
--- a/libraries/legacy/access/rule.php
+++ b/libraries/legacy/access/rule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Access
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/access/rules.php b/libraries/legacy/access/rules.php
index 1d45dc8..72a5bc6 100644
--- a/libraries/legacy/access/rules.php
+++ b/libraries/legacy/access/rules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Access
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/application/application.php b/libraries/legacy/application/application.php
index 1dc8c90..0aac80f 100644
--- a/libraries/legacy/application/application.php
+++ b/libraries/legacy/application/application.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/application/cli.php b/libraries/legacy/application/cli.php
index dae9df2..9c0df8e 100644
--- a/libraries/legacy/application/cli.php
+++ b/libraries/legacy/application/cli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/application/daemon.php b/libraries/legacy/application/daemon.php
index 640ce06..64d8fa7 100644
--- a/libraries/legacy/application/daemon.php
+++ b/libraries/legacy/application/daemon.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/base/node.php b/libraries/legacy/base/node.php
index 98150e1..3bacfad 100644
--- a/libraries/legacy/base/node.php
+++ b/libraries/legacy/base/node.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/base/observable.php b/libraries/legacy/base/observable.php
index c0c9a0f..f198a28 100644
--- a/libraries/legacy/base/observable.php
+++ b/libraries/legacy/base/observable.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/base/observer.php b/libraries/legacy/base/observer.php
index 50a8b48..d8dee21 100644
--- a/libraries/legacy/base/observer.php
+++ b/libraries/legacy/base/observer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/base/tree.php b/libraries/legacy/base/tree.php
index 650c2b2..1f5322f 100644
--- a/libraries/legacy/base/tree.php
+++ b/libraries/legacy/base/tree.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Base
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/categories/categories.php b/libraries/legacy/categories/categories.php
index 7cc6a23..e41c82f 100644
--- a/libraries/legacy/categories/categories.php
+++ b/libraries/legacy/categories/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/controller/admin.php b/libraries/legacy/controller/admin.php
index b06c04d..cae6012 100644
--- a/libraries/legacy/controller/admin.php
+++ b/libraries/legacy/controller/admin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/controller/form.php b/libraries/legacy/controller/form.php
index d621b1d..b2fb590 100644
--- a/libraries/legacy/controller/form.php
+++ b/libraries/legacy/controller/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/controller/legacy.php b/libraries/legacy/controller/legacy.php
index 644e158..f996bbf 100644
--- a/libraries/legacy/controller/legacy.php
+++ b/libraries/legacy/controller/legacy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Controller
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/database/exception.php b/libraries/legacy/database/exception.php
index ffd34a8..fd42e0c 100644
--- a/libraries/legacy/database/exception.php
+++ b/libraries/legacy/database/exception.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/database/mysql.php b/libraries/legacy/database/mysql.php
index 5f9ab65..a1cef21 100644
--- a/libraries/legacy/database/mysql.php
+++ b/libraries/legacy/database/mysql.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/database/mysqli.php b/libraries/legacy/database/mysqli.php
index c248ebb..1296bef 100644
--- a/libraries/legacy/database/mysqli.php
+++ b/libraries/legacy/database/mysqli.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/database/sqlazure.php b/libraries/legacy/database/sqlazure.php
index bd7dad2..21d3b0a 100644
--- a/libraries/legacy/database/sqlazure.php
+++ b/libraries/legacy/database/sqlazure.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/database/sqlsrv.php b/libraries/legacy/database/sqlsrv.php
index 01b73dd..b0589eb 100644
--- a/libraries/legacy/database/sqlsrv.php
+++ b/libraries/legacy/database/sqlsrv.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Database
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/dispatcher/dispatcher.php b/libraries/legacy/dispatcher/dispatcher.php
index 8b7c112..c6f59ef 100644
--- a/libraries/legacy/dispatcher/dispatcher.php
+++ b/libraries/legacy/dispatcher/dispatcher.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Dispatcher
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/error/error.php b/libraries/legacy/error/error.php
index a62758f..f60b302 100644
--- a/libraries/legacy/error/error.php
+++ b/libraries/legacy/error/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Error
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/exception/exception.php b/libraries/legacy/exception/exception.php
index e5a194c..41d9983 100644
--- a/libraries/legacy/exception/exception.php
+++ b/libraries/legacy/exception/exception.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Exception
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/form/field/category.php b/libraries/legacy/form/field/category.php
index 397df94..7586905 100644
--- a/libraries/legacy/form/field/category.php
+++ b/libraries/legacy/form/field/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/form/field/componentlayout.php b/libraries/legacy/form/field/componentlayout.php
index f8ed470..381c08c 100644
--- a/libraries/legacy/form/field/componentlayout.php
+++ b/libraries/legacy/form/field/componentlayout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/form/field/modulelayout.php b/libraries/legacy/form/field/modulelayout.php
index 0af18fd..83e25a6 100644
--- a/libraries/legacy/form/field/modulelayout.php
+++ b/libraries/legacy/form/field/modulelayout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Form
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/log/logexception.php b/libraries/legacy/log/logexception.php
index 3d2f37f..3275a9f 100644
--- a/libraries/legacy/log/logexception.php
+++ b/libraries/legacy/log/logexception.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/model/admin.php b/libraries/legacy/model/admin.php
index 804493d..fff8e11 100644
--- a/libraries/legacy/model/admin.php
+++ b/libraries/legacy/model/admin.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/model/form.php b/libraries/legacy/model/form.php
index 885b56a..f9ae26f 100644
--- a/libraries/legacy/model/form.php
+++ b/libraries/legacy/model/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/model/item.php b/libraries/legacy/model/item.php
index f9d60f7..8364c58 100644
--- a/libraries/legacy/model/item.php
+++ b/libraries/legacy/model/item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/model/legacy.php b/libraries/legacy/model/legacy.php
index 4b20bc1..178df96 100644
--- a/libraries/legacy/model/legacy.php
+++ b/libraries/legacy/model/legacy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/model/list.php b/libraries/legacy/model/list.php
index e7e2c0a..adc8a02 100644
--- a/libraries/legacy/model/list.php
+++ b/libraries/legacy/model/list.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Model
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/request/request.php b/libraries/legacy/request/request.php
index 9a5376a..a83bbd4 100644
--- a/libraries/legacy/request/request.php
+++ b/libraries/legacy/request/request.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Request
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/response/response.php b/libraries/legacy/response/response.php
index a4553a1..0ba512b 100644
--- a/libraries/legacy/response/response.php
+++ b/libraries/legacy/response/response.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Response
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/simplecrypt/simplecrypt.php b/libraries/legacy/simplecrypt/simplecrypt.php
index 5a0aa7c..6d08917 100644
--- a/libraries/legacy/simplecrypt/simplecrypt.php
+++ b/libraries/legacy/simplecrypt/simplecrypt.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Simplecrypt
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/simplepie/factory.php b/libraries/legacy/simplepie/factory.php
index 8419581..bc3b8c1 100644
--- a/libraries/legacy/simplepie/factory.php
+++ b/libraries/legacy/simplepie/factory.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Simplepie
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/table/category.php b/libraries/legacy/table/category.php
index 440d381..1e432a7 100644
--- a/libraries/legacy/table/category.php
+++ b/libraries/legacy/table/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/table/content.php b/libraries/legacy/table/content.php
index ab61b3b..d369363 100644
--- a/libraries/legacy/table/content.php
+++ b/libraries/legacy/table/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/table/menu.php b/libraries/legacy/table/menu.php
index d91e2fe..3149978 100644
--- a/libraries/legacy/table/menu.php
+++ b/libraries/legacy/table/menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/table/menu/type.php b/libraries/legacy/table/menu/type.php
index 1942c09..b1795ce 100644
--- a/libraries/legacy/table/menu/type.php
+++ b/libraries/legacy/table/menu/type.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/table/module.php b/libraries/legacy/table/module.php
index 1dd9fd8..cd5e428 100644
--- a/libraries/legacy/table/module.php
+++ b/libraries/legacy/table/module.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/table/session.php b/libraries/legacy/table/session.php
index a6f3fca..fa466ce 100644
--- a/libraries/legacy/table/session.php
+++ b/libraries/legacy/table/session.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Table
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/utilities/xmlelement.php b/libraries/legacy/utilities/xmlelement.php
index 604fc27..b7b8e07 100644
--- a/libraries/legacy/utilities/xmlelement.php
+++ b/libraries/legacy/utilities/xmlelement.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Utilities
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/view/categories.php b/libraries/legacy/view/categories.php
index 3e08f2c..b2946fc 100644
--- a/libraries/legacy/view/categories.php
+++ b/libraries/legacy/view/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Libraries
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/legacy/view/category.php b/libraries/legacy/view/category.php
index a7cedb6..7be3107 100644
--- a/libraries/legacy/view/category.php
+++ b/libraries/legacy/view/category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/legacy/view/categoryfeed.php b/libraries/legacy/view/categoryfeed.php
index 535ec76..ca8fb97 100644
--- a/libraries/legacy/view/categoryfeed.php
+++ b/libraries/legacy/view/categoryfeed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/libraries/legacy/view/legacy.php b/libraries/legacy/view/legacy.php
index 609ac9f..3ebfdd1 100644
--- a/libraries/legacy/view/legacy.php
+++ b/libraries/legacy/view/legacy.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  View
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/web/client.php b/libraries/legacy/web/client.php
index e350180..b78399c 100644
--- a/libraries/legacy/web/client.php
+++ b/libraries/legacy/web/client.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/legacy/web/web.php b/libraries/legacy/web/web.php
index 2313884..4f615f3 100644
--- a/libraries/legacy/web/web.php
+++ b/libraries/legacy/web/web.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Legacy
  * @subpackage  Application
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/loader.php b/libraries/loader.php
index 47d65d4..7807d68 100644
--- a/libraries/loader.php
+++ b/libraries/loader.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/phpmailer/language/phpmailer.lang-joomla.php b/libraries/phpmailer/language/phpmailer.lang-joomla.php
index fb55c98..445f1a3 100644
--- a/libraries/phpmailer/language/phpmailer.lang-joomla.php
+++ b/libraries/phpmailer/language/phpmailer.lang-joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Platform
  * @subpackage  Mail
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/libraries/platform.php b/libraries/platform.php
index 2664751..3a7e5ba 100644
--- a/libraries/platform.php
+++ b/libraries/platform.php
@@ -2,7 +2,7 @@
 /**
  * @package    Joomla.Platform
  *
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -44,7 +44,7 @@ final class JPlatform
 	const RELEASE_TIME_ZONE = 'GMT';
 
 	// Copyright Notice.
-	const COPYRIGHT = 'Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.';
+	const COPYRIGHT = 'Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.';
 
 	// Link text.
 	const LINK_TEXT = '<a href="http://www.joomla.org">Joomla!</a> is Free Software released under the GNU General Public License.';
diff --git a/media/cms/css/debug.css b/media/cms/css/debug.css
index 627b996..b6cf7f1 100644
--- a/media/cms/css/debug.css
+++ b/media/cms/css/debug.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/editors/tinymce/langs/be.js b/media/editors/tinymce/langs/be.js
new file mode 100644
index 0000000..2d35492
--- /dev/null
+++ b/media/editors/tinymce/langs/be.js
@@ -0,0 +1,180 @@
+tinymce.addI18n('be',{
+"Cut": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c",
+"Header 2": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 2",
+"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0412\u0430\u0448 \u0431\u0440\u0430\u045e\u0437\u044d\u0440 \u043d\u0435 \u043f\u0430\u0434\u0442\u0440\u044b\u043c\u043b\u0456\u0432\u0430\u0435 \u043f\u0440\u0430\u043c\u044b \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u0430 \u0431\u0443\u0444\u0435\u0440\u0430 \u0430\u0431\u043c\u0435\u043d\u0443. \u041a\u0430\u043b\u0456 \u043b\u0430\u0441\u043a\u0430, \u0432\u044b\u043a\u0430\u0440\u044b\u0441\u0442\u043e\u045e\u0432\u0430\u0439\u0446\u0435 \u043d\u0430\u0441\u0442\u0443\u043f\u043d\u044b\u044f \u0441\u043f\u0430\u043b\u0443\u0447\u044d\u043d\u043d\u044f \u043a\u043b\u0430\u0432\u0456\u0448: Ctrl + X\/C\/V.",
+"Div": "\u0411\u043b\u043e\u043a",
+"Paste": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
+"Close": "\u0417\u0430\u0447\u044b\u043d\u0456\u0446\u044c",
+"Font Family": "\u0428\u0440\u044b\u0444\u0442",
+"Pre": "\u041f\u0440\u0430\u0434\u0444\u0430\u0440\u043c\u0430\u0442\u0430\u0432\u0430\u043d\u043d\u0435",
+"Align right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"New document": "\u041d\u043e\u0432\u044b \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442",
+"Blockquote": "\u0426\u044b\u0442\u0430\u0442\u0430",
+"Numbered list": "\u041d\u0443\u043c\u0430\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
+"Increase indent": "\u041f\u0430\u0432\u044f\u043b\u0456\u0447\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Formats": "\u0424\u0430\u0440\u043c\u0430\u0442",
+"Headers": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043a\u0456",
+"Select all": "\u0412\u044b\u043b\u0443\u0447\u044b\u0446\u044c \u0443\u0441\u0451",
+"Header 3": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 3",
+"Blocks": "\u0411\u043b\u043e\u043a\u0456",
+"Undo": "\u0412\u044f\u0440\u043d\u0443\u0446\u044c",
+"Strikethrough": "\u0417\u0430\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
+"Bullet list": "\u041c\u0430\u0440\u043a\u0456\u0440\u0430\u0432\u0430\u043d\u044b \u0441\u043f\u0456\u0441",
+"Header 1": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 1",
+"Superscript": "\u0412\u0435\u0440\u0445\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
+"Clear formatting": "\u0410\u0447\u044b\u0441\u0446\u0456\u0446\u044c \u0444\u0430\u0440\u043c\u0430\u0442",
+"Font Sizes": "\u041f\u0430\u043c\u0435\u0440 \u0448\u0440\u044b\u0444\u0442\u0430",
+"Subscript": "\u041d\u0456\u0436\u043d\u0456 \u0456\u043d\u0434\u044d\u043a\u0441",
+"Header 6": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 6",
+"Redo": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
+"Paragraph": "\u041f\u0430\u0440\u0430\u0433\u0440\u0430\u0444",
+"Ok": "Ok",
+"Bold": "\u0422\u043b\u0443\u0441\u0442\u044b",
+"Code": "\u041a\u043e\u0434",
+"Italic": "\u041a\u0443\u0440\u0441\u0456\u045e",
+"Align center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
+"Header 5": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 5",
+"Decrease indent": "\u041f\u0430\u043c\u0435\u043d\u0448\u044b\u0446\u044c \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Header 4": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a 4",
+"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u0423\u0441\u0442\u0430\u045e\u043a\u0430 \u0437\u0434\u0437\u044f\u0439\u0441\u043d\u044f\u0435\u0446\u0446\u0430 \u045e \u0432\u044b\u0433\u043b\u044f\u0434\u0437\u0435 \u043f\u0440\u043e\u0441\u0442\u0430\u0433\u0430 \u0442\u044d\u043a\u0441\u0442\u0443, \u043f\u0430\u043a\u0443\u043b\u044c \u043d\u0435 \u0430\u0434\u043a\u043b\u044e\u0447\u044b\u0446\u044c \u0434\u0430\u0434\u0437\u0435\u043d\u0443\u044e \u043e\u043f\u0446\u044b\u044e.",
+"Underline": "\u041f\u0430\u0434\u043a\u0440\u044d\u0441\u043b\u0435\u043d\u044b",
+"Cancel": "\u0410\u0434\u043c\u044f\u043d\u0456\u0446\u044c",
+"Justify": "\u041f\u0430 \u0448\u044b\u0440\u044b\u043d\u0456",
+"Inline": "\u0420\u0430\u0434\u043a\u043e\u0432\u044b",
+"Copy": "\u041a\u0430\u043f\u0456\u0440\u0430\u0432\u0430\u0446\u044c",
+"Align left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"Visual aids": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043a\u043e\u043d\u0442\u0443\u0440\u044b",
+"Lower Greek": "\u041c\u0430\u043b\u044b\u044f \u0433\u0440\u044d\u0447\u0430\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
+"Square": "\u041a\u0432\u0430\u0434\u0440\u0430\u0442\u044b",
+"Default": "\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u044b",
+"Lower Alpha": "\u041c\u0430\u043b\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
+"Circle": "\u0410\u043a\u0440\u0443\u0436\u043d\u0430\u0441\u0446\u0456",
+"Disc": "\u041a\u0440\u0443\u0433\u0456",
+"Upper Alpha": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u043b\u0430\u0446\u0456\u043d\u0441\u043a\u0456\u044f \u043b\u0456\u0442\u0430\u0440\u044b",
+"Upper Roman": "\u0417\u0430\u0433\u0430\u043b\u043e\u045e\u043d\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
+"Lower Roman": "\u041c\u0430\u043b\u044b\u044f \u0440\u044b\u043c\u0441\u043a\u0456\u044f \u043b\u0456\u0447\u0431\u044b",
+"Name": "\u0406\u043c\u044f",
+"Anchor": "\u042f\u043a\u0430\u0440",
+"You have unsaved changes are you sure you want to navigate away?": "\u0423 \u0432\u0430\u0441 \u0451\u0441\u0446\u044c \u043d\u0435\u0437\u0430\u0445\u0430\u0432\u0430\u043d\u044b\u044f \u0437\u043c\u0435\u043d\u044b. \u0412\u044b \u045e\u043f\u044d\u045e\u043d\u0435\u043d\u044b\u044f, \u0448\u0442\u043e \u0445\u043e\u0447\u0430\u0446\u0435 \u0432\u044b\u0439\u0441\u0446\u0456?",
+"Restore last draft": "\u0410\u0434\u043d\u0430\u045e\u043b\u0435\u043d\u043d\u0435 \u0430\u043f\u043e\u0448\u043d\u044f\u0433\u0430 \u043f\u0440\u0430\u0435\u043a\u0442\u0430",
+"Special character": "\u0421\u043f\u0435\u0446\u044b\u044f\u043b\u044c\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
+"Source code": "\u0417\u044b\u0445\u043e\u0434\u043d\u044b \u043a\u043e\u0434",
+"Right to left": "\u0421\u043f\u0440\u0430\u0432\u0430 \u043d\u0430\u043b\u0435\u0432\u0430",
+"Left to right": "\u0417\u043b\u0435\u0432\u0430 \u043d\u0430\u043f\u0440\u0430\u0432\u0430",
+"Emoticons": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043c\u0430\u0439\u043b",
+"Robots": "\u0420\u043e\u0431\u0430\u0442\u044b",
+"Document properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0434\u0430\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
+"Title": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
+"Keywords": "\u041a\u043b\u044e\u0447\u0430\u0432\u044b\u044f \u0441\u043b\u043e\u0432\u044b",
+"Encoding": "\u041a\u0430\u0434\u044b\u0440\u043e\u045e\u043a\u0430",
+"Description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435",
+"Author": "\u0410\u045e\u0442\u0430\u0440",
+"Fullscreen": "\u041f\u043e\u045e\u043d\u0430\u044d\u043a\u0440\u0430\u043d\u043d\u044b \u0440\u044d\u0436\u044b\u043c",
+"Horizontal line": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u0430\u044f \u043b\u0456\u043d\u0456\u044f",
+"Horizontal space": "\u0413\u0430\u0440\u044b\u0437\u0430\u043d\u0442\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
+"Insert\/edit image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
+"General": "\u0410\u0433\u0443\u043b\u044c\u043d\u0430\u0435",
+"Advanced": "\u041f\u0430\u0448\u044b\u0440\u0430\u043d\u0430\u0435",
+"Source": "\u041a\u0440\u044b\u043d\u0456\u0446\u0430",
+"Border": "\u041c\u044f\u0436\u0430",
+"Constrain proportions": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c \u043f\u0440\u0430\u043f\u043e\u0440\u0446\u044b\u0456",
+"Vertical space": "\u0412\u0435\u0440\u0442\u044b\u043a\u0430\u043b\u044c\u043d\u044b \u0456\u043d\u0442\u044d\u0440\u0432\u0430\u043b",
+"Image description": "\u0410\u043f\u0456\u0441\u0430\u043d\u043d\u0435 \u0432\u044b\u044f\u0432\u044b",
+"Style": "\u0421\u0442\u044b\u043b\u044c",
+"Dimensions": "\u041f\u0430\u043c\u0435\u0440",
+"Insert image": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u044b\u044f\u0432\u0443",
+"Insert date\/time": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0434\u0430\u0442\u0443\/\u0447\u0430\u0441",
+"Remove link": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"Url": "\u0410\u0434\u0440\u0430\u0441 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
+"Text to display": "\u0422\u044d\u043a\u0441\u0442 \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0456",
+"Anchors": "\u042f\u043a\u0430\u0440\u044b",
+"Insert link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"New window": "\u0423 \u043d\u043e\u0432\u044b\u043c \u0430\u043a\u043d\u0435",
+"None": "\u041d\u044f\u043c\u0430",
+"Target": "\u0410\u0434\u043a\u0440\u044b\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"Insert\/edit link": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0441\u043f\u0430\u0441\u044b\u043b\u043a\u0443",
+"Insert\/edit video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c\/\u0440\u044d\u0434\u0430\u0433\u0430\u0432\u0430\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
+"Poster": "\u0412\u044b\u044f\u0432\u0430",
+"Alternative source": "\u0410\u043b\u044c\u0442\u044d\u0440\u043d\u0430\u0442\u044b\u045e\u043d\u0430\u044f \u043a\u0440\u044b\u043d\u0456\u0446\u0430",
+"Paste your embed code below:": "\u0423\u0441\u0442\u0430\u045e\u0446\u0435 \u0432\u0430\u0448 \u043a\u043e\u0434 \u043d\u0456\u0436\u044d\u0439:",
+"Insert video": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0432\u0456\u0434\u044d\u0430",
+"Embed": "\u041a\u043e\u0434 \u0434\u043b\u044f \u045e\u0441\u0442\u0430\u045e\u043a\u0456",
+"Nonbreaking space": "\u041d\u0435\u043f\u0430\u0440\u044b\u045e\u043d\u044b \u043f\u0440\u0430\u0431\u0435\u043b",
+"Page break": "\u0420\u0430\u0437\u0440\u044b\u045e \u0441\u0442\u0430\u0440\u043e\u043d\u043a\u0456",
+"Paste as text": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u044f\u043a \u0442\u044d\u043a\u0441\u0442",
+"Preview": "\u041f\u0440\u0430\u0434\u043f\u0440\u0430\u0433\u043b\u044f\u0434",
+"Print": "\u0414\u0440\u0443\u043a",
+"Save": "\u0417\u0430\u0445\u0430\u0432\u0430\u0446\u044c",
+"Could not find the specified string.": "\u0417\u0430\u0434\u0430\u0434\u0437\u0435\u043d\u044b \u0440\u0430\u0434\u043e\u043a \u043d\u0435 \u0437\u043d\u043e\u0439\u0434\u0437\u0435\u043d\u044b",
+"Replace": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
+"Next": "\u0423\u043d\u0456\u0437",
+"Whole words": "\u0421\u043b\u043e\u0432\u044b \u0446\u0430\u043b\u043a\u0430\u043c",
+"Find and replace": "\u041f\u043e\u0448\u0443\u043a \u0456 \u0437\u0430\u043c\u0435\u043d\u0430",
+"Replace with": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u043d\u0430",
+"Find": "\u0417\u043d\u0430\u0439\u0441\u0446\u0456",
+"Replace all": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c \u0443\u0441\u0435",
+"Match case": "\u0423\u043b\u0456\u0447\u0432\u0430\u0446\u044c \u0440\u044d\u0433\u0456\u0441\u0442\u0440",
+"Prev": "\u0423\u0432\u0435\u0440\u0445",
+"Spellcheck": "\u041f\u0440\u0430\u0432\u0435\u0440\u043a\u0430 \u043f\u0440\u0430\u0432\u0430\u043f\u0456\u0441\u0443",
+"Finish": "\u0421\u043a\u043e\u043d\u0447\u044b\u0446\u044c",
+"Ignore all": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c \u0443\u0441\u0435",
+"Ignore": "\u0406\u0433\u043d\u0430\u0440\u0430\u0432\u0430\u0446\u044c",
+"Insert row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
+"Rows": "\u0420\u0430\u0434\u043a\u0456",
+"Height": "\u0412\u044b\u0448\u044b\u043d\u044f",
+"Paste row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
+"Alignment": "\u0412\u044b\u0440\u0430\u045e\u043d\u043e\u045e\u0432\u0430\u043d\u043d\u0435",
+"Column group": "\u0413\u0440\u0443\u043f\u0430 \u0441\u043b\u0443\u043f\u043a\u043e\u045e",
+"Row": "\u0420\u0430\u0434\u043e\u043a",
+"Insert column before": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0437\u043b\u0435\u0432\u0430",
+"Split cell": "\u0420\u0430\u0437\u0431\u0456\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0443",
+"Cell padding": "\u0423\u043d\u0443\u0442\u0440\u0430\u043d\u044b \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Cell spacing": "\u0417\u043d\u0435\u0448\u043d\u0456 \u0432\u043e\u0434\u0441\u0442\u0443\u043f",
+"Row type": "\u0422\u044b\u043f \u0440\u0430\u0434\u043a\u0430",
+"Insert table": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
+"Body": "\u0426\u0435\u043b\u0430",
+"Caption": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
+"Footer": "\u041d\u0456\u0437",
+"Delete row": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
+"Paste row before": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u0432\u0435\u0440\u0445\u0443",
+"Scope": "\u0421\u0444\u0435\u0440\u0430",
+"Delete table": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0442\u0430\u0431\u043b\u0456\u0446\u0443",
+"Header cell": "\u0417\u0430\u0433\u0430\u043b\u043e\u0432\u0430\u043a",
+"Column": "\u0421\u043b\u0443\u043f\u043e\u043a",
+"Cell": "\u042f\u0447\u044d\u0439\u043a\u0430",
+"Header": "\u0428\u0430\u043f\u043a\u0430",
+"Cell type": "\u0422\u044b\u043f \u044f\u0447\u044d\u0439\u043a\u0456",
+"Copy row": "\u041a\u0430\u043f\u0456\u044f\u0432\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
+"Row properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0440\u0430\u0434\u043a\u0430",
+"Table properties": "\u0423\u043b\u0430\u0441\u0446\u0456\u0432\u0430\u0441\u0446\u0456 \u0442\u0430\u0431\u043b\u0456\u0446\u044b",
+"Row group": "\u0413\u0440\u0443\u043f\u0430 \u0440\u0430\u0434\u043a\u043e\u045e",
+"Right": "\u041f\u0430 \u043f\u0440\u0430\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"Insert column after": "\u0414\u0430\u0434\u0430\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a \u0441\u043f\u0440\u0430\u0432\u0430",
+"Cols": "\u0421\u043b\u0443\u043f\u043a\u0456",
+"Insert row after": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0440\u0430\u0434\u043e\u043a \u0437\u043d\u0456\u0437\u0443",
+"Width": "\u0428\u044b\u0440\u044b\u043d\u044f",
+"Cell properties": "\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044f\u0447\u044d\u0439\u043a\u0456",
+"Left": "\u041f\u0430 \u043b\u0435\u0432\u044b\u043c \u043a\u0440\u0430\u0456",
+"Cut row": "\u0412\u044b\u0440\u0430\u0437\u0430\u0446\u044c \u0440\u0430\u0434\u043e\u043a",
+"Delete column": "\u0412\u044b\u0434\u0430\u043b\u0456\u0446\u044c \u0441\u043b\u0443\u043f\u043e\u043a",
+"Center": "\u041f\u0430 \u0446\u044d\u043d\u0442\u0440\u044b",
+"Merge cells": "\u0410\u0431'\u044f\u0434\u043d\u0430\u0446\u044c \u044f\u0447\u044d\u0439\u043a\u0456",
+"Insert template": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0448\u0430\u0431\u043b\u043e\u043d",
+"Templates": "\u0428\u0430\u0431\u043b\u043e\u043d\u044b",
+"Background color": "\u041a\u043e\u043b\u0435\u0440 \u0444\u043e\u043d\u0443",
+"Text color": "\u041a\u043e\u043b\u0435\u0440 \u0442\u044d\u043a\u0441\u0442\u0443",
+"Show blocks": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u0431\u043b\u043e\u043a\u0456",
+"Show invisible characters": "\u041f\u0430\u043a\u0430\u0437\u0432\u0430\u0446\u044c \u043d\u044f\u0431\u0430\u0447\u043d\u044b\u044f \u0441\u0456\u043c\u0432\u0430\u043b\u044b",
+"Words: {0}": "\u041a\u043e\u043b\u044c\u043a\u0430\u0441\u0446\u044c \u0441\u043b\u043e\u045e: {0}",
+"Insert": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c",
+"File": "\u0424\u0430\u0439\u043b",
+"Edit": "\u0417\u043c\u044f\u043d\u0456\u0446\u044c",
+"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0422\u044d\u043a\u0441\u0442\u0430\u0432\u0430\u0435 \u043f\u043e\u043b\u0435. \u041d\u0430\u0446\u0456\u0441\u043d\u0456\u0446\u0435 ALT-F9, \u043a\u0430\u0431 \u0432\u044b\u043a\u043b\u0456\u043a\u0430\u0446\u044c \u043c\u0435\u043d\u044e, ALT-F10 - \u043f\u0430\u043d\u044d\u043b\u044c \u043f\u0440\u044b\u043b\u0430\u0434\u0430\u045e, ALT-0 - \u0434\u043b\u044f \u0432\u044b\u043a\u043b\u0456\u043a\u0443 \u0434\u0430\u043f\u0430\u043c\u043e\u0433\u0456.",
+"Tools": "\u041f\u0440\u044b\u043b\u0430\u0434\u044b",
+"View": "\u0412\u044b\u0433\u043b\u044f\u0434",
+"Table": "\u0422\u0430\u0431\u043b\u0456\u0446\u0430",
+"Format": "\u0424\u0430\u0440\u043c\u0430\u0442",
+"Insert time": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u0447\u0430\u0441",
+"Toggle blockquote": "\u041f\u0435\u0440\u0430\u043a\u043b\u044e\u0447\u044b\u0446\u044c \u0446\u044b\u0442\u0430\u0442\u0443",
+"Insert nonbreaking space": "\u0423\u0441\u0442\u0430\u0432\u0456\u0446\u044c \u043d\u0435\u043f\u0430\u0440\u044b\u045e\u043d\u044b \u043f\u0440\u0430\u0431\u0435\u043b"
+});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/advlist/plugin.min.js b/media/editors/tinymce/plugins/advlist/plugin.min.js
index fb605c0..da1cdb2 100644
--- a/media/editors/tinymce/plugins/advlist/plugin.min.js
+++ b/media/editors/tinymce/plugins/advlist/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("advlist",function(e){function t(e,t){var n=[];return tinymce.each(t.split(/[ ,]/),function(e){n.push({text:e.replace(/\-/g," ").replace(/\b\w/g,function(e){return e.toUpperCase()}),data:"default"==e?"":e})}),n}function n(t,n){var r,i=e.dom,o=e.selection;r=i.getParent(o.getNode(),"ol,ul"),r&&r.nodeName==t&&n!==!1||e.execCommand("UL"==t?"InsertUnorderedList":"InsertOrderedList"),n=n===!1?a[t]:n,a[t]=n,r=i.getParent(o.getNode(),"ol,ul"),r&&(i.setStyle(r,"listStyleType",n),r.removeAttribute("data-mce-style")),e.focus()}function r(t){var n=e.dom.getStyle(e.dom.getParent(e.selection.getNode(),"ol,ul"),"listStyleType")||"";t.control.items().each(function(e){e.active(e.settings.data===n)})}var i,o,a={};i=t("OL",e.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),o=t("UL",e.getParam("advlist_bullet_styles","default,circle,disc,square")),e.addButton("numlist",{type:"splitbutton",tooltip:"Numbered list",menu:i,onshow:r,onselect:function(e){n("OL",e.control.settings.data)},onclick:function(){n("OL",!1)}}),e.addButton("bullist",{type:"splitbutton",tooltip:"Bullet list",menu:o,onshow:r,onselect:function(e){n("UL",e.control.settings.data)},onclick:function(){n("UL",!1)}})});
\ No newline at end of file
+tinymce.PluginManager.add("advlist",function(t){function e(t,e){var n=[];return tinymce.each(e.split(/[ ,]/),function(t){n.push({text:t.replace(/\-/g," ").replace(/\b\w/g,function(t){return t.toUpperCase()}),data:"default"==t?"":t})}),n}function n(e,n){var i,r=t.dom,a=t.selection;i=r.getParent(a.getNode(),"ol,ul"),i&&i.nodeName==e&&n!==!1||t.execCommand("UL"==e?"InsertUnorderedList":"InsertOrderedList"),n=n===!1?o[e]:n,o[e]=n,i=r.getParent(a.getNode(),"ol,ul"),i&&(r.setStyle(i,"listStyleType",n),i.removeAttribute("data-mce-style")),t.focus()}function i(e){var n=t.dom.getStyle(t.dom.getParent(t.selection.getNode(),"ol,ul"),"listStyleType")||"";e.control.items().each(function(t){t.active(t.settings.data===n)})}var r,a,o={};r=e("OL",t.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),a=e("UL",t.getParam("advlist_bullet_styles","default,circle,disc,square")),t.addButton("numlist",{type:"splitbutton",tooltip:"Numbered list",menu:r,onshow:i,onselect:function(t){n("OL",t.control.settings.data)},onclick:function(){n("OL",!1)}}),t.addButton("bullist",{type:"splitbutton",tooltip:"Bullet list",menu:a,onshow:i,onselect:function(t){n("UL",t.control.settings.data)},onclick:function(){n("UL",!1)}})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/autolink/plugin.min.js b/media/editors/tinymce/plugins/autolink/plugin.min.js
index f2de84e..3d2f58e 100644
--- a/media/editors/tinymce/plugins/autolink/plugin.min.js
+++ b/media/editors/tinymce/plugins/autolink/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("autolink",function(e){function t(e){i(e,-1,"(",!0)}function n(e){i(e,0,"",!0)}function r(e){i(e,-1,"",!1)}function i(e,t,n){var r,i,o,a,s,l,c,d,u;if(r=e.selection.getRng(!0).cloneRange(),r.startOffset<5){if(d=r.endContainer.previousSibling,!d){if(!r.endContainer.firstChild||!r.endContainer.firstChild.nextSibling)return;d=r.endContainer.firstChild.nextSibling}if(u=d.length,r.setStart(d,u),r.setEnd(d,u),r.endOffset<5)return;i=r.endOffset,a=d}else{if(a=r.endContainer,3!=a.nodeType&&a.firstChild){for(;3!=a.nodeType&&a.firstChild;)a=a.firstChild;3==a.nodeType&&(r.setStart(a,0),r.setEnd(a,a.nodeValue.length))}i=1==r.endOffset?2:r.endOffset-1-t}o=i;do r.setStart(a,i>=2?i-2:0),r.setEnd(a,i>=1?i-1:0),i-=1;while(" "!=r.toString()&&""!==r.toString()&&160!=r.toString().charCodeAt(0)&&i-2>=0&&r.toString()!=n);if(r.toString()==n||160==r.toString().charCodeAt(0)?(r.setStart(a,i),r.setEnd(a,o),i+=1):0===r.startOffset?(r.setStart(a,0),r.setEnd(a,o)):(r.setStart(a,i),r.setEnd(a,o)),l=r.toString(),"."==l.charAt(l.length-1)&&r.setEnd(a,o-1),l=r.toString(),c=l.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i),c&&("www."==c[1]?c[1]="http://www.":/@$/.test(c[1])&&!/^mailto:/.test(c[1])&&(c[1]="mailto:"+c[1]),s=e.selection.getBookmark(),e.selection.setRng(r),e.execCommand("createlink",!1,c[1]+c[2]),e.selection.moveToBookmark(s),e.nodeChanged(),tinymce.Env.webkit)){e.selection.collapse(!1);var f=Math.min(a.length,o+1);r.setStart(a,f),r.setEnd(a,f),e.selection.setRng(r)}}e.on("keydown",function(t){return 13==t.keyCode?r(e):void 0}),tinymce.Env.ie||(e.on("keypress",function(n){return 41==n.which?t(e):void 0}),e.on("keyup",function(t){return 32==t.keyCode?n(e):void 0}))});
\ No newline at end of file
+tinymce.PluginManager.add("autolink",function(t){function e(t){o(t,-1,"(",!0)}function n(t){o(t,0,"",!0)}function i(t){o(t,-1,"",!1)}function o(t,e,n){var i,o,r,a,s,l,c,u,d;if(i=t.selection.getRng(!0).cloneRange(),i.startOffset<5){if(u=i.endContainer.previousSibling,!u){if(!i.endContainer.firstChild||!i.endContainer.firstChild.nextSibling)return;u=i.endContainer.firstChild.nextSibling}if(d=u.length,i.setStart(u,d),i.setEnd(u,d),i.endOffset<5)return;o=i.endOffset,a=u}else{if(a=i.endContainer,3!=a.nodeType&&a.firstChild){for(;3!=a.nodeType&&a.firstChild;)a=a.firstChild;3==a.nodeType&&(i.setStart(a,0),i.setEnd(a,a.nodeValue.length))}o=1==i.endOffset?2:i.endOffset-1-e}r=o;do i.setStart(a,o>=2?o-2:0),i.setEnd(a,o>=1?o-1:0),o-=1;while(" "!=i.toString()&&""!==i.toString()&&160!=i.toString().charCodeAt(0)&&o-2>=0&&i.toString()!=n);if(i.toString()==n||160==i.toString().charCodeAt(0)?(i.setStart(a,o),i.setEnd(a,r),o+=1):0===i.startOffset?(i.setStart(a,0),i.setEnd(a,r)):(i.setStart(a,o),i.setEnd(a,r)),l=i.toString(),"."==l.charAt(l.length-1)&&i.setEnd(a,r-1),l=i.toString(),c=l.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|(?:mailto:)?[A-Z0-9._%+\-]+@)(.+)$/i),c&&("www."==c[1]?c[1]="http://www.":/@$/.test(c[1])&&!/^mailto:/.test(c[1])&&(c[1]="mailto:"+c[1]),s=t.selection.getBookmark(),t.selection.setRng(i),t.execCommand("createlink",!1,c[1]+c[2]),t.selection.moveToBookmark(s),t.nodeChanged(),tinymce.Env.webkit)){t.selection.collapse(!1);var m=Math.min(a.length,r+1);i.setStart(a,m),i.setEnd(a,m),t.selection.setRng(i)}}t.on("keydown",function(e){return 13==e.keyCode?i(t):void 0}),tinymce.Env.ie||(t.on("keypress",function(n){return 41==n.which?e(t):void 0}),t.on("keyup",function(e){return 32==e.keyCode?n(t):void 0}))});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/autoresize/plugin.min.js b/media/editors/tinymce/plugins/autoresize/plugin.min.js
index b2ab328..9a46de8 100644
--- a/media/editors/tinymce/plugins/autoresize/plugin.min.js
+++ b/media/editors/tinymce/plugins/autoresize/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("autoresize",function(e){function t(i){var o,a,s=e.getDoc(),l=s.body,c=s.documentElement,d=tinymce.DOM,u=n.autoresize_min_height;"setcontent"==i.type&&i.initial||e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()||(a=tinymce.Env.ie?l.scrollHeight:tinymce.Env.webkit&&0===l.clientHeight?0:l.offsetHeight,a>n.autoresize_min_height&&(u=a),n.autoresize_max_height&&a>n.autoresize_max_height?(u=n.autoresize_max_height,l.style.overflowY="auto",c.style.overflowY="auto"):(l.style.overflowY="hidden",c.style.overflowY="hidden",l.scrollTop=0),u!==r&&(o=u-r,d.setStyle(d.get(e.id+"_ifr"),"height",u+"px"),r=u,tinymce.isWebKit&&0>o&&t(i)))}var n=e.settings,r=0;e.settings.inline||(n.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),n.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){e.dom.setStyle(e.getBody(),"paddingBottom",e.getParam("autoresize_bottom_margin",50)+"px")}),e.on("change setcontent paste keyup",t),e.getParam("autoresize_on_init",!0)&&e.on("load",t),e.addCommand("mceAutoResize",t))});
\ No newline at end of file
+tinymce.PluginManager.add("autoresize",function(e){function t(i){var a,s,r=e.getDoc(),g=r.body,u=r.documentElement,m=tinymce.DOM,l=n.autoresize_min_height;"setcontent"==i.type&&i.initial||e.plugins.fullscreen&&e.plugins.fullscreen.isFullscreen()||(s=tinymce.Env.ie?g.scrollHeight:tinymce.Env.webkit&&0===g.clientHeight?0:g.offsetHeight,s>n.autoresize_min_height&&(l=s),n.autoresize_max_height&&s>n.autoresize_max_height?(l=n.autoresize_max_height,g.style.overflowY="auto",u.style.overflowY="auto"):(g.style.overflowY="hidden",u.style.overflowY="hidden",g.scrollTop=0),l!==o&&(a=l-o,m.setStyle(m.get(e.id+"_ifr"),"height",l+"px"),o=l,tinymce.isWebKit&&0>a&&t(i)))}function i(e,n,o){setTimeout(function(){t({}),e--?i(e,n,o):o&&o()},n)}var n=e.settings,o=0;e.settings.inline||(n.autoresize_min_height=parseInt(e.getParam("autoresize_min_height",e.getElement().offsetHeight),10),n.autoresize_max_height=parseInt(e.getParam("autoresize_max_height",0),10),e.on("init",function(){e.dom.setStyle(e.getBody(),"paddingBottom",e.getParam("autoresize_bottom_margin",50)+"px")}),e.on("change setcontent paste keyup",t),e.getParam("autoresize_on_init",!0)&&e.on("init",function(){i(20,100,function(){i(5,1e3)})}),e.addCommand("mceAutoResize",t))});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/autosave/plugin.min.js b/media/editors/tinymce/plugins/autosave/plugin.min.js
index 25f5684..2f1637b 100644
--- a/media/editors/tinymce/plugins/autosave/plugin.min.js
+++ b/media/editors/tinymce/plugins/autosave/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("autosave",function(t){function e(t,e){var a={s:1e3,m:6e4};return t=/^(\d+)([ms]?)$/.exec(""+(t||e)),(t[2]?a[t[2]]:1)*parseInt(t,10)}function a(){var t=parseInt(m.getItem(g+"autosave.time"),10)||0;return(new Date).getTime()-t>c.autosave_retention?(n(!1),!1):!0}function n(e){m.removeItem(g+"autosave.draft"),m.removeItem(g+"autosave.time"),e!==!1&&t.fire("RemoveDraft")}function o(){v()||(m.setItem(g+"autosave.draft",t.getContent({format:"raw",no_events:!0})),m.setItem(g+"autosave.time",(new Date).getTime()),t.fire("StoreDraft"))}function r(){a()&&(t.setContent(m.getItem(g+"autosave.draft"),{format:"raw"}),t.fire("RestoreDraft"))}function s(){d||(setInterval(function(){t.removed||o()},c.autosave_interval),d=!0)}function i(){var e=this;e.disabled(!a()),t.on("StoreDraft RestoreDraft RemoveDraft",function(){e.disabled(!a())}),s()}function u(){t.undoManager.beforeChange(),r(),n(),t.undoManager.add()}function f(){var t;return tinymce.each(tinymce.editors,function(e){e.plugins.autosave&&e.plugins.autosave.storeDraft(),!t&&e.isDirty()&&e.getParam("autosave_ask_before_unload",!0)&&(t=e.translate("You have unsaved changes are you sure you want to navigate away?"))}),t}function v(e){var a=t.settings.forced_root_block;return e=tinymce.trim("undefined"==typeof e?t.getBody().innerHTML:e),""===e||new RegExp("^<"+a+"[^>]*>(( |&nbsp;|[ 	]|<br[^>]*>)+?|)</"+a+">|<br>$","i").test(e)}var d,c=t.settings,m=tinymce.util.LocalStorage,g=t.id;c.autosave_interval=e(c.autosave_interval,"30s"),c.autosave_retention=e(c.autosave_retention,"20m"),t.addButton("restoredraft",{title:"Restore last draft",onclick:u,onPostRender:i}),t.addMenuItem("restoredraft",{text:"Restore last draft",onclick:u,onPostRender:i,context:"file"}),t.settings.autosave_restore_when_empty!==!1&&(t.on("init",function(){a()&&v()&&r()}),t.on("saveContent",function(){n()})),window.onbeforeunload=f,this.hasDraft=a,this.storeDraft=o,this.restoreDraft=r,this.removeDraft=n,this.isEmpty=v});
\ No newline at end of file
+tinymce.PluginManager.add("autosave",function(e){function t(e,t){var n={s:1e3,m:6e4};return e=/^(\d+)([ms]?)$/.exec(""+(e||t)),(e[2]?n[e[2]]:1)*parseInt(e,10)}function n(){var e=parseInt(l.getItem(d+"time"),10)||0;return(new Date).getTime()-e>v.autosave_retention?(a(!1),!1):!0}function a(t){l.removeItem(d+"draft"),l.removeItem(d+"time"),t!==!1&&e.fire("RemoveDraft")}function r(){c()||(l.setItem(d+"draft",e.getContent({format:"raw",no_events:!0})),l.setItem(d+"time",(new Date).getTime()),e.fire("StoreDraft"))}function o(){n()&&(e.setContent(l.getItem(d+"draft"),{format:"raw"}),e.fire("RestoreDraft"))}function i(){m||(setInterval(function(){e.removed||r()},v.autosave_interval),m=!0)}function s(){var t=this;t.disabled(!n()),e.on("StoreDraft RestoreDraft RemoveDraft",function(){t.disabled(!n())}),i()}function u(){e.undoManager.beforeChange(),o(),a(),e.undoManager.add()}function f(){var e;return tinymce.each(tinymce.editors,function(t){t.plugins.autosave&&t.plugins.autosave.storeDraft(),!e&&t.isDirty()&&t.getParam("autosave_ask_before_unload",!0)&&(e=t.translate("You have unsaved changes are you sure you want to navigate away?"))}),e}function c(t){var n=e.settings.forced_root_block;return t=tinymce.trim("undefined"==typeof t?e.getBody().innerHTML:t),""===t||new RegExp("^<"+n+"[^>]*>(( |&nbsp;|[ 	]|<br[^>]*>)+?|)</"+n+">|<br>$","i").test(t)}var d,m,v=e.settings,l=tinymce.util.LocalStorage;d=v.autosave_prefix||"tinymce-autosave-{path}{query}-{id}-",d=d.replace(/\{path\}/g,document.location.pathname),d=d.replace(/\{query\}/g,document.location.search),d=d.replace(/\{id\}/g,e.id),v.autosave_interval=t(v.autosave_interval,"30s"),v.autosave_retention=t(v.autosave_retention,"20m"),e.addButton("restoredraft",{title:"Restore last draft",onclick:u,onPostRender:s}),e.addMenuItem("restoredraft",{text:"Restore last draft",onclick:u,onPostRender:s,context:"file"}),e.settings.autosave_restore_when_empty!==!1&&(e.on("init",function(){n()&&c()&&o()}),e.on("saveContent",function(){a()})),window.onbeforeunload=f,this.hasDraft=n,this.storeDraft=r,this.restoreDraft=o,this.removeDraft=a,this.isEmpty=c});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/charmap/plugin.min.js b/media/editors/tinymce/plugins/charmap/plugin.min.js
index b92bdb3..dff18e6 100644
--- a/media/editors/tinymce/plugins/charmap/plugin.min.js
+++ b/media/editors/tinymce/plugins/charmap/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("charmap",function(e){function t(){function t(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var r,i,o,a;r='<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';var s=25;for(o=0;10>o;o++){for(r+="<tr>",i=0;s>i;i++){var l=n[o*s+i],c="g"+(o*s+i);r+='<td title="'+l[1]+'"><div id="'+c+'" tabIndex="-1">'+(l?String.fromCharCode(parseInt(l[0],10)):"&nbsp;")+"</div></td>"}r+="</tr>"}r+="</tbody></table>";var u={type:"container",html:r,onclick:function(t){var n=t.target;"DIV"==n.nodeName&&e.execCommand("mceInsertContent",!1,n.firstChild.nodeValue)},onmouseover:function(e){var n=t(e.target);n&&a.find("#preview").text(n.firstChild.firstChild.data)}};a=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[u,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){a.close()}}]})}var n=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:t}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:t,context:"insert"})});
\ No newline at end of file
+tinymce.PluginManager.add("charmap",function(e){function t(){function t(e){for(;e;){if("TD"==e.nodeName)return e;e=e.parentNode}}var i,a,r,o;i='<table role="presentation" cellspacing="0" class="mce-charmap"><tbody>';var s=25;for(r=0;10>r;r++){for(i+="<tr>",a=0;s>a;a++){var l=n[r*s+a],c="g"+(r*s+a);i+='<td title="'+l[1]+'"><div id="'+c+'" tabIndex="-1">'+(l?String.fromCharCode(parseInt(l[0],10)):"&nbsp;")+"</div></td>"}i+="</tr>"}i+="</tbody></table>";var u={type:"container",html:i,onclick:function(t){var n=t.target;"DIV"==n.nodeName&&e.execCommand("mceInsertContent",!1,n.firstChild.nodeValue)},onmouseover:function(e){var n=t(e.target);n&&o.find("#preview").text(n.firstChild.firstChild.data)}};o=e.windowManager.open({title:"Special character",spacing:10,padding:10,items:[u,{type:"label",name:"preview",text:" ",style:"font-size: 40px; text-align: center",border:1,minWidth:100,minHeight:80}],buttons:[{text:"Close",onclick:function(){o.close()}}]})}var n=[["160","no-break space"],["38","ampersand"],["34","quotation mark"],["162","cent sign"],["8364","euro sign"],["163","pound sign"],["165","yen sign"],["169","copyright sign"],["174","registered sign"],["8482","trade mark sign"],["8240","per mille sign"],["181","micro sign"],["183","middle dot"],["8226","bullet"],["8230","three dot leader"],["8242","minutes / feet"],["8243","seconds / inches"],["167","section sign"],["182","paragraph sign"],["223","sharp s / ess-zed"],["8249","single left-pointing angle quotation mark"],["8250","single right-pointing angle quotation mark"],["171","left pointing guillemet"],["187","right pointing guillemet"],["8216","left single quotation mark"],["8217","right single quotation mark"],["8220","left double quotation mark"],["8221","right double quotation mark"],["8218","single low-9 quotation mark"],["8222","double low-9 quotation mark"],["60","less-than sign"],["62","greater-than sign"],["8804","less-than or equal to"],["8805","greater-than or equal to"],["8211","en dash"],["8212","em dash"],["175","macron"],["8254","overline"],["164","currency sign"],["166","broken bar"],["168","diaeresis"],["161","inverted exclamation mark"],["191","turned question mark"],["710","circumflex accent"],["732","small tilde"],["176","degree sign"],["8722","minus sign"],["177","plus-minus sign"],["247","division sign"],["8260","fraction slash"],["215","multiplication sign"],["185","superscript one"],["178","superscript two"],["179","superscript three"],["188","fraction one quarter"],["189","fraction one half"],["190","fraction three quarters"],["402","function / florin"],["8747","integral"],["8721","n-ary sumation"],["8734","infinity"],["8730","square root"],["8764","similar to"],["8773","approximately equal to"],["8776","almost equal to"],["8800","not equal to"],["8801","identical to"],["8712","element of"],["8713","not an element of"],["8715","contains as member"],["8719","n-ary product"],["8743","logical and"],["8744","logical or"],["172","not sign"],["8745","intersection"],["8746","union"],["8706","partial differential"],["8704","for all"],["8707","there exists"],["8709","diameter"],["8711","backward difference"],["8727","asterisk operator"],["8733","proportional to"],["8736","angle"],["180","acute accent"],["184","cedilla"],["170","feminine ordinal indicator"],["186","masculine ordinal indicator"],["8224","dagger"],["8225","double dagger"],["192","A - grave"],["193","A - acute"],["194","A - circumflex"],["195","A - tilde"],["196","A - diaeresis"],["197","A - ring above"],["198","ligature AE"],["199","C - cedilla"],["200","E - grave"],["201","E - acute"],["202","E - circumflex"],["203","E - diaeresis"],["204","I - grave"],["205","I - acute"],["206","I - circumflex"],["207","I - diaeresis"],["208","ETH"],["209","N - tilde"],["210","O - grave"],["211","O - acute"],["212","O - circumflex"],["213","O - tilde"],["214","O - diaeresis"],["216","O - slash"],["338","ligature OE"],["352","S - caron"],["217","U - grave"],["218","U - acute"],["219","U - circumflex"],["220","U - diaeresis"],["221","Y - acute"],["376","Y - diaeresis"],["222","THORN"],["224","a - grave"],["225","a - acute"],["226","a - circumflex"],["227","a - tilde"],["228","a - diaeresis"],["229","a - ring above"],["230","ligature ae"],["231","c - cedilla"],["232","e - grave"],["233","e - acute"],["234","e - circumflex"],["235","e - diaeresis"],["236","i - grave"],["237","i - acute"],["238","i - circumflex"],["239","i - diaeresis"],["240","eth"],["241","n - tilde"],["242","o - grave"],["243","o - acute"],["244","o - circumflex"],["245","o - tilde"],["246","o - diaeresis"],["248","o slash"],["339","ligature oe"],["353","s - caron"],["249","u - grave"],["250","u - acute"],["251","u - circumflex"],["252","u - diaeresis"],["253","y - acute"],["254","thorn"],["255","y - diaeresis"],["913","Alpha"],["914","Beta"],["915","Gamma"],["916","Delta"],["917","Epsilon"],["918","Zeta"],["919","Eta"],["920","Theta"],["921","Iota"],["922","Kappa"],["923","Lambda"],["924","Mu"],["925","Nu"],["926","Xi"],["927","Omicron"],["928","Pi"],["929","Rho"],["931","Sigma"],["932","Tau"],["933","Upsilon"],["934","Phi"],["935","Chi"],["936","Psi"],["937","Omega"],["945","alpha"],["946","beta"],["947","gamma"],["948","delta"],["949","epsilon"],["950","zeta"],["951","eta"],["952","theta"],["953","iota"],["954","kappa"],["955","lambda"],["956","mu"],["957","nu"],["958","xi"],["959","omicron"],["960","pi"],["961","rho"],["962","final sigma"],["963","sigma"],["964","tau"],["965","upsilon"],["966","phi"],["967","chi"],["968","psi"],["969","omega"],["8501","alef symbol"],["982","pi symbol"],["8476","real part symbol"],["978","upsilon - hook symbol"],["8472","Weierstrass p"],["8465","imaginary part"],["8592","leftwards arrow"],["8593","upwards arrow"],["8594","rightwards arrow"],["8595","downwards arrow"],["8596","left right arrow"],["8629","carriage return"],["8656","leftwards double arrow"],["8657","upwards double arrow"],["8658","rightwards double arrow"],["8659","downwards double arrow"],["8660","left right double arrow"],["8756","therefore"],["8834","subset of"],["8835","superset of"],["8836","not a subset of"],["8838","subset of or equal to"],["8839","superset of or equal to"],["8853","circled plus"],["8855","circled times"],["8869","perpendicular"],["8901","dot operator"],["8968","left ceiling"],["8969","right ceiling"],["8970","left floor"],["8971","right floor"],["9001","left-pointing angle bracket"],["9002","right-pointing angle bracket"],["9674","lozenge"],["9824","black spade suit"],["9827","black club suit"],["9829","black heart suit"],["9830","black diamond suit"],["8194","en space"],["8195","em space"],["8201","thin space"],["8204","zero width non-joiner"],["8205","zero width joiner"],["8206","left-to-right mark"],["8207","right-to-left mark"],["173","soft hyphen"]];e.addButton("charmap",{icon:"charmap",tooltip:"Special character",onclick:t}),e.addMenuItem("charmap",{icon:"charmap",text:"Special character",onclick:t,context:"insert"})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/code/plugin.min.js b/media/editors/tinymce/plugins/code/plugin.min.js
index a77690a..9e7e898 100644
--- a/media/editors/tinymce/plugins/code/plugin.min.js
+++ b/media/editors/tinymce/plugins/code/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("code",function(e){function o(){e.windowManager.open({title:"Source code",body:{type:"textbox",name:"code",multiline:!0,minWidth:e.getParam("code_dialog_width",600),minHeight:e.getParam("code_dialog_height",Math.min(tinymce.DOM.getViewPort().h-200,500)),value:e.getContent({source_view:!0}),spellcheck:!1,style:"direction: ltr; text-align: left"},onSubmit:function(o){e.focus(),e.undoManager.transact(function(){e.setContent(o.data.code)}),e.focus(),e.nodeChanged()}})}e.addCommand("mceCodeEditor",o),e.addButton("code",{icon:"code",tooltip:"Source code",onclick:o}),e.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:o})});
\ No newline at end of file
+tinymce.PluginManager.add("code",function(e){function o(){e.windowManager.open({title:"Source code",body:{type:"textbox",name:"code",multiline:!0,minWidth:e.getParam("code_dialog_width",600),minHeight:e.getParam("code_dialog_height",Math.min(tinymce.DOM.getViewPort().h-200,500)),value:e.getContent({source_view:!0}),spellcheck:!1,style:"direction: ltr; text-align: left"},onSubmit:function(o){e.focus(),e.undoManager.transact(function(){e.setContent(o.data.code)}),e.selection.setCursorLocation(),e.nodeChanged()}})}e.addCommand("mceCodeEditor",o),e.addButton("code",{icon:"code",tooltip:"Source code",onclick:o}),e.addMenuItem("code",{icon:"code",text:"Source code",context:"tools",onclick:o})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/contextmenu/plugin.min.js b/media/editors/tinymce/plugins/contextmenu/plugin.min.js
index 3c5dfe0..f4c664a 100644
--- a/media/editors/tinymce/plugins/contextmenu/plugin.min.js
+++ b/media/editors/tinymce/plugins/contextmenu/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("contextmenu",function(e){var n;e.on("contextmenu",function(t){var o;if(t.preventDefault(),o=e.settings.contextmenu||"link image inserttable | cell row column deletetable",n)n.show();else{var i=[];tinymce.each(o.split(/[ ,]/),function(n){var t=e.menuItems[n];"|"==n&&(t={text:n}),t&&(t.shortcut="",i.push(t))});for(var c=0;c<i.length;c++)"|"==i[c].text&&(0===c||c==i.length-1)&&i.splice(c,1);n=new tinymce.ui.Menu({items:i,context:"contextmenu"}),n.addClass("contextmenu"),n.renderTo(document.body),e.on("remove",function(){n.remove(),n=null})}var a={x:t.pageX,y:t.pageY};e.inline||(a=tinymce.DOM.getPos(e.getContentAreaContainer()),a.x+=t.clientX,a.y+=t.clientY),n.moveTo(a.x,a.y)})});
\ No newline at end of file
+tinymce.PluginManager.add("contextmenu",function(e){var n,t=e.settings.contextmenu_never_use_native;e.on("contextmenu",function(o){var i;if(!o.ctrlKey||t){if(o.preventDefault(),i=e.settings.contextmenu||"link image inserttable | cell row column deletetable",n)n.show();else{var c=[];tinymce.each(i.split(/[ ,]/),function(n){var t=e.menuItems[n];"|"==n&&(t={text:n}),t&&(t.shortcut="",c.push(t))});for(var a=0;a<c.length;a++)"|"==c[a].text&&(0===a||a==c.length-1)&&c.splice(a,1);n=new tinymce.ui.Menu({items:c,context:"contextmenu"}),n.addClass("contextmenu"),n.renderTo(document.body),e.on("remove",function(){n.remove(),n=null})}var l={x:o.pageX,y:o.pageY};e.inline||(l=tinymce.DOM.getPos(e.getContentAreaContainer()),l.x+=o.clientX,l.y+=o.clientY),n.moveTo(l.x,l.y)}})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/directionality/plugin.min.js b/media/editors/tinymce/plugins/directionality/plugin.min.js
index c472a90..60c7f9d 100644
--- a/media/editors/tinymce/plugins/directionality/plugin.min.js
+++ b/media/editors/tinymce/plugins/directionality/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("directionality",function(e){function t(t){var n,r=e.dom,i=e.selection.getSelectedBlocks();i.length&&(n=r.getAttrib(i[0],"dir"),tinymce.each(i,function(e){r.getParent(e.parentNode,"*[dir='"+t+"']",r.getRoot())||(n!=t?r.setAttrib(e,"dir",t):r.setAttrib(e,"dir",null))}),e.nodeChanged())}function n(e){var t=[];return tinymce.each("h1 h2 h3 h4 h5 h6 div p".split(" "),function(n){t.push(n+"[dir="+e+"]")}),t.join(",")}e.addCommand("mceDirectionLTR",function(){t("ltr")}),e.addCommand("mceDirectionRTL",function(){t("rtl")}),e.addButton("ltr",{title:"Left to right",cmd:"mceDirectionLTR",stateSelector:n("ltr")}),e.addButton("rtl",{title:"Right to left",cmd:"mceDirectionRTL",stateSelector:n("rtl")})});
\ No newline at end of file
+tinymce.PluginManager.add("directionality",function(e){function t(t){var n,i=e.dom,a=e.selection.getSelectedBlocks();a.length&&(n=i.getAttrib(a[0],"dir"),tinymce.each(a,function(e){i.getParent(e.parentNode,"*[dir='"+t+"']",i.getRoot())||(n!=t?i.setAttrib(e,"dir",t):i.setAttrib(e,"dir",null))}),e.nodeChanged())}function n(e){var t=[];return tinymce.each("h1 h2 h3 h4 h5 h6 div p".split(" "),function(n){t.push(n+"[dir="+e+"]")}),t.join(",")}e.addCommand("mceDirectionLTR",function(){t("ltr")}),e.addCommand("mceDirectionRTL",function(){t("rtl")}),e.addButton("ltr",{title:"Left to right",cmd:"mceDirectionLTR",stateSelector:n("ltr")}),e.addButton("rtl",{title:"Right to left",cmd:"mceDirectionRTL",stateSelector:n("rtl")})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/example/plugin.min.js b/media/editors/tinymce/plugins/example/plugin.min.js
index 24a64c8..1ff20b4 100644
--- a/media/editors/tinymce/plugins/example/plugin.min.js
+++ b/media/editors/tinymce/plugins/example/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("example",function(e){e.addButton("example",{text:"My button",icon:!1,onclick:function(){e.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(t){e.insertContent("Title: "+t.data.title)}})}}),e.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){e.windowManager.open({title:"TinyMCE site",url:"http://www.tinymce.com",width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file
+tinymce.PluginManager.add("example",function(t){t.addButton("example",{text:"My button",icon:!1,onclick:function(){t.windowManager.open({title:"Example plugin",body:[{type:"textbox",name:"title",label:"Title"}],onsubmit:function(e){t.insertContent("Title: "+e.data.title)}})}}),t.addMenuItem("example",{text:"Example plugin",context:"tools",onclick:function(){t.windowManager.open({title:"TinyMCE site",url:"http://www.tinymce.com",width:800,height:600,buttons:[{text:"Close",onclick:"close"}]})}})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/fullpage/plugin.min.js b/media/editors/tinymce/plugins/fullpage/plugin.min.js
index c3d09d6..7cdbf79 100644
--- a/media/editors/tinymce/plugins/fullpage/plugin.min.js
+++ b/media/editors/tinymce/plugins/fullpage/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("fullpage",function(e){function t(){var t=n();e.windowManager.open({title:"Document properties",data:t,defaults:{type:"textbox",size:40},body:[{name:"title",label:"Title"},{name:"keywords",label:"Keywords"},{name:"description",label:"Description"},{name:"robots",label:"Robots"},{name:"author",label:"Author"},{name:"docencoding",label:"Encoding"}],onSubmit:function(e){r(tinymce.extend(t,e.data))}})}function n(){function t(e,t){var n=e.attr(t);return n||""}var n,r,o=i(),a={};return a.fontface=e.getParam("fullpage_default_fontface",""),a.fontsize=e.getParam("fullpage_default_fontsize",""),n=o.firstChild,7==n.type&&(a.xml_pi=!0,r=/encoding="([^"]+)"/.exec(n.value),r&&(a.docencoding=r[1])),n=o.getAll("#doctype")[0],n&&(a.doctype="<!DOCTYPE"+n.value+">"),n=o.getAll("title")[0],n&&n.firstChild&&(a.title=n.firstChild.value),d(o.getAll("meta"),function(e){var t,n=e.attr("name"),r=e.attr("http-equiv");n?a[n.toLowerCase()]=e.attr("content"):"Content-Type"==r&&(t=/charset\s*=\s*(.*)\s*/gi.exec(e.attr("content")),t&&(a.docencoding=t[1]))}),n=o.getAll("html")[0],n&&(a.langcode=t(n,"lang")||t(n,"xml:lang")),n=o.getAll("link")[0],n&&"stylesheet"==n.attr("rel")&&(a.stylesheet=n.attr("href")),n=o.getAll("body")[0],n&&(a.langdir=t(n,"dir"),a.style=t(n,"style"),a.visited_color=t(n,"vlink"),a.link_color=t(n,"link"),a.active_color=t(n,"alink")),a}function r(t){function n(e,t,n){e.attr(t,n?n:void 0)}function r(e){a.firstChild?a.insert(e,a.firstChild):a.append(e)}var o,a,s,c,f,p=e.dom;o=i(),a=o.getAll("head")[0],a||(c=o.getAll("html")[0],a=new u("head",1),c.firstChild?c.insert(a,c.firstChild,!0):c.append(a)),c=o.firstChild,t.xml_pi?(f='version="1.0"',t.docencoding&&(f+=' encoding="'+t.docencoding+'"'),7!=c.type&&(c=new u("xml",7),o.insert(c,o.firstChild,!0)),c.value=f):c&&7==c.type&&c.remove(),c=o.getAll("#doctype")[0],t.doctype?(c||(c=new u("#doctype",10),t.xml_pi?o.insert(c,o.firstChild):r(c)),c.value=t.doctype.substring(9,t.doctype.length-1)):c&&c.remove(),t.docencoding&&(c=null,d(o.getAll("meta"),function(e){"Content-Type"==e.attr("http-equiv")&&(c=e)}),c||(c=new u("meta",1),c.attr("http-equiv","Content-Type"),c.shortEnded=!0,r(c)),c.attr("content","text/html; charset="+t.docencoding)),c=o.getAll("title")[0],t.title?c||(c=new u("title",1),c.append(new u("#text",3)).value=t.title,r(c)):c&&c.remove(),d("keywords,description,author,copyright,robots".split(","),function(e){var n,i,a=o.getAll("meta"),s=t[e];for(n=0;n<a.length;n++)if(i=a[n],i.attr("name")==e)return s?i.attr("content",s):i.remove(),void 0;s&&(c=new u("meta",1),c.attr("name",e),c.attr("content",s),c.shortEnded=!0,r(c))}),c=o.getAll("link")[0],c&&"stylesheet"==c.attr("rel")?t.stylesheet?c.attr("href",t.stylesheet):c.remove():t.stylesheet&&(c=new u("link",1),c.attr({rel:"stylesheet",text:"text/css",href:t.stylesheet}),c.shortEnded=!0,r(c)),c=o.getAll("body")[0],c&&(n(c,"dir",t.langdir),n(c,"style",t.style),n(c,"vlink",t.visited_color),n(c,"link",t.link_color),n(c,"alink",t.active_color),p.setAttribs(e.getBody(),{style:t.style,dir:t.dir,vLink:t.visited_color,link:t.link_color,aLink:t.active_color})),c=o.getAll("html")[0],c&&(n(c,"lang",t.langcode),n(c,"xml:lang",t.langcode)),a.firstChild||a.remove(),s=new tinymce.html.Serializer({validate:!1,indent:!0,apply_source_formatting:!0,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(o),l=s.substring(0,s.indexOf("</body>"))}function i(){return new tinymce.html.DomParser({validate:!1,root_name:"#document"}).parse(l)}function o(t){function n(e){return e.replace(/<\/?[A-Z]+/g,function(e){return e.toLowerCase()})}var r,o,s,u,f=t.content,p="",m=e.dom;t.selection||"raw"==t.format&&l||t.source_view&&e.getParam("fullpage_hide_in_source_view")||(f=f.replace(/<(\/?)BODY/gi,"<$1body"),r=f.indexOf("<body"),-1!=r?(r=f.indexOf(">",r),l=n(f.substring(0,r+1)),o=f.indexOf("</body",r),-1==o&&(o=f.length),t.content=f.substring(r+1,o),c=n(f.substring(o))):(l=a(),c="\n</body>\n</html>"),s=i(),d(s.getAll("style"),function(e){e.firstChild&&(p+=e.firstChild.value)}),u=s.getAll("body")[0],u&&m.setAttribs(e.getBody(),{style:u.attr("style")||"",dir:u.attr("dir")||"",vLink:u.attr("vlink")||"",link:u.attr("link")||"",aLink:u.attr("alink")||""}),m.remove("fullpage_styles"),p&&(m.add(e.getDoc().getElementsByTagName("head")[0],"style",{id:"fullpage_styles"},p),u=m.get("fullpage_styles"),u.styleSheet&&(u.styleSheet.cssText=p)))}function a(){var t,n="",r="";return e.getParam("fullpage_default_xml_pi")&&(n+='<?xml version="1.0" encoding="'+e.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'),n+=e.getParam("fullpage_default_doctype","<!DOCTYPE html>"),n+="\n<html>\n<head>\n",(t=e.getParam("fullpage_default_title"))&&(n+="<title>"+t+"</title>\n"),(t=e.getParam("fullpage_default_encoding"))&&(n+='<meta http-equiv="Content-Type" content="text/html; charset='+t+'" />\n'),(t=e.getParam("fullpage_default_font_family"))&&(r+="font-family: "+t+";"),(t=e.getParam("fullpage_default_font_size"))&&(r+="font-size: "+t+";"),(t=e.getParam("fullpage_default_text_color"))&&(r+="color: "+t+";"),n+="</head>\n<body"+(r?' style="'+r+'"':"")+">\n"}function s(t){t.selection||t.source_view&&e.getParam("fullpage_hide_in_source_view")||(t.content=tinymce.trim(l)+"\n"+tinymce.trim(t.content)+"\n"+tinymce.trim(c))}var l,c,d=tinymce.each,u=tinymce.html.Node;e.addCommand("mceFullPageProperties",t),e.addButton("fullpage",{title:"Document properties",cmd:"mceFullPageProperties"}),e.addMenuItem("fullpage",{text:"Document properties",cmd:"mceFullPageProperties",context:"file"}),e.on("BeforeSetContent",o),e.on("GetContent",s)});
\ No newline at end of file
+tinymce.PluginManager.add("fullpage",function(e){function t(){var t=n();e.windowManager.open({title:"Document properties",data:t,defaults:{type:"textbox",size:40},body:[{name:"title",label:"Title"},{name:"keywords",label:"Keywords"},{name:"description",label:"Description"},{name:"robots",label:"Robots"},{name:"author",label:"Author"},{name:"docencoding",label:"Encoding"}],onSubmit:function(e){l(tinymce.extend(t,e.data))}})}function n(){function t(e,t){var n=e.attr(t);return n||""}var n,l,a=i(),r={};return r.fontface=e.getParam("fullpage_default_fontface",""),r.fontsize=e.getParam("fullpage_default_fontsize",""),n=a.firstChild,7==n.type&&(r.xml_pi=!0,l=/encoding="([^"]+)"/.exec(n.value),l&&(r.docencoding=l[1])),n=a.getAll("#doctype")[0],n&&(r.doctype="<!DOCTYPE"+n.value+">"),n=a.getAll("title")[0],n&&n.firstChild&&(r.title=n.firstChild.value),s(a.getAll("meta"),function(e){var t,n=e.attr("name"),l=e.attr("http-equiv");n?r[n.toLowerCase()]=e.attr("content"):"Content-Type"==l&&(t=/charset\s*=\s*(.*)\s*/gi.exec(e.attr("content")),t&&(r.docencoding=t[1]))}),n=a.getAll("html")[0],n&&(r.langcode=t(n,"lang")||t(n,"xml:lang")),r.stylesheets=[],tinymce.each(a.getAll("link"),function(e){"stylesheet"==e.attr("rel")&&r.stylesheets.push(e.attr("href"))}),n=a.getAll("body")[0],n&&(r.langdir=t(n,"dir"),r.style=t(n,"style"),r.visited_color=t(n,"vlink"),r.link_color=t(n,"link"),r.active_color=t(n,"alink")),r}function l(t){function n(e,t,n){e.attr(t,n?n:void 0)}function l(e){r.firstChild?r.insert(e,r.firstChild):r.append(e)}var a,r,o,c,u,f=e.dom;a=i(),r=a.getAll("head")[0],r||(c=a.getAll("html")[0],r=new m("head",1),c.firstChild?c.insert(r,c.firstChild,!0):c.append(r)),c=a.firstChild,t.xml_pi?(u='version="1.0"',t.docencoding&&(u+=' encoding="'+t.docencoding+'"'),7!=c.type&&(c=new m("xml",7),a.insert(c,a.firstChild,!0)),c.value=u):c&&7==c.type&&c.remove(),c=a.getAll("#doctype")[0],t.doctype?(c||(c=new m("#doctype",10),t.xml_pi?a.insert(c,a.firstChild):l(c)),c.value=t.doctype.substring(9,t.doctype.length-1)):c&&c.remove(),t.docencoding&&(c=null,s(a.getAll("meta"),function(e){"Content-Type"==e.attr("http-equiv")&&(c=e)}),c||(c=new m("meta",1),c.attr("http-equiv","Content-Type"),c.shortEnded=!0,l(c)),c.attr("content","text/html; charset="+t.docencoding)),c=a.getAll("title")[0],t.title?c||(c=new m("title",1),c.append(new m("#text",3)).value=t.title,l(c)):c&&c.remove(),s("keywords,description,author,copyright,robots".split(","),function(e){var n,i,r=a.getAll("meta"),o=t[e];for(n=0;n<r.length;n++)if(i=r[n],i.attr("name")==e)return o?i.attr("content",o):i.remove(),void 0;o&&(c=new m("meta",1),c.attr("name",e),c.attr("content",o),c.shortEnded=!0,l(c))});var g={};tinymce.each(a.getAll("link"),function(e){"stylesheet"==e.attr("rel")&&(g[e.attr("href")]=e)}),tinymce.each(t.stylesheets,function(e){g[e]||(c=new m("link",1),c.attr({rel:"stylesheet",text:"text/css",href:e}),c.shortEnded=!0,l(c)),delete g[e]}),tinymce.each(g,function(e){e.remove()}),c=a.getAll("body")[0],c&&(n(c,"dir",t.langdir),n(c,"style",t.style),n(c,"vlink",t.visited_color),n(c,"link",t.link_color),n(c,"alink",t.active_color),f.setAttribs(e.getBody(),{style:t.style,dir:t.dir,vLink:t.visited_color,link:t.link_color,aLink:t.active_color})),c=a.getAll("html")[0],c&&(n(c,"lang",t.langcode),n(c,"xml:lang",t.langcode)),r.firstChild||r.remove(),o=new tinymce.html.Serializer({validate:!1,indent:!0,apply_source_formatting:!0,indent_before:"head,html,body,meta,title,script,link,style",indent_after:"head,html,body,meta,title,script,link,style"}).serialize(a),d=o.substring(0,o.indexOf("</body>"))}function i(){return new tinymce.html.DomParser({validate:!1,root_name:"#document"}).parse(d)}function a(t){function n(e){return e.replace(/<\/?[A-Z]+/g,function(e){return e.toLowerCase()})}var l,a,o,m,u=t.content,f="",g=e.dom;if(!t.selection&&!("raw"==t.format&&d||t.source_view&&e.getParam("fullpage_hide_in_source_view"))){u=u.replace(/<(\/?)BODY/gi,"<$1body"),l=u.indexOf("<body"),-1!=l?(l=u.indexOf(">",l),d=n(u.substring(0,l+1)),a=u.indexOf("</body",l),-1==a&&(a=u.length),t.content=u.substring(l+1,a),c=n(u.substring(a))):(d=r(),c="\n</body>\n</html>"),o=i(),s(o.getAll("style"),function(e){e.firstChild&&(f+=e.firstChild.value)}),m=o.getAll("body")[0],m&&g.setAttribs(e.getBody(),{style:m.attr("style")||"",dir:m.attr("dir")||"",vLink:m.attr("vlink")||"",link:m.attr("link")||"",aLink:m.attr("alink")||""}),g.remove("fullpage_styles");var y=e.getDoc().getElementsByTagName("head")[0];f&&(g.add(y,"style",{id:"fullpage_styles"},f),m=g.get("fullpage_styles"),m.styleSheet&&(m.styleSheet.cssText=f));var h={};tinymce.each(y.getElementsByTagName("link"),function(e){"stylesheet"==e.rel&&e.getAttribute("data-mce-fullpage")&&(h[e.href]=e)}),tinymce.each(o.getAll("link"),function(e){var t=e.attr("href");h[t]||"stylesheet"!=e.attr("rel")||g.add(y,"link",{rel:"stylesheet",text:"text/css",href:t,"data-mce-fullpage":"1"}),delete h[t]}),tinymce.each(h,function(e){e.parentNode.removeChild(e)})}}function r(){var t,n="",l="";return e.getParam("fullpage_default_xml_pi")&&(n+='<?xml version="1.0" encoding="'+e.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'),n+=e.getParam("fullpage_default_doctype","<!DOCTYPE html>"),n+="\n<html>\n<head>\n",(t=e.getParam("fullpage_default_title"))&&(n+="<title>"+t+"</title>\n"),(t=e.getParam("fullpage_default_encoding"))&&(n+='<meta http-equiv="Content-Type" content="text/html; charset='+t+'" />\n'),(t=e.getParam("fullpage_default_font_family"))&&(l+="font-family: "+t+";"),(t=e.getParam("fullpage_default_font_size"))&&(l+="font-size: "+t+";"),(t=e.getParam("fullpage_default_text_color"))&&(l+="color: "+t+";"),n+="</head>\n<body"+(l?' style="'+l+'"':"")+">\n"}function o(t){t.selection||t.source_view&&e.getParam("fullpage_hide_in_source_view")||(t.content=tinymce.trim(d)+"\n"+tinymce.trim(t.content)+"\n"+tinymce.trim(c))}var d,c,s=tinymce.each,m=tinymce.html.Node;e.addCommand("mceFullPageProperties",t),e.addButton("fullpage",{title:"Document properties",cmd:"mceFullPageProperties"}),e.addMenuItem("fullpage",{text:"Document properties",cmd:"mceFullPageProperties",context:"file"}),e.on("BeforeSetContent",a),e.on("GetContent",o)});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/fullscreen/plugin.min.js b/media/editors/tinymce/plugins/fullscreen/plugin.min.js
index 70bee60..1bb1940 100644
--- a/media/editors/tinymce/plugins/fullscreen/plugin.min.js
+++ b/media/editors/tinymce/plugins/fullscreen/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("fullscreen",function(e){function n(){var e,n,t=window,i=document,l=i.body;return l.offsetWidth&&(e=l.offsetWidth,n=l.offsetHeight),t.innerWidth&&t.innerHeight&&(e=t.innerWidth,n=t.innerHeight),{w:e,h:n}}function t(){function t(){o.setStyle(d,"height",n().h-(s.clientHeight-d.clientHeight))}var s,d,u,a=document.body,h=document.documentElement;c=!c,s=e.getContainer(),d=e.getContentAreaContainer().firstChild,u=d.style,c?(i=u.width,l=u.height,u.width=u.height="100%",o.addClass(a,"mce-fullscreen"),o.addClass(h,"mce-fullscreen"),o.addClass(s,"mce-fullscreen"),o.bind(window,"resize",t),t(),r=t):(u.width=i,u.height=l,o.removeClass(a,"mce-fullscreen"),o.removeClass(h,"mce-fullscreen"),o.removeClass(s,"mce-fullscreen"),o.unbind(window,"resize",r)),e.fire("FullscreenStateChanged",{state:c})}var i,l,r,c=!1,o=tinymce.DOM;if(!e.settings.inline)return e.on("init",function(){e.addShortcut("Ctrl+Alt+F","",t)}),e.on("remove",function(){r&&o.unbind(window,"resize",r)}),e.addCommand("mceFullScreen",t),e.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Ctrl+Alt+F",selectable:!0,onClick:t,onPostRender:function(){var n=this;e.on("FullscreenStateChanged",function(e){n.active(e.state)})},context:"view"}),e.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Ctrl+Alt+F",onClick:t,onPostRender:function(){var n=this;e.on("FullscreenStateChanged",function(e){n.active(e.state)})}}),{isFullscreen:function(){return c}}});
\ No newline at end of file
+tinymce.PluginManager.add("fullscreen",function(e){function t(){var e,t,n=window,i=document,l=i.body;return l.offsetWidth&&(e=l.offsetWidth,t=l.offsetHeight),n.innerWidth&&n.innerHeight&&(e=n.innerWidth,t=n.innerHeight),{w:e,h:t}}function n(){function n(){d.setStyle(a,"height",t().h-(h.clientHeight-a.clientHeight))}var u,h,a,f,m=document.body,g=document.documentElement;s=!s,h=e.getContainer(),u=h.style,a=e.getContentAreaContainer().firstChild,f=a.style,s?(i=f.width,l=f.height,f.width=f.height="100%",c=u.width,o=u.height,u.width=u.height="",d.addClass(m,"mce-fullscreen"),d.addClass(g,"mce-fullscreen"),d.addClass(h,"mce-fullscreen"),d.bind(window,"resize",n),n(),r=n):(f.width=i,f.height=l,c&&(u.width=c),o&&(u.height=o),d.removeClass(m,"mce-fullscreen"),d.removeClass(g,"mce-fullscreen"),d.removeClass(h,"mce-fullscreen"),d.unbind(window,"resize",r)),e.fire("FullscreenStateChanged",{state:s})}var i,l,r,c,o,s=!1,d=tinymce.DOM;return e.settings.inline?void 0:(e.on("init",function(){e.addShortcut("Ctrl+Alt+F","",n)}),e.on("remove",function(){r&&d.unbind(window,"resize",r)}),e.addCommand("mceFullScreen",n),e.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Ctrl+Alt+F",selectable:!0,onClick:n,onPostRender:function(){var t=this;e.on("FullscreenStateChanged",function(e){t.active(e.state)})},context:"view"}),e.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Ctrl+Alt+F",onClick:n,onPostRender:function(){var t=this;e.on("FullscreenStateChanged",function(e){t.active(e.state)})}}),{isFullscreen:function(){return s}})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/hr/plugin.min.js b/media/editors/tinymce/plugins/hr/plugin.min.js
index e5ff6f3..ca36c92 100644
--- a/media/editors/tinymce/plugins/hr/plugin.min.js
+++ b/media/editors/tinymce/plugins/hr/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("hr",function(n){n.addCommand("InsertHorizontalRule",function(){n.execCommand("mceInsertContent",!1,"<hr />")}),n.addButton("hr",{icon:"hr",tooltip:"Horizontal line",cmd:"InsertHorizontalRule"}),n.addMenuItem("hr",{icon:"hr",text:"Horizontal line",cmd:"InsertHorizontalRule",context:"insert"})});
\ No newline at end of file
+tinymce.PluginManager.add("hr",function(e){e.addCommand("InsertHorizontalRule",function(){e.execCommand("mceInsertContent",!1,"<hr />")}),e.addButton("hr",{icon:"hr",tooltip:"Horizontal line",cmd:"InsertHorizontalRule"}),e.addMenuItem("hr",{icon:"hr",text:"Horizontal line",cmd:"InsertHorizontalRule",context:"insert"})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/image/plugin.min.js b/media/editors/tinymce/plugins/image/plugin.min.js
index 0e1cac7..07950ee 100644
--- a/media/editors/tinymce/plugins/image/plugin.min.js
+++ b/media/editors/tinymce/plugins/image/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("image",function(t){function e(t,e){function n(t,n){i.parentNode.removeChild(i),e({width:t,height:n})}var i=document.createElement("img");i.onload=function(){n(i.clientWidth,i.clientHeight)},i.onerror=function(){n()},i.src=t;var a=i.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(i)}function n(e){return function(){var n=t.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(t){e(tinymce.util.JSON.parse(t))}}):e(n)}}function i(n){function i(){var e=[{text:"None",value:""}];return tinymce.each(n,function(n){e.push({text:n.text||n.title,value:t.convertURL(n.value||n.url,"src"),menu:n.menu})}),e}function a(t){var e,n,i,a;e=s.find("#width")[0],n=s.find("#height")[0],i=e.value(),a=n.value(),s.find("#constrain")[0].checked()&&d&&u&&i&&a&&(t.control==e?(a=Math.round(i/d*a),n.value(a)):(i=Math.round(a/u*i),e.value(i))),d=i,u=a}function o(){function e(e){function i(){e.onload=e.onerror=null,t.selection.select(e),t.nodeChanged()}e.onload=function(){n.width||n.height||m.setAttribs(e,{width:e.clientWidth,height:e.clientHeight}),i()},e.onerror=i}var n=s.toJSON();""===n.width&&(n.width=null),""===n.height&&(n.height=null),""===n.style&&(n.style=null),n={src:n.src,alt:n.alt,width:n.width,height:n.height,style:n.style},t.undoManager.transact(function(){return n.src?(p?m.setAttribs(p,n):(n.id="__mcenew",t.selection.setContent(m.createHTML("img",n)),p=m.get("__mcenew"),m.setAttrib(p,"id",null)),e(p),void 0):(p&&(m.remove(p),t.nodeChanged()),void 0)})}function l(t){return t&&(t=t.replace(/px$/,"")),t}function r(){h&&h.value(t.convertURL(this.value(),"src")),e(this.value(),function(t){t.width&&t.height&&(d=t.width,u=t.height,s.find("#width").value(d),s.find("#height").value(u))})}function c(){function t(t){return t.length>0&&/^[0-9]+$/.test(t)&&(t+="px"),t}var e=s.toJSON(),n=m.parseStyle(e.style);m.setAttrib(p,"style",""),delete n.margin,n["margin-top"]=n["margin-bottom"]=t(e.vspace),n["margin-left"]=n["margin-right"]=t(e.hspace),n["border-width"]=t(e.border),s.find("#style").value(m.serializeStyle(m.parseStyle(m.serializeStyle(n))))}var s,d,u,h,g={},m=t.dom,p=t.selection.getNode();d=m.getAttrib(p,"width"),u=m.getAttrib(p,"height"),"IMG"!=p.nodeName||p.getAttribute("data-mce-object")?p=null:g={src:m.getAttrib(p,"src"),alt:m.getAttrib(p,"alt"),width:d,height:u},n&&(h={type:"listbox",label:"Image list",values:i(),value:g.src&&t.convertURL(g.src,"src"),onselect:function(t){var e=s.find("#alt");(!e.value()||t.lastControl&&e.value()==t.lastControl.text())&&e.value(t.control.text()),s.find("#src").value(t.control.value())},onPostRender:function(){h=this}});var y=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:r},h,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:a},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:a},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}];t.settings.image_advtab?(p&&(g.hspace=l(p.style.marginLeft||p.style.marginRight),g.vspace=l(p.style.marginTop||p.style.marginBottom),g.border=l(p.style.borderWidth),g.style=t.dom.serializeStyle(t.dom.parseStyle(t.dom.getAttrib(p,"style")))),s=t.windowManager.open({title:"Insert/edit image",data:g,bodyType:"tabpanel",body:[{title:"General",type:"form",items:y},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:c},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):s=t.windowManager.open({title:"Insert/edit image",data:g,body:y,onSubmit:o})}t.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(i),stateSelector:"img:not([data-mce-object])"}),t.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(i),context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("image",function(e){function t(e,t){function n(e,n){i.parentNode.removeChild(i),t({width:e,height:n})}var i=document.createElement("img");i.onload=function(){n(i.clientWidth,i.clientHeight)},i.onerror=function(){n()},i.src=e;var a=i.style;a.visibility="hidden",a.position="fixed",a.bottom=a.left=0,a.width=a.height="auto",document.body.appendChild(i)}function n(t){return function(){var n=e.settings.image_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function i(n){function i(){var t=[{text:"None",value:""}];return tinymce.each(n,function(n){t.push({text:n.text||n.title,value:e.convertURL(n.value||n.url,"src"),menu:n.menu})}),t}function a(e){var t,n,i,a;t=s.find("#width")[0],n=s.find("#height")[0],i=t.value(),a=n.value(),s.find("#constrain")[0].checked()&&d&&u&&i&&a&&(e.control==t?(a=Math.round(i/d*a),n.value(a)):(i=Math.round(a/u*i),t.value(i))),d=i,u=a}function o(){function t(t){function i(){t.onload=t.onerror=null,e.selection.select(t),e.nodeChanged()}t.onload=function(){n.width||n.height||m.setAttribs(t,{width:t.clientWidth,height:t.clientHeight}),i()},t.onerror=i}var n=s.toJSON();""===n.width&&(n.width=null),""===n.height&&(n.height=null),""===n.style&&(n.style=null),n={src:n.src,alt:n.alt,width:n.width,height:n.height,style:n.style},e.undoManager.transact(function(){return n.src?(p?m.setAttribs(p,n):(n.id="__mcenew",e.selection.setContent(m.createHTML("img",n)),p=m.get("__mcenew"),m.setAttrib(p,"id",null)),t(p),void 0):(p&&(m.remove(p),e.nodeChanged()),void 0)})}function l(e){return e&&(e=e.replace(/px$/,"")),e}function r(){h&&h.value(e.convertURL(this.value(),"src")),t(this.value(),function(e){e.width&&e.height&&(d=e.width,u=e.height,s.find("#width").value(d),s.find("#height").value(u))})}function c(){function e(e){return e.length>0&&/^[0-9]+$/.test(e)&&(e+="px"),e}var t=s.toJSON(),n=m.parseStyle(t.style);delete n.margin,n["margin-top"]=n["margin-bottom"]=e(t.vspace),n["margin-left"]=n["margin-right"]=e(t.hspace),n["border-width"]=e(t.border),s.find("#style").value(m.serializeStyle(m.parseStyle(m.serializeStyle(n))))}var s,d,u,h,g={},m=e.dom,p=e.selection.getNode();d=m.getAttrib(p,"width"),u=m.getAttrib(p,"height"),"IMG"!=p.nodeName||p.getAttribute("data-mce-object")||p.getAttribute("data-mce-placeholder")?p=null:g={src:m.getAttrib(p,"src"),alt:m.getAttrib(p,"alt"),width:d,height:u},n&&(h={type:"listbox",label:"Image list",values:i(),value:g.src&&e.convertURL(g.src,"src"),onselect:function(e){var t=s.find("#alt");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),s.find("#src").value(e.control.value())},onPostRender:function(){h=this}});var y=[{name:"src",type:"filepicker",filetype:"image",label:"Source",autofocus:!0,onchange:r},h,{name:"alt",type:"textbox",label:"Image description"},{type:"container",label:"Dimensions",layout:"flex",direction:"row",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:a},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:a},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}];e.settings.image_advtab?(p&&(g.hspace=l(p.style.marginLeft||p.style.marginRight),g.vspace=l(p.style.marginTop||p.style.marginBottom),g.border=l(p.style.borderWidth),g.style=e.dom.serializeStyle(e.dom.parseStyle(e.dom.getAttrib(p,"style")))),s=e.windowManager.open({title:"Insert/edit image",data:g,bodyType:"tabpanel",body:[{title:"General",type:"form",items:y},{title:"Advanced",type:"form",pack:"start",items:[{label:"Style",name:"style",type:"textbox"},{type:"form",layout:"grid",packV:"start",columns:2,padding:0,alignH:["left","right"],defaults:{type:"textbox",maxWidth:50,onchange:c},items:[{label:"Vertical space",name:"vspace"},{label:"Horizontal space",name:"hspace"},{label:"Border",name:"border"}]}]}],onSubmit:o})):s=e.windowManager.open({title:"Insert/edit image",data:g,body:y,onSubmit:o})}e.addButton("image",{icon:"image",tooltip:"Insert/edit image",onclick:n(i),stateSelector:"img:not([data-mce-object],[data-mce-placeholder])"}),e.addMenuItem("image",{icon:"image",text:"Insert image",onclick:n(i),context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/importcss/plugin.min.js b/media/editors/tinymce/plugins/importcss/plugin.min.js
index 6162276..e51931b 100644
--- a/media/editors/tinymce/plugins/importcss/plugin.min.js
+++ b/media/editors/tinymce/plugins/importcss/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("importcss",function(t){function e(t){return"string"==typeof t?function(e){return-1!==e.indexOf(t)}:t instanceof RegExp?function(e){return t.test(e)}:t}function n(e,n){function r(t,e){var o,l=t.href;if((e||c[l])&&(!n||n(l))){s(t.imports,function(t){r(t,!0)});try{o=t.cssRules||t.rules}catch(a){}s(o,function(t){t.styleSheet?r(t.styleSheet,!0):t.selectorText&&s(t.selectorText.split(","),function(t){i.push(tinymce.trim(t))})})}}var i=[],c={};s(t.contentCSS,function(t){c[t]=!0});try{s(e.styleSheets,function(t){r(t)})}catch(o){}return i}function r(e){var n,r=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(e);if(r){var i=r[1],s=r[2].substr(1).split(".").join(" ");return r[1]?(n={title:e},t.schema.getTextBlockElements()[i]?n.block=i:t.schema.getBlockElements()[i]?n.selector=i:n.inline=i):r[2]&&(n={inline:"span",title:e.substr(1),classes:s}),t.settings.importcss_merge_classes!==!1?n.classes=s:n.attributes={"class":s},n}}var i=this,s=tinymce.each;t.settings.style_formats||t.on("renderFormatsMenu",function(c){var o=t.settings,l={},a=o.importcss_selector_converter||r,f=e(o.importcss_selector_filter);t.settings.importcss_append||c.control.items().remove();var m=o.importcss_groups;if(m)for(var u=0;u<m.length;u++)m[u].filter=e(m[u].filter);s(n(t.getDoc(),e(o.importcss_file_filter)),function(e){if(-1===e.indexOf(".mce-")&&!l[e]&&(!f||f(e))){var n,r=a.call(i,e);if(r){var s=r.name||tinymce.DOM.uniqueId();if(m)for(var o=0;o<m.length;o++)if(!m[o].filter||m[o].filter(e)){m[o].item||(m[o].item={text:m[o].title,menu:[]}),n=m[o].item.menu;break}t.formatter.register(s,r);var u=tinymce.extend({},c.control.settings.itemDefaults,{text:r.title,format:s});n?n.push(u):c.control.add(u)}l[e]=!0}}),s(m,function(t){c.control.add(t.item)}),c.control.renderNew()}),i.convertSelectorToFormat=r});
\ No newline at end of file
+tinymce.PluginManager.add("importcss",function(t){function e(t){return"string"==typeof t?function(e){return-1!==e.indexOf(t)}:t instanceof RegExp?function(e){return t.test(e)}:t}function n(e,n){function i(t,e){var o,l=t.href;if((e||c[l])&&(!n||n(l))){s(t.imports,function(t){i(t,!0)});try{o=t.cssRules||t.rules}catch(a){}s(o,function(t){t.styleSheet?i(t.styleSheet,!0):t.selectorText&&s(t.selectorText.split(","),function(t){r.push(tinymce.trim(t))})})}}var r=[],c={};s(t.contentCSS,function(t){c[t]=!0});try{s(e.styleSheets,function(t){i(t)})}catch(o){}return r}function i(e){var n,i=/^(?:([a-z0-9\-_]+))?(\.[a-z0-9_\-\.]+)$/i.exec(e);if(i){var r=i[1],s=i[2].substr(1).split(".").join(" ");return i[1]?(n={title:e},t.schema.getTextBlockElements()[r]?n.block=r:t.schema.getBlockElements()[r]?n.selector=r:n.inline=r):i[2]&&(n={inline:"span",title:e.substr(1),classes:s}),t.settings.importcss_merge_classes!==!1?n.classes=s:n.attributes={"class":s},n}}var r=this,s=tinymce.each;t.on("renderFormatsMenu",function(c){var o=t.settings,l={},a=o.importcss_selector_converter||i,f=e(o.importcss_selector_filter);t.settings.importcss_append||t.settings.style_formats||c.control.items().remove();var m=[];tinymce.each(o.importcss_groups,function(t){t=tinymce.extend({},t),t.filter=e(t.filter),m.push(t)}),s(n(t.getDoc(),e(o.importcss_file_filter)),function(e){if(-1===e.indexOf(".mce-")&&!l[e]&&(!f||f(e))){var n,i=a.call(r,e);if(i){var s=i.name||tinymce.DOM.uniqueId();if(m)for(var o=0;o<m.length;o++)if(!m[o].filter||m[o].filter(e)){m[o].item||(m[o].item={text:m[o].title,menu:[]}),n=m[o].item.menu;break}t.formatter.register(s,i);var u=tinymce.extend({},c.control.settings.itemDefaults,{text:i.title,format:s});n?n.push(u):c.control.add(u)}l[e]=!0}}),s(m,function(t){c.control.add(t.item)}),c.control.renderNew()}),r.convertSelectorToFormat=i});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/insertdatetime/plugin.min.js b/media/editors/tinymce/plugins/insertdatetime/plugin.min.js
index 579362b..0a47b92 100644
--- a/media/editors/tinymce/plugins/insertdatetime/plugin.min.js
+++ b/media/editors/tinymce/plugins/insertdatetime/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("insertdatetime",function(e){function t(t,n){function r(e,t){if(e=""+e,e.length<t)for(var n=0;n<t-e.length;n++)e="0"+e;return e}return n=n||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+n.getFullYear()),t=t.replace("%y",""+n.getYear()),t=t.replace("%m",r(n.getMonth()+1,2)),t=t.replace("%d",r(n.getDate(),2)),t=t.replace("%H",""+r(n.getHours(),2)),t=t.replace("%M",""+r(n.getMinutes(),2)),t=t.replace("%S",""+r(n.getSeconds(),2)),t=t.replace("%I",""+((n.getHours()+11)%12+1)),t=t.replace("%p",""+(n.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(s[n.getMonth()])),t=t.replace("%b",""+e.translate(a[n.getMonth()])),t=t.replace("%A",""+e.translate(o[n.getDay()])),t=t.replace("%a",""+e.translate(i[n.getDay()])),t=t.replace("%%","%")}function n(n){var r=t(n);if(e.settings.insertdatetime_element){var i;i=/%[HMSIp]/.test(n)?t("%Y-%m-%dT%H:%M"):t("%Y-%m-%d"),r='<time datetime="'+i+'">'+r+"</time>";var o=e.dom.getParent(e.selection.getStart(),"time");if(o)return e.dom.setOuterHTML(o,r),void 0}e.insertContent(r)}var r,i="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),o="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),a="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),s="January February March April May June July August September October November December".split(" "),l=[];e.addCommand("mceInsertDate",function(){n(e.getParam("insertdatetime_dateformat",e.translate("%Y-%m-%d")))}),e.addCommand("mceInsertTime",function(){n(e.getParam("insertdatetime_timeformat",e.translate("%H:%M:%S")))}),e.addButton("inserttime",{type:"splitbutton",title:"Insert time",onclick:function(){n(r||"%H:%M:%S")},menu:l}),tinymce.each(e.settings.insertdatetime_formats||["%H:%M:%S","%Y-%m-%d","%I:%M:%S %p","%D"],function(e){l.push({text:t(e),onclick:function(){r=e,n(e)}})}),e.addMenuItem("insertdatetime",{icon:"date",text:"Insert date/time",menu:l,context:"insert"})});
\ No newline at end of file
+tinymce.PluginManager.add("insertdatetime",function(e){function t(t,a){function n(e,t){if(e=""+e,e.length<t)for(var a=0;a<t-e.length;a++)e="0"+e;return e}return a=a||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+a.getFullYear()),t=t.replace("%y",""+a.getYear()),t=t.replace("%m",n(a.getMonth()+1,2)),t=t.replace("%d",n(a.getDate(),2)),t=t.replace("%H",""+n(a.getHours(),2)),t=t.replace("%M",""+n(a.getMinutes(),2)),t=t.replace("%S",""+n(a.getSeconds(),2)),t=t.replace("%I",""+((a.getHours()+11)%12+1)),t=t.replace("%p",""+(a.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(u[a.getMonth()])),t=t.replace("%b",""+e.translate(m[a.getMonth()])),t=t.replace("%A",""+e.translate(c[a.getDay()])),t=t.replace("%a",""+e.translate(i[a.getDay()])),t=t.replace("%%","%")}function a(a){var n=t(a);if(e.settings.insertdatetime_element){var r;r=/%[HMSIp]/.test(a)?t("%Y-%m-%dT%H:%M"):t("%Y-%m-%d"),n='<time datetime="'+r+'">'+n+"</time>";var i=e.dom.getParent(e.selection.getStart(),"time");if(i)return e.dom.setOuterHTML(i,n),void 0}e.insertContent(n)}var n,r,i="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),c="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),m="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),u="January February March April May June July August September October November December".split(" "),d=[];e.addCommand("mceInsertDate",function(){a(e.getParam("insertdatetime_dateformat",e.translate("%Y-%m-%d")))}),e.addCommand("mceInsertTime",function(){a(e.getParam("insertdatetime_timeformat",e.translate("%H:%M:%S")))}),e.addButton("inserttime",{type:"splitbutton",title:"Insert time",onclick:function(){a(n||r)},menu:d}),tinymce.each(e.settings.insertdatetime_formats||["%H:%M:%S","%Y-%m-%d","%I:%M:%S %p","%D"],function(e){r||(r=e),d.push({text:t(e),onclick:function(){n=e,a(e)}})}),e.addMenuItem("insertdatetime",{icon:"date",text:"Insert date/time",menu:d,context:"insert"})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/layer/plugin.min.js b/media/editors/tinymce/plugins/layer/plugin.min.js
index cecb352..eb1ad4b 100644
--- a/media/editors/tinymce/plugins/layer/plugin.min.js
+++ b/media/editors/tinymce/plugins/layer/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("layer",function(e){function t(e){do if(e.className&&-1!=e.className.indexOf("mceItemLayer"))return e;while(e=e.parentNode)}function n(t){var n=e.dom;tinymce.each(n.select("div,p",t),function(e){/^(absolute|relative|fixed)$/i.test(e.style.position)&&(e.hasVisual?n.addClass(e,"mceItemVisualAid"):n.removeClass(e,"mceItemVisualAid"),n.addClass(e,"mceItemLayer"))})}function r(n){var r,i,o=[],a=t(e.selection.getNode()),s=-1,l=-1;for(i=[],tinymce.walk(e.getBody(),function(e){1==e.nodeType&&/^(absolute|relative|static)$/i.test(e.style.position)&&i.push(e)},"childNodes"),r=0;r<i.length;r++)o[r]=i[r].style.zIndex?parseInt(i[r].style.zIndex,10):0,0>s&&i[r]==a&&(s=r);if(0>n){for(r=0;r<o.length;r++)if(o[r]<o[s]){l=r;break}l>-1?(i[s].style.zIndex=o[l],i[l].style.zIndex=o[s]):o[s]>0&&(i[s].style.zIndex=o[s]-1)}else{for(r=0;r<o.length;r++)if(o[r]>o[s]){l=r;break}l>-1?(i[s].style.zIndex=o[l],i[l].style.zIndex=o[s]):i[s].style.zIndex=o[s]+1}e.execCommand("mceRepaint")}function i(){var t=e.dom,n=t.getPos(t.getParent(e.selection.getNode(),"*")),r=e.getBody();e.dom.add(r,"div",{style:{position:"absolute",left:n.x,top:n.y>20?n.y:20,width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},e.selection.getContent()||e.getLang("layer.content")),tinymce.Env.ie&&t.setHTML(r,r.innerHTML)}function o(){var n=t(e.selection.getNode());n||(n=e.dom.getParent(e.selection.getNode(),"DIV,P,IMG")),n&&("absolute"==n.style.position.toLowerCase()?(e.dom.setStyles(n,{position:"",left:"",top:"",width:"",height:""}),e.dom.removeClass(n,"mceItemVisualAid"),e.dom.removeClass(n,"mceItemLayer")):(n.style.left||(n.style.left="20px"),n.style.top||(n.style.top="20px"),n.style.width||(n.style.width=n.width?n.width+"px":"100px"),n.style.height||(n.style.height=n.height?n.height+"px":"100px"),n.style.position="absolute",e.dom.setAttrib(n,"data-mce-style",""),e.addVisual(e.getBody())),e.execCommand("mceRepaint"),e.nodeChanged())}e.addCommand("mceInsertLayer",i),e.addCommand("mceMoveForward",function(){r(1)}),e.addCommand("mceMoveBackward",function(){r(-1)}),e.addCommand("mceMakeAbsolute",function(){o()}),e.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"}),e.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"}),e.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"}),e.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"}),e.on("init",function(){tinymce.Env.ie&&e.getDoc().execCommand("2D-Position",!1,!0)}),e.on("mouseup",function(n){var r=t(n.target);r&&e.dom.setAttrib(r,"data-mce-style","")}),e.on("mousedown",function(n){var r,i=n.target,o=e.getDoc();tinymce.Env.gecko&&(t(i)?"on"!==o.designMode&&(o.designMode="on",i=o.body,r=i.parentNode,r.removeChild(i),r.appendChild(i)):"on"==o.designMode&&(o.designMode="off"))}),e.on("NodeChange",n)});
\ No newline at end of file
+tinymce.PluginManager.add("layer",function(e){function t(e){do if(e.className&&-1!=e.className.indexOf("mceItemLayer"))return e;while(e=e.parentNode)}function n(t){var n=e.dom;tinymce.each(n.select("div,p",t),function(e){/^(absolute|relative|fixed)$/i.test(e.style.position)&&(e.hasVisual?n.addClass(e,"mceItemVisualAid"):n.removeClass(e,"mceItemVisualAid"),n.addClass(e,"mceItemLayer"))})}function i(n){var i,o,a=[],r=t(e.selection.getNode()),l=-1,s=-1;for(o=[],tinymce.walk(e.getBody(),function(e){1==e.nodeType&&/^(absolute|relative|static)$/i.test(e.style.position)&&o.push(e)},"childNodes"),i=0;i<o.length;i++)a[i]=o[i].style.zIndex?parseInt(o[i].style.zIndex,10):0,0>l&&o[i]==r&&(l=i);if(0>n){for(i=0;i<a.length;i++)if(a[i]<a[l]){s=i;break}s>-1?(o[l].style.zIndex=a[s],o[s].style.zIndex=a[l]):a[l]>0&&(o[l].style.zIndex=a[l]-1)}else{for(i=0;i<a.length;i++)if(a[i]>a[l]){s=i;break}s>-1?(o[l].style.zIndex=a[s],o[s].style.zIndex=a[l]):o[l].style.zIndex=a[l]+1}e.execCommand("mceRepaint")}function o(){var t=e.dom,n=t.getPos(t.getParent(e.selection.getNode(),"*")),i=e.getBody();e.dom.add(i,"div",{style:{position:"absolute",left:n.x,top:n.y>20?n.y:20,width:100,height:100},"class":"mceItemVisualAid mceItemLayer"},e.selection.getContent()||e.getLang("layer.content")),tinymce.Env.ie&&t.setHTML(i,i.innerHTML)}function a(){var n=t(e.selection.getNode());n||(n=e.dom.getParent(e.selection.getNode(),"DIV,P,IMG")),n&&("absolute"==n.style.position.toLowerCase()?(e.dom.setStyles(n,{position:"",left:"",top:"",width:"",height:""}),e.dom.removeClass(n,"mceItemVisualAid"),e.dom.removeClass(n,"mceItemLayer")):(n.style.left||(n.style.left="20px"),n.style.top||(n.style.top="20px"),n.style.width||(n.style.width=n.width?n.width+"px":"100px"),n.style.height||(n.style.height=n.height?n.height+"px":"100px"),n.style.position="absolute",e.dom.setAttrib(n,"data-mce-style",""),e.addVisual(e.getBody())),e.execCommand("mceRepaint"),e.nodeChanged())}e.addCommand("mceInsertLayer",o),e.addCommand("mceMoveForward",function(){i(1)}),e.addCommand("mceMoveBackward",function(){i(-1)}),e.addCommand("mceMakeAbsolute",function(){a()}),e.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"}),e.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"}),e.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"}),e.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"}),e.on("init",function(){tinymce.Env.ie&&e.getDoc().execCommand("2D-Position",!1,!0)}),e.on("mouseup",function(n){var i=t(n.target);i&&e.dom.setAttrib(i,"data-mce-style","")}),e.on("mousedown",function(n){var i,o=n.target,a=e.getDoc();tinymce.Env.gecko&&(t(o)?"on"!==a.designMode&&(a.designMode="on",o=a.body,i=o.parentNode,i.removeChild(o),i.appendChild(o)):"on"==a.designMode&&(a.designMode="off"))}),e.on("NodeChange",n)});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/legacyoutput/plugin.min.js b/media/editors/tinymce/plugins/legacyoutput/plugin.min.js
index 00db4b5..4f6f7c1 100644
--- a/media/editors/tinymce/plugins/legacyoutput/plugin.min.js
+++ b/media/editors/tinymce/plugins/legacyoutput/plugin.min.js
@@ -1 +1 @@
-!function(e){e.on("AddEditor",function(e){e.editor.settings.inline_styles=!1}),e.PluginManager.add("legacyoutput",function(t){t.on("init",function(){var n="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",r=e.explode(t.settings.font_size_style_values),i=t.schema;t.formatter.register({alignleft:{selector:n,attributes:{align:"left"}},aligncenter:{selector:n,attributes:{align:"center"}},alignright:{selector:n,attributes:{align:"right"}},alignjustify:{selector:n,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:!0}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:!0}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(t){return e.inArray(r,t.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}}),e.each("b,i,u,strike".split(","),function(e){i.addValidElements(e+"[*]")}),i.getElementRule("font")||i.addValidElements("font[face|size|color|style]"),e.each(n.split(","),function(e){var t=i.getElementRule(e);t&&(t.attributes.align||(t.attributes.align={},t.attributesOrder.push("align")))})})})}(tinymce);
\ No newline at end of file
+!function(e){e.on("AddEditor",function(e){e.editor.settings.inline_styles=!1}),e.PluginManager.add("legacyoutput",function(t){t.on("init",function(){var n="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",i=e.explode(t.settings.font_size_style_values),o=t.schema;t.formatter.register({alignleft:{selector:n,attributes:{align:"left"}},aligncenter:{selector:n,attributes:{align:"center"}},alignright:{selector:n,attributes:{align:"right"}},alignjustify:{selector:n,attributes:{align:"justify"}},bold:[{inline:"b",remove:"all"},{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}}],italic:[{inline:"i",remove:"all"},{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}}],underline:[{inline:"u",remove:"all"},{inline:"span",styles:{textDecoration:"underline"},exact:!0}],strikethrough:[{inline:"strike",remove:"all"},{inline:"span",styles:{textDecoration:"line-through"},exact:!0}],fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(t){return e.inArray(i,t.value)+1}}},forecolor:{inline:"font",attributes:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}}),e.each("b,i,u,strike".split(","),function(e){o.addValidElements(e+"[*]")}),o.getElementRule("font")||o.addValidElements("font[face|size|color|style]"),e.each(n.split(","),function(e){var t=o.getElementRule(e);t&&(t.attributes.align||(t.attributes.align={},t.attributesOrder.push("align")))})})})}(tinymce);
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/link/plugin.min.js b/media/editors/tinymce/plugins/link/plugin.min.js
index 05b7ead..0adb9f8 100644
--- a/media/editors/tinymce/plugins/link/plugin.min.js
+++ b/media/editors/tinymce/plugins/link/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("link",function(e){function t(t){return function(){var n=e.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function n(t){function n(e){var t=f.find("#text");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),f.find("#href").value(e.control.value())}function l(){var n=[{text:"None",value:""}];return tinymce.each(t,function(t){n.push({text:t.text||t.title,value:e.convertURL(t.value||t.url,"href"),menu:t.menu})}),n}function i(t){var n=[{text:"None",value:""}];return tinymce.each(e.settings.rel_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function r(t){var n=[{text:"None",value:""}];return e.settings.target_list||n.push({text:"New window",value:"_blank"}),tinymce.each(e.settings.target_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function a(t){var l=[];return tinymce.each(e.dom.select("a:not([href])"),function(e){var n=e.name||e.id;n&&l.push({text:n,value:"#"+n,selected:-1!=t.indexOf("#"+n)})}),l.length?(l.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:l,onselect:n}):void 0}function o(){d&&d.value(e.convertURL(this.value(),"href")),c||0!==x.text.length||this.parent().parent().find("#text")[0].value(this.value())}var u,s,c,f,d,h,v,x={},g=e.selection,m=e.dom;u=g.getNode(),s=m.getParent(u,"a[href]"),x.text=c=s?s.innerText||s.textContent:g.getContent({format:"text"}),x.href=s?m.getAttrib(s,"href"):"",x.target=s?m.getAttrib(s,"target"):"",x.rel=s?m.getAttrib(s,"rel"):"","IMG"==u.nodeName&&(x.text=c=" "),t&&(d={type:"listbox",label:"Link list",values:l(),onselect:n,value:e.convertURL(x.href,"href"),onPostRender:function(){d=this}}),e.settings.target_list!==!1&&(v={name:"target",type:"listbox",label:"Target",values:r(x.target)}),e.settings.rel_list&&(h={name:"rel",type:"listbox",label:"Rel",values:i(x.rel)}),f=e.windowManager.open({title:"Insert link",data:x,body:[{name:"href",type:"filepicker",filetype:"file",size:40,autofocus:!0,label:"Url",onchange:o,onkeyup:o},{name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){x.text=this.value()}},a(x.href),d,h,v],onSubmit:function(t){function n(t,n){window.setTimeout(function(){e.windowManager.confirm(t,n)},0)}function l(){i.text!=c?s?(e.focus(),s.innerHTML=i.text,m.setAttribs(s,{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null}),g.select(s)):e.insertContent(m.createHTML("a",{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null},i.text)):e.execCommand("mceInsertLink",!1,{href:r,target:i.target,rel:i.rel?i.rel:null})}var i=t.data,r=i.href;return r?r.indexOf("@")>0&&-1==r.indexOf("//")&&-1==r.indexOf("mailto:")?(n("The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",function(e){e&&(r="mailto:"+r),l()}),void 0):/^\s*www\./i.test(r)?(n("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(e){e&&(r="http://"+r),l()}),void 0):(l(),void 0):(e.execCommand("unlink"),void 0)}})}e.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]"}),e.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),e.addShortcut("Ctrl+K","",t(n)),this.showDialog=n,e.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("link",function(e){function t(t){return function(){var n=e.settings.link_list;"string"==typeof n?tinymce.util.XHR.send({url:n,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(n)}}function n(t){function n(e){var t=f.find("#text");(!t.value()||e.lastControl&&t.value()==e.lastControl.text())&&t.value(e.control.text()),f.find("#href").value(e.control.value())}function l(){var n=[{text:"None",value:""}];return tinymce.each(t,function(t){n.push({text:t.text||t.title,value:e.convertURL(t.value||t.url,"href"),menu:t.menu})}),n}function i(t){var n=[{text:"None",value:""}];return tinymce.each(e.settings.rel_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function r(t){var n=[{text:"None",value:""}];return e.settings.target_list||n.push({text:"New window",value:"_blank"}),tinymce.each(e.settings.target_list,function(e){n.push({text:e.text||e.title,value:e.value,selected:t===e.value})}),n}function a(t){var l=[];return tinymce.each(e.dom.select("a:not([href])"),function(e){var n=e.name||e.id;n&&l.push({text:n,value:"#"+n,selected:-1!=t.indexOf("#"+n)})}),l.length?(l.unshift({text:"None",value:""}),{name:"anchor",type:"listbox",label:"Anchors",values:l,onselect:n}):void 0}function o(){d&&d.value(e.convertURL(this.value(),"href")),c||0!==x.text.length||this.parent().parent().find("#text")[0].value(this.value())}var u,s,c,f,d,h,v,x={},g=e.selection,m=e.dom;u=g.getNode(),s=m.getParent(u,"a[href]"),x.text=c=s?s.innerText||s.textContent:g.getContent({format:"text"}),x.href=s?m.getAttrib(s,"href"):"",x.target=s?m.getAttrib(s,"target"):"",x.rel=s?m.getAttrib(s,"rel"):"","IMG"==u.nodeName&&(x.text=c=" "),t&&(d={type:"listbox",label:"Link list",values:l(),onselect:n,value:e.convertURL(x.href,"href"),onPostRender:function(){d=this}}),e.settings.target_list!==!1&&(v={name:"target",type:"listbox",label:"Target",values:r(x.target)}),e.settings.rel_list&&(h={name:"rel",type:"listbox",label:"Rel",values:i(x.rel)}),f=e.windowManager.open({title:"Insert link",data:x,body:[{name:"href",type:"filepicker",filetype:"file",size:40,autofocus:!0,label:"Url",onchange:o,onkeyup:o},{name:"text",type:"textbox",size:40,label:"Text to display",onchange:function(){x.text=this.value()}},a(x.href),d,h,v],onSubmit:function(t){function n(t,n){var l=e.selection.getRng();window.setTimeout(function(){e.windowManager.confirm(t,function(t){e.selection.setRng(l),n(t)})},0)}function l(){i.text!=c?s?(e.focus(),s.innerHTML=i.text,m.setAttribs(s,{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null}),g.select(s)):e.insertContent(m.createHTML("a",{href:r,target:i.target?i.target:null,rel:i.rel?i.rel:null},i.text)):e.execCommand("mceInsertLink",!1,{href:r,target:i.target,rel:i.rel?i.rel:null})}var i=t.data,r=i.href;return r?r.indexOf("@")>0&&-1==r.indexOf("//")&&-1==r.indexOf("mailto:")?(n("The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",function(e){e&&(r="mailto:"+r),l()}),void 0):/^\s*www\./i.test(r)?(n("The URL you entered seems to be an external link. Do you want to add the required http:// prefix?",function(e){e&&(r="http://"+r),l()}),void 0):(l(),void 0):(e.execCommand("unlink"),void 0)}})}e.addButton("link",{icon:"link",tooltip:"Insert/edit link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]"}),e.addButton("unlink",{icon:"unlink",tooltip:"Remove link",cmd:"unlink",stateSelector:"a[href]"}),e.addShortcut("Ctrl+K","",t(n)),this.showDialog=n,e.addMenuItem("link",{icon:"link",text:"Insert link",shortcut:"Ctrl+K",onclick:t(n),stateSelector:"a[href]",context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/media/plugin.min.js b/media/editors/tinymce/plugins/media/plugin.min.js
index eb524e5..ae30bfd 100644
--- a/media/editors/tinymce/plugins/media/plugin.min.js
+++ b/media/editors/tinymce/plugins/media/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("media",function(e,t){function i(e){return-1!=e.indexOf(".mp3")?"audio/mpeg":-1!=e.indexOf(".wav")?"audio/wav":-1!=e.indexOf(".mp4")?"video/mp4":-1!=e.indexOf(".webm")?"video/webm":-1!=e.indexOf(".ogg")?"video/ogg":-1!=e.indexOf(".swf")?"application/x-shockwave-flash":""}function o(){function t(e){var t,a,r,c;t=i.find("#width")[0],a=i.find("#height")[0],r=t.value(),c=a.value(),i.find("#constrain")[0].checked()&&o&&s&&r&&c&&(e.control==t?(c=Math.round(r/o*c),a.value(c)):(r=Math.round(c/s*r),t.value(r))),o=r,s=c}var i,o,s,m;m=n(e.selection.getNode()),o=m.width,s=m.height,i=e.windowManager.open({title:"Insert/edit video",data:m,bodyType:"tabpanel",body:[{title:"General",type:"form",onShowTab:function(){this.fromJSON(c(this.next().find("#embed").value()))},items:[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source"},{name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"},{name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"},{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:t},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:t},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}]},{title:"Embed",type:"panel",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,onShowTab:function(){this.find("#embed").value(r(this.parent().toJSON()))},items:[{type:"label",text:"Paste your embed code below:"},{type:"textbox",flex:1,name:"embed",value:a(),multiline:!0,label:"Source"}]}],onSubmit:function(){e.insertContent(r(this.toJSON()))}})}function a(){var t=e.selection.getNode();return t.getAttribute("data-mce-object")?e.selection.getContent():void 0}function r(o){var a="";return o.source1||(tinymce.extend(o,c(o.embed)),o.source1)?(o.source1=e.convertURL(o.source1,"source"),o.source2=e.convertURL(o.source2,"source"),o.source1mime=i(o.source1),o.source2mime=i(o.source2),o.poster=e.convertURL(o.poster,"poster"),o.flashPlayerUrl=e.convertURL(t+"/moxieplayer.swf","movie"),o.embed?a=s(o.embed,o,!0):(tinymce.each(m,function(e){var t,i,a;if(t=e.regex.exec(o.source1)){for(a=e.url,i=0;t[i];i++)a=a.replace("$"+i,function(){return t[i]});o.source1=a,o.type=e.type,o.width=e.w,o.height=e.h}}),o.width=o.width||300,o.height=o.height||150,tinymce.each(o,function(t,i){o[i]=e.dom.encode(t)}),"iframe"==o.type?a+='<iframe src="'+o.source1+'" width="'+o.width+'" height="'+o.height+'"></iframe>':"application/x-shockwave-flash"==o.source1mime?(a+='<object data="'+o.source1+'" width="'+o.width+'" height="'+o.height+'" type="application/x-shockwave-flash">',o.poster&&(a+='<img src="'+o.poster+'" width="'+o.width+'" height="'+o.height+'" />'),a+="</object>"):-1!=o.source1mime.indexOf("audio")?e.settings.audio_template_callback?a=e.settings.audio_template_callback(o):a+='<audio controls="controls" src="'+o.source1+'">'+(o.source2?'\n<source src="'+o.source2+'"'+(o.source2mime?' type="'+o.source2mime+'"':"")+" />\n":"")+"</audio>":a=e.settings.video_template_callback?e.settings.video_template_callback(o):'<video width="'+o.width+'" height="'+o.height+'"'+(o.poster?' poster="'+o.poster+'"':"")+' controls="controls">\n'+'<source src="'+o.source1+'"'+(o.source1mime?' type="'+o.source1mime+'"':"")+" />\n"+(o.source2?'<source src="'+o.source2+'"'+(o.source2mime?' type="'+o.source2mime+'"':"")+" />\n":"")+"</video>"),a):""}function c(e){var t={};return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(e,i){t.source1||"param"!=e||(t.source1=i.map.movie),("iframe"==e||"object"==e||"embed"==e||"video"==e||"audio"==e)&&(t=tinymce.extend(i.map,t)),"source"==e&&(t.source1?t.source2||(t.source2=i.map.src):t.source1=i.map.src),"img"!=e||t.poster||(t.poster=i.map.src)}}).parse(e),t.source1=t.source1||t.src||t.data,t.source2=t.source2||"",t.poster=t.poster||"",t}function n(t){return t.getAttribute("data-mce-object")?c(e.serializer.serialize(t,{selection:!0})):{}}function s(e,t,i){function o(e,t){var i,o,a,r;for(i in t)if(a=""+t[i],e.map[i])for(o=e.length;o--;)r=e[o],r.name==i&&(a?(e.map[i]=a,r.value=a):(delete e.map[i],e.splice(o,1)));else a&&(e.push({name:i,value:a}),e.map[i]=a)}var a,r=new tinymce.html.Writer,c=0;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(e){r.comment(e)},cdata:function(e){r.cdata(e)},text:function(e,t){r.text(e,t)},start:function(e,n,s){switch(e){case"video":case"object":case"embed":case"img":case"iframe":o(n,{width:t.width,height:t.height})}if(i)switch(e){case"video":o(n,{poster:t.poster,src:""}),t.source2&&o(n,{src:""});break;case"iframe":o(n,{src:t.source1});break;case"source":if(c++,2>=c&&(o(n,{src:t["source"+c],type:t["source"+c+"mime"]}),!t["source"+c]))return;break;case"img":if(!t.poster)return;a=!0}r.start(e,n,s)},end:function(e){if("video"==e&&i)for(var n=1;2>=n;n++)if(t["source"+n]){var s=[];s.map={},n>c&&(o(s,{src:t["source"+n],type:t["source"+n+"mime"]}),r.start("source",s,!0))}if(t.poster&&"object"==e&&i&&!a){var m=[];m.map={},o(m,{src:t.poster,width:t.width,height:t.height}),r.start("img",m,!0)}r.end(e)}},new tinymce.html.Schema({})).parse(e),r.getContent()}var m=[{regex:/youtu\.be\/([a-z1-9.-_]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$1"},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$2"},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"http://player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc"},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'http://maps.google.com/maps/ms?msid=$2&output=embed"'}];e.on("ResolveName",function(e){var t;1==e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}),e.on("preInit",function(){var t=e.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.schema.addValidElements("object[id|style|width|height|classid|codebase|*],embed[id|style|width|height|type|src|*],video[*],audio[*]");var i=e.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){i[e]={}}),e.parser.addNodeFilter("iframe,video,audio,object,embed",function(t,i){for(var o,a,r,c,n,s,m,d=t.length;d--;){for(a=t[d],r=new tinymce.html.Node("img",1),r.shortEnded=!0,s=a.attributes,o=s.length;o--;)c=s[o].name,n=s[o].value,"width"!==c&&"height"!==c&&"style"!==c&&(("data"==c||"src"==c)&&(n=e.convertURL(n,c)),r.attr("data-mce-p-"+c,n));m=a.firstChild&&a.firstChild.value,m&&(r.attr("data-mce-html",escape(m)),r.firstChild=null),r.attr({width:a.attr("width")||"300",height:a.attr("height")||("audio"==i?"30":"150"),style:a.attr("style"),src:tinymce.Env.transparentSrc,"data-mce-object":i,"class":"mce-object mce-object-"+i}),a.replace(r)}}),e.serializer.addAttributeFilter("data-mce-object",function(e,t){for(var i,o,a,r,c,n,s=e.length;s--;){for(i=e[s],o=new tinymce.html.Node(i.attr(t),1),"audio"!=i.attr(t)&&o.attr({width:i.attr("width"),height:i.attr("height")}),o.attr({style:i.attr("style")}),r=i.attributes,a=r.length;a--;){var m=r[a].name;0===m.indexOf("data-mce-p-")&&o.attr(m.substr(11),r[a].value)}c=i.attr("data-mce-html"),c&&(n=new tinymce.html.Node("#text",3),n.raw=!0,n.value=unescape(c),o.append(n)),i.replace(o)}})}),e.on("ObjectSelected",function(e){"audio"==e.target.getAttribute("data-mce-object")&&e.preventDefault()}),e.on("objectResized",function(e){var t,i=e.target;i.getAttribute("data-mce-object")&&(t=i.getAttribute("data-mce-html"),t&&(t=unescape(t),i.setAttribute("data-mce-html",escape(s(t,{width:e.width,height:e.height})))))}),e.addButton("media",{tooltip:"Insert/edit video",onclick:o,stateSelector:"img[data-mce-object=video]"}),e.addMenuItem("media",{icon:"media",text:"Insert video",onclick:o,context:"insert",prependToContext:!0})});
\ No newline at end of file
+tinymce.PluginManager.add("media",function(e,t){function i(e){return-1!=e.indexOf(".mp3")?"audio/mpeg":-1!=e.indexOf(".wav")?"audio/wav":-1!=e.indexOf(".mp4")?"video/mp4":-1!=e.indexOf(".webm")?"video/webm":-1!=e.indexOf(".ogg")?"video/ogg":-1!=e.indexOf(".swf")?"application/x-shockwave-flash":""}function r(t){var i=e.settings.media_scripts;if(i)for(var r=0;r<i.length;r++)if(-1!==t.indexOf(i[r].filter))return i[r]}function a(){function t(e){var t,o,c,n;t=i.find("#width")[0],o=i.find("#height")[0],c=t.value(),n=o.value(),i.find("#constrain")[0].checked()&&r&&a&&c&&n&&(e.control==t?(n=Math.round(c/r*n),o.value(n)):(c=Math.round(n/a*c),t.value(c))),r=c,a=n}var i,r,a,m;m=s(e.selection.getNode()),r=m.width,a=m.height,i=e.windowManager.open({title:"Insert/edit video",data:m,bodyType:"tabpanel",body:[{title:"General",type:"form",onShowTab:function(){m=n(this.next().find("#embed").value()),this.fromJSON(m)},items:[{name:"source1",type:"filepicker",filetype:"media",size:40,autofocus:!0,label:"Source"},{name:"source2",type:"filepicker",filetype:"media",size:40,label:"Alternative source"},{name:"poster",type:"filepicker",filetype:"image",size:40,label:"Poster"},{type:"container",label:"Dimensions",layout:"flex",align:"center",spacing:5,items:[{name:"width",type:"textbox",maxLength:3,size:3,onchange:t},{type:"label",text:"x"},{name:"height",type:"textbox",maxLength:3,size:3,onchange:t},{name:"constrain",type:"checkbox",checked:!0,text:"Constrain proportions"}]}]},{title:"Embed",type:"panel",layout:"flex",direction:"column",align:"stretch",padding:10,spacing:10,onShowTab:function(){this.find("#embed").value(c(this.parent().toJSON()))},items:[{type:"label",text:"Paste your embed code below:"},{type:"textbox",flex:1,name:"embed",value:o(),multiline:!0,label:"Source"}]}],onSubmit:function(){e.insertContent(c(this.toJSON()))}})}function o(){var t=e.selection.getNode();return t.getAttribute("data-mce-object")?e.selection.getContent():void 0}function c(a){var o="";if(!a.source1&&(tinymce.extend(a,n(a.embed)),!a.source1))return"";if(a.source1=e.convertURL(a.source1,"source"),a.source2=e.convertURL(a.source2,"source"),a.source1mime=i(a.source1),a.source2mime=i(a.source2),a.poster=e.convertURL(a.poster,"poster"),a.flashPlayerUrl=e.convertURL(t+"/moxieplayer.swf","movie"),a.embed)o=m(a.embed,a,!0);else{tinymce.each(d,function(e){var t,i,r;if(t=e.regex.exec(a.source1)){for(r=e.url,i=0;t[i];i++)r=r.replace("$"+i,function(){return t[i]});a.source1=r,a.type=e.type,a.width=e.w,a.height=e.h}});var c=r(a.source1);c&&(a.type="script",a.width=c.width,a.height=c.height),a.width=a.width||300,a.height=a.height||150,tinymce.each(a,function(t,i){a[i]=e.dom.encode(t)}),"iframe"==a.type?o+='<iframe src="'+a.source1+'" width="'+a.width+'" height="'+a.height+'"></iframe>':"application/x-shockwave-flash"==a.source1mime?(o+='<object data="'+a.source1+'" width="'+a.width+'" height="'+a.height+'" type="application/x-shockwave-flash">',a.poster&&(o+='<img src="'+a.poster+'" width="'+a.width+'" height="'+a.height+'" />'),o+="</object>"):-1!=a.source1mime.indexOf("audio")?e.settings.audio_template_callback?o=e.settings.audio_template_callback(a):o+='<audio controls="controls" src="'+a.source1+'">'+(a.source2?'\n<source src="'+a.source2+'"'+(a.source2mime?' type="'+a.source2mime+'"':"")+" />\n":"")+"</audio>":"script"==a.type?o+='<script src="'+a.source1+'"></script>':o=e.settings.video_template_callback?e.settings.video_template_callback(a):'<video width="'+a.width+'" height="'+a.height+'"'+(a.poster?' poster="'+a.poster+'"':"")+' controls="controls">\n<source src="'+a.source1+'"'+(a.source1mime?' type="'+a.source1mime+'"':"")+" />\n"+(a.source2?'<source src="'+a.source2+'"'+(a.source2mime?' type="'+a.source2mime+'"':"")+" />\n":"")+"</video>"}return o}function n(e){var t={};return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",start:function(e,i){if(t.source1||"param"!=e||(t.source1=i.map.movie),("iframe"==e||"object"==e||"embed"==e||"video"==e||"audio"==e)&&(t.type||(t.type=e),t=tinymce.extend(i.map,t)),"script"==e){var a=r(i.map.src);if(!a)return;t={type:"script",source1:i.map.src,width:a.width,height:a.height}}"source"==e&&(t.source1?t.source2||(t.source2=i.map.src):t.source1=i.map.src),"img"!=e||t.poster||(t.poster=i.map.src)}}).parse(e),t.source1=t.source1||t.src||t.data,t.source2=t.source2||"",t.poster=t.poster||"",t}function s(t){return t.getAttribute("data-mce-object")?n(e.serializer.serialize(t,{selection:!0})):{}}function m(e,t,i){function r(e,t){var i,r,a,o;for(i in t)if(a=""+t[i],e.map[i])for(r=e.length;r--;)o=e[r],o.name==i&&(a?(e.map[i]=a,o.value=a):(delete e.map[i],e.splice(r,1)));else a&&(e.push({name:i,value:a}),e.map[i]=a)}var a,o=new tinymce.html.Writer,c=0;return new tinymce.html.SaxParser({validate:!1,allow_conditional_comments:!0,special:"script,noscript",comment:function(e){o.comment(e)},cdata:function(e){o.cdata(e)},text:function(e,t){o.text(e,t)},start:function(e,n,s){switch(e){case"video":case"object":case"embed":case"img":case"iframe":r(n,{width:t.width,height:t.height})}if(i)switch(e){case"video":r(n,{poster:t.poster,src:""}),t.source2&&r(n,{src:""});break;case"iframe":r(n,{src:t.source1});break;case"source":if(c++,2>=c&&(r(n,{src:t["source"+c],type:t["source"+c+"mime"]}),!t["source"+c]))return;break;case"img":if(!t.poster)return;a=!0}o.start(e,n,s)},end:function(e){if("video"==e&&i)for(var n=1;2>=n;n++)if(t["source"+n]){var s=[];s.map={},n>c&&(r(s,{src:t["source"+n],type:t["source"+n+"mime"]}),o.start("source",s,!0))}if(t.poster&&"object"==e&&i&&!a){var m=[];m.map={},r(m,{src:t.poster,width:t.width,height:t.height}),o.start("img",m,!0)}o.end(e)}},new tinymce.html.Schema({})).parse(e),o.getContent()}var d=[{regex:/youtu\.be\/([a-z1-9.-_]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$1"},{regex:/youtube\.com(.+)v=([^&]+)/,type:"iframe",w:425,h:350,url:"http://www.youtube.com/embed/$2"},{regex:/vimeo\.com\/([0-9]+)/,type:"iframe",w:425,h:350,url:"http://player.vimeo.com/video/$1?title=0&byline=0&portrait=0&color=8dc7dc"},{regex:/maps\.google\.([a-z]{2,3})\/maps\/(.+)msid=(.+)/,type:"iframe",w:425,h:350,url:'http://maps.google.com/maps/ms?msid=$2&output=embed"'}];e.on("ResolveName",function(e){var t;1==e.target.nodeType&&(t=e.target.getAttribute("data-mce-object"))&&(e.name=t)}),e.on("preInit",function(){var t=e.schema.getSpecialElements();tinymce.each("video audio iframe object".split(" "),function(e){t[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.schema.addValidElements("object[id|style|width|height|classid|codebase|*],embed[id|style|width|height|type|src|*],video[*],audio[*]");var i=e.schema.getBoolAttrs();tinymce.each("webkitallowfullscreen mozallowfullscreen allowfullscreen".split(" "),function(e){i[e]={}}),e.parser.addNodeFilter("iframe,video,audio,object,embed,script",function(t,i){for(var a,o,c,n,s,m,d,u,l=t.length;l--;)if(o=t[l],"script"!=o.name||(u=r(o.attr("src")))){for(c=new tinymce.html.Node("img",1),c.shortEnded=!0,u&&(u.width&&o.attr("width",u.width.toString()),u.height&&o.attr("height",u.height.toString())),m=o.attributes,a=m.length;a--;)n=m[a].name,s=m[a].value,"width"!==n&&"height"!==n&&"style"!==n&&(("data"==n||"src"==n)&&(s=e.convertURL(s,n)),c.attr("data-mce-p-"+n,s));d=o.firstChild&&o.firstChild.value,d&&(c.attr("data-mce-html",escape(d)),c.firstChild=null),c.attr({width:o.attr("width")||"300",height:o.attr("height")||("audio"==i?"30":"150"),style:o.attr("style"),src:tinymce.Env.transparentSrc,"data-mce-object":i,"class":"mce-object mce-object-"+i}),o.replace(c)}}),e.serializer.addAttributeFilter("data-mce-object",function(e,t){for(var i,r,a,o,c,n,s,m=e.length;m--;){for(i=e[m],s=i.attr(t),r=new tinymce.html.Node(s,1),"audio"!=s&&"script"!=s&&r.attr({width:i.attr("width"),height:i.attr("height")}),r.attr({style:i.attr("style")}),o=i.attributes,a=o.length;a--;){var d=o[a].name;0===d.indexOf("data-mce-p-")&&r.attr(d.substr(11),o[a].value)}"script"==s&&r.attr("type","text/javascript"),c=i.attr("data-mce-html"),c&&(n=new tinymce.html.Node("#text",3),n.raw=!0,n.value=unescape(c),r.append(n)),i.replace(r)}})}),e.on("ObjectSelected",function(e){var t=e.target.getAttribute("data-mce-object");("audio"==t||"script"==t)&&e.preventDefault()}),e.on("objectResized",function(e){var t,i=e.target;i.getAttribute("data-mce-object")&&(t=i.getAttribute("data-mce-html"),t&&(t=unescape(t),i.setAttribute("data-mce-html",escape(m(t,{width:e.width,height:e.height})))))}),e.addButton("media",{tooltip:"Insert/edit video",onclick:a,stateSelector:"img[data-mce-object=video]"}),e.addMenuItem("media",{icon:"media",text:"Insert video",onclick:a,context:"insert",prependToContext:!0})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/nonbreaking/plugin.min.js b/media/editors/tinymce/plugins/nonbreaking/plugin.min.js
index 4fa98b1..866339c 100644
--- a/media/editors/tinymce/plugins/nonbreaking/plugin.min.js
+++ b/media/editors/tinymce/plugins/nonbreaking/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("nonbreaking",function(e){var t=e.getParam("nonbreaking_force_tab");if(e.addCommand("mceNonBreaking",function(){e.insertContent(e.plugins.visualchars&&e.plugins.visualchars.state?'<span data-mce-bogus="1" class="mce-nbsp">&nbsp;</span>':"&nbsp;")}),e.addButton("nonbreaking",{title:"Insert nonbreaking space",cmd:"mceNonBreaking"}),e.addMenuItem("nonbreaking",{text:"Nonbreaking space",cmd:"mceNonBreaking",context:"insert"}),t){var n=+t>1?+t:3;e.on("keydown",function(t){if(9==t.keyCode){if(t.shiftKey)return;t.preventDefault();for(var r=0;n>r;r++)e.execCommand("mceNonBreaking")}})}});
\ No newline at end of file
+tinymce.PluginManager.add("nonbreaking",function(e){var t=e.getParam("nonbreaking_force_tab");if(e.addCommand("mceNonBreaking",function(){e.insertContent(e.plugins.visualchars&&e.plugins.visualchars.state?'<span data-mce-bogus="1" class="mce-nbsp">&nbsp;</span>':"&nbsp;")}),e.addButton("nonbreaking",{title:"Insert nonbreaking space",cmd:"mceNonBreaking"}),e.addMenuItem("nonbreaking",{text:"Nonbreaking space",cmd:"mceNonBreaking",context:"insert"}),t){var n=+t>1?+t:3;e.on("keydown",function(t){if(9==t.keyCode){if(t.shiftKey)return;t.preventDefault();for(var i=0;n>i;i++)e.execCommand("mceNonBreaking")}})}});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/noneditable/plugin.min.js b/media/editors/tinymce/plugins/noneditable/plugin.min.js
index 534c98f..dd15d59 100644
--- a/media/editors/tinymce/plugins/noneditable/plugin.min.js
+++ b/media/editors/tinymce/plugins/noneditable/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("noneditable",function(e){function t(){function t(e){var t;if(1===e.nodeType){if(t=e.getAttribute(l),t&&"inherit"!==t)return t;if(t=e.contentEditable,"inherit"!==t)return t}return null}function n(e){for(var n;e;){if(n=t(e))return"false"===n?e:null;e=e.parentNode}}function r(e){for(;e;){if(e.id===p)return e;e=e.parentNode}}function i(e){var t;if(e)for(t=new a(e,e),e=t.current();e;e=t.next())if(3===e.nodeType)return e}function o(n,r){var i,o;return"false"===t(n)&&f.isBlock(n)?(m.select(n),void 0):(o=f.createRng(),"true"===t(n)&&(n.firstChild||n.appendChild(e.getDoc().createTextNode(" ")),n=n.firstChild,r=!0),i=f.create("span",{id:p,"data-mce-bogus":!0},h),r?n.parentNode.insertBefore(i,n):f.insertAfter(i,n),o.setStart(i.firstChild,1),o.collapse(!0),m.setRng(o),i)}function s(e){var t,n,o,a;if(e)t=m.getRng(!0),t.setStartBefore(e),t.setEndBefore(e),n=i(e),n&&n.nodeValue.charAt(0)==h&&(n=n.deleteData(0,1)),f.remove(e,!0),m.setRng(t);else for(o=r(m.getStart());(e=f.get(p))&&e!==a;)o!==e&&(n=i(e),n&&n.nodeValue.charAt(0)==h&&(n=n.deleteData(0,1)),f.remove(e,!0)),a=e}function d(){function e(e,n){var r,i,o,s,l;if(r=c.startContainer,i=c.startOffset,3==r.nodeType){if(l=r.nodeValue.length,i>0&&l>i||(n?i==l:0===i))return}else{if(!(i<r.childNodes.length))return n?null:e;var d=!n&&i>0?i-1:i;r=r.childNodes[d],r.hasChildNodes()&&(r=r.firstChild)}for(o=new a(r,e);s=o[n?"prev":"next"]();){if(3===s.nodeType&&s.nodeValue.length>0)return;if("true"===t(s))return s}return e}var r,i,l,c,d;s(),l=m.isCollapsed(),r=n(m.getStart()),i=n(m.getEnd()),(r||i)&&(c=m.getRng(!0),l?(r=r||i,(d=e(r,!0))?o(d,!0):(d=e(r,!1))?o(d,!1):m.select(r)):(c=m.getRng(!0),r&&c.setStartBefore(r),i&&c.setEndAfter(i),m.setRng(c)))}function u(i){function o(e,t){for(;e=e[t?"previousSibling":"nextSibling"];)if(3!==e.nodeType||e.nodeValue.length>0)return e}function l(e,t){m.select(e),m.collapse(t)}function u(i){function o(e){for(var t=l;t;){if(t===e)return;t=t.parentNode}f.remove(e),d()}function a(){var r,a,s=e.schema.getNonEmptyElements();for(a=new tinymce.dom.TreeWalker(l,e.getBody());(r=i?a.prev():a.next())&&!s[r.nodeName.toLowerCase()]&&!(3===r.nodeType&&tinymce.trim(r.nodeValue).length>0);)if("false"===t(r))return o(r),!0;return n(r)?!0:!1}var s,l,c,u;if(m.isCollapsed()){if(s=m.getRng(!0),l=s.startContainer,c=s.startOffset,l=r(l)||l,u=n(l))return o(u),!1;if(3==l.nodeType&&(i?c>0:c<l.nodeValue.length))return!0;if(1==l.nodeType&&(l=l.childNodes[c]||l),a())return!1}return!0}var p,h,g,v,y=i.keyCode;if(g=m.getStart(),v=m.getEnd(),p=n(g)||n(v),p&&(112>y||y>124)&&y!=c.DELETE&&y!=c.BACKSPACE){if((tinymce.isMac?i.metaKey:i.ctrlKey)&&(67==y||88==y||86==y))return;if(i.preventDefault(),y==c.LEFT||y==c.RIGHT){var b=y==c.LEFT;if(e.dom.isBlock(p)){var x=b?p.previousSibling:p.nextSibling,C=new a(x,x),w=b?C.prev():C.next();l(w,!b)}else l(p,b)}}else if(y==c.LEFT||y==c.RIGHT||y==c.BACKSPACE||y==c.DELETE){if(h=r(g)){if(y==c.LEFT||y==c.BACKSPACE)if(p=o(h,!0),p&&"false"===t(p)){if(i.preventDefault(),y!=c.LEFT)return f.remove(p),void 0;l(p,!0)}else s(h);if(y==c.RIGHT||y==c.DELETE)if(p=o(h),p&&"false"===t(p)){if(i.preventDefault(),y!=c.RIGHT)return f.remove(p),void 0;l(p,!1)}else s(h)}if((y==c.BACKSPACE||y==c.DELETE)&&!u(y==c.BACKSPACE))return i.preventDefault(),!1}}var f=e.dom,m=e.selection,p="mce_noneditablecaret",h="";e.on("mousedown",function(n){var r=e.selection.getNode();"false"===t(r)&&r==n.target&&d()}),e.on("mouseup keyup",d),e.on("keydown",u)}function n(t){var n=o.length,r=t.content,a=tinymce.trim(i);if("raw"!=t.format){for(;n--;)r=r.replace(o[n],function(t){var n=arguments,i=n[n.length-2];return i>0&&'"'==r.charAt(i-1)?t:'<span class="'+a+'" data-mce-content="'+e.dom.encode(n[0])+'">'+e.dom.encode("string"==typeof n[1]?n[1]:n[0])+"</span>"});t.content=r}}var r,i,o,a=tinymce.dom.TreeWalker,s="contenteditable",l="data-mce-"+s,c=tinymce.util.VK;r=" "+tinymce.trim(e.getParam("noneditable_editable_class","mceEditable"))+" ",i=" "+tinymce.trim(e.getParam("noneditable_noneditable_class","mceNonEditable"))+" ",o=e.getParam("noneditable_regexp"),o&&!o.length&&(o=[o]),e.on("PreInit",function(){t(),o&&e.on("BeforeSetContent",n),e.parser.addAttributeFilter("class",function(e){for(var t,n,o=e.length;o--;)n=e[o],t=" "+n.attr("class")+" ",-1!==t.indexOf(r)?n.attr(l,"true"):-1!==t.indexOf(i)&&n.attr(l,"false")}),e.serializer.addAttributeFilter(l,function(e){for(var t,n=e.length;n--;)t=e[n],o&&t.attr("data-mce-content")?(t.name="#text",t.type=3,t.raw=!0,t.value=t.attr("data-mce-content")):(t.attr(s,null),t.attr(l,null))}),e.parser.addAttributeFilter(s,function(e){for(var t,n=e.length;n--;)t=e[n],t.attr(l,t.attr(s)),t.attr(s,null)})})});
\ No newline at end of file
+tinymce.PluginManager.add("noneditable",function(e){function t(){function t(e){var t;if(1===e.nodeType){if(t=e.getAttribute(s),t&&"inherit"!==t)return t;if(t=e.contentEditable,"inherit"!==t)return t}return null}function n(e){for(var n;e;){if(n=t(e))return"false"===n?e:null;e=e.parentNode}}function i(e){for(;e;){if(e.id===g)return e;e=e.parentNode}}function o(e){var t;if(e)for(t=new r(e,e),e=t.current();e;e=t.next())if(3===e.nodeType)return e}function a(n,i){var o,a;return"false"===t(n)&&m.isBlock(n)?(f.select(n),void 0):(a=m.createRng(),"true"===t(n)&&(n.firstChild||n.appendChild(e.getDoc().createTextNode(" ")),n=n.firstChild,i=!0),o=m.create("span",{id:g,"data-mce-bogus":!0},p),i?n.parentNode.insertBefore(o,n):m.insertAfter(o,n),a.setStart(o.firstChild,1),a.collapse(!0),f.setRng(a),o)}function l(e){var t,n,a,r;if(e)t=f.getRng(!0),t.setStartBefore(e),t.setEndBefore(e),n=o(e),n&&n.nodeValue.charAt(0)==p&&(n=n.deleteData(0,1)),m.remove(e,!0),f.setRng(t);else for(a=i(f.getStart());(e=m.get(g))&&e!==r;)a!==e&&(n=o(e),n&&n.nodeValue.charAt(0)==p&&(n=n.deleteData(0,1)),m.remove(e,!0)),r=e}function d(){function e(e,n){var i,o,a,l,s;if(i=c.startContainer,o=c.startOffset,3==i.nodeType){if(s=i.nodeValue.length,o>0&&s>o||(n?o==s:0===o))return}else{if(!(o<i.childNodes.length))return n?null:e;var d=!n&&o>0?o-1:o;i=i.childNodes[d],i.hasChildNodes()&&(i=i.firstChild)}for(a=new r(i,e);l=a[n?"prev":"next"]();){if(3===l.nodeType&&l.nodeValue.length>0)return;if("true"===t(l))return l}return e}var i,o,s,c,d;l(),s=f.isCollapsed(),i=n(f.getStart()),o=n(f.getEnd()),(i||o)&&(c=f.getRng(!0),s?(i=i||o,(d=e(i,!0))?a(d,!0):(d=e(i,!1))?a(d,!1):f.select(i)):(c=f.getRng(!0),i&&c.setStartBefore(i),o&&c.setEndAfter(o),f.setRng(c)))}function u(o){function a(e,t){for(;e=e[t?"previousSibling":"nextSibling"];)if(3!==e.nodeType||e.nodeValue.length>0)return e}function s(e,t){f.select(e),f.collapse(t)}function u(o){function a(e){for(var t=s;t;){if(t===e)return;t=t.parentNode}m.remove(e),d()}function r(){var i,r,l=e.schema.getNonEmptyElements();for(r=new tinymce.dom.TreeWalker(s,e.getBody());(i=o?r.prev():r.next())&&!l[i.nodeName.toLowerCase()]&&!(3===i.nodeType&&tinymce.trim(i.nodeValue).length>0);)if("false"===t(i))return a(i),!0;return n(i)?!0:!1}var l,s,c,u;if(f.isCollapsed()){if(l=f.getRng(!0),s=l.startContainer,c=l.startOffset,s=i(s)||s,u=n(s))return a(u),!1;if(3==s.nodeType&&(o?c>0:c<s.nodeValue.length))return!0;if(1==s.nodeType&&(s=s.childNodes[c]||s),r())return!1}return!0}var g,p,h,y,v=o.keyCode;if(h=f.getStart(),y=f.getEnd(),g=n(h)||n(y),g&&(112>v||v>124)&&v!=c.DELETE&&v!=c.BACKSPACE){if((tinymce.isMac?o.metaKey:o.ctrlKey)&&(67==v||88==v||86==v))return;if(o.preventDefault(),v==c.LEFT||v==c.RIGHT){var b=v==c.LEFT;if(e.dom.isBlock(g)){var x=b?g.previousSibling:g.nextSibling,w=new r(x,x),C=b?w.prev():w.next();s(C,!b)}else s(g,b)}}else if(v==c.LEFT||v==c.RIGHT||v==c.BACKSPACE||v==c.DELETE){if(p=i(h)){if(v==c.LEFT||v==c.BACKSPACE)if(g=a(p,!0),g&&"false"===t(g)){if(o.preventDefault(),v!=c.LEFT)return m.remove(g),void 0;s(g,!0)}else l(p);if(v==c.RIGHT||v==c.DELETE)if(g=a(p),g&&"false"===t(g)){if(o.preventDefault(),v!=c.RIGHT)return m.remove(g),void 0;s(g,!1)}else l(p)}if((v==c.BACKSPACE||v==c.DELETE)&&!u(v==c.BACKSPACE))return o.preventDefault(),!1}}var m=e.dom,f=e.selection,g="mce_noneditablecaret",p="";e.on("mousedown",function(n){var i=e.selection.getNode();"false"===t(i)&&i==n.target&&d()}),e.on("mouseup keyup",d),e.on("keydown",u)}function n(t){var n=a.length,i=t.content,r=tinymce.trim(o);if("raw"!=t.format){for(;n--;)i=i.replace(a[n],function(t){var n=arguments,o=n[n.length-2];return o>0&&'"'==i.charAt(o-1)?t:'<span class="'+r+'" data-mce-content="'+e.dom.encode(n[0])+'">'+e.dom.encode("string"==typeof n[1]?n[1]:n[0])+"</span>"});t.content=i}}var i,o,a,r=tinymce.dom.TreeWalker,l="contenteditable",s="data-mce-"+l,c=tinymce.util.VK;i=" "+tinymce.trim(e.getParam("noneditable_editable_class","mceEditable"))+" ",o=" "+tinymce.trim(e.getParam("noneditable_noneditable_class","mceNonEditable"))+" ",a=e.getParam("noneditable_regexp"),a&&!a.length&&(a=[a]),e.on("PreInit",function(){t(),a&&e.on("BeforeSetContent",n),e.parser.addAttributeFilter("class",function(e){for(var t,n,a=e.length;a--;)n=e[a],t=" "+n.attr("class")+" ",-1!==t.indexOf(i)?n.attr(s,"true"):-1!==t.indexOf(o)&&n.attr(s,"false")}),e.serializer.addAttributeFilter(s,function(e){for(var t,n=e.length;n--;)t=e[n],a&&t.attr("data-mce-content")?(t.name="#text",t.type=3,t.raw=!0,t.value=t.attr("data-mce-content")):(t.attr(l,null),t.attr(s,null))}),e.parser.addAttributeFilter(l,function(e){for(var t,n=e.length;n--;)t=e[n],t.attr(s,t.attr(l)),t.attr(l,null)})})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/pagebreak/plugin.min.js b/media/editors/tinymce/plugins/pagebreak/plugin.min.js
index 6c9ec4e..e224cb4 100644
--- a/media/editors/tinymce/plugins/pagebreak/plugin.min.js
+++ b/media/editors/tinymce/plugins/pagebreak/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("pagebreak",function(e){var t,n="mce-pagebreak",r=e.getParam("pagebreak_separator","<!-- pagebreak -->"),i='<img src="'+tinymce.Env.transparentSrc+'" class="'+n+'" data-mce-resize="false" />';t=new RegExp(r.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(e){return"\\"+e}),"gi"),e.addCommand("mcePageBreak",function(){e.execCommand("mceInsertContent",0,i)}),e.addButton("pagebreak",{title:"Page break",cmd:"mcePageBreak"}),e.addMenuItem("pagebreak",{text:"Page break",icon:"pagebreak",cmd:"mcePageBreak",context:"insert"}),e.on("ResolveName",function(t){"IMG"==t.target.nodeName&&e.dom.hasClass(t.target,n)&&(t.name="pagebreak")}),e.on("click",function(t){t=t.target,"IMG"===t.nodeName&&e.dom.hasClass(t,n)&&e.selection.select(t)}),e.on("BeforeSetContent",function(e){e.content=e.content.replace(t,i)}),e.on("PreInit",function(){e.serializer.addNodeFilter("img",function(e){for(var t,n,i=e.length;i--;)t=e[i],n=t.attr("class"),n&&-1!==n.indexOf("mce-pagebreak")&&(t.type=3,t.value=r,t.raw=!0)})})});
\ No newline at end of file
+tinymce.PluginManager.add("pagebreak",function(e){var a="mce-pagebreak",t=e.getParam("pagebreak_separator","<!-- pagebreak -->"),n=new RegExp(t.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(e){return"\\"+e}),"gi"),r='<img src="'+tinymce.Env.transparentSrc+'" class="'+a+'" data-mce-resize="false" />';e.addCommand("mcePageBreak",function(){e.settings.pagebreak_split_block?e.insertContent("<p>"+r+"</p>"):e.insertContent(r)}),e.addButton("pagebreak",{title:"Page break",cmd:"mcePageBreak"}),e.addMenuItem("pagebreak",{text:"Page break",icon:"pagebreak",cmd:"mcePageBreak",context:"insert"}),e.on("ResolveName",function(t){"IMG"==t.target.nodeName&&e.dom.hasClass(t.target,a)&&(t.name="pagebreak")}),e.on("click",function(t){t=t.target,"IMG"===t.nodeName&&e.dom.hasClass(t,a)&&e.selection.select(t)}),e.on("BeforeSetContent",function(e){e.content=e.content.replace(n,r)}),e.on("PreInit",function(){e.serializer.addNodeFilter("img",function(a){for(var n,r,c=a.length;c--;)if(n=a[c],r=n.attr("class"),r&&-1!==r.indexOf("mce-pagebreak")){var o=n.parent;if(e.schema.getBlockElements()[o.name]&&e.settings.pagebreak_split_block){o.type=3,o.value=t,o.raw=!0,n.remove();continue}n.type=3,n.value=t,n.raw=!0}})})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/paste/plugin.min.js b/media/editors/tinymce/plugins/paste/plugin.min.js
index abc2798..95c0129 100644
--- a/media/editors/tinymce/plugins/paste/plugin.min.js
+++ b/media/editors/tinymce/plugins/paste/plugin.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/pasteplugin/Utils",c="tinymce/util/Tools",d="tinymce/html/DomParser",u="tinymce/html/Schema",f="tinymce/pasteplugin/Clipboard",p="tinymce/Env",m="tinymce/util/VK",h="tinymce/pasteplugin/WordFilter",g="tinymce/html/Serializer",v="tinymce/html/Node",y="tinymce/pasteplugin/Quirks",b="tinymce/pasteplugin/Plugin",C="tinymce/PluginManager";r(l,[c,d,u],function(e,t,n){function r(t,n){return e.each(n,function(e){t=e.constructor==RegExp?t.replace(e,""):t.replace(e[0],e[1])}),t}function i(r){function i(e){var t=e.name,n=e;if("br"===t)return s+="\n",void 0;if(l[t]&&(s+=" "),c[t])return s+=" ",void 0;if(3==e.type&&(s+=e.value),!e.shortEnded&&(e=e.firstChild))do i(e);while(e=e.next);d[t]&&n.next&&(s+="\n","p"==t&&(s+="\n"))}var o=new n,a=new t({},o),s="",l=o.getShortEndedElements(),c=e.makeMap("script noscript style textarea video audio iframe object"," "),d=o.getBlockElements();return i(a.parse(r)),s}return{filter:r,innerText:i}}),r(f,[p,m,l],function(e,t,n){return function(r){function i(e){var t,n=r.dom;if(r.settings.paste_data_images||(e=e.replace(/<img[^>]+src=\"data:image[^>]+>/g,"")),t=r.fire("BeforePastePreProcess",{content:e}),t=r.fire("PastePreProcess",t),e=t.content,!t.isDefaultPrevented()){if(r.hasEventListeners("PastePostProcess")&&!t.isDefaultPrevented()){var i=n.add(r.getBody(),"div",{style:"display:none"},e);t=r.fire("PastePostProcess",{node:i}),n.remove(i),e=t.node.innerHTML}t.isDefaultPrevented()||r.insertContent(e)}}function o(e){e=r.dom.encode(e).replace(/\r\n/g,"\n");var t=r.dom.getParent(r.selection.getStart(),r.dom.isBlock),o=r.settings.forced_root_block,a;o&&(a=r.dom.createHTML(o,r.settings.forced_root_block_attrs),a=a.substr(0,a.length-3)+">"),t&&/^(PRE|DIV)$/.test(t.nodeName)||!o?e=n.filter(e,[[/\n/g,"<br>"]]):(e=n.filter(e,[[/\n\n/g,"</p>"+a],[/^(.*<\/p>)(<p>)$/,a+"$1"],[/\n/g,"<br />"]]),-1!=e.indexOf("<p>")&&(e=a+e)),i(e)}function a(){var e=r.dom,t=r.getBody(),n=r.dom.getViewPort(r.getWin()),i=r.inline?t.scrollTop:n.y,o=r.inline?t.clientHeight:n.h;s(),u=e.add(r.getBody(),"div",{id:"mcepastebin",contentEditable:!0,"data-mce-bogus":"1",style:"position: absolute; top: "+(i+20)+"px;"+"width: 10px; height: "+(o-40)+"px; overflow: hidden; opacity: 0"},m),e.setStyle(u,"left","rtl"==e.getStyle(t,"direction",!0)?65535:-65535),e.bind(u,"beforedeactivate focusin focusout",function(e){e.stopPropagation()}),f=r.selection.getRng(),u.focus(),r.selection.select(u,!0)}function s(){u&&(r.dom.unbind(u),r.dom.remove(u),f&&r.selection.setRng(f)),h=!1,u=f=null}function l(){return u?u.innerHTML:m}function c(e){var t={},n=e.clipboardData||r.getDoc().dataTransfer;if(n&&n.types){t["text/plain"]=n.getData("Text");for(var i=0;i<n.types.length;i++){var o=n.types[i];t[o]=n.getData(o)}}return t}var d=this,u,f,p=0,m="%MCEPASTEBIN%",h;r.on("keydown",function(n){if(!n.isDefaultPrevented()&&(t.metaKeyPressed(n)&&86==n.keyCode||n.shiftKey&&45==n.keyCode)){if(h=n.shiftKey&&86==n.keyCode,n.stopImmediatePropagation(),p=(new Date).getTime(),e.ie&&h)return n.preventDefault(),r.fire("paste",{ieFake:!0}),void 0;a()}}),r.on("paste",function(t){var f=c(t),g=(new Date).getTime()-p<100,v="text"==d.pasteFormat||h;g||t.preventDefault(),!e.ie||g&&!t.ieFake||(a(),r.dom.bind(u,"paste",function(e){e.stopPropagation()}),r.getDoc().execCommand("Paste",!1,null),f["text/html"]=l(),s()),setTimeout(function(){var e=l();return u&&u.firstChild&&"mcepastebin"===u.firstChild.id&&(v=!0),s(),e!=m&&g||(e=f["text/html"]||f["text/plain"]||m,e!=m)?(v?o(f["text/plain"]||n.innerText(e)):i(e),void 0):(g||r.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."),void 0)},0)}),d.pasteHtml=i,d.pasteText=o}}),r(h,[c,d,u,g,v,l],function(e,t,n,r,i,o){function a(e){return/class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(e)}function s(s){var l=s.settings;s.on("BeforePastePreProcess",function(c){function d(e){function t(e,t,a,s){var l=e._listLevel||o;l!=o&&(o>l?n&&(n=n.parent.parent):(r=n,n=null)),n&&n.name==a?n.append(e):(r=r||n,n=new i(a,1),s>1&&n.attr("start",""+s),e.wrap(n)),e.name="li",t.value="";var c=t.next;c&&3==c.type&&(c.value=c.value.replace(/^\u00a0+/,"")),l>o&&r&&r.lastChild.append(n),o=l}for(var n,r,o=1,a=e.getAll("p"),s=0;s<a.length;s++)if(e=a[s],"p"==e.name&&e.firstChild){for(var l="",c=e.firstChild;c&&!(l=c.value);)c=c.firstChild;if(/^\s*[\u2022\u00b7\u00a7\u00d8\u25CF]\s*$/.test(l)){t(e,c,"ul");continue}if(/^\s*\w+\.$/.test(l)){var d=/([0-9])\./.exec(l),u=1;d&&(u=parseInt(d[1],10)),t(e,c,"ol",u);continue}n=null}}function u(t,n){if("p"===t.name){var r=/mso-list:\w+ \w+([0-9]+)/.exec(n);r&&(t._listLevel=parseInt(r[1],10))}if(s.getParam("paste_retain_style_properties","none")){var i="";if(e.each(s.dom.parseStyle(n),function(e,t){switch(t){case"horiz-align":return t="text-align",void 0;case"vert-align":return t="vertical-align",void 0;case"font-color":case"mso-foreground":return t="color",void 0;case"mso-background":case"mso-highlight":t="background"}("all"==p||m&&m[t])&&(i+=t+":"+e+";")}),i)return i}return null}var f=c.content,p,m;if(p=l.paste_retain_style_properties,p&&(m=e.makeMap(p)),l.paste_enable_default_filters!==!1&&a(c.content)){c.wordContent=!0,f=o.filter(f,[/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(e,t){return t.length>0?t.replace(/./," ").slice(Math.floor(t.length/2)).split("").join("\xa0"):""}]]);var h=l.paste_word_valid_elements;h||(h="@[style],-strong/b,-em/i,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-table,-tr,-td[colspan|rowspan],-th,-thead,-tfoot,-tbody,-a[!href],sub,sup,strike,br");var g=new n({valid_elements:h}),v=new t({},g);v.addAttributeFilter("style",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("style",u(n,n.attr("style"))),"span"!=n.name||n.attributes.length||n.unwrap()});var y=v.parse(f);d(y),c.content=new r({},g).serialize(y)}})}return s.isWordContent=a,s}),r(y,[p,c,h,l],function(e,t,n,r){return function(i){function o(e){i.on("BeforePastePreProcess",function(t){t.content=e(t.content)})}function a(e){return e=r.filter(e,[/^[\s\S]*<!--StartFragment-->|<!--EndFragment-->[\s\S]*$/g,[/<span class="Apple-converted-space">\u00a0<\/span>/g,"\xa0"],/<br>$/])}function s(e){if(!n.isWordContent(e))return e;var o=[];t.each(i.schema.getBlockElements(),function(e,t){o.push(t)});var a=new RegExp("(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?("+o.join("|")+")[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*","g");return e=r.filter(e,[[a,"$1"]]),e=r.filter(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}function l(e){return(i.settings.paste_remove_styles||i.settings.paste_remove_styles_if_webkit!==!1)&&(e=e.replace(/ style=\"[^\"]+\"/g,"")),e}e.webkit&&(o(l),o(a)),e.ie&&o(s)}}),r(b,[C,f,h,y],function(e,t,n,r){var i;e.add("paste",function(e){function o(){"text"==s.pasteFormat?(this.active(!1),s.pasteFormat="html"):(s.pasteFormat="text",this.active(!0),i||(e.windowManager.alert("Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off."),i=!0))}var a=this,s,l=e.settings;a.clipboard=s=new t(e),a.quirks=new r(e),a.wordFilter=new n(e),e.settings.paste_as_text&&(a.clipboard.pasteFormat="text"),l.paste_preprocess&&e.on("PastePreProcess",function(e){l.paste_preprocess.call(a,a,e)}),l.paste_postprocess&&e.on("PastePostProcess",function(e){l.paste_postprocess.call(a,a,e)}),e.addCommand("mceInsertClipboardContent",function(e,t){t.content&&a.clipboard.pasteHtml(t.content),t.text&&a.clipboard.pasteText(t.text)}),e.paste_block_drop&&e.on("dragend dragover draggesture dragdrop drop drag",function(e){e.preventDefault(),e.stopPropagation()}),e.settings.paste_data_images||e.on("drop",function(e){var t=e.dataTransfer;t&&t.files&&t.files.length>0&&e.preventDefault()}),e.addButton("pastetext",{icon:"pastetext",tooltip:"Paste as text",onclick:o,active:"text"==a.clipboard.pasteFormat}),e.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:s.pasteFormat,onclick:o})})}),a([l,f,h,y,b])}(this);
\ No newline at end of file
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/pasteplugin/Utils",c="tinymce/util/Tools",d="tinymce/html/DomParser",u="tinymce/html/Schema",f="tinymce/pasteplugin/Clipboard",p="tinymce/Env",m="tinymce/util/VK",h="tinymce/pasteplugin/WordFilter",g="tinymce/html/Serializer",v="tinymce/html/Node",y="tinymce/pasteplugin/Quirks",b="tinymce/pasteplugin/Plugin",C="tinymce/PluginManager";r(l,[c,d,u],function(e,t,n){function r(t,n){return e.each(n,function(e){t=e.constructor==RegExp?t.replace(e,""):t.replace(e[0],e[1])}),t}function i(r){function i(e){var t=e.name,n=e;if("br"===t)return s+="\n",void 0;if(l[t]&&(s+=" "),c[t])return s+=" ",void 0;if(3==e.type&&(s+=e.value),!e.shortEnded&&(e=e.firstChild))do i(e);while(e=e.next);d[t]&&n.next&&(s+="\n","p"==t&&(s+="\n"))}var o=new n,a=new t({},o),s="",l=o.getShortEndedElements(),c=e.makeMap("script noscript style textarea video audio iframe object"," "),d=o.getBlockElements();return i(a.parse(r)),s}return{filter:r,innerText:i}}),r(f,[p,m,l],function(e,t,n){return function(r){function i(e){var t,n=r.dom;if(t=r.fire("BeforePastePreProcess",{content:e}),t=r.fire("PastePreProcess",t),e=t.content,!t.isDefaultPrevented()){if(r.hasEventListeners("PastePostProcess")&&!t.isDefaultPrevented()){var i=n.add(r.getBody(),"div",{style:"display:none"},e);t=r.fire("PastePostProcess",{node:i}),n.remove(i),e=t.node.innerHTML}t.isDefaultPrevented()||r.insertContent(e)}}function o(e){e=r.dom.encode(e).replace(/\r\n/g,"\n");var t=r.dom.getParent(r.selection.getStart(),r.dom.isBlock),o=r.settings.forced_root_block,a;o&&(a=r.dom.createHTML(o,r.settings.forced_root_block_attrs),a=a.substr(0,a.length-3)+">"),t&&/^(PRE|DIV)$/.test(t.nodeName)||!o?e=n.filter(e,[[/\n/g,"<br>"]]):(e=n.filter(e,[[/\n\n/g,"</p>"+a],[/^(.*<\/p>)(<p>)$/,a+"$1"],[/\n/g,"<br />"]]),-1!=e.indexOf("<p>")&&(e=a+e)),i(e)}function a(){var e=r.dom,t=r.getBody(),n=r.dom.getViewPort(r.getWin()),i=r.inline?t.clientHeight:n.h;s(),p=e.add(r.getBody(),"div",{id:"mcepastebin",contentEditable:!0,"data-mce-bogus":"1",style:"position: fixed; top: 20px;width: 10px; height: "+(i-40)+"px; overflow: hidden; opacity: 0"},g),e.setStyle(p,"left","rtl"==e.getStyle(t,"direction",!0)?65535:-65535),e.bind(p,"beforedeactivate focusin focusout",function(e){e.stopPropagation()}),m=r.selection.getRng(),p.focus(),r.selection.select(p,!0)}function s(){p&&(r.dom.unbind(p),r.dom.remove(p),m&&r.selection.setRng(m)),v=!1,p=m=null}function l(){return p?p.innerHTML:g}function c(e){var t={};if(e&&e.types){t["text/plain"]=e.getData("Text");for(var n=0;n<e.types.length;n++){var r=e.types[n];t[r]=e.getData(r)}}return t}function d(e){return c(e.clipboardData||r.getDoc().dataTransfer)}function u(e){var t=r.getDoc(),n;if(t.caretPositionFromPoint){var i=t.caretPositionFromPoint(e.pageX,e.pageY);n=t.createRange(),n.setStart(i.offsetNode,i.offset),n.collapse(!0)}else t.caretRangeFromPoint&&(n=t.caretRangeFromPoint(e.pageX,e.pageY));return n}var f=this,p,m,h=0,g="%MCEPASTEBIN%",v;r.on("keydown",function(n){if(!n.isDefaultPrevented()&&(t.metaKeyPressed(n)&&86==n.keyCode||n.shiftKey&&45==n.keyCode)){if(v=n.shiftKey&&86==n.keyCode,n.stopImmediatePropagation(),h=(new Date).getTime(),e.ie&&v)return n.preventDefault(),r.fire("paste",{ieFake:!0}),void 0;a()}}),r.on("paste",function(t){var c=d(t),u=(new Date).getTime()-h<1e3,m="text"==f.pasteFormat||v;u||t.preventDefault(),!e.ie||u&&!t.ieFake||(a(),r.dom.bind(p,"paste",function(e){e.stopPropagation()}),r.getDoc().execCommand("Paste",!1,null),c["text/html"]=l()),setTimeout(function(){var e=l();return p&&p.firstChild&&"mcepastebin"===p.firstChild.id&&(m=!0),s(),e!=g&&u||(e=c["text/html"]||c["text/plain"]||g,e!=g)?(m?o(c["text/plain"]||n.innerText(e)):i(e),void 0):(u||r.windowManager.alert("Please use Ctrl+V/Cmd+V keyboard shortcuts to paste contents."),void 0)},0)}),r.on("dragstart",function(e){e.dataTransfer.types&&e.dataTransfer.setData("mce-internal",r.selection.getContent())}),r.on("drop",function(e){var t=u(e);if(t){var n=c(e.dataTransfer),a=n["mce-internal"]||n["text/html"]||n["text/plain"];a&&(e.preventDefault(),r.undoManager.transact(function(){n["mce-internal"]&&r.execCommand("Delete"),r.selection.setRng(t),n["text/html"]?i(a):o(a)}))}}),f.pasteHtml=i,f.pasteText=o,r.on("preInit",function(){r.parser.addNodeFilter("img",function(t){if(!r.settings.paste_data_images)for(var n=t.length;n--;){var i=t[n].attributes.map.src;i&&0===i.indexOf("data:image")&&(t[n].attr("data-mce-object")||i===e.transparentSrc||t[n].remove())}})}),r.on("PreProcess",function(){r.dom.remove(r.dom.get("mcepastebin"))})}}),r(h,[c,d,u,g,v,l],function(e,t,n,r,i,o){function a(e){return/<font face="Times New Roman"|class="?Mso|style="[^"]*\bmso-|style='[^'']*\bmso-|w:WordDocument/i.test(e)}function s(s){var l=s.settings;s.on("BeforePastePreProcess",function(c){function d(e){function t(e,t,a,s){var l=e._listLevel||o;l!=o&&(o>l?n&&(n=n.parent.parent):(r=n,n=null)),n&&n.name==a?n.append(e):(r=r||n,n=new i(a,1),s>1&&n.attr("start",""+s),e.wrap(n)),e.name="li",t.value="";var c=t.next;c&&3==c.type&&(c.value=c.value.replace(/^\u00a0+/,"")),l>o&&r&&r.lastChild.append(n),o=l}for(var n,r,o=1,a=e.getAll("p"),s=0;s<a.length;s++)if(e=a[s],"p"==e.name&&e.firstChild){for(var l="",c=e.firstChild;c&&!(l=c.value);)c=c.firstChild;if(/^\s*[\u2022\u00b7\u00a7\u00d8\u25CF]\s*$/.test(l)){t(e,c,"ul");continue}if(/^\s*\w+\.$/.test(l)){var d=/([0-9])\./.exec(l),u=1;d&&(u=parseInt(d[1],10)),t(e,c,"ol",u);continue}n=null}}function u(t,n){if("p"===t.name){var r=/mso-list:\w+ \w+([0-9]+)/.exec(n);r&&(t._listLevel=parseInt(r[1],10))}if(s.getParam("paste_retain_style_properties","none")){var i="";if(e.each(s.dom.parseStyle(n),function(e,t){switch(t){case"horiz-align":return t="text-align",void 0;case"vert-align":return t="vertical-align",void 0;case"font-color":case"mso-foreground":return t="color",void 0;case"mso-background":case"mso-highlight":t="background"}("all"==p||m&&m[t])&&(i+=t+":"+e+";")}),i)return i}return null}var f=c.content,p,m;if(p=l.paste_retain_style_properties,p&&(m=e.makeMap(p)),l.paste_enable_default_filters!==!1&&a(c.content)){c.wordContent=!0,f=o.filter(f,[/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\xa0"],[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(e,t){return t.length>0?t.replace(/./," ").slice(Math.floor(t.length/2)).split("").join("\xa0"):""}]]);var h=l.paste_word_valid_elements;h||(h="@[style],-strong/b,-em/i,-span,-p,-ol,-ul,-li,-h1,-h2,-h3,-h4,-h5,-h6,-table,-tr,-td[colspan|rowspan],-th,-thead,-tfoot,-tbody,-a[href|name],sub,sup,strike,br");var g=new n({valid_elements:h}),v=new t({},g);v.addAttributeFilter("style",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("style",u(n,n.attr("style"))),"span"!=n.name||n.attributes.length||n.unwrap()}),v.addNodeFilter("a",function(e){for(var t=e.length,n,r,i;t--;)n=e[t],r=n.attr("href"),i=n.attr("name"),r&&0===r.indexOf("file://")&&(r=r.split("#")[1],r&&(r="#"+r)),r||i?n.attr({href:r,name:i}):n.unwrap()});var y=v.parse(f);d(y),c.content=new r({},g).serialize(y)}})}return s.isWordContent=a,s}),r(y,[p,c,h,l],function(e,t,n,r){return function(i){function o(e){i.on("BeforePastePreProcess",function(t){t.content=e(t.content)})}function a(e){return e=r.filter(e,[/^[\s\S]*<!--StartFragment-->|<!--EndFragment-->[\s\S]*$/g,[/<span class="Apple-converted-space">\u00a0<\/span>/g,"\xa0"],/<br>$/])}function s(e){if(!n.isWordContent(e))return e;var o=[];t.each(i.schema.getBlockElements(),function(e,t){o.push(t)});var a=new RegExp("(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*(<\\/?("+o.join("|")+")[^>]*>)(?:<br>&nbsp;[\\s\\r\\n]+|<br>)*","g");return e=r.filter(e,[[a,"$1"]]),e=r.filter(e,[[/<br><br>/g,"<BR><BR>"],[/<br>/g," "],[/<BR><BR>/g,"<br>"]])}function l(e){return(i.settings.paste_remove_styles||i.settings.paste_remove_styles_if_webkit!==!1)&&(e=e.replace(/ style=\"[^\"]+\"/g,"")),e}e.webkit&&(o(l),o(a)),e.ie&&o(s)}}),r(b,[C,f,h,y],function(e,t,n,r){var i;e.add("paste",function(e){function o(){"text"==s.pasteFormat?(this.active(!1),s.pasteFormat="html"):(s.pasteFormat="text",this.active(!0),i||(e.windowManager.alert("Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off."),i=!0))}var a=this,s,l=e.settings;a.clipboard=s=new t(e),a.quirks=new r(e),a.wordFilter=new n(e),e.settings.paste_as_text&&(a.clipboard.pasteFormat="text"),l.paste_preprocess&&e.on("PastePreProcess",function(e){l.paste_preprocess.call(a,a,e)}),l.paste_postprocess&&e.on("PastePostProcess",function(e){l.paste_postprocess.call(a,a,e)}),e.addCommand("mceInsertClipboardContent",function(e,t){t.content&&a.clipboard.pasteHtml(t.content),t.text&&a.clipboard.pasteText(t.text)}),e.paste_block_drop&&e.on("dragend dragover draggesture dragdrop drop drag",function(e){e.preventDefault(),e.stopPropagation()}),e.settings.paste_data_images||e.on("drop",function(e){var t=e.dataTransfer;t&&t.files&&t.files.length>0&&e.preventDefault()}),e.addButton("pastetext",{icon:"pastetext",tooltip:"Paste as text",onclick:o,active:"text"==a.clipboard.pasteFormat}),e.addMenuItem("pastetext",{text:"Paste as text",selectable:!0,active:s.pasteFormat,onclick:o})})}),a([l,f,h,y,b])}(this);
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/preview/plugin.min.js b/media/editors/tinymce/plugins/preview/plugin.min.js
index 3f1b275..8a24058 100644
--- a/media/editors/tinymce/plugins/preview/plugin.min.js
+++ b/media/editors/tinymce/plugins/preview/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("preview",function(e){var t=e.settings;e.addCommand("mcePreview",function(){e.windowManager.open({title:"Preview",width:parseInt(e.getParam("plugin_preview_width","650"),10),height:parseInt(e.getParam("plugin_preview_height","500"),10),html:'<iframe src="javascript:\'\'" frameborder="0"></iframe>',buttons:{text:"Close",onclick:function(){this.parent().parent().close()}},onPostRender:function(){var n,r=this.getEl("body").firstChild.contentWindow.document,i="";tinymce.each(e.contentCSS,function(t){i+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(t)+'">'});var o=t.body_id||"tinymce";-1!=o.indexOf("=")&&(o=e.getParam("body_id","","hash"),o=o[e.id]||o);var a=t.body_class||"";-1!=a.indexOf("=")&&(a=e.getParam("body_class","","hash"),a=a[e.id]||""),n="<!DOCTYPE html><html><head>"+i+"</head>"+'<body id="'+o+'" class="mce-content-body '+a+'">'+e.getContent()+"</body>"+"</html>",r.open(),r.write(n),r.close()}})}),e.addButton("preview",{title:"Preview",cmd:"mcePreview"}),e.addMenuItem("preview",{text:"Preview",cmd:"mcePreview",context:"view"})});
\ No newline at end of file
+tinymce.PluginManager.add("preview",function(e){var t=e.settings;e.addCommand("mcePreview",function(){e.windowManager.open({title:"Preview",width:parseInt(e.getParam("plugin_preview_width","650"),10),height:parseInt(e.getParam("plugin_preview_height","500"),10),html:'<iframe src="javascript:\'\'" frameborder="0"></iframe>',buttons:{text:"Close",onclick:function(){this.parent().parent().close()}},onPostRender:function(){var i,n=this.getEl("body").firstChild.contentWindow.document,a="";tinymce.each(e.contentCSS,function(t){a+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(t)+'">'});var d=t.body_id||"tinymce";-1!=d.indexOf("=")&&(d=e.getParam("body_id","","hash"),d=d[e.id]||d);var r=t.body_class||"";-1!=r.indexOf("=")&&(r=e.getParam("body_class","","hash"),r=r[e.id]||""),i="<!DOCTYPE html><html><head>"+a+"</head>"+'<body id="'+d+'" class="mce-content-body '+r+'">'+e.getContent()+"</body>"+"</html>",n.open(),n.write(i),n.close()}})}),e.addButton("preview",{title:"Preview",cmd:"mcePreview"}),e.addMenuItem("preview",{text:"Preview",cmd:"mcePreview",context:"view"})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/print/plugin.min.js b/media/editors/tinymce/plugins/print/plugin.min.js
index dc4f02a..abc37b5 100644
--- a/media/editors/tinymce/plugins/print/plugin.min.js
+++ b/media/editors/tinymce/plugins/print/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("print",function(e){e.addCommand("mcePrint",function(){e.getWin().print()}),e.addButton("print",{title:"Print",cmd:"mcePrint"}),e.addShortcut("Ctrl+P","","mcePrint"),e.addMenuItem("print",{text:"Print",cmd:"mcePrint",icon:"print",shortcut:"Ctrl+P",context:"file"})});
\ No newline at end of file
+tinymce.PluginManager.add("print",function(t){t.addCommand("mcePrint",function(){t.getWin().print()}),t.addButton("print",{title:"Print",cmd:"mcePrint"}),t.addShortcut("Ctrl+P","","mcePrint"),t.addMenuItem("print",{text:"Print",cmd:"mcePrint",icon:"print",shortcut:"Ctrl+P",context:"file"})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/save/plugin.min.js b/media/editors/tinymce/plugins/save/plugin.min.js
index dbc1360..bd50cec 100644
--- a/media/editors/tinymce/plugins/save/plugin.min.js
+++ b/media/editors/tinymce/plugins/save/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("save",function(e){function a(){var a,n;return a=tinymce.DOM.getParent(e.id,"form"),!e.getParam("save_enablewhendirty",!0)||e.isDirty()?(tinymce.triggerSave(),(n=e.getParam("save_onsavecallback"))?(e.execCallback("save_onsavecallback",e)&&(e.startContent=tinymce.trim(e.getContent({format:"raw"})),e.nodeChanged()),void 0):(a?(e.isNotDirty=!0,(!a.onsubmit||a.onsubmit())&&("function"==typeof a.submit?a.submit():e.windowManager.alert("Error: Form submit field collision.")),e.nodeChanged()):e.windowManager.alert("Error: No form element found."),void 0)):void 0}function n(){var a,n=tinymce.trim(e.startContent);return(a=e.getParam("save_oncancelcallback"))?(e.execCallback("save_oncancelcallback",e),void 0):(e.setContent(n),e.undoManager.clear(),e.nodeChanged(),void 0)}function t(){var a=this;e.on("nodeChange",function(){a.disabled(e.getParam("save_enablewhendirty",!0)&&!e.isDirty())})}e.addCommand("mceSave",a),e.addCommand("mceCancel",n),e.addButton("save",{icon:"save",text:"Save",cmd:"mceSave",disabled:!0,onPostRender:t}),e.addButton("cancel",{text:"Cancel",icon:!1,cmd:"mceCancel",disabled:!0,onPostRender:t}),e.addShortcut("ctrl+s","","mceSave")});
\ No newline at end of file
+tinymce.PluginManager.add("save",function(e){function t(){var t,n;return t=tinymce.DOM.getParent(e.id,"form"),!e.getParam("save_enablewhendirty",!0)||e.isDirty()?(tinymce.triggerSave(),(n=e.getParam("save_onsavecallback"))?(e.execCallback("save_onsavecallback",e)&&(e.startContent=tinymce.trim(e.getContent({format:"raw"})),e.nodeChanged()),void 0):(t?(e.isNotDirty=!0,(!t.onsubmit||t.onsubmit())&&("function"==typeof t.submit?t.submit():e.windowManager.alert("Error: Form submit field collision.")),e.nodeChanged()):e.windowManager.alert("Error: No form element found."),void 0)):void 0}function n(){var t,n=tinymce.trim(e.startContent);return(t=e.getParam("save_oncancelcallback"))?(e.execCallback("save_oncancelcallback",e),void 0):(e.setContent(n),e.undoManager.clear(),e.nodeChanged(),void 0)}function i(){var t=this;e.on("nodeChange",function(){t.disabled(e.getParam("save_enablewhendirty",!0)&&!e.isDirty())})}e.addCommand("mceSave",t),e.addCommand("mceCancel",n),e.addButton("save",{icon:"save",text:"Save",cmd:"mceSave",disabled:!0,onPostRender:i}),e.addButton("cancel",{text:"Cancel",icon:!1,cmd:"mceCancel",disabled:!0,onPostRender:i}),e.addShortcut("ctrl+s","","mceSave")});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/searchreplace/plugin.min.js b/media/editors/tinymce/plugins/searchreplace/plugin.min.js
index 64fd0ac..7ffaf46 100644
--- a/media/editors/tinymce/plugins/searchreplace/plugin.min.js
+++ b/media/editors/tinymce/plugins/searchreplace/plugin.min.js
@@ -1 +1 @@
-!function(){function e(e,t,n,a,r){function i(e,t){if(t=t||0,!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";var n=e.index;if(t>0){var a=e[t];if(!a)throw"Invalid capture group";n+=e[0].indexOf(a),e[0]=a}return[n,n+e[0].length,[e[0]]]}function d(e){var t;if(3===e.nodeType)return e.data;if(h[e.nodeName]&&!u[e.nodeName])return"";if(t="",(u[e.nodeName]||g[e.nodeName])&&(t+="\n"),e=e.firstChild)do t+=d(e);while(e=e.nextSibling);return t}function o(e,t,n){var a,r,i,d,o=[],l=0,c=e,s=t.shift(),f=0;e:for(;;){if((u[c.nodeName]||g[c.nodeName])&&l++,3===c.nodeType&&(!r&&c.length+l>=s[1]?(r=c,d=s[1]-l):a&&o.push(c),!a&&c.length+l>s[0]&&(a=c,i=s[0]-l),l+=c.length),a&&r){if(c=n({startNode:a,startNodeIndex:i,endNode:r,endNodeIndex:d,innerNodes:o,match:s[2],matchIndex:f}),l-=r.length-d,a=null,r=null,o=[],s=t.shift(),f++,!s)break}else{if((!h[c.nodeName]||u[c.nodeName])&&c.firstChild){c=c.firstChild;continue}if(c.nextSibling){c=c.nextSibling;continue}}for(;;){if(c.nextSibling){c=c.nextSibling;break}if(c.parentNode===e)break e;c=c.parentNode}}}function l(e){var t;if("function"!=typeof e){var n=e.nodeType?e:f.createElement(e);t=function(e,t){var a=n.cloneNode(!1);return a.setAttribute("data-mce-index",t),e&&a.appendChild(f.createTextNode(e)),a}}else t=e;return function(e){var n,a,r,i=e.startNode,d=e.endNode,o=e.matchIndex;if(i===d){var l=i;r=l.parentNode,e.startNodeIndex>0&&(n=f.createTextNode(l.data.substring(0,e.startNodeIndex)),r.insertBefore(n,l));var c=t(e.match[0],o);return r.insertBefore(c,l),e.endNodeIndex<l.length&&(a=f.createTextNode(l.data.substring(e.endNodeIndex)),r.insertBefore(a,l)),l.parentNode.removeChild(l),c}n=f.createTextNode(i.data.substring(0,e.startNodeIndex)),a=f.createTextNode(d.data.substring(e.endNodeIndex));for(var s=t(i.data.substring(e.startNodeIndex),o),u=[],h=0,g=e.innerNodes.length;g>h;++h){var m=e.innerNodes[h],p=t(m.data,o);m.parentNode.replaceChild(p,m),u.push(p)}var x=t(d.data.substring(0,e.endNodeIndex),o);return r=i.parentNode,r.insertBefore(n,i),r.insertBefore(s,i),r.removeChild(i),r=d.parentNode,r.insertBefore(x,d),r.insertBefore(a,d),r.removeChild(d),x}}var c,s,f,u,h,g,m=[],p=0;if(f=t.ownerDocument,u=r.getBlockElements(),h=r.getWhiteSpaceElements(),g=r.getShortEndedElements(),s=d(t)){if(e.global)for(;c=e.exec(s);)m.push(i(c,a));else c=s.match(e),m.push(i(c,a));return m.length&&(p=m.length,o(t,m,l(n))),p}}function t(t){function n(){function e(){r.statusbar.find("#next").disabled(!i(c+1).length),r.statusbar.find("#prev").disabled(!i(c-1).length)}function n(){tinymce.ui.MessageBox.alert("Could not find the specified string.",function(){r.find("#find")[0].focus()})}var a={},r=tinymce.ui.Factory.create({type:"window",layout:"flex",pack:"center",align:"center",onClose:function(){t.focus(),l.done()},onSubmit:function(t){var d,o,s,f;return t.preventDefault(),o=r.find("#case").checked(),f=r.find("#words").checked(),s=r.find("#find").value(),s.length?a.text==s&&a.caseState==o&&a.wholeWord==f?0===i(c+1).length?(n(),void 0):(l.next(),e(),void 0):(d=l.find(s,o,f),d||n(),r.statusbar.items().slice(1).disabled(0===d),e(),a={text:s,caseState:o,wholeWord:f},void 0):(l.done(!1),r.statusbar.items().slice(1).disabled(!0),void 0)},buttons:[{text:"Find",onclick:function(){r.submit()}},{text:"Replace",disabled:!0,onclick:function(){l.replace(r.find("#replace").value())||(r.statusbar.items().slice(1).disabled(!0),c=-1,a={})}},{text:"Replace all",disabled:!0,onclick:function(){l.replace(r.find("#replace").value(),!0,!0),r.statusbar.items().slice(1).disabled(!0),a={}}},{type:"spacer",flex:1},{text:"Prev",name:"prev",disabled:!0,onclick:function(){l.prev(),e()}},{text:"Next",name:"next",disabled:!0,onclick:function(){l.next(),e()}}],title:"Find and replace",items:{type:"form",padding:20,labelGap:30,spacing:10,items:[{type:"textbox",name:"find",size:40,label:"Find",value:t.selection.getNode().src},{type:"textbox",name:"replace",size:40,label:"Replace with"},{type:"checkbox",name:"case",text:"Match case",label:" "},{type:"checkbox",name:"words",text:"Whole words",label:" "}]}}).renderTo().reflow()}function a(n){var a,r;return r=t.dom.create("span",{"class":"mce-match-marker","data-mce-bogus":1}),a=t.getBody(),l.done(!1),e(n,a,r,!1,t.schema)}function r(e){var t=e.parentNode;t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function i(e){var n,a=[];if(n=tinymce.toArray(t.getBody().getElementsByTagName("span")),n.length)for(var r=0;r<n.length;r++){var i=n[r].getAttribute("data-mce-index");null!==i&&i.length&&i===e.toString()&&a.push(n[r])}return a}function d(e){var n=c,a=t.dom;e=e!==!1,e?n++:n--,a.removeClass(i(c),"mce-match-marker-selected");var r=i(n);return r.length?(a.addClass(i(n),"mce-match-marker-selected"),t.selection.scrollIntoView(r[0]),n):-1}function o(e){e.parentNode.removeChild(e)}var l=this,c=-1;l.init=function(e){e.addMenuItem("searchreplace",{text:"Find and replace",shortcut:"Ctrl+F",onclick:n,separator:"before",context:"edit"}),e.addButton("searchreplace",{tooltip:"Find and replace",shortcut:"Ctrl+F",onclick:n}),e.addCommand("SearchReplace",n),e.shortcuts.add("Ctrl+F","",n)},l.find=function(e,t,n){e=e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),e=n?"\\b"+e+"\\b":e;var r=a(new RegExp(e,t?"g":"gi"));return r&&(c=-1,c=d(!0)),r},l.next=function(){var e=d(!0);-1!==e&&(c=e)},l.prev=function(){var e=d(!1);-1!==e&&(c=e)},l.replace=function(e,n,a){var d,s,f,u,h,g,m=c;for(n=n!==!1,f=t.getBody(),s=tinymce.toArray(f.getElementsByTagName("span")),d=0;d<s.length;d++){var p=s[d].getAttribute("data-mce-index");if(null!==p&&p.length)if(u=h=parseInt(p,10),a||u===c){for(e.length?(s[d].firstChild.nodeValue=e,r(s[d])):o(s[d]);s[++d];)if(u=s[d].getAttribute("data-mce-index"),null!==p&&p.length){if(u!==h){d--;break}o(s[d])}n&&m--}else h>c&&s[d].setAttribute("data-mce-index",h-1)}return t.undoManager.add(),c=m,n?(g=i(m+1).length>0,l.next()):(g=i(m-1).length>0,l.prev()),!a&&g},l.done=function(e){var n,a,i,d;for(a=tinymce.toArray(t.getBody().getElementsByTagName("span")),n=0;n<a.length;n++){var o=a[n].getAttribute("data-mce-index");null!==o&&o.length&&(o===c.toString()&&(i||(i=a[n].firstChild),d=a[n].firstChild),r(a[n]))}if(i&&d){var l=t.dom.createRng();return l.setStart(i,0),l.setEnd(d,d.data.length),e!==!1&&t.selection.setRng(l),l}}}tinymce.PluginManager.add("searchreplace",t)}();
\ No newline at end of file
+!function(){function e(e,t,n,a,r){function i(e,t){if(t=t||0,!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";var n=e.index;if(t>0){var a=e[t];if(!a)throw"Invalid capture group";n+=e[0].indexOf(a),e[0]=a}return[n,n+e[0].length,[e[0]]]}function d(e){var t;if(3===e.nodeType)return e.data;if(h[e.nodeName]&&!u[e.nodeName])return"";if(t="",(u[e.nodeName]||m[e.nodeName])&&(t+="\n"),e=e.firstChild)do t+=d(e);while(e=e.nextSibling);return t}function o(e,t,n){var a,r,i,d,o=[],l=0,c=e,s=t.shift(),f=0;e:for(;;){if((u[c.nodeName]||m[c.nodeName])&&l++,3===c.nodeType&&(!r&&c.length+l>=s[1]?(r=c,d=s[1]-l):a&&o.push(c),!a&&c.length+l>s[0]&&(a=c,i=s[0]-l),l+=c.length),a&&r){if(c=n({startNode:a,startNodeIndex:i,endNode:r,endNodeIndex:d,innerNodes:o,match:s[2],matchIndex:f}),l-=r.length-d,a=null,r=null,o=[],s=t.shift(),f++,!s)break}else{if((!h[c.nodeName]||u[c.nodeName])&&c.firstChild){c=c.firstChild;continue}if(c.nextSibling){c=c.nextSibling;continue}}for(;;){if(c.nextSibling){c=c.nextSibling;break}if(c.parentNode===e)break e;c=c.parentNode}}}function l(e){var t;if("function"!=typeof e){var n=e.nodeType?e:f.createElement(e);t=function(e,t){var a=n.cloneNode(!1);return a.setAttribute("data-mce-index",t),e&&a.appendChild(f.createTextNode(e)),a}}else t=e;return function(e){var n,a,r,i=e.startNode,d=e.endNode,o=e.matchIndex;if(i===d){var l=i;r=l.parentNode,e.startNodeIndex>0&&(n=f.createTextNode(l.data.substring(0,e.startNodeIndex)),r.insertBefore(n,l));var c=t(e.match[0],o);return r.insertBefore(c,l),e.endNodeIndex<l.length&&(a=f.createTextNode(l.data.substring(e.endNodeIndex)),r.insertBefore(a,l)),l.parentNode.removeChild(l),c}n=f.createTextNode(i.data.substring(0,e.startNodeIndex)),a=f.createTextNode(d.data.substring(e.endNodeIndex));for(var s=t(i.data.substring(e.startNodeIndex),o),u=[],h=0,m=e.innerNodes.length;m>h;++h){var g=e.innerNodes[h],p=t(g.data,o);g.parentNode.replaceChild(p,g),u.push(p)}var x=t(d.data.substring(0,e.endNodeIndex),o);return r=i.parentNode,r.insertBefore(n,i),r.insertBefore(s,i),r.removeChild(i),r=d.parentNode,r.insertBefore(x,d),r.insertBefore(a,d),r.removeChild(d),x}}var c,s,f,u,h,m,g=[],p=0;if(f=t.ownerDocument,u=r.getBlockElements(),h=r.getWhiteSpaceElements(),m=r.getShortEndedElements(),s=d(t)){if(e.global)for(;c=e.exec(s);)g.push(i(c,a));else c=s.match(e),g.push(i(c,a));return g.length&&(p=g.length,o(t,g,l(n))),p}}function t(t){function n(){function e(){r.statusbar.find("#next").disabled(!d(s+1).length),r.statusbar.find("#prev").disabled(!d(s-1).length)}function n(){tinymce.ui.MessageBox.alert("Could not find the specified string.",function(){r.find("#find")[0].focus()})}var a={},r=tinymce.ui.Factory.create({type:"window",layout:"flex",pack:"center",align:"center",onClose:function(){t.focus(),c.done()},onSubmit:function(t){var i,o,l,f;return t.preventDefault(),o=r.find("#case").checked(),f=r.find("#words").checked(),l=r.find("#find").value(),l.length?a.text==l&&a.caseState==o&&a.wholeWord==f?0===d(s+1).length?(n(),void 0):(c.next(),e(),void 0):(i=c.find(l,o,f),i||n(),r.statusbar.items().slice(1).disabled(0===i),e(),a={text:l,caseState:o,wholeWord:f},void 0):(c.done(!1),r.statusbar.items().slice(1).disabled(!0),void 0)},buttons:[{text:"Find",onclick:function(){r.submit()}},{text:"Replace",disabled:!0,onclick:function(){c.replace(r.find("#replace").value())||(r.statusbar.items().slice(1).disabled(!0),s=-1,a={})}},{text:"Replace all",disabled:!0,onclick:function(){c.replace(r.find("#replace").value(),!0,!0),r.statusbar.items().slice(1).disabled(!0),a={}}},{type:"spacer",flex:1},{text:"Prev",name:"prev",disabled:!0,onclick:function(){c.prev(),e()}},{text:"Next",name:"next",disabled:!0,onclick:function(){c.next(),e()}}],title:"Find and replace",items:{type:"form",padding:20,labelGap:30,spacing:10,items:[{type:"textbox",name:"find",size:40,label:"Find",value:t.selection.getNode().src},{type:"textbox",name:"replace",size:40,label:"Replace with"},{type:"checkbox",name:"case",text:"Match case",label:" "},{type:"checkbox",name:"words",text:"Whole words",label:" "}]}}).renderTo().reflow()}function a(e){var t=e.getAttribute("data-mce-index");return"number"==typeof t?""+t:t}function r(n){var a,r;return r=t.dom.create("span",{"data-mce-bogus":1}),r.className="mce-match-marker",a=t.getBody(),c.done(!1),e(n,a,r,!1,t.schema)}function i(e){var t=e.parentNode;t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function d(e){var n,r=[];if(n=tinymce.toArray(t.getBody().getElementsByTagName("span")),n.length)for(var i=0;i<n.length;i++){var d=a(n[i]);null!==d&&d.length&&d===e.toString()&&r.push(n[i])}return r}function o(e){var n=s,a=t.dom;e=e!==!1,e?n++:n--,a.removeClass(d(s),"mce-match-marker-selected");var r=d(n);return r.length?(a.addClass(d(n),"mce-match-marker-selected"),t.selection.scrollIntoView(r[0]),n):-1}function l(e){e.parentNode.removeChild(e)}var c=this,s=-1;c.init=function(e){e.addMenuItem("searchreplace",{text:"Find and replace",shortcut:"Ctrl+F",onclick:n,separator:"before",context:"edit"}),e.addButton("searchreplace",{tooltip:"Find and replace",shortcut:"Ctrl+F",onclick:n}),e.addCommand("SearchReplace",n),e.shortcuts.add("Ctrl+F","",n)},c.find=function(e,t,n){e=e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&"),e=n?"\\b"+e+"\\b":e;var a=r(new RegExp(e,t?"g":"gi"));return a&&(s=-1,s=o(!0)),a},c.next=function(){var e=o(!0);-1!==e&&(s=e)},c.prev=function(){var e=o(!1);-1!==e&&(s=e)},c.replace=function(e,n,r){var o,f,u,h,m,g,p=s;for(n=n!==!1,u=t.getBody(),f=tinymce.toArray(u.getElementsByTagName("span")),o=0;o<f.length;o++){var x=a(f[o]);if(null!==x&&x.length)if(h=m=parseInt(x,10),r||h===s){for(e.length?(f[o].firstChild.nodeValue=e,i(f[o])):l(f[o]);f[++o];)if(h=a(f[o]),null!==x&&x.length){if(h!==m){o--;break}l(f[o])}n&&p--}else m>s&&f[o].setAttribute("data-mce-index",m-1)}return t.undoManager.add(),s=p,n?(g=d(p+1).length>0,c.next()):(g=d(p-1).length>0,c.prev()),!r&&g},c.done=function(e){var n,r,d,o;for(r=tinymce.toArray(t.getBody().getElementsByTagName("span")),n=0;n<r.length;n++){var l=a(r[n]);null!==l&&l.length&&(l===s.toString()&&(d||(d=r[n].firstChild),o=r[n].firstChild),i(r[n]))}if(d&&o){var c=t.dom.createRng();return c.setStart(d,0),c.setEnd(o,o.data.length),e!==!1&&t.selection.setRng(c),c}}}tinymce.PluginManager.add("searchreplace",t)}();
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/spellchecker/plugin.min.js b/media/editors/tinymce/plugins/spellchecker/plugin.min.js
index 42c02b0..2e40b27 100644
--- a/media/editors/tinymce/plugins/spellchecker/plugin.min.js
+++ b/media/editors/tinymce/plugins/spellchecker/plugin.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/spellcheckerplugin/DomTextMatcher",c="tinymce/spellcheckerplugin/Plugin",d="tinymce/PluginManager",u="tinymce/util/Tools",f="tinymce/ui/Menu",p="tinymce/dom/DOMUtils",m="tinymce/util/JSONRequest",h="tinymce/util/URI";r(l,[],function(){return function(e,t,n){function r(e){if(!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";var t=e.index;return[t,t+e[0].length,[e[0]]]}function i(e){var t;if(3===e.nodeType)return e.data;if(g[e.nodeName]&&!h[e.nodeName])return"";if(t="",(h[e.nodeName]||v[e.nodeName])&&(t+="\n"),e=e.firstChild)do t+=i(e);while(e=e.nextSibling);return t}function o(e,t,n){var r,i,o,a,s=[],l=0,c=e,d=t.shift(),u=0;e:for(;;){if((h[c.nodeName]||v[c.nodeName])&&l++,3===c.nodeType&&(!i&&c.length+l>=d[1]?(i=c,a=d[1]-l):r&&s.push(c),!r&&c.length+l>d[0]&&(r=c,o=d[0]-l),l+=c.length),r&&i){if(c=n({startNode:r,startNodeIndex:o,endNode:i,endNodeIndex:a,innerNodes:s,match:d[2],matchIndex:u}),l-=i.length-a,r=null,i=null,s=[],d=t.shift(),u++,!d)break}else{if((!g[c.nodeName]||h[c.nodeName])&&c.firstChild){c=c.firstChild;continue}if(c.nextSibling){c=c.nextSibling;continue}}for(;;){if(c.nextSibling){c=c.nextSibling;break}if(c.parentNode===e)break e;c=c.parentNode}}}function a(e){var t;if("function"!=typeof e){var n=e.nodeType?e:m.createElement(e);t=function(e,t){var r=n.cloneNode(!1);return r.setAttribute("data-mce-index",t),e&&r.appendChild(m.createTextNode(e)),r}}else t=e;return function r(e){var n,r,i,o=e.startNode,a=e.endNode,s=e.matchIndex;if(o===a){var l=o;i=l.parentNode,e.startNodeIndex>0&&(n=m.createTextNode(l.data.substring(0,e.startNodeIndex)),i.insertBefore(n,l));var c=t(e.match[0],s);return i.insertBefore(c,l),e.endNodeIndex<l.length&&(r=m.createTextNode(l.data.substring(e.endNodeIndex)),i.insertBefore(r,l)),l.parentNode.removeChild(l),c}n=m.createTextNode(o.data.substring(0,e.startNodeIndex)),r=m.createTextNode(a.data.substring(e.endNodeIndex));for(var d=t(o.data.substring(e.startNodeIndex),s),u=[],f=0,p=e.innerNodes.length;p>f;++f){var h=e.innerNodes[f],g=t(h.data,s);h.parentNode.replaceChild(g,h),u.push(g)}var v=t(a.data.substring(0,e.endNodeIndex),s);return i=o.parentNode,i.insertBefore(n,o),i.insertBefore(d,o),i.removeChild(o),i=a.parentNode,i.insertBefore(v,a),i.insertBefore(r,a),i.removeChild(a),v}}function s(e){var t=[];return l(function(n,r){e(n,r)&&t.push(n)}),u=t,this}function l(e){for(var t=0,n=u.length;n>t&&e(u[t],t)!==!1;t++);return this}function c(e){return u.length&&(p=u.length,o(t,u,a(e))),this}var d,u=[],f,p=0,m,h,g,v;if(m=t.ownerDocument,h=n.getBlockElements(),g=n.getWhiteSpaceElements(),v=n.getShortEndedElements(),f=i(t),f&&e.global)for(;d=e.exec(f);)u.push(r(d));return{text:f,count:p,matches:u,each:l,filter:s,mark:c}}}),r(c,[l,d,u,f,p,m,h],function(e,t,n,r,i,o,a){t.add("spellchecker",function(t,s){function l(e){for(var t in e)return!1;return!0}function c(e,o){var a=[],s=g[o];n.each(s,function(e){a.push({text:e,onclick:function(){t.insertContent(e),u()}})}),a.push.apply(a,[{text:"-"},{text:"Ignore",onclick:function(){p(e,o)}},{text:"Ignore all",onclick:function(){p(e,o,!0)}},{text:"Finish",onclick:m}]),y=new r({items:a,context:"contextmenu",onautohide:function(e){-1!=e.target.className.indexOf("spellchecker")&&e.preventDefault()},onhide:function(){y.remove(),y=null}}),y.renderTo(document.body);var l=i.DOM.getPos(t.getContentAreaContainer()),c=t.dom.getPos(e);l.x+=c.x,l.y+=c.y,y.moveTo(l.x,l.y+e.offsetHeight)}function d(){function n(e){return t.setProgressState(!1),l(e)?(t.windowManager.alert("No misspellings found"),v=!1,void 0):(g=e,i.filter(function(t){return!!e[t[2][0]]}).mark(t.dom.create("span",{"class":"mce-spellchecker-word","data-mce-bogus":1})),i=null,t.fire("SpellcheckStart"),void 0)}function r(e,n,r){o.sendRPC({url:new a(s).toAbsolute(b.spellchecker_rpc_url),method:e,params:{lang:b.spellchecker_language||"en",words:n},success:function(e){r(e)},error:function(e,n){e="JSON Parse error."==e?"Non JSON response:"+n.responseText:"Error: "+e,t.windowManager.alert(e),t.setProgressState(!1),i=null,v=!1}})}var i,c=[],d={};if(v)return m(),void 0;v=!0;var u=t.getParam("spellchecker_wordchar_pattern")||new RegExp('[^\\s!"#$%&()*+,-./:;<=>?@[\\]^_{|}`\xa7\xa9\xab\xae\xb1\xb6\xb7\xb8\xbb\xbc\xbd\xbe\xbf\xd7\xf7\xa4\u201d\u201c\u201e]+',"g");i=new e(u,t.getBody(),t.schema).each(function(e){var t=e[2][0];if(!d[t]){if(/^\d+$/.test(t)||1==t.length)return;c.push(t),d[t]=!0}}),t.setProgressState(!0);var f=b.spellchecker_callback||r;f("spellcheck",c,n)}function u(){t.dom.select("span.mce-spellchecker-word").length||m()}function f(e){var t=e.parentNode;t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function p(e,r,i){i?n.each(t.dom.select("span.mce-spellchecker-word"),function(e){var t=e.innerText||e.textContent;t==r&&f(e)}):f(e),u()}function m(){var e,n,r;for(v=!1,r=t.getBody(),n=r.getElementsByTagName("span"),e=n.length;e--;)r=n[e],r.getAttribute("data-mce-index")&&f(r);t.fire("SpellcheckEnd")}function h(e){var n,r,i,o=-1,a,s;for(e=""+e,n=t.getBody().getElementsByTagName("span"),r=0;r<n.length&&(i=n[r],"mce-spellchecker-word"!=i.className||(o=i.getAttribute("data-mce-index"),o===e&&(o=e,a||(a=i.firstChild),s=i.firstChild),o===e||!s));r++);var l=t.dom.createRng();return l.setStart(a,0),l.setEnd(s,s.length),t.selection.setRng(l),l}var g,v,y,b=t.settings;t.on("click",function(e){if("mce-spellchecker-word"==e.target.className){e.preventDefault();var t=h(e.target.getAttribute("data-mce-index"));c(e.target,t.toString())}}),t.addMenuItem("spellchecker",{text:"Spellcheck",context:"tools",onclick:d,selectable:!0,onPostRender:function(){var e=this;t.on("SpellcheckStart SpellcheckEnd",function(){e.active(v)})}}),t.addButton("spellchecker",{tooltip:"Spellcheck",onclick:d,onPostRender:function(){var e=this;t.on("SpellcheckStart SpellcheckEnd",function(){e.active(v)})}}),t.on("remove",function(){y&&(y.remove(),y=null)})})}),a([l,c])}(this);
\ No newline at end of file
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],o=0;o<e.length;++o){if(n=c[e[o]]||i(e[o]),!n)throw"module definition dependecy not found: "+e[o];r.push(n)}t.apply(null,r)}function r(e,r,o){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(o===t)throw"invalid module definition, definition function must be specified";n(r,function(){c[e]=o.apply(null,arguments)})}function o(e){return!!c[e]}function i(t){for(var n=e,r=t.split(/[.\/]/),o=0;o<r.length;++o){if(!n[r[o]])return;n=n[r[o]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var o=e,i=n[r],a=i.split(/[.\/]/),l=0;l<a.length-1;++l)o[a[l]]===t&&(o[a[l]]={}),o=o[a[l]];o[a[a.length-1]]=c[i]}}var c={},l="tinymce/spellcheckerplugin/DomTextMatcher",d="tinymce/spellcheckerplugin/Plugin",s="tinymce/PluginManager",u="tinymce/util/Tools",f="tinymce/ui/Menu",h="tinymce/dom/DOMUtils",g="tinymce/util/JSONRequest",p="tinymce/util/URI";r(l,[],function(){return function(e,t,n){function r(e){if(!e[0])throw"findAndReplaceDOMText cannot handle zero-length matches";var t=e.index;return[t,t+e[0].length,[e[0]]]}function o(e){var t;if(3===e.nodeType)return e.data;if(m[e.nodeName]&&!p[e.nodeName])return"";if(t="",(p[e.nodeName]||v[e.nodeName])&&(t+="\n"),e=e.firstChild)do t+=o(e);while(e=e.nextSibling);return t}function i(e,t,n){var r,o,i,a,c=[],l=0,d=e,s=t.shift(),u=0;e:for(;;){if((p[d.nodeName]||v[d.nodeName])&&l++,3===d.nodeType&&(!o&&d.length+l>=s[1]?(o=d,a=s[1]-l):r&&c.push(d),!r&&d.length+l>s[0]&&(r=d,i=s[0]-l),l+=d.length),r&&o){if(d=n({startNode:r,startNodeIndex:i,endNode:o,endNodeIndex:a,innerNodes:c,match:s[2],matchIndex:u}),l-=o.length-a,r=null,o=null,c=[],s=t.shift(),u++,!s)break}else{if((!m[d.nodeName]||p[d.nodeName])&&d.firstChild){d=d.firstChild;continue}if(d.nextSibling){d=d.nextSibling;continue}}for(;;){if(d.nextSibling){d=d.nextSibling;break}if(d.parentNode===e)break e;d=d.parentNode}}}function a(e){var t;if("function"!=typeof e){var n=e.nodeType?e:g.createElement(e);t=function(e,t){var r=n.cloneNode(!1);return r.setAttribute("data-mce-index",t),e&&r.appendChild(g.createTextNode(e)),r}}else t=e;return function r(e){var n,r,o,i=e.startNode,a=e.endNode,c=e.matchIndex;if(i===a){var l=i;o=l.parentNode,e.startNodeIndex>0&&(n=g.createTextNode(l.data.substring(0,e.startNodeIndex)),o.insertBefore(n,l));var d=t(e.match[0],c);return o.insertBefore(d,l),e.endNodeIndex<l.length&&(r=g.createTextNode(l.data.substring(e.endNodeIndex)),o.insertBefore(r,l)),l.parentNode.removeChild(l),d}n=g.createTextNode(i.data.substring(0,e.startNodeIndex)),r=g.createTextNode(a.data.substring(e.endNodeIndex));for(var s=t(i.data.substring(e.startNodeIndex),c),u=[],f=0,h=e.innerNodes.length;h>f;++f){var p=e.innerNodes[f],m=t(p.data,c);p.parentNode.replaceChild(m,p),u.push(m)}var v=t(a.data.substring(0,e.endNodeIndex),c);return o=i.parentNode,o.insertBefore(n,i),o.insertBefore(s,i),o.removeChild(i),o=a.parentNode,o.insertBefore(v,a),o.insertBefore(r,a),o.removeChild(a),v}}function c(e){var t=[];return l(function(n,r){e(n,r)&&t.push(n)}),u=t,this}function l(e){for(var t=0,n=u.length;n>t&&e(u[t],t)!==!1;t++);return this}function d(e){return u.length&&(h=u.length,i(t,u,a(e))),this}var s,u=[],f,h=0,g,p,m,v;if(g=t.ownerDocument,p=n.getBlockElements(),m=n.getWhiteSpaceElements(),v=n.getShortEndedElements(),f=o(t),f&&e.global)for(;s=e.exec(f);)u.push(r(s));return{text:f,count:h,matches:u,each:l,filter:c,mark:d}}}),r(d,[l,s,u,f,h,g,p],function(e,t,n,r,o,i,a){t.add("spellchecker",function(t,c){function l(e){for(var t in e)return!1;return!0}function d(e,i){var a=[],c=m[i];n.each(c,function(e){a.push({text:e,onclick:function(){t.insertContent(e),u()}})}),a.push.apply(a,[{text:"-"},{text:"Ignore",onclick:function(){h(e,i)}},{text:"Ignore all",onclick:function(){h(e,i,!0)}},{text:"Finish",onclick:g}]),N=new r({items:a,context:"contextmenu",onautohide:function(e){-1!=e.target.className.indexOf("spellchecker")&&e.preventDefault()},onhide:function(){N.remove(),N=null}}),N.renderTo(document.body);var l=o.DOM.getPos(t.getContentAreaContainer()),d=t.dom.getPos(e);l.x+=d.x,l.y+=d.y,N.moveTo(l.x,l.y+e.offsetHeight)}function s(){function n(e){return t.setProgressState(!1),l(e)?(t.windowManager.alert("No misspellings found"),v=!1,void 0):(m=e,o.filter(function(t){return!!e[t[2][0]]}).mark(t.dom.create("span",{"class":"mce-spellchecker-word","data-mce-bogus":1})),o=null,t.fire("SpellcheckStart"),void 0)}function r(e,n,r){i.sendRPC({url:new a(c).toAbsolute(x.spellchecker_rpc_url),method:e,params:{lang:x.spellchecker_language||"en",words:n},success:function(e){r(e)},error:function(e,n){e="JSON Parse error."==e?"Non JSON response:"+n.responseText:"Error: "+e,t.windowManager.alert(e),t.setProgressState(!1),o=null,v=!1}})}var o,d=[],s={};if(v)return g(),void 0;v=!0;var u=t.getParam("spellchecker_wordchar_pattern")||new RegExp('[^\\s!"#$%&()*+,-./:;<=>?@[\\]^_{|}`\xa7\xa9\xab\xae\xb1\xb6\xb7\xb8\xbb\xbc\xbd\xbe\xbf\xd7\xf7\xa4\u201d\u201c\u201e]+',"g");o=new e(u,t.getBody(),t.schema).each(function(e){var t=e[2][0];if(!s[t]){if(/^\d+$/.test(t)||1==t.length)return;d.push(t),s[t]=!0}}),t.setProgressState(!0);var f=x.spellchecker_callback||r;f("spellcheck",d,n)}function u(){t.dom.select("span.mce-spellchecker-word").length||g()}function f(e){var t=e.parentNode;t.insertBefore(e.firstChild,e),e.parentNode.removeChild(e)}function h(e,r,o){o?n.each(t.dom.select("span.mce-spellchecker-word"),function(e){var t=e.innerText||e.textContent;t==r&&f(e)}):f(e),u()}function g(){var e,n,r;for(v=!1,r=t.getBody(),n=r.getElementsByTagName("span"),e=n.length;e--;)r=n[e],r.getAttribute("data-mce-index")&&f(r);t.fire("SpellcheckEnd")}function p(e){var n,r,o,i=-1,a,c;for(e=""+e,n=t.getBody().getElementsByTagName("span"),r=0;r<n.length&&(o=n[r],"mce-spellchecker-word"!=o.className||(i=o.getAttribute("data-mce-index"),i===e&&(i=e,a||(a=o.firstChild),c=o.firstChild),i===e||!c));r++);var l=t.dom.createRng();return l.setStart(a,0),l.setEnd(c,c.length),t.selection.setRng(l),l}var m,v,N,x=t.settings;t.on("click",function(e){if("mce-spellchecker-word"==e.target.className){e.preventDefault();var t=p(e.target.getAttribute("data-mce-index"));d(e.target,t.toString())}}),t.addMenuItem("spellchecker",{text:"Spellcheck",context:"tools",onclick:s,selectable:!0,onPostRender:function(){var e=this;t.on("SpellcheckStart SpellcheckEnd",function(){e.active(v)})}}),t.addButton("spellchecker",{tooltip:"Spellcheck",onclick:s,onPostRender:function(){var e=this;t.on("SpellcheckStart SpellcheckEnd",function(){e.active(v)})}}),t.on("remove",function(){N&&(N.remove(),N=null)})})}),a([l,d])}(this);
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/tabfocus/plugin.min.js b/media/editors/tinymce/plugins/tabfocus/plugin.min.js
index 23c5a59..bd71785 100644
--- a/media/editors/tinymce/plugins/tabfocus/plugin.min.js
+++ b/media/editors/tinymce/plugins/tabfocus/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("tabfocus",function(e){function t(e){9===e.keyCode&&e.preventDefault()}function n(t){function n(t){function n(e){return"BODY"===e.nodeName||"hidden"!=e.type&&"none"!=e.style.display&&"hidden"!=e.style.visibility&&n(e.parentNode)}function o(e){return e.tabIndex||"INPUT"==e.nodeName||"TEXTAREA"==e.nodeName}function l(e){return!o(e)&&"-1"!=e.getAttribute("tabindex")&&n(e)}if(s=r.select(":input:enabled,*[tabindex]:not(iframe)"),i(s,function(t,n){return t.id==e.id?(a=n,!1):void 0}),t>0){for(c=a+1;c<s.length;c++)if(l(s[c]))return s[c]}else for(c=a-1;c>=0;c--)if(l(s[c]))return s[c];return null}var a,s,l,c;if(9===t.keyCode&&(l=o(e.getParam("tab_focus",e.getParam("tabfocus_elements",":prev,:next"))),1==l.length&&(l[1]=l[0],l[0]=":prev"),s=t.shiftKey?":prev"==l[0]?n(-1):r.get(l[0]):":next"==l[1]?n(1):r.get(l[1]))){var d=tinymce.get(s.id||s.name);s.id&&d?d.focus():window.setTimeout(function(){tinymce.Env.webkit||window.focus(),s.focus()},10),t.preventDefault()}}var r=tinymce.DOM,i=tinymce.each,o=tinymce.explode;e.on("init",function(){e.inline&&tinymce.DOM.setAttrib(e.getBody(),"tabIndex",null)}),e.on("keyup",t),tinymce.Env.gecko?e.on("keypress keydown",n):e.on("keydown",n)});
\ No newline at end of file
+tinymce.PluginManager.add("tabfocus",function(e){function n(e){9===e.keyCode&&e.preventDefault()}function t(n){function t(n){function t(e){return"BODY"===e.nodeName||"hidden"!=e.type&&"none"!=e.style.display&&"hidden"!=e.style.visibility&&t(e.parentNode)}function r(e){return e.tabIndex||"INPUT"==e.nodeName||"TEXTAREA"==e.nodeName}function a(e){return!r(e)&&"-1"!=e.getAttribute("tabindex")&&t(e)}if(d=i.select(":input:enabled,*[tabindex]:not(iframe)"),o(d,function(n,t){return n.id==e.id?(u=t,!1):void 0}),n>0){for(c=u+1;c<d.length;c++)if(a(d[c]))return d[c]}else for(c=u-1;c>=0;c--)if(a(d[c]))return d[c];return null}var u,d,a,c;if(9===n.keyCode&&(a=r(e.getParam("tab_focus",e.getParam("tabfocus_elements",":prev,:next"))),1==a.length&&(a[1]=a[0],a[0]=":prev"),d=n.shiftKey?":prev"==a[0]?t(-1):i.get(a[0]):":next"==a[1]?t(1):i.get(a[1]))){var f=tinymce.get(d.id||d.name);d.id&&f?f.focus():window.setTimeout(function(){tinymce.Env.webkit||window.focus(),d.focus()},10),n.preventDefault()}}var i=tinymce.DOM,o=tinymce.each,r=tinymce.explode;e.on("init",function(){e.inline&&tinymce.DOM.setAttrib(e.getBody(),"tabIndex",null)}),e.on("keyup",n),tinymce.Env.gecko?e.on("keypress keydown",t):e.on("keydown",t)});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/table/plugin.min.js b/media/editors/tinymce/plugins/table/plugin.min.js
index 8c8df3b..d953931 100644
--- a/media/editors/tinymce/plugins/table/plugin.min.js
+++ b/media/editors/tinymce/plugins/table/plugin.min.js
@@ -1 +1 @@
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/tableplugin/TableGrid",c="tinymce/util/Tools",d="tinymce/Env",u="tinymce/tableplugin/Quirks",f="tinymce/util/VK",p="tinymce/tableplugin/CellSelection",m="tinymce/dom/TreeWalker",h="tinymce/tableplugin/Plugin",g="tinymce/PluginManager";r(l,[c,d],function(e,t){function n(e,t){return parseInt(e.getAttribute(t)||1,10)}var r=e.each;return function(i,o){function a(){var e=0;R=[],r(["thead","tbody","tfoot"],function(t){var i=L.select("> "+t+" tr",o);r(i,function(i,o){o+=e,r(L.select("> td, > th",i),function(e,r){var i,a,s,l;if(R[o])for(;R[o][r];)r++;for(s=n(e,"rowspan"),l=n(e,"colspan"),a=o;o+s>a;a++)for(R[a]||(R[a]=[]),i=r;r+l>i;i++)R[a][i]={part:t,real:a==o&&i==r,elm:e,rowspan:s,colspan:l}})}),e+=i.length})}function s(e,t){return e=e.cloneNode(t),e.removeAttribute("id"),e}function l(e,t){var n;return n=R[t],n?n[e]:void 0}function c(e,t,n){e&&(n=parseInt(n,10),1===n?e.removeAttribute(t,1):e.setAttribute(t,n,1))}function d(e){return e&&(L.hasClass(e.elm,"mce-item-selected")||e==P)}function u(){var e=[];return r(o.rows,function(t){r(t.cells,function(n){return L.hasClass(n,"mce-item-selected")||n==P.elm?(e.push(t),!1):void 0})}),e}function f(){var e=L.createRng();e.setStartAfter(o),e.setEndAfter(o),M.setRng(e),L.remove(o)}function p(n){var o,a={};return i.settings.table_clone_elements!==!1&&(a=e.makeMap((i.settings.table_clone_elements||"strong em b i span font h1 h2 h3 h4 h5 h6 p div").toUpperCase(),/[ ,]/)),e.walk(n,function(e){var i;return 3==e.nodeType?(r(L.getParents(e.parentNode,null,n).reverse(),function(e){a[e.nodeName]&&(e=s(e,!1),o?i&&i.appendChild(e):o=i=e,i=e)}),i&&(i.innerHTML=t.ie?"&nbsp;":'<br data-mce-bogus="1" />'),!1):void 0},"childNodes"),n=s(n,!1),c(n,"rowSpan",1),c(n,"colSpan",1),o?n.appendChild(o):t.ie||(n.innerHTML='<br data-mce-bogus="1" />'),n}function m(){var e=L.createRng(),t;return r(L.select("tr",o),function(e){0===e.cells.length&&L.remove(e)}),0===L.select("tr",o).length?(e.setStartBefore(o),e.setEndBefore(o),M.setRng(e),L.remove(o),void 0):(r(L.select("thead,tbody,tfoot",o),function(e){0===e.rows.length&&L.remove(e)}),a(),t=R[Math.min(R.length-1,A.y)],t&&(M.select(t[Math.min(t.length-1,A.x)].elm,!0),M.collapse(!0)),void 0)}function h(e,t,n,r){var i,o,a,s,l;for(i=R[t][e].elm.parentNode,a=1;n>=a;a++)if(i=L.getNext(i,"tr")){for(o=e;o>=0;o--)if(l=R[t+a][o].elm,l.parentNode==i){for(s=1;r>=s;s++)L.insertAfter(p(l),l);break}if(-1==o)for(s=1;r>=s;s++)i.insertBefore(p(i.cells[0]),i.cells[0])}}function g(){r(R,function(e,t){r(e,function(e,r){var i,o,a;if(d(e)&&(e=e.elm,i=n(e,"colspan"),o=n(e,"rowspan"),i>1||o>1)){for(c(e,"rowSpan",1),c(e,"colSpan",1),a=0;i-1>a;a++)L.insertAfter(p(e),e);h(r,t,o-1,i)}})})}function v(t,n,i){var o,s,u,f,p,h,v,y,b,C,x;if(t?(o=k(t),s=o.x,u=o.y,f=s+(n-1),p=u+(i-1)):(A=B=null,r(R,function(e,t){r(e,function(e,n){d(e)&&(A||(A={x:n,y:t}),B={x:n,y:t})})}),s=A.x,u=A.y,f=B.x,p=B.y),y=l(s,u),b=l(f,p),y&&b&&y.part==b.part){for(g(),a(),y=l(s,u).elm,c(y,"colSpan",f-s+1),c(y,"rowSpan",p-u+1),v=u;p>=v;v++)for(h=s;f>=h;h++)R[v]&&R[v][h]&&(t=R[v][h].elm,t!=y&&(C=e.grep(t.childNodes),r(C,function(e){y.appendChild(e)}),C.length&&(C=e.grep(y.childNodes),x=0,r(C,function(e){"BR"==e.nodeName&&L.getAttrib(e,"data-mce-bogus")&&x++<C.length-1&&y.removeChild(e)})),L.remove(t)));m()}}function y(e){var t,i,o,a,l,u,f,m,h;for(r(R,function(n,i){return r(n,function(n){return d(n)&&(n=n.elm,l=n.parentNode,u=s(l,!1),t=i,e)?!1:void 0}),e?!t:void 0}),a=0;a<R[0].length;a++)if(R[t][a]&&(i=R[t][a].elm,i!=o)){if(e){if(t>0&&R[t-1][a]&&(m=R[t-1][a].elm,h=n(m,"rowSpan"),h>1)){c(m,"rowSpan",h+1);continue}}else if(h=n(i,"rowspan"),h>1){c(i,"rowSpan",h+1);continue}f=p(i),c(f,"colSpan",i.colSpan),u.appendChild(f),o=i}u.hasChildNodes()&&(e?l.parentNode.insertBefore(u,l):L.insertAfter(u,l))}function b(e){var t,i;r(R,function(n){return r(n,function(n,r){return d(n)&&(t=r,e)?!1:void 0}),e?!t:void 0}),r(R,function(r,o){var a,s,l;r[t]&&(a=r[t].elm,a!=i&&(l=n(a,"colspan"),s=n(a,"rowspan"),1==l?e?(a.parentNode.insertBefore(p(a),a),h(t,o,s-1,l)):(L.insertAfter(p(a),a),h(t,o,s-1,l)):c(a,"colSpan",a.colSpan+1),i=a))})}function C(){var t=[];r(R,function(i){r(i,function(i,o){d(i)&&-1===e.inArray(t,o)&&(r(R,function(e){var t=e[o].elm,r;r=n(t,"colSpan"),r>1?c(t,"colSpan",r-1):L.remove(t)}),t.push(o))})}),m()}function x(){function e(e){var t,i,o;t=L.getNext(e,"tr"),r(e.cells,function(e){var t=n(e,"rowSpan");t>1&&(c(e,"rowSpan",t-1),i=k(e),h(i.x,i.y,1,1))}),i=k(e.cells[0]),r(R[i.y],function(e){var t;e=e.elm,e!=o&&(t=n(e,"rowSpan"),1>=t?L.remove(e):c(e,"rowSpan",t-1),o=e)})}var t;t=u(),r(t.reverse(),function(t){e(t)}),m()}function w(){var e=u();return L.remove(e),m(),e}function _(){var e=u();return r(e,function(t,n){e[n]=s(t,!0)}),e}function N(e,t){var n=u(),i=n[t?0:n.length-1],o=i.cells.length;e&&(r(R,function(e){var t;return o=0,r(e,function(e){e.real&&(o+=e.colspan),e.elm.parentNode==i&&(t=1)}),t?!1:void 0}),t||e.reverse(),r(e,function(e){var n,r=e.cells.length,a;for(n=0;r>n;n++)a=e.cells[n],c(a,"colSpan",1),c(a,"rowSpan",1);for(n=r;o>n;n++)e.appendChild(p(e.cells[r-1]));for(n=o;r>n;n++)L.remove(e.cells[n]);t?i.parentNode.insertBefore(e,i):L.insertAfter(e,i)}),L.removeClass(L.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"))}function k(e){var t;return r(R,function(n,i){return r(n,function(n,r){return n.elm==e?(t={x:r,y:i},!1):void 0}),!t}),t}function S(e){A=k(e)}function E(){var e,t;return e=t=0,r(R,function(n,i){r(n,function(n,r){var o,a;d(n)&&(n=R[i][r],r>e&&(e=r),i>t&&(t=i),n.real&&(o=n.colspan-1,a=n.rowspan-1,o&&r+o>e&&(e=r+o),a&&i+a>t&&(t=i+a)))})}),{x:e,y:t}}function T(e){var t,n,r,i,o,a,s,l,c,d;if(B=k(e),A&&B){for(t=Math.min(A.x,B.x),n=Math.min(A.y,B.y),r=Math.max(A.x,B.x),i=Math.max(A.y,B.y),o=r,a=i,d=n;a>=d;d++)e=R[d][t],e.real||t-(e.colspan-1)<t&&(t-=e.colspan-1);for(c=t;o>=c;c++)e=R[n][c],e.real||n-(e.rowspan-1)<n&&(n-=e.rowspan-1);for(d=n;i>=d;d++)for(c=t;r>=c;c++)e=R[d][c],e.real&&(s=e.colspan-1,l=e.rowspan-1,s&&c+s>o&&(o=c+s),l&&d+l>a&&(a=d+l));for(L.removeClass(L.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),d=n;a>=d;d++)for(c=t;o>=c;c++)R[d][c]&&L.addClass(R[d][c].elm,"mce-item-selected")}}var R,A,B,P,M=i.selection,L=M.dom;o=o||L.getParent(M.getStart(),"table"),a(),P=L.getParent(M.getStart(),"th,td"),P&&(A=k(P),B=E(),P=l(A.x,A.y)),e.extend(this,{deleteTable:f,split:g,merge:v,insertRow:y,insertCol:b,deleteCols:C,deleteRows:x,cutRows:w,copyRows:_,pasteRows:N,getPos:k,setStartCell:S,setEndCell:T})}}),r(u,[f,d,c],function(e,t,n){function r(e,t){return parseInt(e.getAttribute(t)||1,10)}var i=n.each;return function(n){function o(){function t(t){function o(e,r){var i=e?"previousSibling":"nextSibling",o=n.dom.getParent(r,"tr"),s=o[i];if(s)return g(n,r,s,e),t.preventDefault(),!0;var d=n.dom.getParent(o,"table"),u=o.parentNode,f=u.nodeName.toLowerCase();if("tbody"===f||f===(e?"tfoot":"thead")){var p=a(e,d,u,"tbody");if(null!==p)return l(e,p,r)}return c(e,o,i,d)}function a(e,t,r,i){var o=n.dom.select(">"+i,t),a=o.indexOf(r);if(e&&0===a||!e&&a===o.length-1)return s(e,t);if(-1===a){var l="thead"===r.tagName.toLowerCase()?0:o.length-1;return o[l]}return o[a+(e?-1:1)]}function s(e,t){var r=e?"thead":"tfoot",i=n.dom.select(">"+r,t);return 0!==i.length?i[0]:null}function l(e,r,i){var o=d(r,e);return o&&g(n,i,o,e),t.preventDefault(),!0}function c(e,r,i,a){var s=a[i];if(s)return u(s),!0;var l=n.dom.getParent(a,"td,th");if(l)return o(e,l,t);var c=d(r,!e);return u(c),t.preventDefault(),!1}function d(e,t){var r=e&&e[t?"lastChild":"firstChild"];return r&&"BR"===r.nodeName?n.dom.getParent(r,"td,th"):r}function u(e){n.selection.setCursorLocation(e,0)}function f(){return b==e.UP||b==e.DOWN}function p(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"tr");return null!==n}function m(e){for(var t=0,n=e;n.previousSibling;)n=n.previousSibling,t+=r(n,"colspan");return t}function h(e,t){var n=0,o=0;return i(e.children,function(e,i){return n+=r(e,"colspan"),o=i,n>t?!1:void 0}),o}function g(e,t,r,i){var o=m(n.dom.getParent(t,"td,th")),a=h(r,o),s=r.childNodes[a],l=d(s,i);u(l||s)}function v(e){var t=n.selection.getNode(),r=n.dom.getParent(t,"td,th"),i=n.dom.getParent(e,"td,th");return r&&r!==i&&y(r,i)}function y(e,t){return n.dom.getParent(e,"TABLE")===n.dom.getParent(t,"TABLE")}var b=t.keyCode;if(f()&&p(n)){var C=n.selection.getNode();setTimeout(function(){v(C)&&o(!t.shiftKey&&b===e.UP,C,t)},0)}}n.on("KeyDown",function(e){t(e)})}function a(){function e(e,t){var n=t.ownerDocument,r=n.createRange(),i;return r.setStartBefore(t),r.setEnd(e.endContainer,e.endOffset),i=n.createElement("body"),i.appendChild(r.cloneContents()),0===i.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length}n.on("KeyDown",function(t){var r,i,o=n.dom;(37==t.keyCode||38==t.keyCode)&&(r=n.selection.getRng(),i=o.getParent(r.startContainer,"table"),i&&n.getBody().firstChild==i&&e(r,i)&&(r=o.createRng(),r.setStartBefore(i),r.setEndBefore(i),n.selection.setRng(r),t.preventDefault()))})}function s(){n.on("KeyDown SetContent VisualAid",function(){var e;for(e=n.getBody().lastChild;e;e=e.previousSibling)if(3==e.nodeType){if(e.nodeValue.length>0)break}else if(1==e.nodeType&&!e.getAttribute("data-mce-bogus"))break;e&&"TABLE"==e.nodeName&&(n.settings.forced_root_block?n.dom.add(n.getBody(),n.settings.forced_root_block,n.settings.forced_root_block_attrs,t.ie&&t.ie<11?"&nbsp;":'<br data-mce-bogus="1" />'):n.dom.add(n.getBody(),"br",{"data-mce-bogus":"1"}))}),n.on("PreProcess",function(e){var t=e.node.lastChild;t&&("BR"==t.nodeName||1==t.childNodes.length&&("BR"==t.firstChild.nodeName||"\xa0"==t.firstChild.nodeValue))&&t.previousSibling&&"TABLE"==t.previousSibling.nodeName&&n.dom.remove(t)})}function l(){function e(e,t,n,r){var i=3,o=e.dom.getParent(t.startContainer,"TABLE"),a,s,l;return o&&(a=o.parentNode),s=t.startContainer.nodeType==i&&0===t.startOffset&&0===t.endOffset&&r&&("TR"==n.nodeName||n==a),l=("TD"==n.nodeName||"TH"==n.nodeName)&&!r,s||l}function t(){var t=n.selection.getRng(),r=n.selection.getNode(),i=n.dom.getParent(t.startContainer,"TD,TH");if(e(n,t,r,i)){i||(i=r);for(var o=i.lastChild;o.lastChild;)o=o.lastChild;t.setEnd(o,o.nodeValue.length),n.selection.setRng(t)}}n.on("KeyDown",function(){t()}),n.on("MouseDown",function(e){2!=e.button&&t()})}t.webkit&&(o(),l()),t.gecko&&(a(),s()),t.ie>10&&(a(),s())}}),r(p,[l,m,c],function(e,t,n){return function(r){function i(){r.getBody().style.webkitUserSelect="",d&&(r.dom.removeClass(r.dom.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),d=!1)}function o(t){var n,i,o=t.target;if(l&&(s||o!=l)&&("TD"==o.nodeName||"TH"==o.nodeName)){i=a.getParent(o,"table"),i==c&&(s||(s=new e(r,i),s.setStartCell(l),r.getBody().style.webkitUserSelect="none"),s.setEndCell(o),d=!0),n=r.selection.getSel();try{n.removeAllRanges?n.removeAllRanges():n.empty()}catch(u){}t.preventDefault()}}var a=r.dom,s,l,c,d=!0;return r.on("MouseDown",function(e){2!=e.button&&(i(),l=a.getParent(e.target,"td,th"),c=a.getParent(l,"table"))}),a.bind(r.getDoc(),"mouseover",o),r.on("remove",function(){a.unbind(r.getDoc(),"mouseover",o)}),r.on("MouseUp",function(){function e(e,r){var o=new t(e,e);do{if(3==e.nodeType&&0!==n.trim(e.nodeValue).length)return r?i.setStart(e,0):i.setEnd(e,e.nodeValue.length),void 0;if("BR"==e.nodeName)return r?i.setStartBefore(e):i.setEndBefore(e),void 0}while(e=r?o.next():o.prev())}var i,o=r.selection,d,u,f,p,m;if(l){if(s&&(r.getBody().style.webkitUserSelect=""),d=a.select("td.mce-item-selected,th.mce-item-selected"),d.length>0){i=a.createRng(),f=d[0],m=d[d.length-1],i.setStartBefore(f),i.setEndAfter(f),e(f,1),u=new t(f,a.getParent(d[0],"table"));do if("TD"==f.nodeName||"TH"==f.nodeName){if(!a.hasClass(f,"mce-item-selected"))break;p=f}while(f=u.next());e(p),o.setRng(i)}r.nodeChanged(),l=s=c=null}}),r.on("KeyUp",function(){i()}),{clear:i}}}),r(h,[l,u,p,c,m,d,g],function(e,t,n,r,i,o,a){function s(r){function i(e){return e?e.replace(/px$/,""):""}function a(e){return/^[0-9]+$/.test(e)&&(e+="px"),e}function s(e){l("left center right".split(" "),function(t){r.formatter.remove("align"+t,{},e)})}function c(){var e=r.dom,t,n,c;t=r.dom.getParent(r.selection.getStart(),"table"),c=!1,n={width:i(e.getStyle(t,"width")||e.getAttrib(t,"width")),height:i(e.getStyle(t,"height")||e.getAttrib(t,"height")),cellspacing:e.getAttrib(t,"cellspacing"),cellpadding:e.getAttrib(t,"cellpadding"),border:e.getAttrib(t,"border"),caption:!!e.select("caption",t)[0]},l("left center right".split(" "),function(e){r.formatter.matchNode(t,"align"+e)&&(n.align=e)}),r.windowManager.open({title:"Table properties",items:{type:"form",layout:"grid",columns:2,data:n,defaults:{type:"textbox",maxWidth:50},items:[c?{label:"Cols",name:"cols",disabled:!0}:null,c?{label:"Rows",name:"rows",disabled:!0}:null,{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell spacing",name:"cellspacing"},{label:"Cell padding",name:"cellpadding"},{label:"Border",name:"border"},{label:"Caption",name:"caption",type:"checkbox"},{label:"Alignment",minWidth:90,name:"align",type:"listbox",text:"None",maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]},onsubmit:function(){var n=this.toJSON(),i;r.undoManager.transact(function(){r.dom.setAttribs(t,{cellspacing:n.cellspacing,cellpadding:n.cellpadding,border:n.border}),r.dom.setStyles(t,{width:a(n.width),height:a(n.height)}),i=e.select("caption",t)[0],i&&!n.caption&&e.remove(i),!i&&n.caption&&(i=e.create("caption"),o.ie||(i.innerHTML='<br data-mce-bogus="1"/>'),t.insertBefore(i,t.firstChild)),s(t),n.align&&r.formatter.apply("align"+n.align,{},t),r.focus(),r.addVisual()})}})}function d(e,t){r.windowManager.open({title:"Merge cells",body:[{label:"Cols",name:"cols",type:"textbox",size:10},{label:"Rows",name:"rows",type:"textbox",size:10}],onsubmit:function(){var n=this.toJSON();r.undoManager.transact(function(){e.merge(t,n.cols,n.rows)})}})}function u(){var e=r.dom,t,n,o=[];o=r.dom.select("td.mce-item-selected,th.mce-item-selected"),t=r.dom.getParent(r.selection.getStart(),"td,th"),!o.length&&t&&o.push(t),t=t||o[0],n={width:i(e.getStyle(t,"width")||e.getAttrib(t,"width")),height:i(e.getStyle(t,"height")||e.getAttrib(t,"height")),scope:e.getAttrib(t,"scope")},n.type=t.nodeName.toLowerCase(),l("left center right".split(" "),function(e){r.formatter.matchNode(t,"align"+e)&&(n.align=e)}),r.windowManager.open({title:"Cell properties",items:{type:"form",data:n,layout:"grid",columns:2,defaults:{type:"textbox",maxWidth:50},items:[{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell type",name:"type",type:"listbox",text:"None",minWidth:90,maxWidth:null,menu:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{label:"Scope",name:"scope",type:"listbox",text:"None",minWidth:90,maxWidth:null,menu:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{label:"Alignment",name:"align",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]},onsubmit:function(){var t=this.toJSON();r.undoManager.transact(function(){l(o,function(n){r.dom.setAttrib(n,"scope",t.scope),r.dom.setStyles(n,{width:a(t.width),height:a(t.height)}),t.type&&n.nodeName.toLowerCase()!=t.type&&(n=e.rename(n,t.type)),s(n),t.align&&r.formatter.apply("align"+t.align,{},n)}),r.focus()})}})}function f(){var e=r.dom,t,n,o,c,d=[];t=r.dom.getParent(r.selection.getStart(),"table"),n=r.dom.getParent(r.selection.getStart(),"td,th"),l(t.rows,function(t){l(t.cells,function(r){return e.hasClass(r,"mce-item-selected")||r==n?(d.push(t),!1):void 0})}),o=d[0],c={height:i(e.getStyle(o,"height")||e.getAttrib(o,"height")),scope:e.getAttrib(o,"scope")},c.type=o.parentNode.nodeName.toLowerCase(),l("left center right".split(" "),function(e){r.formatter.matchNode(o,"align"+e)&&(c.align=e)}),r.windowManager.open({title:"Row properties",items:{type:"form",data:c,columns:2,defaults:{type:"textbox"},items:[{type:"listbox",name:"type",label:"Row type",text:"None",maxWidth:null,menu:[{text:"Header",value:"thead"},{text:"Body",value:"tbody"},{text:"Footer",value:"tfoot"}]},{type:"listbox",name:"align",label:"Alignment",text:"None",maxWidth:null,menu:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height"}]},onsubmit:function(){var t=this.toJSON(),n,i,o;r.undoManager.transact(function(){var c=t.type;l(d,function(l){r.dom.setAttrib(l,"scope",t.scope),r.dom.setStyles(l,{height:a(t.height)}),c!=l.parentNode.nodeName.toLowerCase()&&(n=e.getParent(l,"table"),i=l.parentNode,o=e.select(c,n)[0],o||(o=e.create(c),n.firstChild?n.insertBefore(o,n.firstChild):n.appendChild(o)),o.appendChild(l),i.hasChildNodes()||e.remove(i)),s(l),t.align&&r.formatter.apply("align"+t.align,{},l)}),r.focus()})}})}function p(e){return function(){r.execCommand(e)}}function m(e,t){var n,i,a;for(a="<table><tbody>",n=0;t>n;n++){for(a+="<tr>",i=0;e>i;i++)a+="<td>"+(o.ie?" ":"<br>")+"</td>";a+="</tr>"}a+="</tbody></table>",r.insertContent(a)}function h(e,t){function n(){e.disabled(!r.dom.getParent(r.selection.getStart(),t)),r.selection.selectorChanged(t,function(t){e.disabled(!t)})}r.initialized?n():r.on("init",n)}function g(){h(this,"table")}function v(){h(this,"td,th")}function y(){var e="";e='<table role="presentation" class="mce-grid mce-grid-border">';for(var t=0;10>t;t++){e+="<tr>";for(var n=0;10>n;n++)e+='<td><a href="#" data-mce-index="'+n+","+t+'"></a></td>';e+="</tr>"}return e+="</table>",e+='<div class="mce-text-center">0 x 0</div>'}var b,C,x=this;r.addMenuItem("inserttable",{text:"Insert table",icon:"table",context:"table",onhide:function(){r.dom.removeClass(this.menu.items()[0].getEl().getElementsByTagName("a"),"mce-active")},menu:[{type:"container",html:y(),onmousemove:function(e){var t,n,i=e.target;if("A"==i.nodeName){var o=r.dom.getParent(i,"table"),a=i.getAttribute("data-mce-index"),s=e.control.parent().rel;if(a!=this.lastPos){if(a=a.split(","),a[0]=parseInt(a[0],10),a[1]=parseInt(a[1],10),e.control.isRtl()||"tl-tr"==s){for(n=9;n>=0;n--)for(t=0;10>t;t++)r.dom.toggleClass(o.rows[n].childNodes[t].firstChild,"mce-active",t>=a[0]&&n<=a[1]);a[0]=9-a[0],o.nextSibling.innerHTML=a[0]+" x "+(a[1]+1)}else{for(n=0;10>n;n++)for(t=0;10>t;t++)r.dom.toggleClass(o.rows[n].childNodes[t].firstChild,"mce-active",t<=a[0]&&n<=a[1]);o.nextSibling.innerHTML=a[0]+1+" x "+(a[1]+1)}this.lastPos=a}}},onclick:function(e){"A"==e.target.nodeName&&this.lastPos&&(e.preventDefault(),m(this.lastPos[0]+1,this.lastPos[1]+1),this.parent().cancel())}}]}),r.addMenuItem("tableprops",{text:"Table properties",context:"table",onPostRender:g,onclick:c}),r.addMenuItem("deletetable",{text:"Delete table",context:"table",onPostRender:g,cmd:"mceTableDelete"}),r.addMenuItem("cell",{separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:p("mceTableCellProps"),onPostRender:v},{text:"Merge cells",onclick:p("mceTableMergeCells"),onPostRender:v},{text:"Split cell",onclick:p("mceTableSplitCells"),onPostRender:v}]}),r.addMenuItem("row",{text:"Row",context:"table",menu:[{text:"Insert row before",onclick:p("mceTableInsertRowBefore"),onPostRender:v},{text:"Insert row after",onclick:p("mceTableInsertRowAfter"),onPostRender:v},{text:"Delete row",onclick:p("mceTableDeleteRow"),onPostRender:v},{text:"Row properties",onclick:p("mceTableRowProps"),onPostRender:v},{text:"-"},{text:"Cut row",onclick:p("mceTableCutRow"),onPostRender:v},{text:"Copy row",onclick:p("mceTableCopyRow"),onPostRender:v},{text:"Paste row before",onclick:p("mceTablePasteRowBefore"),onPostRender:v},{text:"Paste row after",onclick:p("mceTablePasteRowAfter"),onPostRender:v}]}),r.addMenuItem("column",{text:"Column",context:"table",menu:[{text:"Insert column before",onclick:p("mceTableInsertColBefore"),onPostRender:v},{text:"Insert column after",onclick:p("mceTableInsertColAfter"),onPostRender:v},{text:"Delete column",onclick:p("mceTableDeleteCol"),onPostRender:v}]});var w=[];l("inserttable tableprops deletetable | cell row column".split(" "),function(e){"|"==e?w.push({text:"-"}):w.push(r.menuItems[e])}),r.addButton("table",{type:"menubutton",title:"Table",menu:w}),o.isIE||r.on("click",function(e){e=e.target,"TABLE"===e.nodeName&&(r.selection.select(e),r.nodeChanged())}),x.quirks=new t(r),r.on("Init",function(){b=r.windowManager,x.cellSelection=new n(r)}),l({mceTableSplitCells:function(e){e.split()},mceTableMergeCells:function(e){var t,n,i;i=r.dom.getParent(r.selection.getStart(),"th,td"),i&&(t=i.rowSpan,n=i.colSpan),r.dom.select("td.mce-item-selected,th.mce-item-selected").length?e.merge():d(e,i)},mceTableInsertRowBefore:function(e){e.insertRow(!0)},mceTableInsertRowAfter:function(e){e.insertRow()},mceTableInsertColBefore:function(e){e.insertCol(!0)},mceTableInsertColAfter:function(e){e.insertCol()},mceTableDeleteCol:function(e){e.deleteCols()},mceTableDeleteRow:function(e){e.deleteRows()},mceTableCutRow:function(e){C=e.cutRows()},mceTableCopyRow:function(e){C=e.copyRows()},mceTablePasteRowBefore:function(e){e.pasteRows(C,!0)},mceTablePasteRowAfter:function(e){e.pasteRows(C)},mceTableDelete:function(e){e.deleteTable()}},function(t,n){r.addCommand(n,function(){var n=new e(r);n&&(t(n),r.execCommand("mceRepaint"),x.cellSelection.clear())})}),l({mceInsertTable:function(){c()},mceTableRowProps:f,mceTableCellProps:u},function(e,t){r.addCommand(t,function(t,n){e(n)})})}var l=r.each;a.add("table",s)}),a([l,u,p,h])}(this);
\ No newline at end of file
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/tableplugin/TableGrid",c="tinymce/util/Tools",d="tinymce/Env",u="tinymce/tableplugin/Quirks",f="tinymce/util/VK",p="tinymce/tableplugin/CellSelection",m="tinymce/dom/TreeWalker",h="tinymce/tableplugin/Plugin",g="tinymce/PluginManager";r(l,[c,d],function(e,t){function n(e,t){return parseInt(e.getAttribute(t)||1,10)}var r=e.each;return function(i,o){function a(){var e=0;R=[],r(["thead","tbody","tfoot"],function(t){var i=H.select("> "+t+" tr",o);r(i,function(i,o){o+=e,r(H.select("> td, > th",i),function(e,r){var i,a,s,l;if(R[o])for(;R[o][r];)r++;for(s=n(e,"rowspan"),l=n(e,"colspan"),a=o;o+s>a;a++)for(R[a]||(R[a]=[]),i=r;r+l>i;i++)R[a][i]={part:t,real:a==o&&i==r,elm:e,rowspan:s,colspan:l}})}),e+=i.length})}function s(e,t){return e=e.cloneNode(t),e.removeAttribute("id"),e}function l(e,t){var n;return n=R[t],n?n[e]:void 0}function c(e,t,n){e&&(n=parseInt(n,10),1===n?e.removeAttribute(t,1):e.setAttribute(t,n,1))}function d(e){return e&&(H.hasClass(e.elm,"mce-item-selected")||e==L)}function u(){var e=[];return r(o.rows,function(t){r(t.cells,function(n){return H.hasClass(n,"mce-item-selected")||n==L.elm?(e.push(t),!1):void 0})}),e}function f(){var e=H.createRng();e.setStartAfter(o),e.setEndAfter(o),D.setRng(e),H.remove(o)}function p(n){var o,a={};return i.settings.table_clone_elements!==!1&&(a=e.makeMap((i.settings.table_clone_elements||"strong em b i span font h1 h2 h3 h4 h5 h6 p div").toUpperCase(),/[ ,]/)),e.walk(n,function(e){var i;return 3==e.nodeType?(r(H.getParents(e.parentNode,null,n).reverse(),function(e){a[e.nodeName]&&(e=s(e,!1),o?i&&i.appendChild(e):o=i=e,i=e)}),i&&(i.innerHTML=t.ie?"&nbsp;":'<br data-mce-bogus="1" />'),!1):void 0},"childNodes"),n=s(n,!1),c(n,"rowSpan",1),c(n,"colSpan",1),o?n.appendChild(o):t.ie||(n.innerHTML='<br data-mce-bogus="1" />'),n}function m(){var e=H.createRng(),t;return r(H.select("tr",o),function(e){0===e.cells.length&&H.remove(e)}),0===H.select("tr",o).length?(e.setStartBefore(o),e.setEndBefore(o),D.setRng(e),H.remove(o),void 0):(r(H.select("thead,tbody,tfoot",o),function(e){0===e.rows.length&&H.remove(e)}),a(),t=R[Math.min(R.length-1,A.y)],t&&(D.select(t[Math.min(t.length-1,A.x)].elm,!0),D.collapse(!0)),void 0)}function h(e,t,n,r){var i,o,a,s,l;for(i=R[t][e].elm.parentNode,a=1;n>=a;a++)if(i=H.getNext(i,"tr")){for(o=e;o>=0;o--)if(l=R[t+a][o].elm,l.parentNode==i){for(s=1;r>=s;s++)H.insertAfter(p(l),l);break}if(-1==o)for(s=1;r>=s;s++)i.insertBefore(p(i.cells[0]),i.cells[0])}}function g(){r(R,function(e,t){r(e,function(e,r){var i,o,a;if(d(e)&&(e=e.elm,i=n(e,"colspan"),o=n(e,"rowspan"),i>1||o>1)){for(c(e,"rowSpan",1),c(e,"colSpan",1),a=0;i-1>a;a++)H.insertAfter(p(e),e);h(r,t,o-1,i)}})})}function v(t,n,i){var o,s,u,f,p,h,v,y,b,C,x;if(t?(o=E(t),s=o.x,u=o.y,f=s+(n-1),p=u+(i-1)):(A=B=null,r(R,function(e,t){r(e,function(e,n){d(e)&&(A||(A={x:n,y:t}),B={x:n,y:t})})}),s=A.x,u=A.y,f=B.x,p=B.y),y=l(s,u),b=l(f,p),y&&b&&y.part==b.part){for(g(),a(),y=l(s,u).elm,c(y,"colSpan",f-s+1),c(y,"rowSpan",p-u+1),v=u;p>=v;v++)for(h=s;f>=h;h++)R[v]&&R[v][h]&&(t=R[v][h].elm,t!=y&&(C=e.grep(t.childNodes),r(C,function(e){y.appendChild(e)}),C.length&&(C=e.grep(y.childNodes),x=0,r(C,function(e){"BR"==e.nodeName&&H.getAttrib(e,"data-mce-bogus")&&x++<C.length-1&&y.removeChild(e)})),H.remove(t)));m()}}function y(e){var t,i,o,a,l,u,f,m,h;for(r(R,function(n,i){return r(n,function(n){return d(n)&&(n=n.elm,l=n.parentNode,u=s(l,!1),t=i,e)?!1:void 0}),e?!t:void 0}),a=0;a<R[0].length;a++)if(R[t][a]&&(i=R[t][a].elm,i!=o)){if(e){if(t>0&&R[t-1][a]&&(m=R[t-1][a].elm,h=n(m,"rowSpan"),h>1)){c(m,"rowSpan",h+1);continue}}else if(h=n(i,"rowspan"),h>1){c(i,"rowSpan",h+1);continue}f=p(i),c(f,"colSpan",i.colSpan),u.appendChild(f),o=i}u.hasChildNodes()&&(e?l.parentNode.insertBefore(u,l):H.insertAfter(u,l))}function b(e){var t,i;r(R,function(n){return r(n,function(n,r){return d(n)&&(t=r,e)?!1:void 0}),e?!t:void 0}),r(R,function(r,o){var a,s,l;r[t]&&(a=r[t].elm,a!=i&&(l=n(a,"colspan"),s=n(a,"rowspan"),1==l?e?(a.parentNode.insertBefore(p(a),a),h(t,o,s-1,l)):(H.insertAfter(p(a),a),h(t,o,s-1,l)):c(a,"colSpan",a.colSpan+1),i=a))})}function C(){var t=[];r(R,function(i){r(i,function(i,o){d(i)&&-1===e.inArray(t,o)&&(r(R,function(e){var t=e[o].elm,r;r=n(t,"colSpan"),r>1?c(t,"colSpan",r-1):H.remove(t)}),t.push(o))})}),m()}function x(){function e(e){var t,i,o;t=H.getNext(e,"tr"),r(e.cells,function(e){var t=n(e,"rowSpan");t>1&&(c(e,"rowSpan",t-1),i=E(e),h(i.x,i.y,1,1))}),i=E(e.cells[0]),r(R[i.y],function(e){var t;e=e.elm,e!=o&&(t=n(e,"rowSpan"),1>=t?H.remove(e):c(e,"rowSpan",t-1),o=e)})}var t;t=u(),r(t.reverse(),function(t){e(t)}),m()}function w(){var e=u();return H.remove(e),m(),e}function _(){var e=u();return r(e,function(t,n){e[n]=s(t,!0)}),e}function N(e,t){var n=u(),i=n[t?0:n.length-1],o=i.cells.length;e&&(r(R,function(e){var t;return o=0,r(e,function(e){e.real&&(o+=e.colspan),e.elm.parentNode==i&&(t=1)}),t?!1:void 0}),t||e.reverse(),r(e,function(e){var n,r=e.cells.length,a;for(n=0;r>n;n++)a=e.cells[n],c(a,"colSpan",1),c(a,"rowSpan",1);for(n=r;o>n;n++)e.appendChild(p(e.cells[r-1]));for(n=o;r>n;n++)H.remove(e.cells[n]);t?i.parentNode.insertBefore(e,i):H.insertAfter(e,i)}),H.removeClass(H.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"))}function E(e){var t;return r(R,function(n,i){return r(n,function(n,r){return n.elm==e?(t={x:r,y:i},!1):void 0}),!t}),t}function k(e){A=E(e)}function S(){var e,t;return e=t=0,r(R,function(n,i){r(n,function(n,r){var o,a;d(n)&&(n=R[i][r],r>e&&(e=r),i>t&&(t=i),n.real&&(o=n.colspan-1,a=n.rowspan-1,o&&r+o>e&&(e=r+o),a&&i+a>t&&(t=i+a)))})}),{x:e,y:t}}function T(e){var t,n,r,i,o,a,s,l,c,d;if(B=E(e),A&&B){for(t=Math.min(A.x,B.x),n=Math.min(A.y,B.y),r=Math.max(A.x,B.x),i=Math.max(A.y,B.y),o=r,a=i,d=n;a>=d;d++)e=R[d][t],e.real||t-(e.colspan-1)<t&&(t-=e.colspan-1);for(c=t;o>=c;c++)e=R[n][c],e.real||n-(e.rowspan-1)<n&&(n-=e.rowspan-1);for(d=n;i>=d;d++)for(c=t;r>=c;c++)e=R[d][c],e.real&&(s=e.colspan-1,l=e.rowspan-1,s&&c+s>o&&(o=c+s),l&&d+l>a&&(a=d+l));for(H.removeClass(H.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),d=n;a>=d;d++)for(c=t;o>=c;c++)R[d][c]&&H.addClass(R[d][c].elm,"mce-item-selected")}}var R,A,B,L,D=i.selection,H=D.dom;o=o||H.getParent(D.getStart(),"table"),a(),L=H.getParent(D.getStart(),"th,td"),L&&(A=E(L),B=S(),L=l(A.x,A.y)),e.extend(this,{deleteTable:f,split:g,merge:v,insertRow:y,insertCol:b,deleteCols:C,deleteRows:x,cutRows:w,copyRows:_,pasteRows:N,getPos:E,setStartCell:k,setEndCell:T})}}),r(u,[f,d,c],function(e,t,n){function r(e,t){return parseInt(e.getAttribute(t)||1,10)}var i=n.each;return function(n){function o(){function t(t){function o(e,r){var i=e?"previousSibling":"nextSibling",o=n.dom.getParent(r,"tr"),s=o[i];if(s)return g(n,r,s,e),t.preventDefault(),!0;var d=n.dom.getParent(o,"table"),u=o.parentNode,f=u.nodeName.toLowerCase();if("tbody"===f||f===(e?"tfoot":"thead")){var p=a(e,d,u,"tbody");if(null!==p)return l(e,p,r)}return c(e,o,i,d)}function a(e,t,r,i){var o=n.dom.select(">"+i,t),a=o.indexOf(r);if(e&&0===a||!e&&a===o.length-1)return s(e,t);if(-1===a){var l="thead"===r.tagName.toLowerCase()?0:o.length-1;return o[l]}return o[a+(e?-1:1)]}function s(e,t){var r=e?"thead":"tfoot",i=n.dom.select(">"+r,t);return 0!==i.length?i[0]:null}function l(e,r,i){var o=d(r,e);return o&&g(n,i,o,e),t.preventDefault(),!0}function c(e,r,i,a){var s=a[i];if(s)return u(s),!0;var l=n.dom.getParent(a,"td,th");if(l)return o(e,l,t);var c=d(r,!e);return u(c),t.preventDefault(),!1}function d(e,t){var r=e&&e[t?"lastChild":"firstChild"];return r&&"BR"===r.nodeName?n.dom.getParent(r,"td,th"):r}function u(e){n.selection.setCursorLocation(e,0)}function f(){return b==e.UP||b==e.DOWN}function p(e){var t=e.selection.getNode(),n=e.dom.getParent(t,"tr");return null!==n}function m(e){for(var t=0,n=e;n.previousSibling;)n=n.previousSibling,t+=r(n,"colspan");return t}function h(e,t){var n=0,o=0;return i(e.children,function(e,i){return n+=r(e,"colspan"),o=i,n>t?!1:void 0}),o}function g(e,t,r,i){var o=m(n.dom.getParent(t,"td,th")),a=h(r,o),s=r.childNodes[a],l=d(s,i);u(l||s)}function v(e){var t=n.selection.getNode(),r=n.dom.getParent(t,"td,th"),i=n.dom.getParent(e,"td,th");return r&&r!==i&&y(r,i)}function y(e,t){return n.dom.getParent(e,"TABLE")===n.dom.getParent(t,"TABLE")}var b=t.keyCode;if(f()&&p(n)){var C=n.selection.getNode();setTimeout(function(){v(C)&&o(!t.shiftKey&&b===e.UP,C,t)},0)}}n.on("KeyDown",function(e){t(e)})}function a(){function e(e,t){var n=t.ownerDocument,r=n.createRange(),i;return r.setStartBefore(t),r.setEnd(e.endContainer,e.endOffset),i=n.createElement("body"),i.appendChild(r.cloneContents()),0===i.innerHTML.replace(/<(br|img|object|embed|input|textarea)[^>]*>/gi,"-").replace(/<[^>]+>/g,"").length}n.on("KeyDown",function(t){var r,i,o=n.dom;(37==t.keyCode||38==t.keyCode)&&(r=n.selection.getRng(),i=o.getParent(r.startContainer,"table"),i&&n.getBody().firstChild==i&&e(r,i)&&(r=o.createRng(),r.setStartBefore(i),r.setEndBefore(i),n.selection.setRng(r),t.preventDefault()))})}function s(){n.on("KeyDown SetContent VisualAid",function(){var e;for(e=n.getBody().lastChild;e;e=e.previousSibling)if(3==e.nodeType){if(e.nodeValue.length>0)break}else if(1==e.nodeType&&!e.getAttribute("data-mce-bogus"))break;e&&"TABLE"==e.nodeName&&(n.settings.forced_root_block?n.dom.add(n.getBody(),n.settings.forced_root_block,n.settings.forced_root_block_attrs,t.ie&&t.ie<11?"&nbsp;":'<br data-mce-bogus="1" />'):n.dom.add(n.getBody(),"br",{"data-mce-bogus":"1"}))}),n.on("PreProcess",function(e){var t=e.node.lastChild;t&&("BR"==t.nodeName||1==t.childNodes.length&&("BR"==t.firstChild.nodeName||"\xa0"==t.firstChild.nodeValue))&&t.previousSibling&&"TABLE"==t.previousSibling.nodeName&&n.dom.remove(t)})}function l(){function e(e,t,n,r){var i=3,o=e.dom.getParent(t.startContainer,"TABLE"),a,s,l;return o&&(a=o.parentNode),s=t.startContainer.nodeType==i&&0===t.startOffset&&0===t.endOffset&&r&&("TR"==n.nodeName||n==a),l=("TD"==n.nodeName||"TH"==n.nodeName)&&!r,s||l}function t(){var t=n.selection.getRng(),r=n.selection.getNode(),i=n.dom.getParent(t.startContainer,"TD,TH");if(e(n,t,r,i)){i||(i=r);for(var o=i.lastChild;o.lastChild;)o=o.lastChild;t.setEnd(o,o.nodeValue.length),n.selection.setRng(t)}}n.on("KeyDown",function(){t()}),n.on("MouseDown",function(e){2!=e.button&&t()})}function c(){n.on("keydown",function(t){if((t.keyCode==e.DELETE||t.keyCode==e.BACKSPACE)&&!t.isDefaultPrevented()){var r=n.dom.getParent(n.selection.getStart(),"table");if(r){for(var i=n.dom.select("td,th",r),o=i.length;o--;)if(!n.dom.hasClass(i[o],"mce-item-selected"))return;t.preventDefault(),n.execCommand("mceTableDelete")}}})}c(),t.webkit&&(o(),l()),t.gecko&&(a(),s()),t.ie>10&&(a(),s())}}),r(p,[l,m,c],function(e,t,n){return function(r){function i(){r.getBody().style.webkitUserSelect="",d&&(r.dom.removeClass(r.dom.select("td.mce-item-selected,th.mce-item-selected"),"mce-item-selected"),d=!1)}function o(t){var n,i,o=t.target;if(l&&(s||o!=l)&&("TD"==o.nodeName||"TH"==o.nodeName)){i=a.getParent(o,"table"),i==c&&(s||(s=new e(r,i),s.setStartCell(l),r.getBody().style.webkitUserSelect="none"),s.setEndCell(o),d=!0),n=r.selection.getSel();try{n.removeAllRanges?n.removeAllRanges():n.empty()}catch(u){}t.preventDefault()}}var a=r.dom,s,l,c,d=!0;return r.on("MouseDown",function(e){2!=e.button&&(i(),l=a.getParent(e.target,"td,th"),c=a.getParent(l,"table"))}),a.bind(r.getDoc(),"mouseover",o),r.on("remove",function(){a.unbind(r.getDoc(),"mouseover",o)}),r.on("MouseUp",function(){function e(e,r){var o=new t(e,e);do{if(3==e.nodeType&&0!==n.trim(e.nodeValue).length)return r?i.setStart(e,0):i.setEnd(e,e.nodeValue.length),void 0;if("BR"==e.nodeName)return r?i.setStartBefore(e):i.setEndBefore(e),void 0}while(e=r?o.next():o.prev())}var i,o=r.selection,d,u,f,p,m;if(l){if(s&&(r.getBody().style.webkitUserSelect=""),d=a.select("td.mce-item-selected,th.mce-item-selected"),d.length>0){i=a.createRng(),f=d[0],m=d[d.length-1],i.setStartBefore(f),i.setEndAfter(f),e(f,1),u=new t(f,a.getParent(d[0],"table"));do if("TD"==f.nodeName||"TH"==f.nodeName){if(!a.hasClass(f,"mce-item-selected"))break;p=f}while(f=u.next());e(p),o.setRng(i)}r.nodeChanged(),l=s=c=null}}),r.on("KeyUp",function(){i()}),{clear:i}}}),r(h,[l,u,p,c,m,d,g],function(e,t,n,r,i,o,a){function s(r){function i(e){return e?e.replace(/px$/,""):""}function a(e){return/^[0-9]+$/.test(e)&&(e+="px"),e}function s(e){l("left center right".split(" "),function(t){r.formatter.remove("align"+t,{},e)})}function c(){var e=r.dom,t,n,c;t=r.dom.getParent(r.selection.getStart(),"table"),c=!1,n={width:i(e.getStyle(t,"width")||e.getAttrib(t,"width")),height:i(e.getStyle(t,"height")||e.getAttrib(t,"height")),cellspacing:e.getAttrib(t,"cellspacing"),cellpadding:e.getAttrib(t,"cellpadding"),border:e.getAttrib(t,"border"),caption:!!e.select("caption",t)[0]},l("left center right".split(" "),function(e){r.formatter.matchNode(t,"align"+e)&&(n.align=e)}),r.windowManager.open({title:"Table properties",items:{type:"form",layout:"grid",columns:2,data:n,defaults:{type:"textbox",maxWidth:50},items:[c?{label:"Cols",name:"cols",disabled:!0}:null,c?{label:"Rows",name:"rows",disabled:!0}:null,{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell spacing",name:"cellspacing"},{label:"Cell padding",name:"cellpadding"},{label:"Border",name:"border"},{label:"Caption",name:"caption",type:"checkbox"},{label:"Alignment",minWidth:90,name:"align",type:"listbox",text:"None",maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]},onsubmit:function(){var n=this.toJSON(),i;r.undoManager.transact(function(){r.dom.setAttribs(t,{cellspacing:n.cellspacing,cellpadding:n.cellpadding,border:n.border}),r.dom.setStyles(t,{width:a(n.width),height:a(n.height)}),i=e.select("caption",t)[0],i&&!n.caption&&e.remove(i),!i&&n.caption&&(i=e.create("caption"),i.innerHTML=o.ie?"\xa0":'<br data-mce-bogus="1"/>',t.insertBefore(i,t.firstChild)),s(t),n.align&&r.formatter.apply("align"+n.align,{},t),r.focus(),r.addVisual()})}})}function d(e,t){r.windowManager.open({title:"Merge cells",body:[{label:"Cols",name:"cols",type:"textbox",size:10},{label:"Rows",name:"rows",type:"textbox",size:10}],onsubmit:function(){var n=this.toJSON();r.undoManager.transact(function(){e.merge(t,n.cols,n.rows)})}})}function u(){var e=r.dom,t,n,o=[];o=r.dom.select("td.mce-item-selected,th.mce-item-selected"),t=r.dom.getParent(r.selection.getStart(),"td,th"),!o.length&&t&&o.push(t),t=t||o[0],n={width:i(e.getStyle(t,"width")||e.getAttrib(t,"width")),height:i(e.getStyle(t,"height")||e.getAttrib(t,"height")),scope:e.getAttrib(t,"scope")},n.type=t.nodeName.toLowerCase(),l("left center right".split(" "),function(e){r.formatter.matchNode(t,"align"+e)&&(n.align=e)}),r.windowManager.open({title:"Cell properties",items:{type:"form",data:n,layout:"grid",columns:2,defaults:{type:"textbox",maxWidth:50},items:[{label:"Width",name:"width"},{label:"Height",name:"height"},{label:"Cell type",name:"type",type:"listbox",text:"None",minWidth:90,maxWidth:null,menu:[{text:"Cell",value:"td"},{text:"Header cell",value:"th"}]},{label:"Scope",name:"scope",type:"listbox",text:"None",minWidth:90,maxWidth:null,menu:[{text:"None",value:""},{text:"Row",value:"row"},{text:"Column",value:"col"},{text:"Row group",value:"rowgroup"},{text:"Column group",value:"colgroup"}]},{label:"Alignment",name:"align",type:"listbox",text:"None",minWidth:90,maxWidth:null,values:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]}]},onsubmit:function(){var t=this.toJSON();r.undoManager.transact(function(){l(o,function(n){r.dom.setAttrib(n,"scope",t.scope),r.dom.setStyles(n,{width:a(t.width),height:a(t.height)}),t.type&&n.nodeName.toLowerCase()!=t.type&&(n=e.rename(n,t.type)),s(n),t.align&&r.formatter.apply("align"+t.align,{},n)}),r.focus()})}})}function f(){var e=r.dom,t,n,o,c,d=[];t=r.dom.getParent(r.selection.getStart(),"table"),n=r.dom.getParent(r.selection.getStart(),"td,th"),l(t.rows,function(t){l(t.cells,function(r){return e.hasClass(r,"mce-item-selected")||r==n?(d.push(t),!1):void 0})}),o=d[0],c={height:i(e.getStyle(o,"height")||e.getAttrib(o,"height")),scope:e.getAttrib(o,"scope")},c.type=o.parentNode.nodeName.toLowerCase(),l("left center right".split(" "),function(e){r.formatter.matchNode(o,"align"+e)&&(c.align=e)}),r.windowManager.open({title:"Row properties",items:{type:"form",data:c,columns:2,defaults:{type:"textbox"},items:[{type:"listbox",name:"type",label:"Row type",text:"None",maxWidth:null,menu:[{text:"Header",value:"thead"},{text:"Body",value:"tbody"},{text:"Footer",value:"tfoot"}]},{type:"listbox",name:"align",label:"Alignment",text:"None",maxWidth:null,menu:[{text:"None",value:""},{text:"Left",value:"left"},{text:"Center",value:"center"},{text:"Right",value:"right"}]},{label:"Height",name:"height"}]},onsubmit:function(){var t=this.toJSON(),n,i,o;r.undoManager.transact(function(){var c=t.type;l(d,function(l){r.dom.setAttrib(l,"scope",t.scope),r.dom.setStyles(l,{height:a(t.height)}),c!=l.parentNode.nodeName.toLowerCase()&&(n=e.getParent(l,"table"),i=l.parentNode,o=e.select(c,n)[0],o||(o=e.create(c),n.firstChild?n.insertBefore(o,n.firstChild):n.appendChild(o)),o.appendChild(l),i.hasChildNodes()||e.remove(i)),s(l),t.align&&r.formatter.apply("align"+t.align,{},l)}),r.focus()})}})}function p(e){return function(){r.execCommand(e)}}function m(e,t){var n,i,a;for(a="<table><tbody>",n=0;t>n;n++){for(a+="<tr>",i=0;e>i;i++)a+="<td>"+(o.ie?" ":"<br>")+"</td>";a+="</tr>"}a+="</tbody></table>",r.insertContent(a)}function h(e,t){function n(){e.disabled(!r.dom.getParent(r.selection.getStart(),t)),r.selection.selectorChanged(t,function(t){e.disabled(!t)})}r.initialized?n():r.on("init",n)}function g(){h(this,"table")}function v(){h(this,"td,th")}function y(){var e="";e='<table role="presentation" class="mce-grid mce-grid-border">';for(var t=0;10>t;t++){e+="<tr>";for(var n=0;10>n;n++)e+='<td><a href="#" data-mce-index="'+n+","+t+'"></a></td>';e+="</tr>"}return e+="</table>",e+='<div class="mce-text-center">0 x 0</div>'}var b,C,x=this;r.addMenuItem("inserttable",{text:"Insert table",icon:"table",context:"table",onhide:function(){r.dom.removeClass(this.menu.items()[0].getEl().getElementsByTagName("a"),"mce-active")},menu:[{type:"container",html:y(),onmousemove:function(e){var t,n,i=e.target;if("A"==i.nodeName){var o=r.dom.getParent(i,"table"),a=i.getAttribute("data-mce-index"),s=e.control.parent().rel;if(a!=this.lastPos){if(a=a.split(","),a[0]=parseInt(a[0],10),a[1]=parseInt(a[1],10),e.control.isRtl()||"tl-tr"==s){for(n=9;n>=0;n--)for(t=0;10>t;t++)r.dom.toggleClass(o.rows[n].childNodes[t].firstChild,"mce-active",t>=a[0]&&n<=a[1]);a[0]=9-a[0],o.nextSibling.innerHTML=a[0]+" x "+(a[1]+1)}else{for(n=0;10>n;n++)for(t=0;10>t;t++)r.dom.toggleClass(o.rows[n].childNodes[t].firstChild,"mce-active",t<=a[0]&&n<=a[1]);o.nextSibling.innerHTML=a[0]+1+" x "+(a[1]+1)}this.lastPos=a}}},onclick:function(e){"A"==e.target.nodeName&&this.lastPos&&(e.preventDefault(),m(this.lastPos[0]+1,this.lastPos[1]+1),this.parent().cancel())}}]}),r.addMenuItem("tableprops",{text:"Table properties",context:"table",onPostRender:g,onclick:c}),r.addMenuItem("deletetable",{text:"Delete table",context:"table",onPostRender:g,cmd:"mceTableDelete"}),r.addMenuItem("cell",{separator:"before",text:"Cell",context:"table",menu:[{text:"Cell properties",onclick:p("mceTableCellProps"),onPostRender:v},{text:"Merge cells",onclick:p("mceTableMergeCells"),onPostRender:v},{text:"Split cell",onclick:p("mceTableSplitCells"),onPostRender:v}]}),r.addMenuItem("row",{text:"Row",context:"table",menu:[{text:"Insert row before",onclick:p("mceTableInsertRowBefore"),onPostRender:v},{text:"Insert row after",onclick:p("mceTableInsertRowAfter"),onPostRender:v},{text:"Delete row",onclick:p("mceTableDeleteRow"),onPostRender:v},{text:"Row properties",onclick:p("mceTableRowProps"),onPostRender:v},{text:"-"},{text:"Cut row",onclick:p("mceTableCutRow"),onPostRender:v},{text:"Copy row",onclick:p("mceTableCopyRow"),onPostRender:v},{text:"Paste row before",onclick:p("mceTablePasteRowBefore"),onPostRender:v},{text:"Paste row after",onclick:p("mceTablePasteRowAfter"),onPostRender:v}]}),r.addMenuItem("column",{text:"Column",context:"table",menu:[{text:"Insert column before",onclick:p("mceTableInsertColBefore"),onPostRender:v},{text:"Insert column after",onclick:p("mceTableInsertColAfter"),onPostRender:v},{text:"Delete column",onclick:p("mceTableDeleteCol"),onPostRender:v}]});var w=[];l("inserttable tableprops deletetable | cell row column".split(" "),function(e){"|"==e?w.push({text:"-"}):w.push(r.menuItems[e])}),r.addButton("table",{type:"menubutton",title:"Table",menu:w}),o.isIE||r.on("click",function(e){e=e.target,"TABLE"===e.nodeName&&(r.selection.select(e),r.nodeChanged())}),x.quirks=new t(r),r.on("Init",function(){b=r.windowManager,x.cellSelection=new n(r)}),l({mceTableSplitCells:function(e){e.split()},mceTableMergeCells:function(e){var t,n,i;i=r.dom.getParent(r.selection.getStart(),"th,td"),i&&(t=i.rowSpan,n=i.colSpan),r.dom.select("td.mce-item-selected,th.mce-item-selected").length?e.merge():d(e,i)},mceTableInsertRowBefore:function(e){e.insertRow(!0)},mceTableInsertRowAfter:function(e){e.insertRow()},mceTableInsertColBefore:function(e){e.insertCol(!0)},mceTableInsertColAfter:function(e){e.insertCol()},mceTableDeleteCol:function(e){e.deleteCols()},mceTableDeleteRow:function(e){e.deleteRows()},mceTableCutRow:function(e){C=e.cutRows()},mceTableCopyRow:function(e){C=e.copyRows()},mceTablePasteRowBefore:function(e){e.pasteRows(C,!0)},mceTablePasteRowAfter:function(e){e.pasteRows(C)},mceTableDelete:function(e){e.deleteTable()}},function(t,n){r.addCommand(n,function(){var n=new e(r);n&&(t(n),r.execCommand("mceRepaint"),x.cellSelection.clear())})}),l({mceInsertTable:function(){c()},mceTableRowProps:f,mceTableCellProps:u},function(e,t){r.addCommand(t,function(t,n){e(n)})})}var l=r.each;a.add("table",s)}),a([l,u,p,h])}(this);
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/template/plugin.min.js b/media/editors/tinymce/plugins/template/plugin.min.js
index ee7715d..91a8b5f 100644
--- a/media/editors/tinymce/plugins/template/plugin.min.js
+++ b/media/editors/tinymce/plugins/template/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("template",function(e){function t(t){return function(){var a=e.settings.templates;"string"==typeof a?tinymce.util.XHR.send({url:a,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(a)}}function a(t){function a(t){function a(t){if(-1==t.indexOf("<html>")){var a="";tinymce.each(e.contentCSS,function(t){a+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(t)+'">'}),t="<!DOCTYPE html><html><head>"+a+"</head>"+"<body>"+t+"</body>"+"</html>"}t=r(t,"template_preview_replace_values");var l=n.find("iframe")[0].getEl().contentWindow.document;l.open(),l.write(t),l.close()}var c=t.control.value();c.url?tinymce.util.XHR.send({url:c.url,success:function(e){l=e,a(l)}}):(l=c.content,a(l)),n.find("#description")[0].text(t.control.value().description)}var n,l,o=[];return t&&0!==t.length?(tinymce.each(t,function(e){o.push({selected:!o.length,text:e.title,value:{url:e.url,content:e.content,description:e.description}})}),n=e.windowManager.open({title:"Insert template",body:[{type:"container",label:"Templates",items:{type:"listbox",name:"template",values:o,onselect:a}},{type:"label",name:"description",label:"Description",text:" "},{type:"iframe",minWidth:600,minHeight:400,border:1}],onsubmit:function(){c(!1,l)}}),n.find("listbox")[0].fire("select"),void 0):(e.windowManager.alert("No templates defined"),void 0)}function n(t,a){function n(e,t){if(e=""+e,e.length<t)for(var a=0;a<t-e.length;a++)e="0"+e;return e}var l="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),r="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),c="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),o="January February March April May June July August September October November December".split(" ");return a=a||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+a.getFullYear()),t=t.replace("%y",""+a.getYear()),t=t.replace("%m",n(a.getMonth()+1,2)),t=t.replace("%d",n(a.getDate(),2)),t=t.replace("%H",""+n(a.getHours(),2)),t=t.replace("%M",""+n(a.getMinutes(),2)),t=t.replace("%S",""+n(a.getSeconds(),2)),t=t.replace("%I",""+((a.getHours()+11)%12+1)),t=t.replace("%p",""+(a.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(o[a.getMonth()])),t=t.replace("%b",""+e.translate(c[a.getMonth()])),t=t.replace("%A",""+e.translate(r[a.getDay()])),t=t.replace("%a",""+e.translate(l[a.getDay()])),t=t.replace("%%","%")}function l(t){var a=e.dom,n=e.getParam("template_replace_values");o(a.select("*",t),function(e){o(n,function(t,l){a.hasClass(e,l)&&"function"==typeof n[l]&&n[l](e)})})}function r(t,a){return o(e.getParam(a),function(e,a){"function"!=typeof e&&(t=t.replace(new RegExp("\\{\\$"+a+"\\}","g"),e))}),t}function c(t,a){function c(e,t){return new RegExp("\\b"+t+"\\b","g").test(e.className)}var i,s,m=e.dom,u=e.selection.getContent();a=r(a,"template_replace_values"),i=m.create("div",null,a),s=m.select(".mceTmpl",i),s&&s.length>0&&(i=m.create("div",null),i.appendChild(s[0].cloneNode(!0))),o(m.select("*",i),function(t){c(t,e.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_cdate_format",e.getLang("template.cdate_format")))),c(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_mdate_format",e.getLang("template.mdate_format")))),c(t,e.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))&&(t.innerHTML=u)}),l(i),e.execCommand("mceInsertContent",!1,i.innerHTML),e.addVisual()}var o=tinymce.each;e.addCommand("mceInsertTemplate",c),e.addButton("template",{title:"Insert template",onclick:t(a)}),e.addMenuItem("template",{text:"Insert template",onclick:t(a),context:"insert"}),e.on("PreProcess",function(t){var a=e.dom;o(a.select("div",t.node),function(t){a.hasClass(t,"mceTmpl")&&(o(a.select("*",t),function(t){a.hasClass(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_mdate_format",e.getLang("template.mdate_format"))))}),l(t))})})});
\ No newline at end of file
+tinymce.PluginManager.add("template",function(e){function t(t){return function(){var a=e.settings.templates;"string"==typeof a?tinymce.util.XHR.send({url:a,success:function(e){t(tinymce.util.JSON.parse(e))}}):t(a)}}function a(t){function a(t){function a(t){if(-1==t.indexOf("<html>")){var a="";tinymce.each(e.contentCSS,function(t){a+='<link type="text/css" rel="stylesheet" href="'+e.documentBaseURI.toAbsolute(t)+'">'}),t="<!DOCTYPE html><html><head>"+a+"</head>"+"<body>"+t+"</body>"+"</html>"}t=r(t,"template_preview_replace_values");var l=n.find("iframe")[0].getEl().contentWindow.document;l.open(),l.write(t),l.close()}var c=t.control.value();c.url?tinymce.util.XHR.send({url:c.url,success:function(e){l=e,a(l)}}):(l=c.content,a(l)),n.find("#description")[0].text(t.control.value().description)}var n,l,i=[];return t&&0!==t.length?(tinymce.each(t,function(e){i.push({selected:!i.length,text:e.title,value:{url:e.url,content:e.content,description:e.description}})}),n=e.windowManager.open({title:"Insert template",layout:"flex",direction:"column",align:"stretch",padding:15,spacing:10,items:[{type:"form",flex:0,padding:0,items:[{type:"container",label:"Templates",items:{type:"listbox",label:"Templates",name:"template",values:i,onselect:a}}]},{type:"label",name:"description",label:"Description",text:" "},{type:"iframe",flex:1,border:1}],onsubmit:function(){c(!1,l)},width:e.getParam("template_popup_width",600),height:e.getParam("template_popup_height",500)}),n.find("listbox")[0].fire("select"),void 0):(e.windowManager.alert("No templates defined"),void 0)}function n(t,a){function n(e,t){if(e=""+e,e.length<t)for(var a=0;a<t-e.length;a++)e="0"+e;return e}var l="Sun Mon Tue Wed Thu Fri Sat Sun".split(" "),r="Sunday Monday Tuesday Wednesday Thursday Friday Saturday Sunday".split(" "),c="Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec".split(" "),i="January February March April May June July August September October November December".split(" ");return a=a||new Date,t=t.replace("%D","%m/%d/%Y"),t=t.replace("%r","%I:%M:%S %p"),t=t.replace("%Y",""+a.getFullYear()),t=t.replace("%y",""+a.getYear()),t=t.replace("%m",n(a.getMonth()+1,2)),t=t.replace("%d",n(a.getDate(),2)),t=t.replace("%H",""+n(a.getHours(),2)),t=t.replace("%M",""+n(a.getMinutes(),2)),t=t.replace("%S",""+n(a.getSeconds(),2)),t=t.replace("%I",""+((a.getHours()+11)%12+1)),t=t.replace("%p",""+(a.getHours()<12?"AM":"PM")),t=t.replace("%B",""+e.translate(i[a.getMonth()])),t=t.replace("%b",""+e.translate(c[a.getMonth()])),t=t.replace("%A",""+e.translate(r[a.getDay()])),t=t.replace("%a",""+e.translate(l[a.getDay()])),t=t.replace("%%","%")}function l(t){var a=e.dom,n=e.getParam("template_replace_values");i(a.select("*",t),function(e){i(n,function(t,l){a.hasClass(e,l)&&"function"==typeof n[l]&&n[l](e)})})}function r(t,a){return i(e.getParam(a),function(e,a){"function"!=typeof e&&(t=t.replace(new RegExp("\\{\\$"+a+"\\}","g"),e))}),t}function c(t,a){function c(e,t){return new RegExp("\\b"+t+"\\b","g").test(e.className)}var o,s,p=e.dom,m=e.selection.getContent();a=r(a,"template_replace_values"),o=p.create("div",null,a),s=p.select(".mceTmpl",o),s&&s.length>0&&(o=p.create("div",null),o.appendChild(s[0].cloneNode(!0))),i(p.select("*",o),function(t){c(t,e.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_cdate_format",e.getLang("template.cdate_format")))),c(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_mdate_format",e.getLang("template.mdate_format")))),c(t,e.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))&&(t.innerHTML=m)}),l(o),e.execCommand("mceInsertContent",!1,o.innerHTML),e.addVisual()}var i=tinymce.each;e.addCommand("mceInsertTemplate",c),e.addButton("template",{title:"Insert template",onclick:t(a)}),e.addMenuItem("template",{text:"Insert template",onclick:t(a),context:"insert"}),e.on("PreProcess",function(t){var a=e.dom;i(a.select("div",t.node),function(t){a.hasClass(t,"mceTmpl")&&(i(a.select("*",t),function(t){a.hasClass(t,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))&&(t.innerHTML=n(e.getParam("template_mdate_format",e.getLang("template.mdate_format"))))}),l(t))})})});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/visualblocks/plugin.min.js b/media/editors/tinymce/plugins/visualblocks/plugin.min.js
index 8c48ed0..cafa418 100644
--- a/media/editors/tinymce/plugins/visualblocks/plugin.min.js
+++ b/media/editors/tinymce/plugins/visualblocks/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("visualblocks",function(e,s){function o(){var s=this;s.active(a),e.on("VisualBlocks",function(){s.active(e.dom.hasClass(e.getBody(),"mce-visualblocks"))})}var l,t,a;window.NodeList&&(e.addCommand("mceVisualBlocks",function(){var o,c=e.dom;l||(l=c.uniqueId(),o=c.create("link",{id:l,rel:"stylesheet",href:s+"/css/visualblocks.css"}),e.getDoc().getElementsByTagName("head")[0].appendChild(o)),e.on("PreviewFormats AfterPreviewFormats",function(s){a&&c.toggleClass(e.getBody(),"mce-visualblocks","afterpreviewformats"==s.type)}),c.toggleClass(e.getBody(),"mce-visualblocks"),a=e.dom.hasClass(e.getBody(),"mce-visualblocks"),t&&t.active(c.hasClass(e.getBody(),"mce-visualblocks")),e.fire("VisualBlocks")}),e.addButton("visualblocks",{title:"Show blocks",cmd:"mceVisualBlocks",onPostRender:o}),e.addMenuItem("visualblocks",{text:"Show blocks",cmd:"mceVisualBlocks",onPostRender:o,selectable:!0,context:"view",prependToContext:!0}),e.on("init",function(){e.settings.visualblocks_default_state&&e.execCommand("mceVisualBlocks",!1,null,{skip_focus:!0})}),e.on("remove",function(){e.dom.removeClass(e.getBody(),"mce-visualblocks")}))});
\ No newline at end of file
+tinymce.PluginManager.add("visualblocks",function(e,t){function n(){var t=this;t.active(r),e.on("VisualBlocks",function(){t.active(e.dom.hasClass(e.getBody(),"mce-visualblocks"))})}var i,a,r;window.NodeList&&(e.addCommand("mceVisualBlocks",function(){var n,o=e.dom;i||(i=o.uniqueId(),n=o.create("link",{id:i,rel:"stylesheet",href:t+"/css/visualblocks.css"}),e.getDoc().getElementsByTagName("head")[0].appendChild(n)),e.on("PreviewFormats AfterPreviewFormats",function(t){r&&o.toggleClass(e.getBody(),"mce-visualblocks","afterpreviewformats"==t.type)}),o.toggleClass(e.getBody(),"mce-visualblocks"),r=e.dom.hasClass(e.getBody(),"mce-visualblocks"),a&&a.active(o.hasClass(e.getBody(),"mce-visualblocks")),e.fire("VisualBlocks")}),e.addButton("visualblocks",{title:"Show blocks",cmd:"mceVisualBlocks",onPostRender:n}),e.addMenuItem("visualblocks",{text:"Show blocks",cmd:"mceVisualBlocks",onPostRender:n,selectable:!0,context:"view",prependToContext:!0}),e.on("init",function(){e.settings.visualblocks_default_state&&e.execCommand("mceVisualBlocks",!1,null,{skip_focus:!0})}),e.on("remove",function(){e.dom.removeClass(e.getBody(),"mce-visualblocks")}))});
\ No newline at end of file
diff --git a/media/editors/tinymce/plugins/visualchars/plugin.min.js b/media/editors/tinymce/plugins/visualchars/plugin.min.js
index ad915d6..4474238 100644
--- a/media/editors/tinymce/plugins/visualchars/plugin.min.js
+++ b/media/editors/tinymce/plugins/visualchars/plugin.min.js
@@ -1 +1 @@
-tinymce.PluginManager.add("visualchars",function(e){function t(t){var n,i,o,a,s,l,c=e.getBody(),d=e.selection;if(r=!r,e.fire("VisualChars",{state:r}),t&&(l=d.getBookmark()),r)for(i=[],tinymce.walk(c,function(e){3==e.nodeType&&e.nodeValue&&-1!=e.nodeValue.indexOf(" ")&&i.push(e)},"childNodes"),o=0;o<i.length;o++){for(a=i[o].nodeValue,a=a.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mce-nbsp">$1</span>'),s=e.dom.create("div",null,a);n=s.lastChild;)e.dom.insertAfter(n,i[o]);e.dom.remove(i[o])}else for(i=e.dom.select("span.mce-nbsp",c),o=i.length-1;o>=0;o--)e.dom.remove(i[o],1);d.moveToBookmark(l)}function n(){var t=this;e.on("VisualChars",function(e){t.active(e.state)})}var r;e.addCommand("mceVisualChars",t),e.addButton("visualchars",{title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n}),e.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n,selectable:!0,context:"view",prependToContext:!0}),e.on("beforegetcontent",function(e){r&&"raw"!=e.format&&!e.draft&&(r=!0,t(!1))})});
\ No newline at end of file
+tinymce.PluginManager.add("visualchars",function(e){function t(t){var n,a,r,o,l,s,c=e.getBody(),d=e.selection;if(i=!i,e.fire("VisualChars",{state:i}),t&&(s=d.getBookmark()),i)for(a=[],tinymce.walk(c,function(e){3==e.nodeType&&e.nodeValue&&-1!=e.nodeValue.indexOf(" ")&&a.push(e)},"childNodes"),r=0;r<a.length;r++){for(o=a[r].nodeValue,o=o.replace(/(\u00a0)/g,'<span data-mce-bogus="1" class="mce-nbsp">$1</span>'),l=e.dom.create("div",null,o);n=l.lastChild;)e.dom.insertAfter(n,a[r]);e.dom.remove(a[r])}else for(a=e.dom.select("span.mce-nbsp",c),r=a.length-1;r>=0;r--)e.dom.remove(a[r],1);d.moveToBookmark(s)}function n(){var t=this;e.on("VisualChars",function(e){t.active(e.state)})}var i;e.addCommand("mceVisualChars",t),e.addButton("visualchars",{title:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n}),e.addMenuItem("visualchars",{text:"Show invisible characters",cmd:"mceVisualChars",onPostRender:n,selectable:!0,context:"view",prependToContext:!0}),e.on("beforegetcontent",function(e){i&&"raw"!=e.format&&!e.draft&&(i=!0,t(!1))})});
\ No newline at end of file
diff --git a/media/editors/tinymce/skins/lightgray/content.inline.min.css b/media/editors/tinymce/skins/lightgray/content.inline.min.css
index 8ff8ee2..2f0db0e 100644
--- a/media/editors/tinymce/skins/lightgray/content.inline.min.css
+++ b/media/editors/tinymce/skins/lightgray/content.inline.min.css
@@ -1 +1 @@
-.mce-object{border:1px dotted #3a3a3a;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px!important;height:9px!important;border:1px dotted #3a3a3a;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp{background:#AAA}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-spellchecker-word{background:url(img/wline.gif) repeat-x bottom left;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#39f!important}.mce-edit-focus{outline:1px dotted #333}
\ No newline at end of file
+.mce-object{border:1px dotted #3A3A3A;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp{background:#AAA}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{background:url(img/wline.gif) repeat-x bottom left;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}
\ No newline at end of file
diff --git a/media/editors/tinymce/skins/lightgray/content.min.css b/media/editors/tinymce/skins/lightgray/content.min.css
index 15ab86f..340a537 100644
--- a/media/editors/tinymce/skins/lightgray/content.min.css
+++ b/media/editors/tinymce/skins/lightgray/content.min.css
@@ -1 +1 @@
-body{background-color:#fff;color:#000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px;scrollbar-3dlight-color:#f0f0ee;scrollbar-arrow-color:#676662;scrollbar-base-color:#f0f0ee;scrollbar-darkshadow-color:#ddd;scrollbar-face-color:#e0e0dd;scrollbar-highlight-color:#f0f0ee;scrollbar-shadow-color:#f0f0ee;scrollbar-track-color:#f5f5f5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px}.mce-object{border:1px dotted #3a3a3a;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px!important;height:9px!important;border:1px dotted #3a3a3a;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp{background:#AAA}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#39f;color:#fff}.mce-spellchecker-word{background:url(img/wline.gif) repeat-x bottom left;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#39f!important}.mce-edit-focus{outline:1px dotted #333}
\ No newline at end of file
+body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:11px}.mce-object{border:1px dotted #3A3A3A;background:#d5d5d5 url(img/object.gif) no-repeat center}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#d5d5d5 url(img/anchor.gif) no-repeat center}.mce-nbsp{background:#AAA}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{background:url(img/wline.gif) repeat-x bottom left;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td.mce-item-selected,th.mce-item-selected{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}
\ No newline at end of file
diff --git a/media/editors/tinymce/skins/lightgray/skin.ie7.min.css b/media/editors/tinymce/skins/lightgray/skin.ie7.min.css
index c2bed1c..509ce7f 100644
--- a/media/editors/tinymce/skins/lightgray/skin.ie7.min.css
+++ b/media/editors/tinymce/skins/lightgray/skin.ie7.min.css
@@ -1 +1 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #9e9e9e;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td div{border:1px solid #d6d6d6;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#a1a1a1}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#a1a1a1;background:#c8def4}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);top:0;left:0;background:#fff;border:1px solid #9e9e9e;border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#9e9e9e;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#fff;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#c0c0c0));background-image:-webkit-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-o-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:linear-gradient(to bottom,#e6e6e6,#c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffc0c0c0',GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:not(.mce-disabled):active{background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#c0c0c0));background-image:-webkit-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-o-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:linear-gradient(to bottom,#e6e6e6,#c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffc0c0c0',GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{min-width:50px;color:#fff;border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1}.mce-primary:hover,.mce-primary:focus{background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#005299;background-image:-moz-linear-gradient(top,#069,#039);background-image:-webkit-gradient(linear,0 0,0 100%,from(#069),to(#039));background-image:-webkit-linear-gradient(top,#069,#039);background-image:-o-linear-gradient(top,#069,#039);background-image:linear-gradient(to bottom,#069,#039);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff006699',endColorstr='#ff003399',GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px #333}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-first{border-left:1px solid #b1b1b1;border-left:1px solid rgba(0,0,0,0.25);-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #b1b1b1;border-right:1px solid rgba(0,0,0,0.1);-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:4px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-14px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;border-left:1px solid transparent;border-right:1px solid transparent}.mce-colorbutton:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:4px;margin-right:-14px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;margin-right:-17px;padding-left:0}.mce-rtl .mce-colorbutton button{padding-right:10px;padding-left:10px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid #9e9e9e;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #c4c4c4}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:transparent;background:#e6e6e6;filter:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-menubtn.mce-disabled span{color:#aaa}.mce-menubtn span{color:#333;margin-right:2px;line-height:20px;*line-height:16px}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:#fff}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:#fff}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:#fff}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#c8def4}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:#333}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:#fff}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#cbcbcb;border-bottom:1px solid #fff;cursor:default;filter:none}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:#fff}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:10px;padding-left:10px}.mce-rtl .mce-splitbtn .mce-open{padding-left:4px;padding-right:4px}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-btn-small .mce-ico{font-family:'tinymce-small'}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = this.currentStyle['-ie7-icon'].substr(1,1)+'&nbsp;')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-inserttime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-pastetext{-ie7-icon:"\e035"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#BBB}
\ No newline at end of file
+.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #9e9e9e;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td div{border:1px solid #d6d6d6;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#a1a1a1}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#a1a1a1;background:#c8def4}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-toolbar-grp{padding-bottom:2px}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fdfdfd, #ddd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fdfdfd), to(#ddd));background-image:-webkit-linear-gradient(top, #fdfdfd, #ddd);background-image:-o-linear-gradient(top, #fdfdfd, #ddd);background-image:linear-gradient(to bottom, #fdfdfd, #ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd', endColorstr='#ffdddddd', GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2)}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);top:0;left:0;background:#fff;border:1px solid #9e9e9e;border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#9e9e9e;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#fff;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000000;-moz-box-shadow:0 0 5px #000000;box-shadow:0 0 5px #000000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0px;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fff, #d9d9d9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#d9d9d9));background-image:-webkit-linear-gradient(top, #fff, #d9d9d9);background-image:-o-linear-gradient(top, #fff, #d9d9d9);background-image:linear-gradient(to bottom, #fff, #d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffd9d9d9', GradientType=0);zoom:1}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;background-image:-moz-linear-gradient(top, #f2f2f2, #ccc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#ccc));background-image:-webkit-linear-gradient(top, #f2f2f2, #ccc);background-image:-o-linear-gradient(top, #f2f2f2, #ccc);background-image:linear-gradient(to bottom, #f2f2f2, #ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffcccccc', GradientType=0);zoom:1}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#d6d6d6;background-image:-moz-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e6e6e6), to(#c0c0c0));background-image:-webkit-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-o-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:linear-gradient(to bottom, #e6e6e6, #c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6', endColorstr='#ffc0c0c0', GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-btn:not(.mce-disabled):active{background-color:#d6d6d6;background-image:-moz-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e6e6e6), to(#c0c0c0));background-image:-webkit-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-o-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:linear-gradient(to bottom, #e6e6e6, #c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6', endColorstr='#ffc0c0c0', GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{min-width:50px;color:#fff;border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top, #08c, #04c);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#08c), to(#04c));background-image:-webkit-linear-gradient(top, #08c, #04c);background-image:-o-linear-gradient(top, #08c, #04c);background-image:linear-gradient(to bottom, #08c, #04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);zoom:1}.mce-primary:hover,.mce-primary:focus{background-color:#005fb3;background-image:-moz-linear-gradient(top, #0077b3, #003cb3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0077b3), to(#003cb3));background-image:-webkit-linear-gradient(top, #0077b3, #003cb3);background-image:-o-linear-gradient(top, #0077b3, #003cb3);background-image:linear-gradient(to bottom, #0077b3, #003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3', endColorstr='#ff003cb3', GradientType=0);zoom:1}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#005299;background-image:-moz-linear-gradient(top, #069, #039);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#069), to(#039));background-image:-webkit-linear-gradient(top, #069, #039);background-image:-o-linear-gradient(top, #069, #039);background-image:linear-gradient(to bottom, #069, #039);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff006699', endColorstr='#ff003399', GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px #333}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-first{border-left:1px solid #b1b1b1;border-left:1px solid rgba(0,0,0,0.25);-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #b1b1b1;border-right:1px solid rgba(0,0,0,0.1);-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fff, #d9d9d9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#d9d9d9));background-image:-webkit-linear-gradient(top, #fff, #d9d9d9);background-image:-o-linear-gradient(top, #fff, #d9d9d9);background-image:linear-gradient(to bottom, #fff, #d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffd9d9d9', GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:4px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-14px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;border-left:1px solid transparent;border-right:1px solid transparent}.mce-colorbutton:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:4px;margin-right:-14px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;margin-right:-17px;padding-left:0}.mce-rtl .mce-colorbutton button{padding-right:10px;padding-left:10px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid #9e9e9e;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #c4c4c4}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:transparent;background:#e6e6e6;filter:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-menubtn.mce-disabled span{color:#aaa}.mce-menubtn span{color:#333;margin-right:2px;line-height:20px;*line-height:16px}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:#fff}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:#fff}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:#fff}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#c8def4}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:#333}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:#fff}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top, #08c, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#08c), to(#0077b3));background-image:-webkit-linear-gradient(top, #08c, #0077b3);background-image:-o-linear-gradient(top, #08c, #0077b3);background-image:linear-gradient(to bottom, #08c, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);zoom:1}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#cbcbcb;border-bottom:1px solid #fff;cursor:default;filter:none}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:#fff}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:10px;padding-left:10px}.mce-rtl .mce-splitbtn .mce-open{padding-left:4px;padding-right:4px}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce';font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333;-ie7-icon:' '}.mce-btn-small .mce-ico{font-family:'tinymce-small'}.mce-ico,i.mce-i-checkbox{zoom:expression(this.runtimeStyle['zoom'] = '1', this.innerHTML = this.currentStyle['-ie7-icon'].substr(1, 1) + '&nbsp;')}.mce-i-save{-ie7-icon:"\e000"}.mce-i-newdocument{-ie7-icon:"\e001"}.mce-i-fullpage{-ie7-icon:"\e002"}.mce-i-alignleft{-ie7-icon:"\e003"}.mce-i-aligncenter{-ie7-icon:"\e004"}.mce-i-alignright{-ie7-icon:"\e005"}.mce-i-alignjustify{-ie7-icon:"\e006"}.mce-i-cut{-ie7-icon:"\e007"}.mce-i-paste{-ie7-icon:"\e008"}.mce-i-searchreplace{-ie7-icon:"\e009"}.mce-i-bullist{-ie7-icon:"\e00a"}.mce-i-numlist{-ie7-icon:"\e00b"}.mce-i-indent{-ie7-icon:"\e00c"}.mce-i-outdent{-ie7-icon:"\e00d"}.mce-i-blockquote{-ie7-icon:"\e00e"}.mce-i-undo{-ie7-icon:"\e00f"}.mce-i-redo{-ie7-icon:"\e010"}.mce-i-link{-ie7-icon:"\e011"}.mce-i-unlink{-ie7-icon:"\e012"}.mce-i-anchor{-ie7-icon:"\e013"}.mce-i-image{-ie7-icon:"\e014"}.mce-i-media{-ie7-icon:"\e015"}.mce-i-help{-ie7-icon:"\e016"}.mce-i-code{-ie7-icon:"\e017"}.mce-i-inserttime{-ie7-icon:"\e018"}.mce-i-preview{-ie7-icon:"\e019"}.mce-i-forecolor{-ie7-icon:"\e01a"}.mce-i-backcolor{-ie7-icon:"\e01a"}.mce-i-table{-ie7-icon:"\e01b"}.mce-i-hr{-ie7-icon:"\e01c"}.mce-i-removeformat{-ie7-icon:"\e01d"}.mce-i-subscript{-ie7-icon:"\e01e"}.mce-i-superscript{-ie7-icon:"\e01f"}.mce-i-charmap{-ie7-icon:"\e020"}.mce-i-emoticons{-ie7-icon:"\e021"}.mce-i-print{-ie7-icon:"\e022"}.mce-i-fullscreen{-ie7-icon:"\e023"}.mce-i-spellchecker{-ie7-icon:"\e024"}.mce-i-nonbreaking{-ie7-icon:"\e025"}.mce-i-template{-ie7-icon:"\e026"}.mce-i-pagebreak{-ie7-icon:"\e027"}.mce-i-restoredraft{-ie7-icon:"\e028"}.mce-i-untitled{-ie7-icon:"\e029"}.mce-i-bold{-ie7-icon:"\e02a"}.mce-i-italic{-ie7-icon:"\e02b"}.mce-i-underline{-ie7-icon:"\e02c"}.mce-i-strikethrough{-ie7-icon:"\e02d"}.mce-i-visualchars{-ie7-icon:"\e02e"}.mce-i-ltr{-ie7-icon:"\e02f"}.mce-i-rtl{-ie7-icon:"\e030"}.mce-i-copy{-ie7-icon:"\e031"}.mce-i-resize{-ie7-icon:"\e032"}.mce-i-browse{-ie7-icon:"\e034"}.mce-i-pastetext{-ie7-icon:"\e035"}.mce-i-checkbox,.mce-i-selected{-ie7-icon:"\e033"}.mce-i-selected{visibility:hidden}.mce-i-backcolor{background:#BBB}
\ No newline at end of file
diff --git a/media/editors/tinymce/skins/lightgray/skin.min.css b/media/editors/tinymce/skins/lightgray/skin.min.css
index d290f77..bcf7b87 100644
--- a/media/editors/tinymce/skins/lightgray/skin.min.css
+++ b/media/editors/tinymce/skins/lightgray/skin.min.css
@@ -1 +1 @@
-.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible!important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #9e9e9e;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td div{border:1px solid #d6d6d6;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#a1a1a1}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#a1a1a1;background:#c8def4}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fdfdfd,#ddd);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fdfdfd),to(#ddd));background-image:-webkit-linear-gradient(top,#fdfdfd,#ddd);background-image:-o-linear-gradient(top,#fdfdfd,#ddd);background-image:linear-gradient(to bottom,#fdfdfd,#ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd',endColorstr='#ffdddddd',GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2)}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);top:0;left:0;background:#fff;border:1px solid #9e9e9e;border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#9e9e9e;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#fff;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0,0,0,0.3);-moz-box-shadow:0 3px 7px rgba(0,0,0,0.3);box-shadow:0 3px 7px rgba(0,0,0,0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000;-moz-box-shadow:0 0 5px #000;box-shadow:0 0 5px #000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:0;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:0;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;background-image:-moz-linear-gradient(top,#f2f2f2,#ccc);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f2f2f2),to(#ccc));background-image:-webkit-linear-gradient(top,#f2f2f2,#ccc);background-image:-o-linear-gradient(top,#f2f2f2,#ccc);background-image:linear-gradient(to bottom,#f2f2f2,#ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2',endColorstr='#ffcccccc',GradientType=0);zoom:1}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#c0c0c0));background-image:-webkit-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-o-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:linear-gradient(to bottom,#e6e6e6,#c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffc0c0c0',GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn:not(.mce-disabled):active{background-color:#d6d6d6;background-image:-moz-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#c0c0c0));background-image:-webkit-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:-o-linear-gradient(top,#e6e6e6,#c0c0c0);background-image:linear-gradient(to bottom,#e6e6e6,#c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6',endColorstr='#ffc0c0c0',GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{min-width:50px;color:#fff;border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top,#08c,#04c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#04c));background-image:-webkit-linear-gradient(top,#08c,#04c);background-image:-o-linear-gradient(top,#08c,#04c);background-image:linear-gradient(to bottom,#08c,#04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0044cc',GradientType=0);zoom:1}.mce-primary:hover,.mce-primary:focus{background-color:#005fb3;background-image:-moz-linear-gradient(top,#0077b3,#003cb3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#0077b3),to(#003cb3));background-image:-webkit-linear-gradient(top,#0077b3,#003cb3);background-image:-o-linear-gradient(top,#0077b3,#003cb3);background-image:linear-gradient(to bottom,#0077b3,#003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3',endColorstr='#ff003cb3',GradientType=0);zoom:1}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#005299;background-image:-moz-linear-gradient(top,#069,#039);background-image:-webkit-gradient(linear,0 0,0 100%,from(#069),to(#039));background-image:-webkit-linear-gradient(top,#069,#039);background-image:-o-linear-gradient(top,#069,#039);background-image:linear-gradient(to bottom,#069,#039);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff006699',endColorstr='#ff003399',GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px #333}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-first{border-left:1px solid #b1b1b1;border-left:1px solid rgba(0,0,0,0.25);-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #b1b1b1;border-right:1px solid rgba(0,0,0,0.1);-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.2),0 1px 2px rgba(0,0,0,0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#fff,#d9d9d9);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#d9d9d9));background-image:-webkit-linear-gradient(top,#fff,#d9d9d9);background-image:-o-linear-gradient(top,#fff,#d9d9d9);background-image:linear-gradient(to bottom,#fff,#d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffd9d9d9',GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:4px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-14px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;border-left:1px solid transparent;border-right:1px solid transparent}.mce-colorbutton:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:4px;margin-right:-14px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;margin-right:-17px;padding-left:0}.mce-rtl .mce-colorbutton button{padding-right:10px;padding-left:10px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9e9e9e;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid #9e9e9e;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #c4c4c4}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:transparent;background:#e6e6e6;filter:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-menubtn.mce-disabled span{color:#aaa}.mce-menubtn span{color:#333;margin-right:2px;line-height:20px;*line-height:16px}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:#fff}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:#fff}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:#fff}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#c8def4}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:#333}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:#fff}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top,#08c,#0077b3);background-image:-webkit-gradient(linear,0 0,0 100%,from(#08c),to(#0077b3));background-image:-webkit-linear-gradient(top,#08c,#0077b3);background-image:-o-linear-gradient(top,#08c,#0077b3);background-image:linear-gradient(to bottom,#08c,#0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc',endColorstr='#ff0077b3',GradientType=0);zoom:1}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#cbcbcb;border-bottom:1px solid #fff;cursor:default;filter:none}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:#fff}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);-moz-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 2px 4px rgba(0,0,0,0.15),0 1px 2px rgba(0,0,0,0.05)}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:10px;padding-left:10px}.mce-rtl .mce-splitbtn .mce-open{padding-left:4px;padding-right:4px}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);display:inline-block;-webkit-transition:border linear .2s,box-shadow linear .2s;transition:border linear .2s,box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(82,168,236,0.65)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333}.mce-btn-small .mce-ico{font-family:'tinymce-small',Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-inserttime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-pastetext:before{content:"\e035"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#bbb}
\ No newline at end of file
+.mce-container,.mce-container *,.mce-widget,.mce-widget *{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:#333;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;-webkit-tap-highlight-color:transparent;line-height:normal;font-weight:normal;text-align:left;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr}.mce-widget button{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}.mce-container *[unselectable]{-moz-user-select:none;-webkit-user-select:none;-o-user-select:none;user-select:none}.mce-container ::-webkit-scrollbar{width:8px;height:8px;-webkit-border-radius:4px}.mce-container ::-webkit-scrollbar-track,.mce-container ::-webkit-scrollbar-track-piece{background-color:transparent}.mce-container ::-webkit-scrollbar-thumb{background-color:rgba(53,57,71,0.3);width:6px;height:6px;-webkit-border-radius:4px}.mce-fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.mce-fade.mce-in{opacity:1}.mce-tinymce{visibility:visible !important;position:relative}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;height:100%;z-index:100}div.mce-fullscreen{position:fixed;top:0;left:0;width:100%;height:auto}.mce-tinymce{display:block;-webkit-border-radius:2px;-moz-border-radius:2px;border-radius:2px}.mce-wordcount{position:absolute;top:0;right:0;padding:8px}div.mce-edit-area{background:#FFF;filter:none}.mce-statusbar{position:relative}.mce-statusbar .mce-container-body{position:relative}.mce-fullscreen .mce-resizehandle{display:none}.mce-charmap{border-collapse:collapse}.mce-charmap td{cursor:default;border:1px solid #9e9e9e;width:20px;height:20px;line-height:20px;text-align:center;vertical-align:middle;padding:2px}.mce-charmap td div{text-align:center}.mce-charmap td:hover{background:#d9d9d9}.mce-grid td div{border:1px solid #d6d6d6;width:12px;height:12px;margin:2px;cursor:pointer}.mce-grid{border-spacing:2px;border-collapse:separate}.mce-grid a{display:block;border:1px solid transparent}.mce-grid a:hover{border-color:#a1a1a1}.mce-grid-border{margin:0 4px 0 4px}.mce-grid-border a{border-color:#d6d6d6;width:13px;height:13px}.mce-grid-border a:hover,.mce-grid-border a.mce-active{border-color:#a1a1a1;background:#c8def4}.mce-text-center{text-align:center}div.mce-tinymce-inline{width:100%;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-toolbar-grp{padding-bottom:2px}.mce-toolbar-grp .mce-flow-layout-item{margin-bottom:0}.mce-rtl .mce-wordcount{left:0;right:auto}.mce-container,.mce-container-body{display:block}.mce-autoscroll{overflow:hidden}.mce-scrollbar{position:absolute;width:7px;height:100%;top:2px;right:2px;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-scrollbar-h{top:auto;right:auto;left:2px;bottom:2px;width:100%;height:7px}.mce-scrollbar-thumb{position:absolute;background-color:#000;border:1px solid #888;border-color:rgba(85,85,85,0.6);width:5px;height:100%;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scrollbar-h .mce-scrollbar-thumb{width:100%;height:5px}.mce-scrollbar:hover,.mce-scrollbar.mce-active{background-color:#AAA;opacity:.6;filter:alpha(opacity=60);zoom:1;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.mce-scroll{position:relative}.mce-panel{border:0 solid #9e9e9e;background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fdfdfd, #ddd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fdfdfd), to(#ddd));background-image:-webkit-linear-gradient(top, #fdfdfd, #ddd);background-image:-o-linear-gradient(top, #fdfdfd, #ddd);background-image:linear-gradient(to bottom, #fdfdfd, #ddd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffdfdfd', endColorstr='#ffdddddd', GradientType=0);zoom:1}.mce-floatpanel{position:absolute;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2)}.mce-floatpanel.mce-fixed{position:fixed}.mce-floatpanel .mce-arrow,.mce-floatpanel .mce-arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.mce-floatpanel .mce-arrow{border-width:11px}.mce-floatpanel .mce-arrow:after{border-width:10px;content:""}.mce-floatpanel.mce-popover{filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);top:0;left:0;background:#fff;border:1px solid #9e9e9e;border:1px solid rgba(0,0,0,0.25)}.mce-floatpanel.mce-popover.mce-bottom{margin-top:10px;*margin-top:0}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#9e9e9e;border-bottom-color:rgba(0,0,0,0.25);top:-11px}.mce-floatpanel.mce-popover.mce-bottom>.mce-arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.mce-floatpanel.mce-popover.mce-bottom.mce-start{margin-left:-22px}.mce-floatpanel.mce-popover.mce-bottom.mce-start>.mce-arrow{left:20px}.mce-floatpanel.mce-popover.mce-bottom.mce-end{margin-left:22px}.mce-floatpanel.mce-popover.mce-bottom.mce-end>.mce-arrow{right:10px;left:auto}.mce-fullscreen{border:0;padding:0;margin:0;overflow:hidden;background:#fff;height:100%}div.mce-fullscreen{position:fixed;top:0;left:0}#mce-modal-block{opacity:0;filter:alpha(opacity=0);zoom:1;position:fixed;left:0;top:0;width:100%;height:100%;background:#000}#mce-modal-block.mce-in{opacity:.3;filter:alpha(opacity=30);zoom:1}.mce-window-move{cursor:move}.mce-window{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;background:#fff;position:fixed;top:0;left:0;opacity:0;-webkit-transition:opacity 150ms ease-in;transition:opacity 150ms ease-in}.mce-window.mce-in{opacity:1}.mce-window-head{padding:9px 15px;border-bottom:1px solid #c5c5c5;position:relative}.mce-window-head .mce-close{position:absolute;right:15px;top:9px;font-size:20px;font-weight:bold;line-height:20px;color:#858585;cursor:pointer;height:20px;overflow:hidden}.mce-close:hover{color:#adadad}.mce-window-head .mce-title{line-height:20px;font-size:20px;font-weight:bold;text-rendering:optimizelegibility;padding-right:10px}.mce-window .mce-container-body{display:block}.mce-foot{display:block;background-color:#fff;border-top:1px solid #c5c5c5;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px}.mce-window-head .mce-dragh{position:absolute;top:0;left:0;cursor:move;width:90%;height:100%}.mce-window iframe{width:100%;height:100%}.mce-window.mce-fullscreen,.mce-window.mce-fullscreen .mce-foot{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-rtl .mce-window-head .mce-close{position:absolute;right:auto;left:15px}.mce-rtl .mce-window-head .mce-dragh{left:auto;right:0}.mce-rtl .mce-window-head .mce-title{direction:rtl;text-align:right}.mce-abs-layout{position:relative}body .mce-abs-layout-item,.mce-abs-end{position:absolute}.mce-abs-end{width:1px;height:1px}.mce-container-body.mce-abs-layout{overflow:hidden}.mce-tooltip{position:absolute;padding:5px;opacity:.8;filter:alpha(opacity=80);zoom:1}.mce-tooltip-inner{font-size:11px;background-color:#000;color:#fff;max-width:200px;padding:5px 8px 4px 8px;text-align:center;white-space:normal}.mce-tooltip-inner{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-tooltip-inner{-webkit-box-shadow:0 0 5px #000000;-moz-box-shadow:0 0 5px #000000;box-shadow:0 0 5px #000000}.mce-tooltip-arrow{position:absolute;width:0;height:0;line-height:0;border:5px dashed #000}.mce-tooltip-arrow-n{border-bottom-color:#000}.mce-tooltip-arrow-s{border-top-color:#000}.mce-tooltip-arrow-e{border-left-color:#000}.mce-tooltip-arrow-w{border-right-color:#000}.mce-tooltip-nw,.mce-tooltip-sw{margin-left:-14px}.mce-tooltip-n .mce-tooltip-arrow{top:0px;left:50%;margin-left:-5px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-nw .mce-tooltip-arrow{top:0;left:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-ne .mce-tooltip-arrow{top:0;right:10px;border-bottom-style:solid;border-top:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-s .mce-tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-sw .mce-tooltip-arrow{bottom:0;left:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-se .mce-tooltip-arrow{bottom:0;right:10px;border-top-style:solid;border-bottom:none;border-left-color:transparent;border-right-color:transparent}.mce-tooltip-e .mce-tooltip-arrow{right:0;top:50%;margin-top:-5px;border-left-style:solid;border-right:none;border-top-color:transparent;border-bottom-color:transparent}.mce-tooltip-w .mce-tooltip-arrow{left:0;top:50%;margin-top:-5px;border-right-style:solid;border-left:none;border-top-color:transparent;border-bottom-color:transparent}.mce-btn{border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);position:relative;text-shadow:0 1px 1px rgba(255,255,255,0.75);display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fff, #d9d9d9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#d9d9d9));background-image:-webkit-linear-gradient(top, #fff, #d9d9d9);background-image:-o-linear-gradient(top, #fff, #d9d9d9);background-image:linear-gradient(to bottom, #fff, #d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffd9d9d9', GradientType=0);zoom:1}.mce-btn:hover,.mce-btn:focus{color:#333;background-color:#e3e3e3;background-image:-moz-linear-gradient(top, #f2f2f2, #ccc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#ccc));background-image:-webkit-linear-gradient(top, #f2f2f2, #ccc);background-image:-o-linear-gradient(top, #f2f2f2, #ccc);background-image:linear-gradient(to bottom, #f2f2f2, #ccc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffcccccc', GradientType=0);zoom:1}.mce-btn.mce-disabled button,.mce-btn.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-btn.mce-active,.mce-btn.mce-active:hover{background-color:#d6d6d6;background-image:-moz-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e6e6e6), to(#c0c0c0));background-image:-webkit-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-o-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:linear-gradient(to bottom, #e6e6e6, #c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6', endColorstr='#ffc0c0c0', GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-btn:not(.mce-disabled):active{background-color:#d6d6d6;background-image:-moz-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#e6e6e6), to(#c0c0c0));background-image:-webkit-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:-o-linear-gradient(top, #e6e6e6, #c0c0c0);background-image:linear-gradient(to bottom, #e6e6e6, #c0c0c0);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe6e6e6', endColorstr='#ffc0c0c0', GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-btn button{padding:4px 10px;font-size:14px;line-height:20px;*line-height:16px;cursor:pointer;color:#333;text-align:center;overflow:visible;-webkit-appearance:none}.mce-btn button::-moz-focus-inner{border:0;padding:0}.mce-btn i{text-shadow:1px 1px #fff}.mce-primary{min-width:50px;color:#fff;border:1px solid #b1b1b1;border-color:rgba(0,0,0,0.1) rgba(0,0,0,0.1) rgba(0,0,0,0.25) rgba(0,0,0,0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top, #08c, #04c);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#08c), to(#04c));background-image:-webkit-linear-gradient(top, #08c, #04c);background-image:-o-linear-gradient(top, #08c, #04c);background-image:linear-gradient(to bottom, #08c, #04c);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);zoom:1}.mce-primary:hover,.mce-primary:focus{background-color:#005fb3;background-image:-moz-linear-gradient(top, #0077b3, #003cb3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0077b3), to(#003cb3));background-image:-webkit-linear-gradient(top, #0077b3, #003cb3);background-image:-o-linear-gradient(top, #0077b3, #003cb3);background-image:linear-gradient(to bottom, #0077b3, #003cb3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0077b3', endColorstr='#ff003cb3', GradientType=0);zoom:1}.mce-primary.mce-disabled button,.mce-primary.mce-disabled:hover button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-primary.mce-active,.mce-primary.mce-active:hover,.mce-primary:not(.mce-disabled):active{background-color:#005299;background-image:-moz-linear-gradient(top, #069, #039);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#069), to(#039));background-image:-webkit-linear-gradient(top, #069, #039);background-image:-o-linear-gradient(top, #069, #039);background-image:linear-gradient(to bottom, #069, #039);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff006699', endColorstr='#ff003399', GradientType=0);zoom:1;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-primary button,.mce-primary button i{color:#fff;text-shadow:1px 1px #333}.mce-btn-large button{padding:9px 14px;font-size:16px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.mce-btn-large i{margin-top:2px}.mce-btn-small button{padding:1px 5px;font-size:12px;*padding-bottom:2px}.mce-btn-small i{line-height:20px;vertical-align:top;*line-height:18px}.mce-btn .mce-caret{margin-top:8px;margin-left:0}.mce-btn-small .mce-caret{margin-top:8px;margin-left:0}.mce-caret{display:inline-block;*display:inline;*zoom:1;width:0;height:0;vertical-align:top;border-top:4px solid #333;border-right:4px solid transparent;border-left:4px solid transparent;content:""}.mce-disabled .mce-caret{border-top-color:#aaa}.mce-caret.mce-up{border-bottom:4px solid #333;border-top:0}.mce-rtl .mce-btn button{direction:rtl}.mce-btn-group .mce-btn{border-width:1px 0 1px 0;margin:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}.mce-btn-group .mce-first{border-left:1px solid #b1b1b1;border-left:1px solid rgba(0,0,0,0.25);-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px}.mce-btn-group .mce-last{border-right:1px solid #b1b1b1;border-right:1px solid rgba(0,0,0,0.1);-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0}.mce-btn-group .mce-first.mce-last{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-btn-group .mce-btn.mce-flow-layout-item{margin:0}.mce-checkbox{cursor:pointer}i.mce-i-checkbox{margin:0 3px 0 0;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);background-color:#f0f0f0;background-image:-moz-linear-gradient(top, #fff, #d9d9d9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fff), to(#d9d9d9));background-image:-webkit-linear-gradient(top, #fff, #d9d9d9);background-image:-o-linear-gradient(top, #fff, #d9d9d9);background-image:linear-gradient(to bottom, #fff, #d9d9d9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffd9d9d9', GradientType=0);zoom:1;text-indent:-10em;*font-size:0;*line-height:0;*text-indent:0;overflow:hidden}.mce-checked i.mce-i-checkbox{color:#333;font-size:16px;line-height:16px;text-indent:0}.mce-checkbox:focus i.mce-i-checkbox,.mce-checkbox.mce-focus i.mce-i-checkbox{border:1px solid rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65)}.mce-checkbox.mce-disabled .mce-label,.mce-checkbox.mce-disabled i.mce-i-checkbox{color:#acacac}.mce-rtl .mce-checkbox{direction:rtl;text-align:right}.mce-rtl i.mce-i-checkbox{margin:0 0 0 3px}.mce-colorbutton .mce-ico{position:relative}.mce-colorbutton-grid{margin:4px}.mce-colorbutton button{padding-right:4px}.mce-colorbutton .mce-preview{padding-right:3px;display:block;position:absolute;left:50%;top:50%;margin-left:-14px;margin-top:7px;background:gray;width:13px;height:2px;overflow:hidden}.mce-colorbutton.mce-btn-small .mce-preview{margin-left:-16px;padding-right:0;width:16px}.mce-colorbutton .mce-open{padding-left:4px;border-left:1px solid transparent;border-right:1px solid transparent}.mce-colorbutton:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-colorbutton.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-colorbutton{direction:rtl}.mce-rtl .mce-colorbutton .mce-preview{margin-left:0;padding-right:0;padding-left:4px;margin-right:-14px}.mce-rtl .mce-colorbutton.mce-btn-small .mce-preview{margin-left:0;padding-right:0;margin-right:-17px;padding-left:0}.mce-rtl .mce-colorbutton button{padding-right:10px;padding-left:10px}.mce-rtl .mce-colorbutton .mce-open{padding-left:4px;padding-right:4px}.mce-combobox{display:inline-block;*display:inline;*zoom:1;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);*height:32px}.mce-combobox input{border:1px solid #c5c5c5;border-right-color:#c5c5c5;height:28px}.mce-combobox.mce-disabled input{color:#adadad}.mce-combobox.mce-has-open input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px}.mce-combobox .mce-btn{border-left:0;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0}.mce-combobox button{padding-right:8px;padding-left:8px}.mce-combobox.mce-disabled .mce-btn button{cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;opacity:.4;filter:alpha(opacity=40);zoom:1}.mce-path{display:inline-block;*display:inline;*zoom:1;padding:8px;white-space:normal}.mce-path .mce-txt{display:inline-block;padding-right:3px}.mce-path .mce-path-body{display:inline-block}.mce-path-item{display:inline-block;*display:inline;*zoom:1;cursor:pointer;color:#333}.mce-path-item:hover{text-decoration:underline}.mce-path-item:focus{background:#666;color:#fff}.mce-path .mce-divider{display:inline}.mce-disabled .mce-path-item{color:#aaa}.mce-rtl .mce-path{direction:rtl}.mce-fieldset{border:0 solid #9E9E9E;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.mce-fieldset>.mce-container-body{margin-top:-15px}.mce-fieldset-title{margin-left:5px;padding:0 5px 0 5px}.mce-fit-layout{display:inline-block;*display:inline;*zoom:1}.mce-fit-layout-item{position:absolute}.mce-flow-layout-item{display:inline-block;*display:inline;*zoom:1}.mce-flow-layout-item{margin:2px 0 2px 2px}.mce-flow-layout-item.mce-last{margin-right:2px}.mce-flow-layout{white-space:normal}.mce-tinymce-inline .mce-flow-layout{white-space:nowrap}.mce-rtl .mce-flow-layout{text-align:right;direction:rtl}.mce-rtl .mce-flow-layout-item{margin:2px 2px 2px 0}.mce-rtl .mce-flow-layout-item.mce-last{margin-left:2px}.mce-iframe{border:0 solid #9e9e9e;width:100%;height:100%}.mce-label{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 1px rgba(255,255,255,0.75);border:0;overflow:hidden}.mce-label.mce-autoscroll{overflow:auto}.mce-label.mce-disabled{color:#aaa}.mce-label.mce-multiline{white-space:pre-wrap}.mce-rtl .mce-label{text-align:right;direction:rtl}.mce-menubar .mce-menubtn{border-color:transparent;background:transparent;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;filter:none}.mce-menubar{border:1px solid #c4c4c4}.mce-menubar .mce-menubtn button span{color:#333}.mce-menubar .mce-caret{border-top-color:#333}.mce-menubar .mce-menubtn:hover,.mce-menubar .mce-menubtn.mce-active,.mce-menubar .mce-menubtn:focus{border-color:transparent;background:#e6e6e6;filter:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.mce-menubtn.mce-disabled span{color:#aaa}.mce-menubtn span{color:#333;margin-right:2px;line-height:20px;*line-height:16px}.mce-menubtn.mce-btn-small span{font-size:12px}.mce-menubtn.mce-fixed-width span{display:inline-block;overflow-x:hidden;text-overflow:ellipsis;width:90px}.mce-menubtn.mce-fixed-width.mce-btn-small span{width:70px}.mce-menubtn .mce-caret{*margin-top:6px}.mce-rtl .mce-menubtn button{direction:rtl;text-align:right}.mce-listbox button{text-align:left;padding-right:20px;position:relative}.mce-listbox .mce-caret{position:absolute;margin-top:-2px;right:8px;top:50%}.mce-rtl .mce-listbox .mce-caret{right:auto;left:8px}.mce-rtl .mce-listbox button{padding-right:10px;padding-left:20px}.mce-menu-item{display:block;padding:6px 15px 6px 12px;clear:both;font-weight:normal;line-height:20px;color:#333;white-space:nowrap;cursor:pointer;line-height:normal;border-left:4px solid transparent;margin-bottom:1px}.mce-menu-item .mce-ico,.mce-menu-item .mce-text{color:#333}.mce-menu-item.mce-disabled .mce-text,.mce-menu-item.mce-disabled .mce-ico{color:#adadad}.mce-menu-item:hover .mce-text,.mce-menu-item.mce-selected .mce-text{color:#fff}.mce-menu-item:hover .mce-ico,.mce-menu-item.mce-selected .mce-ico,.mce-menu-item:focus .mce-ico{color:#fff}.mce-menu-item.mce-disabled:hover{background:#ccc}.mce-menu-shortcut{display:inline-block;color:#adadad}.mce-menu-shortcut{display:inline-block;*display:inline;*zoom:1;padding:0 15px 0 20px}.mce-menu-item:hover .mce-menu-shortcut,.mce-menu-item.mce-selected .mce-menu-shortcut,.mce-menu-item:focus .mce-menu-shortcut{color:#fff}.mce-menu-item .mce-caret{margin-top:4px;*margin-top:3px;margin-right:6px;border-top:4px solid transparent;border-bottom:4px solid transparent;border-left:4px solid #333}.mce-menu-item.mce-selected .mce-caret,.mce-menu-item:focus .mce-caret,.mce-menu-item:hover .mce-caret{border-left-color:#fff}.mce-menu-align .mce-menu-shortcut{*margin-top:-2px}.mce-menu-align .mce-menu-shortcut,.mce-menu-align .mce-caret{position:absolute;right:0}.mce-menu-item.mce-active i{visibility:visible}.mce-menu-item-normal.mce-active{background-color:#c8def4}.mce-menu-item-preview.mce-active{border-left:5px solid #aaa}.mce-menu-item-normal.mce-active .mce-text{color:#333}.mce-menu-item-normal.mce-active:hover .mce-text,.mce-menu-item-normal.mce-active:hover .mce-ico{color:#fff}.mce-menu-item:hover,.mce-menu-item.mce-selected,.mce-menu-item:focus{text-decoration:none;color:#fff;background-color:#0081c2;background-image:-moz-linear-gradient(top, #08c, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#08c), to(#0077b3));background-image:-webkit-linear-gradient(top, #08c, #0077b3);background-image:-o-linear-gradient(top, #08c, #0077b3);background-image:linear-gradient(to bottom, #08c, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);zoom:1}div.mce-menu .mce-menu-item-sep,.mce-menu-item-sep:hover{border:0;padding:0;height:1px;margin:9px 1px;overflow:hidden;background:#cbcbcb;border-bottom:1px solid #fff;cursor:default;filter:none}.mce-menu.mce-rtl{direction:rtl}.mce-rtl .mce-menu-item{text-align:right;direction:rtl;padding:6px 12px 6px 15px}.mce-menu-align.mce-rtl .mce-menu-shortcut,.mce-menu-align.mce-rtl .mce-caret{right:auto;left:0}.mce-rtl .mce-menu-item .mce-caret{margin-left:6px;margin-right:0;border-right:4px solid #333;border-left:0}.mce-rtl .mce-menu-item.mce-selected .mce-caret,.mce-rtl .mce-menu-item:focus .mce-caret,.mce-rtl .mce-menu-item:hover .mce-caret{border-left-color:transparent;border-right-color:#fff}.mce-menu{position:absolute;left:0;top:0;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);background:transparent;z-index:1000;padding:5px 0 5px 0;margin:2px 0 0;min-width:160px;background:#fff;border:1px solid #989898;border:1px solid rgba(0,0,0,0.2);z-index:1002;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);max-height:400px;overflow:auto;overflow-x:hidden}.mce-menu i{display:none}.mce-menu-has-icons i{display:inline-block;*display:inline}.mce-menu-sub-tr-tl{margin:-6px 0 0 -1px}.mce-menu-sub-br-bl{margin:6px 0 0 -1px}.mce-menu-sub-tl-tr{margin:-6px 0 0 1px}.mce-menu-sub-bl-br{margin:6px 0 0 1px}.mce-container-body .mce-resizehandle{position:absolute;right:0;bottom:0;width:16px;height:16px;visibility:visible;cursor:s-resize;margin:0}.mce-container-body .mce-resizehandle-both{cursor:se-resize}i.mce-i-resize{color:#333}.mce-spacer{visibility:hidden}.mce-splitbtn .mce-open{border-left:1px solid transparent;border-right:1px solid transparent}.mce-splitbtn:hover .mce-open{border-left-color:#bdbdbd;border-right-color:#bdbdbd}.mce-splitbtn button{padding-right:4px}.mce-splitbtn .mce-open{padding-left:4px}.mce-splitbtn .mce-open.mce-active{-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05)}.mce-splitbtn.mce-btn-small .mce-open{padding:0 3px 0 3px}.mce-rtl .mce-splitbtn{direction:rtl;text-align:right}.mce-rtl .mce-splitbtn button{padding-right:10px;padding-left:10px}.mce-rtl .mce-splitbtn .mce-open{padding-left:4px;padding-right:4px}.mce-stack-layout-item{display:block}.mce-tabs{display:block;border-bottom:1px solid #c5c5c5}.mce-tab{display:inline-block;*display:inline;*zoom:1;border:1px solid #c5c5c5;border-width:0 1px 0 0;background:#e3e3e3;padding:8px;text-shadow:0 1px 1px rgba(255,255,255,0.75);height:13px;cursor:pointer}.mce-tab:hover{background:#fdfdfd}.mce-tab.mce-active{background:#fdfdfd;border-bottom-color:transparent;margin-bottom:-1px;height:14px}.mce-rtl .mce-tabs{text-align:right;direction:rtl}.mce-rtl .mce-tab{border-width:0 0 0 1px}.mce-textbox{background:#fff;border:1px solid #c5c5c5;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);display:inline-block;-webkit-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;height:28px;resize:none;padding:0 4px 0 4px;white-space:pre-wrap;*white-space:pre;color:#333}.mce-textbox:focus,.mce-textbox.mce-focus{border-color:rgba(82,168,236,0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.65)}.mce-placeholder .mce-textbox{color:#aaa}.mce-textbox.mce-multiline{padding:4px}.mce-textbox.mce-disabled{color:#adadad}.mce-rtl .mce-textbox{text-align:right;direction:rtl}.mce-throbber{position:absolute;top:0;left:0;width:100%;height:100%;opacity:.6;filter:alpha(opacity=60);zoom:1;background:#fff url('img/loader.gif') no-repeat center center}@font-face{font-family:'tinymce';src:url('fonts/tinymce.eot');src:url('fonts/tinymce.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce.woff') format('woff'),url('fonts/tinymce.ttf') format('truetype'),url('fonts/tinymce.svg#tinymce') format('svg');font-weight:normal;font-style:normal}@font-face{font-family:'tinymce-small';src:url('fonts/tinymce-small.eot');src:url('fonts/tinymce-small.eot?#iefix') format('embedded-opentype'),url('fonts/tinymce-small.woff') format('woff'),url('fonts/tinymce-small.ttf') format('truetype'),url('fonts/tinymce-small.svg#tinymce') format('svg');font-weight:normal;font-style:normal}.mce-ico{font-family:'tinymce',Arial;font-style:normal;font-weight:normal;font-size:16px;line-height:16px;vertical-align:text-top;-webkit-font-smoothing:antialiased;display:inline-block;background:transparent center center;width:16px;height:16px;color:#333}.mce-btn-small .mce-ico{font-family:'tinymce-small',Arial}.mce-i-save:before{content:"\e000"}.mce-i-newdocument:before{content:"\e001"}.mce-i-fullpage:before{content:"\e002"}.mce-i-alignleft:before{content:"\e003"}.mce-i-aligncenter:before{content:"\e004"}.mce-i-alignright:before{content:"\e005"}.mce-i-alignjustify:before{content:"\e006"}.mce-i-cut:before{content:"\e007"}.mce-i-paste:before{content:"\e008"}.mce-i-searchreplace:before{content:"\e009"}.mce-i-bullist:before{content:"\e00a"}.mce-i-numlist:before{content:"\e00b"}.mce-i-indent:before{content:"\e00c"}.mce-i-outdent:before{content:"\e00d"}.mce-i-blockquote:before{content:"\e00e"}.mce-i-undo:before{content:"\e00f"}.mce-i-redo:before{content:"\e010"}.mce-i-link:before{content:"\e011"}.mce-i-unlink:before{content:"\e012"}.mce-i-anchor:before{content:"\e013"}.mce-i-image:before{content:"\e014"}.mce-i-media:before{content:"\e015"}.mce-i-help:before{content:"\e016"}.mce-i-code:before{content:"\e017"}.mce-i-inserttime:before{content:"\e018"}.mce-i-preview:before{content:"\e019"}.mce-i-forecolor:before{content:"\e01a"}.mce-i-backcolor:before{content:"\e01a"}.mce-i-table:before{content:"\e01b"}.mce-i-hr:before{content:"\e01c"}.mce-i-removeformat:before{content:"\e01d"}.mce-i-subscript:before{content:"\e01e"}.mce-i-superscript:before{content:"\e01f"}.mce-i-charmap:before{content:"\e020"}.mce-i-emoticons:before{content:"\e021"}.mce-i-print:before{content:"\e022"}.mce-i-fullscreen:before{content:"\e023"}.mce-i-spellchecker:before{content:"\e024"}.mce-i-nonbreaking:before{content:"\e025"}.mce-i-template:before{content:"\e026"}.mce-i-pagebreak:before{content:"\e027"}.mce-i-restoredraft:before{content:"\e028"}.mce-i-untitled:before{content:"\e029"}.mce-i-bold:before{content:"\e02a"}.mce-i-italic:before{content:"\e02b"}.mce-i-underline:before{content:"\e02c"}.mce-i-strikethrough:before{content:"\e02d"}.mce-i-visualchars:before{content:"\e02e"}.mce-i-visualblocks:before{content:"\e02e"}.mce-i-ltr:before{content:"\e02f"}.mce-i-rtl:before{content:"\e030"}.mce-i-copy:before{content:"\e031"}.mce-i-resize:before{content:"\e032"}.mce-i-browse:before{content:"\e034"}.mce-i-pastetext:before{content:"\e035"}.mce-i-checkbox:before,.mce-i-selected:before{content:"\e033"}.mce-i-selected{visibility:hidden}i.mce-i-backcolor{text-shadow:none;background:#bbb}
\ No newline at end of file
diff --git a/media/editors/tinymce/themes/modern/theme.min.js b/media/editors/tinymce/themes/modern/theme.min.js
index 4e30f4c..6869cf7 100644
--- a/media/editors/tinymce/themes/modern/theme.min.js
+++ b/media/editors/tinymce/themes/modern/theme.min.js
@@ -1 +1 @@
-tinymce.ThemeManager.add("modern",function(e){function t(){function t(t){var i,o=[];if(t)return d(t.split(/[ ,]/),function(t){function n(){var n=e.selection;"bullist"==r&&n.selectorChanged("ul > li",function(e,n){for(var i,o=n.parents.length;o--&&(i=n.parents[o].nodeName,"OL"!=i&&"UL"!=i););t.active(e&&"UL"==i)}),"numlist"==r&&n.selectorChanged("ol > li",function(e,n){for(var i,o=n.parents.length;o--&&(i=n.parents[o].nodeName,"OL"!=i&&"UL"!=i););t.active(e&&"OL"==i)}),t.settings.stateSelector&&n.selectorChanged(t.settings.stateSelector,function(e){t.active(e)},!0),t.settings.disabledStateSelector&&n.selectorChanged(t.settings.disabledStateSelector,function(e){t.disabled(e)})}var r;"|"==t?i=null:c.has(t)?(t={type:t},u.toolbar_items_size&&(t.size=u.toolbar_items_size),o.push(t),i=null):(i||(i={type:"buttongroup",items:[]},o.push(i)),e.buttons[t]&&(r=t,t=e.buttons[r],"function"==typeof t&&(t=t()),t.type=t.type||"button",u.toolbar_items_size&&(t.size=u.toolbar_items_size),t=c.create(t),i.items.push(t),e.initialized?n():e.on("init",n)))}),n.push({type:"toolbar",layout:"flow",items:o}),!0}for(var n=[],i=1;10>i&&t(u["toolbar"+i]);i++);return n.length||t(u.toolbar||f),n}function n(){function t(t){var n;return"|"==t?{text:"|"}:n=e.menuItems[t]}function n(n){var i,o,r,a,s;if(s=tinymce.makeMap((u.removed_menuitems||"").split(/[ ,]/)),u.menu?(o=u.menu[n],a=!0):o=h[n],o){i={text:o.title},r=[],d((o.items||"").split(/[ ,]/),function(e){var n=t(e);n&&!s[e]&&r.push(t(e))}),a||d(e.menuItems,function(e){e.context==n&&("before"==e.separator&&r.push({text:"|"}),e.prependToContext?r.unshift(e):r.push(e),"after"==e.separator&&r.push({text:"|"}))});for(var l=0;l<r.length;l++)"|"==r[l].text&&(0===l||l==r.length-1)&&r.splice(l,1);if(i.menu=r,!i.menu.length)return null}return i}var i,o=[],r=[];if(u.menu)for(i in u.menu)r.push(i);else for(i in h)r.push(i);for(var a="string"==typeof u.menubar?u.menubar.split(/[ ,]/):r,s=0;s<a.length;s++){var l=a[s];l=n(l),l&&o.push(l)}return o}function i(t){function n(e){var n=t.find(e)[0];n&&n.focus()}e.shortcuts.add("Alt+F9","",function(){n("menubar")}),e.shortcuts.add("Alt+F10","",function(){n("toolbar")}),e.shortcuts.add("Alt+F11","",function(){n("elementpath")}),t.on("cancel",function(){e.focus()})}function o(t,n){function i(e){return{width:e.clientWidth,height:e.clientHeight}}var o,r,a,s;o=e.getContainer(),r=e.getContentAreaContainer().firstChild,a=i(o),s=i(r),null!==t&&(t=Math.max(u.min_width||100,t),t=Math.min(u.max_width||65535,t),m.css(o,"width",t+(a.width-s.width)),m.css(r,"width",t)),n=Math.max(u.min_height||100,n),n=Math.min(u.max_height||65535,n),m.css(r,"height",n),e.fire("ResizeEditor")}function r(t,n){var i=e.getContentAreaContainer();l.resizeTo(i.clientWidth+t,i.clientHeight+n)}function a(){function o(){if(d&&d.moveRel&&d.visible()&&!d._fixed){var t=e.selection.getScrollContainer(),n=e.getBody(),i=0,o=0;if(t){var r=m.getPos(n),a=m.getPos(t);i=Math.max(0,a.x-r.x),o=Math.max(0,a.y-r.y)}d.fixed(!1).moveRel(n,e.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl"]).moveBy(i,o)}}function r(){d&&(d.show(),o(),m.addClass(e.getBody(),"mce-edit-focus"))}function a(){d&&(d.hide(),m.removeClass(e.getBody(),"mce-edit-focus"))}function s(){return d?(d.visible()||r(),void 0):(d=l.panel=c.create({type:h?"panel":"floatpanel",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!!h,border:1,items:[u.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:n()},u.toolbar===!1?null:{type:"panel",name:"toolbar",layout:"stack",items:t()}]}),d.renderTo(h||document.body).reflow(),i(d),r(),e.on("nodeChange",o),e.on("activate",r),e.on("deactivate",a),void 0)}var d,h;return u.fixed_toolbar_container&&(h=m.select(u.fixed_toolbar_container)[0]),u.content_editable=!0,e.on("focus",s),e.on("blur",a),e.on("remove",function(){d&&(d.remove(),d=null)}),{}}function s(r){var a,s,d;return a=l.panel=c.create({type:"panel",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[u.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:n()},u.toolbar===!1?null:{type:"panel",layout:"stack",items:t()},{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",html:"",border:"1 0 0 0"}]}),u.resize!==!1&&(s={type:"resizehandle",direction:u.resize,onResizeStart:function(){var t=e.getContentAreaContainer().firstChild;d={width:t.clientWidth,height:t.clientHeight}},onResize:function(e){"both"==u.resize?o(d.width+e.deltaX,d.height+e.deltaY):o(null,d.height+e.deltaY)}}),u.statusbar!==!1&&a.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",items:[{type:"elementpath"},s]}),u.readonly&&a.find("*").disabled(!0),a.renderBefore(r.targetNode).reflow(),u.width&&tinymce.DOM.setStyle(a.getEl(),"width",u.width),e.on("remove",function(){a.remove(),a=null}),i(a),{iframeContainer:a.find("#iframe")[0].getEl(),editorContainer:a.getEl()}}var l=this,u=e.settings,c=tinymce.ui.Factory,d=tinymce.each,m=tinymce.DOM,h={file:{title:"File",items:"newdocument"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},insert:{title:"Insert",items:"|"},view:{title:"View",items:"visualaid |"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript | formats | removeformat"},table:{title:"Table"},tools:{title:"Tools"}},f="undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image";l.renderUI=function(t){var n=u.skin!==!1?u.skin||"lightgray":!1;if(n){var i=u.skin_url;i=i?e.documentBaseURI.toAbsolute(i):tinymce.baseURL+"/skins/"+n,tinymce.Env.documentMode<=7?tinymce.DOM.loadCSS(i+"/skin.ie7.min.css"):tinymce.DOM.loadCSS(i+"/skin.min.css"),e.contentCSS.push(i+"/content"+(e.inline?".inline":"")+".min.css")}return e.on("ProgressState",function(e){l.throbber=l.throbber||new tinymce.ui.Throbber(l.panel.getEl("body")),e.state?l.throbber.show(e.time):l.throbber.hide()}),u.inline?a(t):s(t)},l.resizeTo=o,l.resizeBy=r});
\ No newline at end of file
+tinymce.ThemeManager.add("modern",function(e){function t(){function t(t){var i,o=[];if(t)return d(t.split(/[ ,]/),function(t){function n(){var n=e.selection;"bullist"==r&&n.selectorChanged("ul > li",function(e,n){for(var i,o=n.parents.length;o--&&(i=n.parents[o].nodeName,"OL"!=i&&"UL"!=i););t.active(e&&"UL"==i)}),"numlist"==r&&n.selectorChanged("ol > li",function(e,n){for(var i,o=n.parents.length;o--&&(i=n.parents[o].nodeName,"OL"!=i&&"UL"!=i););t.active(e&&"OL"==i)}),t.settings.stateSelector&&n.selectorChanged(t.settings.stateSelector,function(e){t.active(e)},!0),t.settings.disabledStateSelector&&n.selectorChanged(t.settings.disabledStateSelector,function(e){t.disabled(e)})}var r;"|"==t?i=null:c.has(t)?(t={type:t},u.toolbar_items_size&&(t.size=u.toolbar_items_size),o.push(t),i=null):(i||(i={type:"buttongroup",items:[]},o.push(i)),e.buttons[t]&&(r=t,t=e.buttons[r],"function"==typeof t&&(t=t()),t.type=t.type||"button",u.toolbar_items_size&&(t.size=u.toolbar_items_size),t=c.create(t),i.items.push(t),e.initialized?n():e.on("init",n)))}),n.push({type:"toolbar",layout:"flow",items:o}),!0}for(var n=[],i=1;10>i&&t(u["toolbar"+i]);i++);return n.length||t(u.toolbar||f),n}function n(){function t(t){var n;return"|"==t?{text:"|"}:n=e.menuItems[t]}function n(n){var i,o,r,a,s;if(s=tinymce.makeMap((u.removed_menuitems||"").split(/[ ,]/)),u.menu?(o=u.menu[n],a=!0):o=h[n],o){i={text:o.title},r=[],d((o.items||"").split(/[ ,]/),function(e){var n=t(e);n&&!s[e]&&r.push(t(e))}),a||d(e.menuItems,function(e){e.context==n&&("before"==e.separator&&r.push({text:"|"}),e.prependToContext?r.unshift(e):r.push(e),"after"==e.separator&&r.push({text:"|"}))});for(var l=0;l<r.length;l++)"|"==r[l].text&&(0===l||l==r.length-1)&&r.splice(l,1);if(i.menu=r,!i.menu.length)return null}return i}var i,o=[],r=[];if(u.menu)for(i in u.menu)r.push(i);else for(i in h)r.push(i);for(var a="string"==typeof u.menubar?u.menubar.split(/[ ,]/):r,s=0;s<a.length;s++){var l=a[s];l=n(l),l&&o.push(l)}return o}function i(t){function n(e){var n=t.find(e)[0];n&&n.focus()}e.shortcuts.add("Alt+F9","",function(){n("menubar")}),e.shortcuts.add("Alt+F10","",function(){n("toolbar")}),e.shortcuts.add("Alt+F11","",function(){n("elementpath")}),t.on("cancel",function(){e.focus()})}function o(t,n){function i(e){return{width:e.clientWidth,height:e.clientHeight}}var o,r,a,s;o=e.getContainer(),r=e.getContentAreaContainer().firstChild,a=i(o),s=i(r),null!==t&&(t=Math.max(u.min_width||100,t),t=Math.min(u.max_width||65535,t),m.css(o,"width",t+(a.width-s.width)),m.css(r,"width",t)),n=Math.max(u.min_height||100,n),n=Math.min(u.max_height||65535,n),m.css(r,"height",n),e.fire("ResizeEditor")}function r(t,n){var i=e.getContentAreaContainer();l.resizeTo(i.clientWidth+t,i.clientHeight+n)}function a(){function o(){if(d&&d.moveRel&&d.visible()&&!d._fixed){var t=e.selection.getScrollContainer(),n=e.getBody(),i=0,o=0;if(t){var r=m.getPos(n),a=m.getPos(t);i=Math.max(0,a.x-r.x),o=Math.max(0,a.y-r.y)}d.fixed(!1).moveRel(n,e.rtl?["tr-br","br-tr"]:["tl-bl","bl-tl"]).moveBy(i,o)}}function r(){d&&(d.show(),o(),m.addClass(e.getBody(),"mce-edit-focus"))}function a(){d&&(d.hide(),m.removeClass(e.getBody(),"mce-edit-focus"))}function s(){return d?(d.visible()||r(),void 0):(d=l.panel=c.create({type:h?"panel":"floatpanel",classes:"tinymce tinymce-inline",layout:"flex",direction:"column",align:"stretch",autohide:!1,autofix:!0,fixed:!!h,border:1,items:[u.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:n()},u.toolbar===!1?null:{type:"panel",layout:"stack",classes:"toolbar-grp",items:t()}]}),e.fire("BeforeRenderUI"),d.renderTo(h||document.body).reflow(),i(d),r(),e.on("nodeChange",o),e.on("activate",r),e.on("deactivate",a),void 0)}var d,h;return u.fixed_toolbar_container&&(h=m.select(u.fixed_toolbar_container)[0]),u.content_editable=!0,e.on("focus",s),e.on("blur",a),e.on("remove",function(){d&&(d.remove(),d=null)}),{}}function s(r){var a,s,d;return a=l.panel=c.create({type:"panel",classes:"tinymce",style:"visibility: hidden",layout:"stack",border:1,items:[u.menubar===!1?null:{type:"menubar",border:"0 0 1 0",items:n()},u.toolbar===!1?null:{type:"panel",layout:"stack",classes:"toolbar-grp",items:t()},{type:"panel",name:"iframe",layout:"stack",classes:"edit-area",html:"",border:"1 0 0 0"}]}),u.resize!==!1&&(s={type:"resizehandle",direction:u.resize,onResizeStart:function(){var t=e.getContentAreaContainer().firstChild;d={width:t.clientWidth,height:t.clientHeight}},onResize:function(e){"both"==u.resize?o(d.width+e.deltaX,d.height+e.deltaY):o(null,d.height+e.deltaY)}}),u.statusbar!==!1&&a.add({type:"panel",name:"statusbar",classes:"statusbar",layout:"flow",border:"1 0 0 0",items:[{type:"elementpath"},s]}),u.readonly&&a.find("*").disabled(!0),e.fire("BeforeRenderUI"),a.renderBefore(r.targetNode).reflow(),u.width&&tinymce.DOM.setStyle(a.getEl(),"width",u.width),e.on("remove",function(){a.remove(),a=null}),i(a),{iframeContainer:a.find("#iframe")[0].getEl(),editorContainer:a.getEl()}}var l=this,u=e.settings,c=tinymce.ui.Factory,d=tinymce.each,m=tinymce.DOM,h={file:{title:"File",items:"newdocument"},edit:{title:"Edit",items:"undo redo | cut copy paste pastetext | selectall"},insert:{title:"Insert",items:"|"},view:{title:"View",items:"visualaid |"},format:{title:"Format",items:"bold italic underline strikethrough superscript subscript | formats | removeformat"},table:{title:"Table"},tools:{title:"Tools"}},f="undo redo | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link image";l.renderUI=function(t){var n=u.skin!==!1?u.skin||"lightgray":!1;if(n){var i=u.skin_url;i=i?e.documentBaseURI.toAbsolute(i):tinymce.baseURL+"/skins/"+n,tinymce.Env.documentMode<=7?tinymce.DOM.loadCSS(i+"/skin.ie7.min.css"):tinymce.DOM.loadCSS(i+"/skin.min.css"),e.contentCSS.push(i+"/content"+(e.inline?".inline":"")+".min.css")}return e.on("ProgressState",function(e){l.throbber=l.throbber||new tinymce.ui.Throbber(l.panel.getEl("body")),e.state?l.throbber.show(e.time):l.throbber.hide()}),u.inline?a(t):s(t)},l.resizeTo=o,l.resizeBy=r});
\ No newline at end of file
diff --git a/media/editors/tinymce/tinymce.min.js b/media/editors/tinymce/tinymce.min.js
index aadfd35..2aa1862 100644
--- a/media/editors/tinymce/tinymce.min.js
+++ b/media/editors/tinymce/tinymce.min.js
@@ -1,10 +1,10 @@
-// 4.0.10 (2013-10-28)
-!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/dom/EventUtils",c="tinymce/dom/Sizzle",u="tinymce/dom/DomQuery",d="tinymce/html/Styles",f="tinymce/dom/TreeWalker",p="tinymce/util/Tools",h="tinymce/dom/Range",m="tinymce/html/Entities",g="tinymce/Env",v="tinymce/dom/DOMUtils",y="tinymce/dom/ScriptLoader",b="tinymce/AddOnManager",C="tinymce/html/Node",x="tinymce/html/Schema",w="tinymce/html/SaxParser",_="tinymce/html/DomParser",N="tinymce/html/Writer",E="tinymce/html/Serializer",k="tinymce/dom/Serializer",S="tinymce/dom/TridentSelection",T="tinymce/util/VK",R="tinymce/dom/ControlSelection",A="tinymce/dom/Selection",B="tinymce/dom/RangeUtils",L="tinymce/Formatter",H="tinymce/UndoManager",D="tinymce/EnterKey",M="tinymce/ForceBlocks",P="tinymce/EditorCommands",O="tinymce/util/URI",I="tinymce/util/Class",F="tinymce/ui/Selector",z="tinymce/ui/Collection",W="tinymce/ui/DomUtils",V="tinymce/ui/Control",U="tinymce/ui/Factory",q="tinymce/ui/Container",$="tinymce/ui/DragHelper",j="tinymce/ui/Scrollable",K="tinymce/ui/Panel",G="tinymce/ui/Movable",Y="tinymce/ui/Resizable",X="tinymce/ui/FloatPanel",J="tinymce/ui/KeyboardNavigation",Q="tinymce/ui/Window",Z="tinymce/ui/MessageBox",et="tinymce/WindowManager",tt="tinymce/util/Quirks",nt="tinymce/util/Observable",rt="tinymce/Shortcuts",it="tinymce/Editor",ot="tinymce/util/I18n",at="tinymce/FocusManager",st="tinymce/EditorManager",lt="tinymce/LegacyInput",ct="tinymce/util/XHR",ut="tinymce/util/JSON",dt="tinymce/util/JSONRequest",ft="tinymce/util/JSONP",pt="tinymce/util/LocalStorage",ht="tinymce/Compat",mt="tinymce/ui/Layout",gt="tinymce/ui/AbsoluteLayout",vt="tinymce/ui/Tooltip",yt="tinymce/ui/Widget",bt="tinymce/ui/Button",Ct="tinymce/ui/ButtonGroup",xt="tinymce/ui/Checkbox",wt="tinymce/ui/PanelButton",_t="tinymce/ui/ColorButton",Nt="tinymce/ui/ComboBox",Et="tinymce/ui/Path",kt="tinymce/ui/ElementPath",St="tinymce/ui/FormItem",Tt="tinymce/ui/Form",Rt="tinymce/ui/FieldSet",At="tinymce/ui/FilePicker",Bt="tinymce/ui/FitLayout",Lt="tinymce/ui/FlexLayout",Ht="tinymce/ui/FlowLayout",Dt="tinymce/ui/FormatControls",Mt="tinymce/ui/GridLayout",Pt="tinymce/ui/Iframe",Ot="tinymce/ui/Label",It="tinymce/ui/Toolbar",Ft="tinymce/ui/MenuBar",zt="tinymce/ui/MenuButton",Wt="tinymce/ui/ListBox",Vt="tinymce/ui/MenuItem",Ut="tinymce/ui/Menu",qt="tinymce/ui/Radio",$t="tinymce/ui/ResizeHandle",jt="tinymce/ui/Spacer",Kt="tinymce/ui/SplitButton",Gt="tinymce/ui/StackLayout",Yt="tinymce/ui/TabPanel",Xt="tinymce/ui/TextBox",Jt="tinymce/ui/Throbber";r(l,[],function(){function e(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)}function t(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)}function n(e,t){function n(){return!1}function r(){return!0}var i,o=t||{},l;for(i in e)s[i]||(o[i]=e[i]);if(o.target||(o.target=o.srcElement||document),e&&a.test(e.type)&&e.pageX===l&&e.clientX!==l){var c=o.target.ownerDocument||document,u=c.documentElement,d=c.body;o.pageX=e.clientX+(u&&u.scrollLeft||d&&d.scrollLeft||0)-(u&&u.clientLeft||d&&d.clientLeft||0),o.pageY=e.clientY+(u&&u.scrollTop||d&&d.scrollTop||0)-(u&&u.clientTop||d&&d.clientTop||0)}return o.preventDefault=function(){o.isDefaultPrevented=r,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},o.stopPropagation=function(){o.isPropagationStopped=r,e&&(e.stopPropagation?e.stopPropagation():e.cancelBubble=!0)},o.stopImmediatePropagation=function(){o.isImmediatePropagationStopped=r,o.stopPropagation()},o.isDefaultPrevented||(o.isDefaultPrevented=n,o.isPropagationStopped=n,o.isImmediatePropagationStopped=n),o}function r(n,r,i){function o(){i.domLoaded||(i.domLoaded=!0,r(c))}function a(){"complete"===l.readyState&&(t(l,"readystatechange",a),o())}function s(){try{l.documentElement.doScroll("left")}catch(e){return setTimeout(s,0),void 0}o()}var l=n.document,c={type:"ready"};return i.domLoaded?(r(c),void 0):(l.addEventListener?"complete"===l.readyState?o():e(n,"DOMContentLoaded",o):(e(l,"readystatechange",a),l.documentElement.doScroll&&n===n.top&&s()),e(n,"load",o),void 0)}function i(){function i(e,t){var n,r,i,o,a=s[t];if(n=a&&a[e.type])for(r=0,i=n.length;i>r;r++)if(o=n[r],o&&o.func.call(o.scope,e)===!1&&e.preventDefault(),e.isImmediatePropagationStopped())return}var a=this,s={},l,c,u,d,f;c=o+(+new Date).toString(32),d="onmouseenter"in document.documentElement,u="onfocusin"in document.documentElement,f={mouseenter:"mouseover",mouseleave:"mouseout"},l=1,a.domLoaded=!1,a.events=s,a.bind=function(t,o,p,h){function m(e){i(n(e||_.event),g)}var g,v,y,b,C,x,w,_=window;if(t&&3!==t.nodeType&&8!==t.nodeType){for(t[c]?g=t[c]:(g=l++,t[c]=g,s[g]={}),h=h||t,o=o.split(" "),y=o.length;y--;)b=o[y],x=m,C=w=!1,"DOMContentLoaded"===b&&(b="ready"),a.domLoaded&&"ready"===b&&"complete"==t.readyState?p.call(h,n({type:b})):(d||(C=f[b],C&&(x=function(e){var t,r;if(t=e.currentTarget,r=e.relatedTarget,r&&t.contains)r=t.contains(r);else for(;r&&r!==t;)r=r.parentNode;r||(e=n(e||_.event),e.type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,i(e,g))})),u||"focusin"!==b&&"focusout"!==b||(w=!0,C="focusin"===b?"focus":"blur",x=function(e){e=n(e||_.event),e.type="focus"===e.type?"focusin":"focusout",i(e,g)}),v=s[g][b],v?"ready"===b&&a.domLoaded?p({type:b}):v.push({func:p,scope:h}):(s[g][b]=v=[{func:p,scope:h}],v.fakeName=C,v.capture=w,v.nativeHandler=x,"ready"===b?r(t,x,a):e(t,C||b,x,w)));return t=v=0,p}},a.unbind=function(e,n,r){var i,o,l,u,d,f;if(!e||3===e.nodeType||8===e.nodeType)return a;if(i=e[c]){if(f=s[i],n){for(n=n.split(" "),l=n.length;l--;)if(d=n[l],o=f[d]){if(r)for(u=o.length;u--;)if(o[u].func===r){var p=o.nativeHandler;o=o.slice(0,u).concat(o.slice(u+1)),o.nativeHandler=p,f[d]=o}r&&0!==o.length||(delete f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture))}}else{for(d in f)o=f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture);f={}}for(d in f)return a;delete s[i];try{delete e[c]}catch(h){e[c]=null}}return a},a.fire=function(e,t,r){var o;if(!e||3===e.nodeType||8===e.nodeType)return a;r=n(null,r),r.type=t,r.target=e;do o=e[c],o&&i(r,o),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow;while(e&&!r.isPropagationStopped());return a},a.clean=function(e){var t,n,r=a.unbind;if(!e||3===e.nodeType||8===e.nodeType)return a;if(e[c]&&r(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(r(e),n=e.getElementsByTagName("*"),t=n.length;t--;)e=n[t],e[c]&&r(e);return a},a.destroy=function(){s={}},a.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}}var o="mce-data-",a=/^(?:mouse|contextmenu)|click/,s={keyLocation:1,layerX:1,layerY:1,returnValue:1};return i.Event=new i,i.Event.bind(window,"ready",function(){}),i}),r(c,[],function(){function e(e){return mt.test(e+"")}function n(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>_.cacheLength&&delete e[t.shift()],e[n]=r,r}}function r(e){return e[I]=!0,e}function i(e){var t=B.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t=null}}function o(e,t,n,r){var i,o,a,s,l,c,f,p,h,m;if((t?t.ownerDocument||t:F)!==B&&A(t),t=t||B,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(H&&!r){if(i=gt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&O(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Z.apply(n,t.getElementsByTagName(e)),n;if((a=i[3])&&z.getElementsByClassName&&t.getElementsByClassName)return Z.apply(n,t.getElementsByClassName(a)),n}if(z.qsa&&!D.test(e)){if(f=!0,p=I,h=t,m=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(c=u(e),(f=t.getAttribute("id"))?p=f.replace(bt,"\\$&"):t.setAttribute("id",p),p="[id='"+p+"'] ",l=c.length;l--;)c[l]=p+d(c[l]);h=ht.test(e)&&t.parentNode||t,m=c.join(",")}if(m)try{return Z.apply(n,h.querySelectorAll(m)),n}catch(g){}finally{f||t.removeAttribute("id")}}}return b(e.replace(lt,"$1"),t,n,r)}function a(e,t){var n=t&&e,r=n&&(~t.sourceIndex||Y)-(~e.sourceIndex||Y);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function u(e,t){var n,r,i,a,s,l,c,u=q[e+" "];if(u)return t?0:u.slice(0);for(s=e,l=[],c=_.preFilter;s;){(!n||(r=ct.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=ut.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(lt," ")}),s=s.slice(n.length));for(a in _.filter)!(r=pt[a].exec(s))||c[a]&&!(r=c[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?o.error(e):q(e,l).slice(0)}function d(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function f(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=V++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,l,c,u=W+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i)if(c=t[I]||(t[I]={}),(l=c[r])&&l[0]===u){if((s=l[1])===!0||s===w)return s===!0}else if(l=c[r]=[u],l[1]=e(t,n,a)||w,l[1]===!0)return!0}}function p(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function h(e,t,n,r,i){for(var o,a=[],s=0,l=e.length,c=null!=t;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),c&&t.push(s));return a}function m(e,t,n,i,o,a){return i&&!i[I]&&(i=m(i)),o&&!o[I]&&(o=m(o,a)),r(function(r,a,s,l){var c,u,d,f=[],p=[],m=a.length,g=r||y(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?g:h(g,f,e,s,l),b=n?o||(r?e:m||i)?[]:a:v;if(n&&n(v,b,s,l),i)for(c=h(b,p),i(c,[],s,l),u=c.length;u--;)(d=c[u])&&(b[p[u]]=!(v[p[u]]=d));if(r){if(o||e){if(o){for(c=[],u=b.length;u--;)(d=b[u])&&c.push(v[u]=d);o(null,b=[],c,l)}for(u=b.length;u--;)(d=b[u])&&(c=o?tt.call(r,d):f[u])>-1&&(r[c]=!(a[c]=d))}}else b=h(b===a?b.splice(m,b.length):b),o?o(null,a,b,l):Z.apply(a,b)})}function g(e){for(var t,n,r,i=e.length,o=_.relative[e[0].type],a=o||_.relative[" "],s=o?1:0,l=f(function(e){return e===t},a,!0),c=f(function(e){return tt.call(t,e)>-1},a,!0),u=[function(e,n,r){return!o&&(r||n!==S)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];i>s;s++)if(n=_.relative[e[s].type])u=[f(p(u),n)];else{if(n=_.filter[e[s].type].apply(null,e[s].matches),n[I]){for(r=++s;i>r&&!_.relative[e[r].type];r++);return m(s>1&&p(u),s>1&&d(e.slice(0,s-1)).replace(lt,"$1"),n,r>s&&g(e.slice(s,r)),i>r&&g(e=e.slice(r)),i>r&&d(e))}u.push(n)}return p(u)}function v(e,t){var n=0,i=t.length>0,a=e.length>0,s=function(r,s,l,c,u){var d,f,p,m=[],g=0,v="0",y=r&&[],b=null!=u,C=S,x=r||a&&_.find.TAG("*",u&&s.parentNode||s),N=W+=null==C?1:Math.random()||.1;for(b&&(S=s!==B&&s,w=n);null!=(d=x[v]);v++){if(a&&d){for(f=0;p=e[f++];)if(p(d,s,l)){c.push(d);break}b&&(W=N,w=++n)}i&&((d=!p&&d)&&g--,r&&y.push(d))}if(g+=v,i&&v!==g){for(f=0;p=t[f++];)p(y,m,s,l);if(r){if(g>0)for(;v--;)y[v]||m[v]||(m[v]=J.call(c));m=h(m)}Z.apply(c,m),b&&!r&&m.length>0&&g+t.length>1&&o.uniqueSort(c)}return b&&(W=N,S=C),y};return i?r(s):s}function y(e,t,n){for(var r=0,i=t.length;i>r;r++)o(e,t[r],n);return n}function b(e,t,n,r){var i,o,a,s,l,c=u(e);if(!r&&1===c.length){if(o=c[0]=c[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&H&&_.relative[o[1].type]){if(t=(_.find.ID(a.matches[0].replace(xt,wt),t)||[])[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=pt.needsContext.test(e)?0:o.length;i--&&(a=o[i],!_.relative[s=a.type]);)if((l=_.find[s])&&(r=l(a.matches[0].replace(xt,wt),ht.test(o[0].type)&&t.parentNode||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Z.apply(n,r),n;break}}return k(e,c)(r,t,!H,n,ht.test(e)),n}function C(){}var x,w,_,N,E,k,S,T,R,A,B,L,H,D,M,P,O,I="sizzle"+-new Date,F=window.document,z={},W=0,V=0,U=n(),q=n(),$=n(),j=!1,K=function(){return 0},G=typeof t,Y=1<<31,X=[],J=X.pop,Q=X.push,Z=X.push,et=X.slice,tt=X.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},nt="[\\x20\\t\\r\\n\\f]",rt="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",it=rt.replace("w","w#"),ot="([*^$|!~]?=)",at="\\["+nt+"*("+rt+")"+nt+"*(?:"+ot+nt+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+it+")|)|)"+nt+"*\\]",st=":("+rt+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+at.replace(3,8)+")*)|.*)\\)|)",lt=new RegExp("^"+nt+"+|((?:^|[^\\\\])(?:\\\\.)*)"+nt+"+$","g"),ct=new RegExp("^"+nt+"*,"+nt+"*"),ut=new RegExp("^"+nt+"*([\\x20\\t\\r\\n\\f>+~])"+nt+"*"),dt=new RegExp(st),ft=new RegExp("^"+it+"$"),pt={ID:new RegExp("^#("+rt+")"),CLASS:new RegExp("^\\.("+rt+")"),NAME:new RegExp("^\\[name=['\"]?("+rt+")['\"]?\\]"),TAG:new RegExp("^("+rt.replace("w","w*")+")"),ATTR:new RegExp("^"+at),PSEUDO:new RegExp("^"+st),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+nt+"*(even|odd|(([+-]|)(\\d*)n|)"+nt+"*(?:([+-]|)"+nt+"*(\\d+)|))"+nt+"*\\)|)","i"),needsContext:new RegExp("^"+nt+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+nt+"*((?:-\\d)?\\d*)"+nt+"*\\)|)(?=[^-]|$)","i")},ht=/[\x20\t\r\n\f]*[+~]/,mt=/^[^{]+\{\s*\[native code/,gt=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,vt=/^(?:input|select|textarea|button)$/i,yt=/^h\d$/i,bt=/'|\\/g,Ct=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,xt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,wt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(55296|n>>10,56320|1023&n)};try{Z.apply(X=et.call(F.childNodes),F.childNodes),X[F.childNodes.length].nodeType}catch(_t){Z={apply:X.length?function(e,t){Q.apply(e,et.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}E=o.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},A=o.setDocument=function(n){var r=n?n.ownerDocument||n:F;return r!==B&&9===r.nodeType&&r.documentElement?(B=r,L=r.documentElement,H=!E(r),z.getElementsByTagName=i(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),z.attributes=i(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),z.getElementsByClassName=i(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),z.getByName=i(function(e){e.id=I+0,e.appendChild(B.createElement("a")).setAttribute("name",I),e.appendChild(B.createElement("i")).setAttribute("name",I),L.appendChild(e);var t=r.getElementsByName&&r.getElementsByName(I).length===2+r.getElementsByName(I+0).length;return L.removeChild(e),t}),z.sortDetached=i(function(e){return e.compareDocumentPosition&&1&e.compareDocumentPosition(B.createElement("div"))}),_.attrHandle=i(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==G&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},z.getByName?(_.find.ID=function(e,t){if(typeof t.getElementById!==G&&H){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},_.filter.ID=function(e){var t=e.replace(xt,wt);return function(e){return e.getAttribute("id")===t}}):(_.find.ID=function(e,n){if(typeof n.getElementById!==G&&H){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==G&&r.getAttributeNode("id").value===e?[r]:t:[]}},_.filter.ID=function(e){var t=e.replace(xt,wt);return function(e){var n=typeof e.getAttributeNode!==G&&e.getAttributeNode("id");return n&&n.value===t}}),_.find.TAG=z.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==G?t.getElementsByTagName(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},_.find.NAME=z.getByName&&function(e,t){return typeof t.getElementsByName!==G?t.getElementsByName(name):void 0},_.find.CLASS=z.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==G&&H?t.getElementsByClassName(e):void 0},M=[],D=[":focus"],(z.qsa=e(r.querySelectorAll))&&(i(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||D.push("\\["+nt+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||D.push(":checked")}),i(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&D.push("[*^$]="+nt+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||D.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),D.push(",.*:")})),(z.matchesSelector=e(P=L.matchesSelector||L.mozMatchesSelector||L.webkitMatchesSelector||L.oMatchesSelector||L.msMatchesSelector))&&i(function(e){z.disconnectedMatch=P.call(e,"div"),P.call(e,"[s!='']:x"),M.push("!=",st)}),D=new RegExp(D.join("|")),M=M.length&&new RegExp(M.join("|")),O=e(L.contains)||L.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},K=L.compareDocumentPosition?function(e,t){if(e===t)return j=!0,0;var n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return n?1&n||T&&t.compareDocumentPosition(e)===n?e===r||O(F,e)?-1:t===r||O(F,t)?1:R?tt.call(R,e)-tt.call(R,t):0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,s=t.parentNode,l=[e],c=[t];if(e===t)return j=!0,0;if(!o||!s)return e===r?-1:t===r?1:o?-1:s?1:0;if(o===s)return a(e,t);for(n=e;n=n.parentNode;)l.unshift(n);for(n=t;n=n.parentNode;)c.unshift(n);for(;l[i]===c[i];)i++;return i?a(l[i],c[i]):l[i]===F?-1:c[i]===F?1:0},B):B},o.matches=function(e,t){return o(e,null,null,t)},o.matchesSelector=function(e,t){if((e.ownerDocument||e)!==B&&A(e),t=t.replace(Ct,"='$1']"),z.matchesSelector&&H&&(!M||!M.test(t))&&!D.test(t))try{var n=P.call(e,t);if(n||z.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return o(t,B,null,[e]).length>0},o.contains=function(e,t){return(e.ownerDocument||e)!==B&&A(e),O(e,t)},o.attr=function(e,t){var n;return(e.ownerDocument||e)!==B&&A(e),H&&(t=t.toLowerCase()),(n=_.attrHandle[t])?n(e):!H||z.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},o.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},o.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!z.detectDuplicates,T=!z.sortDetached,R=!z.sortStable&&e.slice(0),e.sort(K),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return e},N=o.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=N(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=N(t);return n},_=o.selectors={cacheLength:50,createPseudo:r,match:pt,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xt,wt),e[3]=(e[4]||e[5]||"").replace(xt,wt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||o.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&o.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return pt.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&dt.test(n)&&(t=u(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(xt,wt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=U[e+" "];return t||(t=new RegExp("(^|"+nt+")"+e+"("+nt+"|$)"))&&U(e,function(e){return t.test(e.className||typeof e.getAttribute!==G&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=o.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var c,u,d,f,p,h,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s;if(g){if(o){for(;m;){for(d=t;d=d[m];)if(s?d.nodeName.toLowerCase()===v:1===d.nodeType)return!1;h=m="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(u=g[I]||(g[I]={}),c=u[e]||[],p=c[0]===W&&c[1],f=c[0]===W&&c[2],d=p&&g.childNodes[p];d=++p&&d&&d[m]||(f=p=0)||h.pop();)if(1===d.nodeType&&++f&&d===t){u[e]=[W,p,f];break}}else if(y&&(c=(t[I]||(t[I]={}))[e])&&c[0]===W)f=c[1];else for(;(d=++p&&d&&d[m]||(f=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==v:1!==d.nodeType)||!++f||(y&&((d[I]||(d[I]={}))[e]=[W,f]),d!==t)););return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,i=_.pseudos[e]||_.setFilters[e.toLowerCase()]||o.error("unsupported pseudo: "+e);return i[I]?i(t):i.length>1?(n=[e,e,"",t],_.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,n){for(var r,o=i(e,t),a=o.length;a--;)r=tt.call(e,o[a]),e[r]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(lt,"$1"));return i[I]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),!n.pop()}}),has:r(function(e){return function(t){return o(e,t).length>0}}),contains:r(function(e){return function(t){return(t.textContent||t.innerText||N(t)).indexOf(e)>-1}}),lang:r(function(e){return ft.test(e||"")||o.error("unsupported lang: "+e),e=e.replace(xt,wt).toLowerCase(),function(t){var n;do if(n=H?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===L},focus:function(e){return e===B.activeElement&&(!B.hasFocus||B.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!_.pseudos.empty(e)},header:function(e){return yt.test(e.nodeName)},input:function(e){return vt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;++r<t;)e.push(r);return e})}};for(x in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})_.pseudos[x]=s(x);for(x in{submit:!0,reset:!0})_.pseudos[x]=l(x);return k=o.compile=function(e,t){var n,r=[],i=[],o=$[e+" "];if(!o){for(t||(t=u(e)),n=t.length;n--;)o=g(t[n]),o[I]?r.push(o):i.push(o);o=$(e,v(i,r))}return o},_.pseudos.nth=_.pseudos.eq,C.prototype=_.filters=_.pseudos,_.setFilters=new C,z.sortStable=I.split("").sort(K).join("")===I,A(),[0,0].sort(K),z.detectDuplicates=j,o}),r(u,[l,c],function(e,n){function r(e){return"undefined"!=typeof e}function i(e){return"string"==typeof e}function o(e){var t,n,r;for(r=g.createElement("div"),t=g.createDocumentFragment(),r.innerHTML=e;n=r.firstChild;)t.appendChild(n);return t}function a(e,t,n){var r;if("string"==typeof t)t=o(t);else if(t.length){for(r=0;r<t.length;r++)a(e,t[r],n);return e}for(r=e.length;r--;)n.call(e[r],t.parentNode?t:t);return e}function s(e,t){return e&&t&&-1!==(" "+e.className+" ").indexOf(" "+t+" ")}function l(e,t){var n;for(e=e||[],"string"==typeof e&&(e=e.split(" ")),t=t||{},n=e.length;n--;)t[e[n]]={};return t}function c(e,t){return new c.fn.init(e,t)}function u(e){var t=arguments,n,r,i;for(r=1;r<t.length;r++){n=t[r];for(i in n)e[i]=n[i]}return e}function d(e){var t=[],n,r;for(n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function f(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1}function p(e,t){var n,r,i,o,a;if(e)if(n=e.length,n===o){for(r in e)if(e.hasOwnProperty(r)&&(a=e[r],t.call(a,a,r)===!1))break}else for(i=0;n>i&&(a=e[i],t.call(a,a,r)!==!1);i++);return e}function h(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!c(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i}function m(e,t,n,r){for(var i=[];e;e=e[n])r&&e.nodeType!==r||e===t||i.push(e);return i}var g=document,v=Array.prototype.push,y=Array.prototype.slice,b=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,C=e.Event,x=l("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"),w=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},_=/^\s*|\s*$/g,N=function(e){return null===e||e===t?"":(""+e).replace(_,"")};return c.fn=c.prototype={constructor:c,selector:"",length:0,init:function(e,t){var n=this,r,a;if(!e)return n;if(e.nodeType)return n.context=n[0]=e,n.length=1,n;if(i(e)){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:b.exec(e),!r)return c(t||document).find(e);if(r[1])for(a=o(e).firstChild;a;)this.add(a),a=a.nextSibling;else{if(a=g.getElementById(r[2]),a.id!==r[2])return n.find(e);n.length=1,n[0]=a}}else this.add(e);return n},toArray:function(){return d(this)},add:function(e){var t=this;return w(e)?v.apply(t,e):e instanceof c?t.add(e.toArray()):v.call(t,e),t},attr:function(e,n){var i=this;if("object"==typeof e)p(e,function(e,t){i.attr(t,e)});else{if(!r(n))return i[0]&&1===i[0].nodeType?i[0].getAttribute(e):t;this.each(function(){1===this.nodeType&&this.setAttribute(e,n)})}return i},css:function(e,n){var i=this;if("object"==typeof e)p(e,function(e,t){i.css(t,e)});else{if(e=e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),!r(n))return i[0]?i[0].style[e]:t;"number"!=typeof n||x[e]||(n+="px"),i.each(function(){var t=this.style;"opacity"===e&&this.runtimeStyle&&"undefined"==typeof this.runtimeStyle.opacity&&(t.filter=""===n?"":"alpha(opacity="+100*n+")");try{t[e]=n}catch(r){}})}return i},remove:function(){for(var e=this,t,n=this.length;n--;)t=e[n],C.clean(t),t.parentNode&&t.parentNode.removeChild(t);return this},empty:function(){for(var e=this,t,n=this.length;n--;)for(t=e[n];t.firstChild;)t.removeChild(t.firstChild);return this},html:function(e){var t=this,n;if(r(e)){for(n=t.length;n--;)t[n].innerHTML=e;return t}return t[0]?t[0].innerHTML:""},text:function(e){var t=this,n;if(r(e)){for(n=t.length;n--;)t[n].innerText=t[0].textContent=e;return t}return t[0]?t[0].innerText||t[0].textContent:""},append:function(){return a(this,arguments,function(e){1===this.nodeType&&this.appendChild(e)})},prepend:function(){return a(this,arguments,function(e){1===this.nodeType&&this.insertBefore(e,this.firstChild)})},before:function(){var e=this;return e[0]&&e[0].parentNode?a(e,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)}):e},after:function(){var e=this;return e[0]&&e[0].parentNode?a(e,arguments,function(e){this.parentNode.insertBefore(e,this)}):e},appendTo:function(e){return c(e).append(this),this},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(e,t){var n=this;return-1!==e.indexOf(" ")?p(e.split(" "),function(){n.toggleClass(this,t)}):n.each(function(){var n=this,r;s(n,e)!==t&&(r=n.className,t?n.className+=r?" "+e:e:n.className=N((" "+r+" ").replace(" "+e+" "," ")))}),n},hasClass:function(e){return s(this[0],e)},each:function(e){return p(this,e)},on:function(e,t){return this.each(function(){C.bind(this,e,t)})},off:function(e,t){return this.each(function(){C.unbind(this,e,t)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return new c(y.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},replaceWith:function(e){var t=this;return t[0]&&t[0].parentNode.replaceChild(c(e)[0],t[0]),t},wrap:function(e){return e=c(e)[0],this.each(function(){var t=this,n=e.cloneNode(!1);t.parentNode.insertBefore(n,t),n.appendChild(t)})},unwrap:function(){return this.each(function(){for(var e=this,t=e.firstChild,n;t;)n=t,t=t.nextSibling,e.parentNode.insertBefore(n,e)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),c(e)},find:function(e){var t,n,r=[];for(t=0,n=this.length;n>t;t++)c.find(e,this[t],r);return c(r)},push:v,sort:[].sort,splice:[].splice},u(c,{extend:u,toArray:d,inArray:f,isArray:w,each:p,trim:N,makeMap:l,find:n,expr:n.selectors,unique:n.uniqueSort,text:n.getText,isXMLDoc:n.isXML,contains:n.contains,filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?c.find.matchesSelector(t[0],e)?[t[0]]:[]:c.find.matches(e,t)}}),p({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t){return h(e,"parentNode",t)},next:function(e){return m(e,"nextSibling",1)},prev:function(e){return m(e,"previousSibling",1)},nextNodes:function(e){return m(e,"nextSibling")},prevNodes:function(e){return m(e,"previousSibling")},children:function(e){return m(e.firstChild,"nextSibling",1)},contents:function(e){return d(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,t){c.fn[e]=function(n){var r=this,i;if(r.length>1)throw new Error("DomQuery only supports traverse functions on a single node.");return r[0]&&(i=t(r[0],n)),i=c(i),n&&"parentsUntil"!==e?i.filter(n):i}}),c.fn.filter=function(e){return c.filter(e)},c.fn.is=function(e){return!!e&&this.filter(e).length>0},c.fn.init.prototype=c.fn,c}),r(d,[],function(){return function(e,t){function n(e,t,n,r){function i(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+i(t)+i(n)+i(r)}var r=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,i=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,a=/\s+$/,s,l,c={},u,d="\ufeff";
-for(e=e||{},u=("\\\" \\' \\; \\: ; : "+d).split(" "),l=0;l<u.length;l++)c[u[l]]=d+l,c[d+l]=u[l];return{toHex:function(e){return e.replace(r,n)},parse:function(t){function s(e,t){var n,r,i,o;"none"===h["border-image"]&&delete h["border-image"],n=h[e+"-top"+t],n&&(r=h[e+"-right"+t],n==r&&(i=h[e+"-bottom"+t],r==i&&(o=h[e+"-left"+t],i==o&&(h[e+t]=o,delete h[e+"-top"+t],delete h[e+"-right"+t],delete h[e+"-bottom"+t],delete h[e+"-left"+t]))))}function l(e){var t=h[e],n;if(t&&!(t.indexOf(" ")<0)){for(t=t.split(" "),n=t.length;n--;)if(t[n]!==t[0])return!1;return h[e]=t[0],!0}}function u(e,t,n,r){l(t)&&l(n)&&l(r)&&(h[e]=h[t]+" "+h[n]+" "+h[r],delete h[t],delete h[n],delete h[r])}function d(e){return y=!0,c[e]}function f(e,t){return y&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return c[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e}function p(t,n,r,i,o,a){return(o=o||a)?(o=f(o),"'"+o.replace(/\'/g,"\\'")+"'"):(n=f(n||r||i),!e.allow_script_urls&&/(java|vb)script:/i.test(n.replace(/[\s\r\n]+/,""))?"":(b&&(n=b.call(C,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"))}var h={},m,g,v,y,b=e.url_converter,C=e.url_converter_scope||this;if(t){for(t=t.replace(/[\u0000-\u001F]/g,""),t=t.replace(/\\[\"\';:\uFEFF]/g,d).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,d)});m=o.exec(t);){if(g=m[1].replace(a,"").toLowerCase(),v=m[2].replace(a,""),g&&v.length>0){if(!e.allow_script_urls&&("behavior"==g||/expression\s*\(/.test(v)))continue;"font-weight"===g&&"700"===v?v="bold":("color"===g||"background-color"===g)&&(v=v.toLowerCase()),v=v.replace(r,n),v=v.replace(i,p),h[g]=y?f(v,!0):v}o.lastIndex=m.index+m[0].length}s("border",""),s("border","-width"),s("border","-color"),s("border","-style"),s("padding",""),s("margin",""),u("border","border-width","border-style","border-color"),"medium none"===h.border&&delete h.border}return h},serialize:function(e,n){function r(n){var r,o,a,l;if(r=t.styles[n])for(o=0,a=r.length;a>o;o++)n=r[o],l=e[n],l!==s&&l.length>0&&(i+=(i.length>0?" ":"")+n+": "+l+";")}var i="",o,a;if(n&&t&&t.styles)r("*"),r(n);else for(o in e)a=e[o],a!==s&&a.length>0&&(i+=(i.length>0?" ":"")+o+": "+a+";");return i}}}}),r(f,[],function(){return function(e,t){function n(e,n,r,i){var o,a;if(e){if(!i&&e[n])return e[n];if(e!=t){if(o=e[r])return o;for(a=e.parentNode;a&&a!=t;a=a.parentNode)if(o=a[r])return o}}}var r=e;this.current=function(){return r},this.next=function(e){return r=n(r,"firstChild","nextSibling",e)},this.prev=function(e){return r=n(r,"lastChild","previousSibling",e)}}}),r(p,[],function(){function e(e,n){return n?"array"==n&&g(e)?!0:typeof e==n:e!==t}function n(e){var t=[],n,r;for(n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function r(e,t,n){var r;for(e=e||[],t=t||",","string"==typeof e&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n}function i(e,n,r){var i,o;if(!e)return 0;if(r=r||e,e.length!==t){for(i=0,o=e.length;o>i;i++)if(n.call(r,e[i],i,e)===!1)return 0}else for(i in e)if(e.hasOwnProperty(i)&&n.call(r,e[i],i,e)===!1)return 0;return 1}function o(e,t){var n=[];return i(e,function(e){n.push(t(e))}),n}function a(e,t){var n=[];return i(e,function(e){(!t||t(e))&&n.push(e)}),n}function s(e,t,n){var r=this,i,o,a,s,l,c=0;if(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e),a=e[3].match(/(^|\.)(\w+)$/i)[2],o=r.createNS(e[3].replace(/\.\w+$/,""),n),!o[a]){if("static"==e[2])return o[a]=t,this.onCreate&&this.onCreate(e[2],e[3],o[a]),void 0;t[a]||(t[a]=function(){},c=1),o[a]=t[a],r.extend(o[a].prototype,t),e[5]&&(i=r.resolve(e[5]).prototype,s=e[5].match(/\.(\w+)$/i)[1],l=o[a],o[a]=c?function(){return i[s].apply(this,arguments)}:function(){return this.parent=i[s],l.apply(this,arguments)},o[a].prototype[a]=o[a],r.each(i,function(e,t){o[a].prototype[t]=i[t]}),r.each(t,function(e,t){i[t]?o[a].prototype[t]=function(){return this.parent=i[t],e.apply(this,arguments)}:t!=a&&(o[a].prototype[t]=e)})),r.each(t["static"],function(e,t){o[a][t]=e})}}function l(e,t){var n,r;if(e)for(n=0,r=e.length;r>n;n++)if(e[n]===t)return n;return-1}function c(e,n){var r,i,o,a=arguments,s;for(r=1,i=a.length;i>r;r++){n=a[r];for(o in n)n.hasOwnProperty(o)&&(s=n[o],s!==t&&(e[o]=s))}return e}function u(e,t,n,r){r=r||this,e&&(n&&(e=e[n]),i(e,function(e,i){return t.call(r,e,i,n)===!1?!1:(u(e,t,n,r),void 0)}))}function d(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;n<e.length;n++)r=e[n],t[r]||(t[r]={}),t=t[r];return t}function f(e,t){var n,r;for(t=t||window,e=e.split("."),n=0,r=e.length;r>n&&(t=t[e[n]],t);n++);return t}function p(t,n){return!t||e(t,"array")?t:o(t.split(n||","),m)}var h=/^\s*|\s*$/g,m=function(e){return null===e||e===t?"":(""+e).replace(h,"")},g=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return{trim:m,isArray:g,is:e,toArray:n,makeMap:r,each:i,map:o,grep:a,inArray:l,extend:c,create:s,walk:u,createNS:d,resolve:f,explode:p}}),r(h,[p],function(e){function t(n){function r(){return M.createDocumentFragment()}function i(e,t){_(F,e,t)}function o(e,t){_(z,e,t)}function a(e){i(e.parentNode,j(e))}function s(e){i(e.parentNode,j(e)+1)}function l(e){o(e.parentNode,j(e))}function c(e){o(e.parentNode,j(e)+1)}function u(e){e?(D[U]=D[V],D[q]=D[W]):(D[V]=D[U],D[W]=D[q]),D.collapsed=F}function d(e){a(e),c(e)}function f(e){i(e,0),o(e,1===e.nodeType?e.childNodes.length:e.nodeValue.length)}function p(e,t){var n=D[V],r=D[W],i=D[U],o=D[q],a=t.startContainer,s=t.startOffset,l=t.endContainer,c=t.endOffset;return 0===e?w(n,r,a,s):1===e?w(i,o,a,s):2===e?w(i,o,l,c):3===e?w(n,r,l,c):void 0}function h(){N(I)}function m(){return N(P)}function g(){return N(O)}function v(e){var t=this[V],r=this[W],i,o;3!==t.nodeType&&4!==t.nodeType||!t.nodeValue?(t.childNodes.length>0&&(o=t.childNodes[r]),o?t.insertBefore(e,o):3==t.nodeType?n.insertAfter(e,t):t.appendChild(e)):r?r>=t.nodeValue.length?n.insertAfter(e,t):(i=t.splitText(r),t.parentNode.insertBefore(e,i)):t.parentNode.insertBefore(e,t)}function y(e){var t=D.extractContents();D.insertNode(e),e.appendChild(t),D.selectNode(e)}function b(){return $(new t(n),{startContainer:D[V],startOffset:D[W],endContainer:D[U],endOffset:D[q],collapsed:D.collapsed,commonAncestorContainer:D.commonAncestorContainer})}function C(e,t){var n;if(3==e.nodeType)return e;if(0>t)return e;for(n=e.firstChild;n&&t>0;)--t,n=n.nextSibling;return n?n:e}function x(){return D[V]==D[U]&&D[W]==D[q]}function w(e,t,r,i){var o,a,s,l,c,u;if(e==r)return t==i?0:i>t?-1:1;for(o=r;o&&o.parentNode!=e;)o=o.parentNode;if(o){for(a=0,s=e.firstChild;s!=o&&t>a;)a++,s=s.nextSibling;return a>=t?-1:1}for(o=e;o&&o.parentNode!=r;)o=o.parentNode;if(o){for(a=0,s=r.firstChild;s!=o&&i>a;)a++,s=s.nextSibling;return i>a?-1:1}for(l=n.findCommonAncestor(e,r),c=e;c&&c.parentNode!=l;)c=c.parentNode;for(c||(c=l),u=r;u&&u.parentNode!=l;)u=u.parentNode;if(u||(u=l),c==u)return 0;for(s=l.firstChild;s;){if(s==c)return-1;if(s==u)return 1;s=s.nextSibling}}function _(e,t,r){var i,o;for(e?(D[V]=t,D[W]=r):(D[U]=t,D[q]=r),i=D[U];i.parentNode;)i=i.parentNode;for(o=D[V];o.parentNode;)o=o.parentNode;o==i?w(D[V],D[W],D[U],D[q])>0&&D.collapse(e):D.collapse(e),D.collapsed=x(),D.commonAncestorContainer=n.findCommonAncestor(D[V],D[U])}function N(e){var t,n=0,r=0,i,o,a,s,l,c;if(D[V]==D[U])return E(e);for(t=D[U],i=t.parentNode;i;t=i,i=i.parentNode){if(i==D[V])return k(t,e);++n}for(t=D[V],i=t.parentNode;i;t=i,i=i.parentNode){if(i==D[U])return S(t,e);++r}for(o=r-n,a=D[V];o>0;)a=a.parentNode,o--;for(s=D[U];0>o;)s=s.parentNode,o++;for(l=a.parentNode,c=s.parentNode;l!=c;l=l.parentNode,c=c.parentNode)a=l,s=c;return T(a,s,e)}function E(e){var t,n,i,o,a,s,l,c,u;if(e!=I&&(t=r()),D[W]==D[q])return t;if(3==D[V].nodeType){if(n=D[V].nodeValue,i=n.substring(D[W],D[q]),e!=O&&(o=D[V],c=D[W],u=D[q]-D[W],0===c&&u>=o.nodeValue.length-1?o.parentNode.removeChild(o):o.deleteData(c,u),D.collapse(F)),e==I)return;return i.length>0&&t.appendChild(M.createTextNode(i)),t}for(o=C(D[V],D[W]),a=D[q]-D[W];o&&a>0;)s=o.nextSibling,l=L(o,e),t&&t.appendChild(l),--a,o=s;return e!=O&&D.collapse(F),t}function k(e,t){var n,i,o,a,s,l;if(t!=I&&(n=r()),i=R(e,t),n&&n.appendChild(i),o=j(e),a=o-D[W],0>=a)return t!=O&&(D.setEndBefore(e),D.collapse(z)),n;for(i=e.previousSibling;a>0;)s=i.previousSibling,l=L(i,t),n&&n.insertBefore(l,n.firstChild),--a,i=s;return t!=O&&(D.setEndBefore(e),D.collapse(z)),n}function S(e,t){var n,i,o,a,s,l;for(t!=I&&(n=r()),o=A(e,t),n&&n.appendChild(o),i=j(e),++i,a=D[q]-i,o=e.nextSibling;o&&a>0;)s=o.nextSibling,l=L(o,t),n&&n.appendChild(l),--a,o=s;return t!=O&&(D.setStartAfter(e),D.collapse(F)),n}function T(e,t,n){var i,o,a,s,l,c,u,d;for(n!=I&&(o=r()),i=A(e,n),o&&o.appendChild(i),a=e.parentNode,s=j(e),l=j(t),++s,c=l-s,u=e.nextSibling;c>0;)d=u.nextSibling,i=L(u,n),o&&o.appendChild(i),u=d,--c;return i=R(t,n),o&&o.appendChild(i),n!=O&&(D.setStartAfter(e),D.collapse(F)),o}function R(e,t){var n=C(D[U],D[q]-1),r,i,o,a,s,l=n!=D[U];if(n==e)return B(n,l,z,t);for(r=n.parentNode,i=B(r,z,z,t);r;){for(;n;)o=n.previousSibling,a=B(n,l,z,t),t!=I&&i.insertBefore(a,i.firstChild),l=F,n=o;if(r==e)return i;n=r.previousSibling,r=r.parentNode,s=B(r,z,z,t),t!=I&&s.appendChild(i),i=s}}function A(e,t){var n=C(D[V],D[W]),r=n!=D[V],i,o,a,s,l;if(n==e)return B(n,r,F,t);for(i=n.parentNode,o=B(i,z,F,t);i;){for(;n;)a=n.nextSibling,s=B(n,r,F,t),t!=I&&o.appendChild(s),r=F,n=a;if(i==e)return o;n=i.nextSibling,i=i.parentNode,l=B(i,z,F,t),t!=I&&l.appendChild(o),o=l}}function B(e,t,r,i){var o,a,s,l,c;if(t)return L(e,i);if(3==e.nodeType){if(o=e.nodeValue,r?(l=D[W],a=o.substring(l),s=o.substring(0,l)):(l=D[q],a=o.substring(0,l),s=o.substring(l)),i!=O&&(e.nodeValue=s),i==I)return;return c=n.clone(e,z),c.nodeValue=a,c}if(i!=I)return n.clone(e,z)}function L(e,t){return t!=I?t==O?n.clone(e,F):e:(e.parentNode.removeChild(e),void 0)}function H(){return n.create("body",null,g()).outerText}var D=this,M=n.doc,P=0,O=1,I=2,F=!0,z=!1,W="startOffset",V="startContainer",U="endContainer",q="endOffset",$=e.extend,j=n.nodeIndex;return $(D,{startContainer:M,startOffset:0,endContainer:M,endOffset:0,collapsed:F,commonAncestorContainer:M,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:i,setEnd:o,setStartBefore:a,setStartAfter:s,setEndBefore:l,setEndAfter:c,collapse:u,selectNode:d,selectNodeContents:f,compareBoundaryPoints:p,deleteContents:h,extractContents:m,cloneContents:g,insertNode:v,surroundContents:y,cloneRange:b,toStringIE:H}),D}return t.prototype.toString=function(){return this.toStringIE()},t}),r(m,[p],function(e){function t(e){var t;return t=document.createElement("div"),t.innerHTML=e,t.textContent||t.innerText||e}function n(e,t){var n,r,i,a={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),o[r]||(i="&"+e[n+1]+";",a[r]=i,a[i]=r);return a}}var r=e.makeMap,i,o,a,s=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,l=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,c=/[<>&\"\']/g,u=/&(#x|#)?([\w]+);/g,d={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};o={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"},a={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},i=n("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var f={encodeRaw:function(e,t){return e.replace(t?s:l,function(e){return o[e]||e})},encodeAllRaw:function(e){return(""+e).replace(c,function(e){return o[e]||e})},encodeNumeric:function(e,t){return e.replace(t?s:l,function(e){return e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":o[e]||"&#"+e.charCodeAt(0)+";"})},encodeNamed:function(e,t,n){return n=n||i,e.replace(t?s:l,function(e){return o[e]||n[e]||e})},getEncodeFunc:function(e,t){function a(e,n){return e.replace(n?s:l,function(e){return o[e]||t[e]||"&#"+e.charCodeAt(0)+";"||e})}function c(e,n){return f.encodeNamed(e,n,t)}return t=n(t)||i,e=r(e.replace(/\+/g,",")),e.named&&e.numeric?a:e.named?t?c:f.encodeNamed:e.numeric?f.encodeNumeric:f.encodeRaw},decode:function(e){return e.replace(u,function(e,n,r){return n?(r=parseInt(r,2===n.length?16:10),r>65535?(r-=65536,String.fromCharCode(55296+(r>>10),56320+(1023&r))):d[r]||String.fromCharCode(r)):a[e]||i[e]||t(e)})}};return f}),r(g,[],function(){var e=navigator,t=e.userAgent,n,r,i,o,a,s,l;n=window.opera&&window.opera.buildNumber,r=/WebKit/.test(t),i=!r&&!n&&/MSIE/gi.test(t)&&/Explorer/gi.test(e.appName),i=i&&/MSIE (\w+)\./.exec(t)[1],o=-1==t.indexOf("Trident/")||-1==t.indexOf("rv:")&&-1==e.appName.indexOf("Netscape")?!1:11,i=i||o,a=!r&&!o&&/Gecko/.test(t),s=-1!=t.indexOf("Mac"),l=/(iPad|iPhone)/.test(t);var c=!l||t.match(/AppleWebKit\/(\d*)/)[1]>=534;return{opera:n,webkit:r,ie:i,gecko:a,mac:s,iOS:l,contentEditable:c,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!=i,range:window.getSelection&&"Range"in window,documentMode:i?document.documentMode||7:10}}),r(v,[c,d,l,f,h,m,g,p],function(e,n,r,i,o,a,s,l){function c(e,t){var i=this,o;i.doc=e,i.win=window,i.files={},i.counter=0,i.stdMode=!g||e.documentMode>=8,i.boxModel=!g||"CSS1Compat"==e.compatMode||i.stdMode,i.hasOuterHTML="outerHTML"in e.createElement("a"),this.boundEvents=[],i.settings=t=h({keep_values:!1,hex_colors:1},t),i.schema=t.schema,i.styles=new n({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope},t.schema),i.fixDoc(e),i.events=t.ownEvents?new r(t.proxy):r.Event,o=t.schema?t.schema.getBlockElements():{},i.isBlock=function(e){if(!e)return!1;var t=e.nodeType;return t?!(1!==t||!o[e.nodeName]):!!o[e]}}var u=l.each,d=l.is,f=l.grep,p=l.trim,h=l.extend,m=s.webkit,g=s.ie,v=/^([a-z0-9],?)+$/i,y=/^[ \t\r\n]*$/,b=l.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," ");return c.prototype={root:null,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},fixDoc:function(e){var t=this.settings,n;if(g&&t.schema){"abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video".replace(/\w+/g,function(t){e.createElement(t)});for(n in t.schema.getCustomElements())e.createElement(n)}},clone:function(e,t){var n=this,r,i;return!g||1!==e.nodeType||t?e.cloneNode(t):(i=n.doc,t?r.firstChild:(r=i.createElement(e.nodeName),u(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),r))},getRoot:function(){var e=this;return e.get(e.settings.root_element)||e.doc.body},getViewPort:function(e){var t,n;return e=e?e:this.win,t=e.document,n=this.boxModel?t.documentElement:t.body,{x:e.pageXOffset||n.scrollLeft,y:e.pageYOffset||n.scrollTop,w:e.innerWidth||n.clientWidth,h:e.innerHeight||n.clientHeight}},getRect:function(e){var t=this,n,r;return e=t.get(e),n=t.getPos(e),r=t.getSize(e),{x:n.x,y:n.y,w:r.w,h:r.h}},getSize:function(e){var t=this,n,r;return e=t.get(e),n=t.getStyle(e,"width"),r=t.getStyle(e,"height"),-1===n.indexOf("px")&&(n=0),-1===r.indexOf("px")&&(r=0),{w:parseInt(n,10)||e.offsetWidth||e.clientWidth,h:parseInt(r,10)||e.offsetHeight||e.clientHeight}},getParent:function(e,t,n){return this.getParents(e,t,n,!1)},getParents:function(e,n,r,i){var o=this,a,s=[];for(e=o.get(e),i=i===t,r=r||("BODY"!=o.getRoot().nodeName?o.getRoot().parentNode:null),d(n,"string")&&(a=n,n="*"===n?function(e){return 1==e.nodeType}:function(e){return o.is(e,a)});e&&e!=r&&e.nodeType&&9!==e.nodeType;){if(!n||n(e)){if(!i)return e;s.push(e)}e=e.parentNode}return i?s:null},get:function(e){var t;return e&&this.doc&&"string"==typeof e&&(t=e,e=this.doc.getElementById(e),e&&e.id!==t)?this.doc.getElementsByName(t)[1]:e},getNext:function(e,t){return this._findSib(e,t,"nextSibling")},getPrev:function(e,t){return this._findSib(e,t,"previousSibling")},select:function(t,n){var r=this;return e(t,r.get(n)||r.get(r.settings.root_element)||r.doc,[])},is:function(n,r){var i;if(n.length===t){if("*"===r)return 1==n.nodeType;if(v.test(r)){for(r=r.toLowerCase().split(/,/),n=n.nodeName.toLowerCase(),i=r.length-1;i>=0;i--)if(r[i]==n)return!0;return!1}}return n.nodeType&&1!=n.nodeType?!1:e.matches(r,n.nodeType?[n]:n).length>0},add:function(e,t,n,r,i){var o=this;return this.run(e,function(e){var a;return a=d(t,"string")?o.doc.createElement(t):t,o.setAttribs(a,n),r&&(r.nodeType?a.appendChild(r):o.setHTML(a,r)),i?a:e.appendChild(a)})},create:function(e,t,n){return this.add(this.doc.createElement(e),e,t,n,1)},createHTML:function(e,t,n){var r="",i;r+="<"+e;for(i in t)t.hasOwnProperty(i)&&null!==t[i]&&(r+=" "+i+'="'+this.encode(t[i])+'"');return"undefined"!=typeof n?r+">"+n+"</"+e+">":r+" />"},createFragment:function(e){var t,n,r=this.doc,i;for(i=r.createElement("div"),t=r.createDocumentFragment(),e&&(i.innerHTML=e);n=i.firstChild;)t.appendChild(n);return t},remove:function(e,t){return this.run(e,function(e){var n,r=e.parentNode;if(!r)return null;if(t)for(;n=e.firstChild;)!g||3!==n.nodeType||n.nodeValue?r.insertBefore(n,e):e.removeChild(n);return r.removeChild(e)})},setStyle:function(e,t,n){return this.run(e,function(e){var r=this,i,o;if(t)if("string"==typeof t){i=e.style,t=t.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"number"!=typeof n||b[t]||(n+="px"),"opacity"===t&&e.runtimeStyle&&"undefined"==typeof e.runtimeStyle.opacity&&(i.filter=""===n?"":"alpha(opacity="+100*n+")"),"float"==t&&(t="cssFloat"in e.style?"cssFloat":"styleFloat");try{i[t]=n}catch(a){}r.settings.update_styles&&e.removeAttribute("data-mce-style")}else for(o in t)r.setStyle(e,o,t[o])})},getStyle:function(e,n,r){if(e=this.get(e)){if(this.doc.defaultView&&r){n=n.replace(/[A-Z]/g,function(e){return"-"+e});try{return this.doc.defaultView.getComputedStyle(e,null).getPropertyValue(n)}catch(i){return null}}return n=n.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"float"==n&&(n=g?"styleFloat":"cssFloat"),e.currentStyle&&r?e.currentStyle[n]:e.style?e.style[n]:t}},setStyles:function(e,t){this.setStyle(e,t)},css:function(e,t,n){this.setStyle(e,t,n)},removeAllAttribs:function(e){return this.run(e,function(e){var t,n=e.attributes;for(t=n.length-1;t>=0;t--)e.removeAttributeNode(n.item(t))})},setAttrib:function(e,t,n){var r=this;if(e&&t)return this.run(e,function(e){var i=r.settings,o=e.getAttribute(t);if(null!==n)switch(t){case"style":if(!d(n,"string"))return u(n,function(t,n){r.setStyle(e,n,t)}),void 0;i.keep_values&&(n?e.setAttribute("data-mce-style",n,2):e.removeAttribute("data-mce-style",2)),e.style.cssText=n;break;case"class":e.className=n||"";break;case"src":case"href":i.keep_values&&(i.url_converter&&(n=i.url_converter.call(i.url_converter_scope||r,n,t,e)),r.setAttrib(e,"data-mce-"+t,n,2));break;case"shape":e.setAttribute("data-mce-style",n)}d(n)&&null!==n&&0!==n.length?e.setAttribute(t,""+n,2):e.removeAttribute(t,2),o!=n&&i.onSetAttrib&&i.onSetAttrib({attrElm:e,attrName:t,attrValue:n})})},setAttribs:function(e,t){var n=this;return this.run(e,function(e){u(t,function(t,r){n.setAttrib(e,r,t)})})},getAttrib:function(e,t,n){var r,i=this,o;if(e=i.get(e),!e||1!==e.nodeType)return n===o?!1:n;if(d(n)||(n=""),/^(src|href|style|coords|shape)$/.test(t)&&(r=e.getAttribute("data-mce-"+t)))return r;if(g&&i.props[t]&&(r=e[i.props[t]],r=r&&r.nodeValue?r.nodeValue:r),r||(r=e.getAttribute(t,2)),/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(t))return e[i.props[t]]===!0&&""===r?t:r?t:"";if("FORM"===e.nodeName&&e.getAttributeNode(t))return e.getAttributeNode(t).nodeValue;if("style"===t&&(r=r||e.style.cssText,r&&(r=i.serializeStyle(i.parseStyle(r),e.nodeName),i.settings.keep_values&&e.setAttribute("data-mce-style",r))),m&&"class"===t&&r&&(r=r.replace(/(apple|webkit)\-[a-z\-]+/gi,"")),g)switch(t){case"rowspan":case"colspan":1===r&&(r="");break;case"size":("+0"===r||20===r||0===r)&&(r="");break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":0===r&&(r="");break;case"hspace":-1===r&&(r="");break;case"maxlength":case"tabindex":(32768===r||2147483647===r||"32768"===r)&&(r="");break;case"multiple":case"compact":case"noshade":case"nowrap":return 65535===r?t:n;case"shape":r=r.toLowerCase();break;default:0===t.indexOf("on")&&r&&(r=(""+r).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1"))}return r!==o&&null!==r&&""!==r?""+r:n},getPos:function(e,t){var n=this,r=0,i=0,o,a=n.doc,s;if(e=n.get(e),t=t||a.body,e){if(t===a.body&&e.getBoundingClientRect)return s=e.getBoundingClientRect(),t=n.boxModel?a.documentElement:a.body,r=s.left+(a.documentElement.scrollLeft||a.body.scrollLeft)-t.clientTop,i=s.top+(a.documentElement.scrollTop||a.body.scrollTop)-t.clientLeft,{x:r,y:i};for(o=e;o&&o!=t&&o.nodeType;)r+=o.offsetLeft||0,i+=o.offsetTop||0,o=o.offsetParent;for(o=e.parentNode;o&&o!=t&&o.nodeType;)r-=o.scrollLeft||0,i-=o.scrollTop||0,o=o.parentNode}return{x:r,y:i}},parseStyle:function(e){return this.styles.parse(e)},serializeStyle:function(e,t){return this.styles.serialize(e,t)},addStyle:function(e){var t=this,n=t.doc,r,i;if(t!==c.DOM&&n===document){var o=c.DOM.addedStyles;if(o=o||[],o[e])return;o[e]=!0,c.DOM.addedStyles=o}i=n.getElementById("mceDefaultStyles"),i||(i=n.createElement("style"),i.id="mceDefaultStyles",i.type="text/css",r=n.getElementsByTagName("head")[0],r.firstChild?r.insertBefore(i,r.firstChild):r.appendChild(i)),i.styleSheet?i.styleSheet.cssText+=e:i.appendChild(n.createTextNode(e))},loadCSS:function(e){var t=this,n=t.doc,r;return t!==c.DOM&&n===document?(c.DOM.loadCSS(e),void 0):(e||(e=""),r=n.getElementsByTagName("head")[0],u(e.split(","),function(e){var i;t.files[e]||(t.files[e]=!0,i=t.create("link",{rel:"stylesheet",href:e}),g&&n.documentMode&&n.recalc&&(i.onload=function(){n.recalc&&n.recalc(),i.onload=null}),r.appendChild(i))}),void 0)},addClass:function(e,t){return this.run(e,function(e){var n;return t?this.hasClass(e,t)?e.className:(n=this.removeClass(e,t),e.className=n=(""!==n?n+" ":"")+t,n):0})},removeClass:function(e,t){var n=this,r;return n.run(e,function(e){var i;return n.hasClass(e,t)?(r||(r=new RegExp("(^|\\s+)"+t+"(\\s+|$)","g")),i=e.className.replace(r," "),i=p(" "!=i?i:""),e.className=i,i||(e.removeAttribute("class"),e.removeAttribute("className")),i):e.className})},hasClass:function(e,t){return e=this.get(e),e&&t?-1!==(" "+e.className+" ").indexOf(" "+t+" "):!1},toggleClass:function(e,n,r){r=r===t?!this.hasClass(e,n):r,this.hasClass(e,n)!==r&&(r?this.addClass(e,n):this.removeClass(e,n))},show:function(e){return this.setStyle(e,"display","block")},hide:function(e){return this.setStyle(e,"display","none")},isHidden:function(e){return e=this.get(e),!e||"none"==e.style.display||"none"==this.getStyle(e,"display")},uniqueId:function(e){return(e?e:"mce_")+this.counter++},setHTML:function(e,t){var n=this;return n.run(e,function(e){if(g){for(;e.firstChild;)e.removeChild(e.firstChild);try{e.innerHTML="<br />"+t,e.removeChild(e.firstChild)}catch(r){var i=n.create("div");i.innerHTML="<br />"+t,u(f(i.childNodes),function(t,n){n&&e.canHaveHTML&&e.appendChild(t)})}}else e.innerHTML=t;return t})},getOuterHTML:function(e){var t,n=this;return(e=n.get(e))?1===e.nodeType&&n.hasOuterHTML?e.outerHTML:(t=(e.ownerDocument||n.doc).createElement("body"),t.appendChild(e.cloneNode(!0)),t.innerHTML):null},setOuterHTML:function(e,t,n){var r=this;return r.run(e,function(e){function i(){var i,o;for(o=n.createElement("body"),o.innerHTML=t,i=o.lastChild;i;)r.insertAfter(i.cloneNode(!0),e),i=i.previousSibling;r.remove(e)}if(1==e.nodeType)if(n=n||e.ownerDocument||r.doc,g)try{1==e.nodeType&&r.hasOuterHTML?e.outerHTML=t:i()}catch(o){i()}else i()})},decode:a.decode,encode:a.encodeAllRaw,insertAfter:function(e,t){return t=this.get(t),this.run(e,function(e){var n,r;return n=t.parentNode,r=t.nextSibling,r?n.insertBefore(e,r):n.appendChild(e),e})},replace:function(e,t,n){var r=this;return r.run(t,function(t){return d(t,"array")&&(e=e.cloneNode(!0)),n&&u(f(t.childNodes),function(t){e.appendChild(t)}),t.parentNode.replaceChild(e,t)})},rename:function(e,t){var n=this,r;return e.nodeName!=t.toUpperCase()&&(r=n.create(t),u(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),n.replace(r,e,1)),r||e},findCommonAncestor:function(e,t){for(var n=e,r;n;){for(r=t;r&&n!=r;)r=r.parentNode;if(n==r)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},toHex:function(e){return this.styles.toHex(l.trim(e))},run:function(e,t,n){var r=this,i;return"string"==typeof e&&(e=r.get(e)),e?(n=n||this,e.nodeType||!e.length&&0!==e.length?t.call(n,e):(i=[],u(e,function(e,o){e&&("string"==typeof e&&(e=r.get(e)),i.push(t.call(n,e,o)))}),i)):!1},getAttribs:function(e){var t;if(e=this.get(e),!e)return[];if(g){if(t=[],"OBJECT"==e.nodeName)return e.attributes;"OPTION"===e.nodeName&&this.getAttrib(e,"selected")&&t.push({specified:1,nodeName:"selected"});var n=/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi;return e.cloneNode(!1).outerHTML.replace(n,"").replace(/[\w:\-]+/gi,function(e){t.push({specified:1,nodeName:e})}),t}return e.attributes},isEmpty:function(e,t){var n=this,r,o,a,s,l,c=0;if(e=e.firstChild){s=new i(e,e.parentNode),t=t||n.schema?n.schema.getNonEmptyElements():null;do{if(a=e.nodeType,1===a){if(e.getAttribute("data-mce-bogus"))continue;if(l=e.nodeName.toLowerCase(),t&&t[l]){if("br"===l){c++;continue}return!1}for(o=n.getAttribs(e),r=e.attributes.length;r--;)if(l=e.attributes[r].nodeName,"name"===l||"data-mce-bookmark"===l)return!1}if(8==a)return!1;if(3===a&&!y.test(e.nodeValue))return!1}while(e=s.next())}return 1>=c},createRng:function(){var e=this.doc;return e.createRange?e.createRange():new o(this)},nodeIndex:function(e,t){var n=0,r,i,o;if(e)for(r=e.nodeType,e=e.previousSibling,i=e;e;e=e.previousSibling)o=e.nodeType,(!t||3!=o||o!=r&&e.nodeValue.length)&&(n++,r=o);return n},split:function(e,t,n){function r(e){function t(e){var t=e.previousSibling&&"SPAN"==e.previousSibling.nodeName,n=e.nextSibling&&"SPAN"==e.nextSibling.nodeName;return t&&n}var n,o=e.childNodes,a=e.nodeType;if(1!=a||"bookmark"!=e.getAttribute("data-mce-type")){for(n=o.length-1;n>=0;n--)r(o[n]);if(9!=a){if(3==a&&e.nodeValue.length>0){var s=p(e.nodeValue).length;if(!i.isBlock(e.parentNode)||s>0||0===s&&t(e))return}else if(1==a&&(o=e.childNodes,1==o.length&&o[0]&&1==o[0].nodeType&&"bookmark"==o[0].getAttribute("data-mce-type")&&e.parentNode.insertBefore(o[0],e),o.length||/^(br|hr|input|img)$/i.test(e.nodeName)))return;i.remove(e)}return e}}var i=this,o=i.createRng(),a,s,l;return e&&t?(o.setStart(e.parentNode,i.nodeIndex(e)),o.setEnd(t.parentNode,i.nodeIndex(t)),a=o.extractContents(),o=i.createRng(),o.setStart(t.parentNode,i.nodeIndex(t)+1),o.setEnd(e.parentNode,i.nodeIndex(e)+1),s=o.extractContents(),l=e.parentNode,l.insertBefore(r(a),e),n?l.replaceChild(n,t):l.insertBefore(t,e),l.insertBefore(r(s),e),i.remove(e),n||t):void 0},bind:function(e,t,n,r){var i=this;if(l.isArray(e)){for(var o=e.length;o--;)e[o]=i.bind(e[o],t,n,r);return e}return!i.settings.collect||e!==i.doc&&e!==i.win||i.boundEvents.push([e,t,n,r]),i.events.bind(e,t,n,r||i)},unbind:function(e,t,n){var r=this,i;if(l.isArray(e)){for(i=e.length;i--;)e[i]=r.unbind(e[i],t,n);return e}if(r.boundEvents&&(e===r.doc||e===r.win))for(i=r.boundEvents.length;i--;){var o=r.boundEvents[i];e!=o[0]||t&&t!=o[1]||n&&n!=o[2]||this.events.unbind(o[0],o[1],o[2])}return this.events.unbind(e,t,n)},fire:function(e,t,n){return this.events.fire(e,t,n)},getContentEditable:function(e){var t;return 1!=e.nodeType?null:(t=e.getAttribute("data-mce-contenteditable"),t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null)},destroy:function(){var t=this;if(t.boundEvents){for(var n=t.boundEvents.length;n--;){var r=t.boundEvents[n];this.events.unbind(r[0],r[1],r[2])}t.boundEvents=null}e.setDocument&&e.setDocument(),t.win=t.doc=t.root=t.events=t.frag=null},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},_findSib:function(e,t,n){var r=this,i=t;if(e)for("string"==typeof i&&(i=function(e){return r.is(e,t)}),e=e[n];e;e=e[n])if(i(e))return e;return null}},c.DOM=new c(document),c}),r(y,[v,p],function(e,t){function n(){function e(e,t){function n(){o.remove(s),a&&(a.onreadystatechange=a.onload=a=null),t()}function i(){"undefined"!=typeof console&&console.log&&console.log("Failed to load: "+e)}var o=r,a,s;s=o.uniqueId(),a=document.createElement("script"),a.id=s,a.type="text/javascript",a.src=e,"onreadystatechange"in a?a.onreadystatechange=function(){/loaded|complete/.test(a.readyState)&&n()}:a.onload=n,a.onerror=i,(document.getElementsByTagName("head")[0]||document.body).appendChild(a)}var t=0,n=1,a=2,s={},l=[],c={},u=[],d=0,f;this.isDone=function(e){return s[e]==a},this.markDone=function(e){s[e]=a},this.add=this.load=function(e,n,r){var i=s[e];i==f&&(l.push(e),s[e]=t),n&&(c[e]||(c[e]=[]),c[e].push({func:n,scope:r||this}))},this.loadQueue=function(e,t){this.loadScripts(l,e,t)},this.loadScripts=function(t,r,l){function p(e){i(c[e],function(e){e.func.call(e.scope)}),c[e]=f}var h;u.push({func:r,scope:l||this}),h=function(){var r=o(t);t.length=0,i(r,function(t){return s[t]==a?(p(t),void 0):(s[t]!=n&&(s[t]=n,d++,e(t,function(){s[t]=a,d--,p(t),h()})),void 0)}),d||(i(u,function(e){e.func.call(e.scope)}),u.length=0)},h()}}var r=e.DOM,i=t.each,o=t.grep;return n.ScriptLoader=new n,n}),r(b,[y,p],function(e,n){function r(){var e=this;e.items=[],e.urls={},e.lookup={}}var i=n.each;return r.prototype={get:function(e){return this.lookup[e]?this.lookup[e].instance:t},dependencies:function(e){var t;return this.lookup[e]&&(t=this.lookup[e].dependencies),t||[]
-},requireLangPack:function(t){r.language&&r.languageLoad!==!1&&e.ScriptLoader.add(this.urls[t]+"/langs/"+r.language+".js")},add:function(e,t,n){return this.items.push(t),this.lookup[e]={instance:t,dependencies:n},t},createUrl:function(e,t){return"object"==typeof t?t:{prefix:e.prefix,resource:t,suffix:e.suffix}},addComponents:function(t,n){var r=this.urls[t];i(n,function(t){e.ScriptLoader.add(r+"/"+t)})},load:function(n,o,a,s){function l(){var r=c.dependencies(n);i(r,function(e){var n=c.createUrl(o,e);c.load(n.resource,n,t,t)}),a&&(s?a.call(s):a.call(e))}var c=this,u=o;c.urls[n]||("object"==typeof o&&(u=o.prefix+o.resource+o.suffix),0!==u.indexOf("/")&&-1==u.indexOf("://")&&(u=r.baseURL+"/"+u),c.urls[n]=u.substring(0,u.lastIndexOf("/")),c.lookup[n]?l():e.ScriptLoader.add(u,l,s))}},r.PluginManager=new r,r.ThemeManager=new r,r}),r(C,[],function(){function e(e,t,n){var r,i,o=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[o])return e[o];if(e!==t){if(r=e[a])return r;for(i=e.parent;i&&i!==t;i=i.parent)if(r=i[a])return r}}function t(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}var n=/^[ \t\r\n]*$/,r={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};return t.prototype={replace:function(e){var t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t},attr:function(e,t){var n=this,r,i,o;if("string"!=typeof e){for(i in e)n.attr(i,e[i]);return n}if(r=n.attributes){if(t!==o){if(null===t){if(e in r.map)for(delete r.map[e],i=r.length;i--;)if(r[i].name===e)return r=r.splice(i,1),n;return n}if(e in r.map){for(i=r.length;i--;)if(r[i].name===e){r[i].value=t;break}}else r.push({name:e,value:t});return r.map[e]=t,n}return r.map[e]}},clone:function(){var e=this,n=new t(e.name,e.type),r,i,o,a,s;if(o=e.attributes){for(s=[],s.map={},r=0,i=o.length;i>r;r++)a=o[r],"id"!==a.name&&(s[s.length]={name:a.name,value:a.value},s.map[a.name]=a.value);n.attributes=s}return n.value=e.value,n.shortEnded=e.shortEnded,n},wrap:function(e){var t=this;return t.parent.insert(e,t),e.append(t),t},unwrap:function(){var e=this,t,n;for(t=e.firstChild;t;)n=t.next,e.insert(t,e,!0),t=n;e.remove()},remove:function(){var e=this,t=e.parent,n=e.next,r=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):r.next=n,t.lastChild===e?(t.lastChild=r,r&&(r.next=null)):n.prev=r,e.parent=e.next=e.prev=null),e},append:function(e){var t=this,n;return e.parent&&e.remove(),n=t.lastChild,n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e},insert:function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,e.next=t,t.prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,e.prev=t,t.next=e),e.parent=r,e},getAll:function(t){var n=this,r,i=[];for(r=n.firstChild;r;r=e(r,n))r.name===t&&i.push(r);return i},empty:function(){var t=this,n,r,i;if(t.firstChild){for(n=[],i=t.firstChild;i;i=e(i,t))n.push(i);for(r=n.length;r--;)i=n[r],i.parent=i.firstChild=i.lastChild=i.next=i.prev=null}return t.firstChild=t.lastChild=null,t},isEmpty:function(t){var r=this,i=r.firstChild,o,a;if(i)do{if(1===i.type){if(i.attributes.map["data-mce-bogus"])continue;if(t[i.name])return!1;for(o=i.attributes.length;o--;)if(a=i.attributes[o].name,"name"===a||0===a.indexOf("data-mce-"))return!1}if(8===i.type)return!1;if(3===i.type&&!n.test(i.value))return!1}while(i=e(i,r));return!0},walk:function(t){return e(this,null,t)}},t.create=function(e,n){var i,o;if(i=new t(e,r[e]||1),n)for(o in n)i.attr(o,n[o]);return i},t}),r(x,[p],function(e){function t(e,t){return e?e.split(t||" "):[]}function n(e){function n(e,n,r){function i(e){var t={},n,r;for(n=0,r=e.length;r>n;n++)t[e[n]]={};return t}var o,l,c,u=arguments;for(r=r||[],n=n||"","string"==typeof r&&(r=t(r)),l=3;l<u.length;l++)"string"==typeof u[l]&&(u[l]=t(u[l])),r.push.apply(r,u[l]);for(e=t(e),o=e.length;o--;)c=[].concat(s,t(n)),a[e[o]]={attributes:i(c),attributesOrder:c,children:i(r)}}function i(e,n){var r,i,o,s;for(e=t(e),r=e.length,n=t(n);r--;)for(i=a[e[r]],o=0,s=n.length;s>o;o++)i.attributes[n[o]]={},i.attributesOrder.push(n[o])}var a={},s,l,c,u,d,f,p;return r[e]?r[e]:(s=t("id accesskey class dir lang style tabindex title"),l=t("onabort onblur oncancel oncanplay oncanplaythrough onchange onclick onclose oncontextmenu oncuechange ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange onemptied onended onerror onfocus oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onpause onplay onplaying onprogress onratechange onreset onscroll onseeked onseeking onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate onvolumechange onwaiting"),c=t("address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul"),u=t("a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment"),"html4"!=e&&(s.push.apply(s,t("contenteditable contextmenu draggable dropzone hidden spellcheck translate")),c.push.apply(c,t("article aside details dialog figure header footer hgroup section nav")),u.push.apply(u,t("audio canvas command datalist mark meter output progress time wbr video ruby bdi keygen"))),"html5-strict"!=e&&(s.push("xml:lang"),p=t("acronym applet basefont big font strike tt"),u.push.apply(u,p),o(p,function(e){n(e,"",u)}),f=t("center dir isindex noframes"),c.push.apply(c,f),d=[].concat(c,u),o(f,function(e){n(e,"",d)})),d=d||[].concat(c,u),n("html","manifest","head body"),n("head","","base command link meta noscript script style title"),n("title hr noscript br"),n("base","href target"),n("link","href rel media hreflang type sizes hreflang"),n("meta","name http-equiv content charset"),n("style","media type scoped"),n("script","src async defer type charset"),n("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",d),n("address dt dd div caption","",d),n("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",u),n("blockquote","cite",d),n("ol","reversed start type","li"),n("ul","","li"),n("li","value",d),n("dl","","dt dd"),n("a","href target rel media hreflang type",u),n("q","cite",u),n("ins del","cite datetime",d),n("img","src alt usemap ismap width height"),n("iframe","src name width height",d),n("embed","src type width height"),n("object","data type typemustmatch name usemap form width height",d,"param"),n("param","name value"),n("map","name",d,"area"),n("area","alt coords shape href target rel media hreflang type"),n("table","border","caption colgroup thead tfoot tbody tr"+("html4"==e?" col":"")),n("colgroup","span","col"),n("col","span"),n("tbody thead tfoot","","tr"),n("tr","","td th"),n("td","colspan rowspan headers",d),n("th","colspan rowspan headers scope abbr",d),n("form","accept-charset action autocomplete enctype method name novalidate target",d),n("fieldset","disabled form name",d,"legend"),n("label","form for",u),n("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),n("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"==e?d:u),n("select","disabled form multiple name required size","option optgroup"),n("optgroup","disabled label","option"),n("option","disabled label selected value"),n("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),n("menu","type label",d,"li"),n("noscript","",d),"html4"!=e&&(n("wbr"),n("ruby","",u,"rt rp"),n("figcaption","",d),n("mark rt rp summary bdi","",u),n("canvas","width height",d),n("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height",d,"track source"),n("audio","src crossorigin preload autoplay mediagroup loop muted controls",d,"track source"),n("source","src type media"),n("track","kind src srclang label default"),n("datalist","",u,"option"),n("article section nav aside header footer","",d),n("hgroup","","h1 h2 h3 h4 h5 h6"),n("figure","",d,"figcaption"),n("time","datetime",u),n("dialog","open",d),n("command","type label icon disabled checked radiogroup command"),n("output","for form name",u),n("progress","value max",u),n("meter","value min max low high optimum",u),n("details","open",d,"summary"),n("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!=e&&(i("script","language xml:space"),i("style","xml:space"),i("object","declare classid codebase codetype archive standby align border hspace vspace"),i("param","valuetype type"),i("a","charset name rev shape coords"),i("br","clear"),i("applet","codebase archive code object alt name width height align hspace vspace"),i("img","name longdesc align border hspace vspace"),i("iframe","longdesc frameborder marginwidth marginheight scrolling align"),i("font basefont","size color face"),i("input","usemap align"),i("select","onchange"),i("textarea"),i("h1 h2 h3 h4 h5 h6 div p legend caption","align"),i("ul","type compact"),i("li","type"),i("ol dl menu dir","compact"),i("pre","width xml:space"),i("hr","align noshade size width"),i("isindex","prompt"),i("table","summary width frame rules cellspacing cellpadding align bgcolor"),i("col","width align char charoff valign"),i("colgroup","width align char charoff valign"),i("thead","align char charoff valign"),i("tr","align char charoff valign bgcolor"),i("th","axis align char charoff valign nowrap bgcolor width height"),i("form","accept"),i("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),i("tfoot","align char charoff valign"),i("tbody","align char charoff valign"),i("area","nohref"),i("body","background bgcolor text link vlink alink")),"html4"!=e&&(i("input button select textarea","autofocus"),i("input textarea","placeholder"),i("a","download"),i("link script img","crossorigin"),i("iframe","srcdoc sandbox seamless allowfullscreen")),o(t("a form meter progress dfn"),function(e){a[e]&&delete a[e].children[e]}),delete a.caption.children.table,r[e]=a,a)}var r={},i=e.makeMap,o=e.each,a=e.extend,s=e.explode,l=e.inArray;return function(e){function c(t,n,o){var s=e[t];return s?s=i(s,",",i(s.toUpperCase()," ")):(s=r[t],s||(s=i(n," ",i(n.toUpperCase()," ")),s=a(s,o),r[t]=s)),s}function u(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")}function d(e){var n,r,o,a,s,c,d,f,p,h,m,g,y,C,x,w,_,N,E,k=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,S=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,T=/[*?+]/;if(e)for(e=t(e,","),v["@"]&&(w=v["@"].attributes,_=v["@"].attributesOrder),n=0,r=e.length;r>n;n++)if(s=k.exec(e[n])){if(C=s[1],p=s[2],x=s[3],f=s[5],g={},y=[],c={attributes:g,attributesOrder:y},"#"===C&&(c.paddEmpty=!0),"-"===C&&(c.removeEmpty=!0),"!"===s[4]&&(c.removeEmptyAttrs=!0),w){for(N in w)g[N]=w[N];y.push.apply(y,_)}if(f)for(f=t(f,"|"),o=0,a=f.length;a>o;o++)if(s=S.exec(f[o])){if(d={},m=s[1],h=s[2].replace(/::/g,":"),C=s[3],E=s[4],"!"===m&&(c.attributesRequired=c.attributesRequired||[],c.attributesRequired.push(h),d.required=!0),"-"===m){delete g[h],y.splice(l(y,h),1);continue}C&&("="===C&&(c.attributesDefault=c.attributesDefault||[],c.attributesDefault.push({name:h,value:E}),d.defaultValue=E),":"===C&&(c.attributesForced=c.attributesForced||[],c.attributesForced.push({name:h,value:E}),d.forcedValue=E),"<"===C&&(d.validValues=i(E,"?"))),T.test(h)?(c.attributePatterns=c.attributePatterns||[],d.pattern=u(h),c.attributePatterns.push(d)):(g[h]||y.push(h),g[h]=d)}w||"@"!=p||(w=g,_=y),x&&(c.outputName=p,v[x]=c),T.test(p)?(c.pattern=u(p),b.push(c)):v[p]=c}}function f(e){v={},b=[],d(e),o(x,function(e,t){y[t]=e.children})}function p(e){var n=/^(~)?(.+)$/;e&&o(t(e,","),function(e){var t=n.exec(e),r="~"===t[1],i=r?"span":"div",s=t[2];if(y[s]=y[i],R[s]=i,r||(k[s.toUpperCase()]={},k[s]={}),!v[s]){var l=v[i];l=a({},l),delete l.removeEmptyAttrs,delete l.removeEmpty,v[s]=l}o(y,function(e){e[i]&&(e[s]=e[i])})})}function h(e){var n=/^([+\-]?)(\w+)\[([^\]]+)\]$/;e&&o(t(e,","),function(e){var r=n.exec(e),i,a;r&&(a=r[1],i=a?y[r[2]]:y[r[2]]={"#comment":{}},i=y[r[2]],o(t(r[3],"|"),function(e){"-"===a?delete i[e]:i[e]={}}))})}function m(e){var t=v[e],n;if(t)return t;for(n=b.length;n--;)if(t=b[n],t.pattern.test(e))return t}var g=this,v={},y={},b=[],C,x,w,_,N,E,k,S,T,R={},A={};e=e||{},x=n(e.schema),e.verify_html===!1&&(e.valid_elements="*[*]"),e.valid_styles&&(C={},o(e.valid_styles,function(e,t){C[t]=s(e)})),w=c("whitespace_elements","pre script noscript style textarea video audio iframe object"),_=c("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),N=c("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),E=c("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),S=c("non_empty_elements","td th iframe video audio object",N),T=c("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure"),k=c("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup",T),o((e.special||"script noscript style textarea").split(" "),function(e){A[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.valid_elements?f(e.valid_elements):(o(x,function(e,t){v[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},y[t]=e.children}),"html5"!=e.schema&&o(t("strong/b em/i"),function(e){e=t(e,"/"),v[e[1]].outputName=e[0]}),v.img.attributesDefault=[{name:"alt",value:""}],o(t("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){v[e]&&(v[e].removeEmpty=!0)}),o(t("p h1 h2 h3 h4 h5 h6 th td pre div address caption"),function(e){v[e].paddEmpty=!0}),o(t("span"),function(e){v[e].removeEmptyAttrs=!0})),p(e.custom_elements),h(e.valid_children),d(e.extended_valid_elements),h("+ol[ul|ol],+ul[ul|ol]"),e.invalid_elements&&o(s(e.invalid_elements),function(e){v[e]&&delete v[e]}),m("span")||d("span[!data-mce-type|*]"),g.children=y,g.styles=C,g.getBoolAttrs=function(){return E},g.getBlockElements=function(){return k},g.getTextBlockElements=function(){return T},g.getShortEndedElements=function(){return N},g.getSelfClosingElements=function(){return _},g.getNonEmptyElements=function(){return S},g.getWhiteSpaceElements=function(){return w},g.getSpecialElements=function(){return A},g.isValidChild=function(e,t){var n=y[e];return!(!n||!n[t])},g.isValid=function(e,t){var n,r,i=m(e);if(i){if(!t)return!0;if(i.attributes[t])return!0;if(n=i.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},g.getElementRule=m,g.getCustomElements=function(){return R},g.addValidElements=d,g.setValidElements=f,g.addCustomElements=p,g.addValidChildren=h,g.elements=v}}),r(w,[x,m,p],function(e,t,n){var r=n.each;return function(i,o){var a=this,s=function(){};i=i||{},a.schema=o=o||new e,i.fix_self_closing!==!1&&(i.fix_self_closing=!0),r("comment cdata text start end pi doctype".split(" "),function(e){e&&(a[e]=i[e]||s)}),a.parse=function(e){function r(e){var t,n;for(t=f.length;t--&&f[t].name!==e;);if(t>=0){for(n=f.length-1;n>=t;n--)e=f[n],e.valid&&s.end(e.name);f.length=t}}function a(e,t,n,r,o){var a,s,l=/[\s\u0000-\u001F]+/g;if(t=t.toLowerCase(),n=t in C?t:F(n||r||o||""),w&&!v&&0!==t.indexOf("data-")){if(a=S[t],!a&&T){for(s=T.length;s--&&(a=T[s],!a.pattern.test(t)););-1===s&&(a=null)}if(!a)return;if(a.validValues&&!(n in a.validValues))return}W[t]&&!i.allow_script_urls&&/(java|vb)script:/i.test(decodeURIComponent(n.replace(l,"")))||(p.map[t]=n,p.push({name:t,value:n}))}var s=this,l,c=0,u,d,f=[],p,h,m,g,v,y,b,C,x,w,_,N,E,k,S,T,R,A,B,L,H,D,M,P,O,I=0,F=t.decode,z,W=n.makeMap("src,href");for(D=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),M=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,b=o.getShortEndedElements(),H=i.self_closing_elements||o.getSelfClosingElements(),C=o.getBoolAttrs(),w=i.validate,y=i.remove_internals,z=i.fix_self_closing,P=o.getSpecialElements();l=D.exec(e);){if(c<l.index&&s.text(F(e.substr(c,l.index-c))),u=l[6])u=u.toLowerCase(),":"===u.charAt(0)&&(u=u.substr(1)),r(u);else if(u=l[7]){if(u=u.toLowerCase(),":"===u.charAt(0)&&(u=u.substr(1)),x=u in b,z&&H[u]&&f.length>0&&f[f.length-1].name===u&&r(u),!w||(_=o.getElementRule(u))){if(N=!0,w&&(S=_.attributes,T=_.attributePatterns),(k=l[8])?(v=-1!==k.indexOf("data-mce-type"),v&&y&&(N=!1),p=[],p.map={},k.replace(M,a)):(p=[],p.map={}),w&&!v){if(R=_.attributesRequired,A=_.attributesDefault,B=_.attributesForced,L=_.removeEmptyAttrs,L&&!p.length&&(N=!1),B)for(h=B.length;h--;)E=B[h],g=E.name,O=E.value,"{$uid}"===O&&(O="mce_"+I++),p.map[g]=O,p.push({name:g,value:O});if(A)for(h=A.length;h--;)E=A[h],g=E.name,g in p.map||(O=E.value,"{$uid}"===O&&(O="mce_"+I++),p.map[g]=O,p.push({name:g,value:O}));if(R){for(h=R.length;h--&&!(R[h]in p.map););-1===h&&(N=!1)}p.map["data-mce-bogus"]&&(N=!1)}N&&s.start(u,p,x)}else N=!1;if(d=P[u]){d.lastIndex=c=l.index+l[0].length,(l=d.exec(e))?(N&&(m=e.substr(c,l.index-c)),c=l.index+l[0].length):(m=e.substr(c),c=e.length),N&&(m.length>0&&s.text(m,!0),s.end(u)),D.lastIndex=c;continue}x||(k&&k.indexOf("/")==k.length-1?N&&s.end(u):f.push({name:u,valid:N}))}else(u=l[1])?(">"===u.charAt(0)&&(u=" "+u),i.allow_conditional_comments||"[if"!==u.substr(0,3)||(u=" "+u),s.comment(u)):(u=l[2])?s.cdata(u):(u=l[3])?s.doctype(u):(u=l[4])&&s.pi(u,l[5]);c=l.index+l[0].length}for(c<e.length&&s.text(F(e.substr(c))),h=f.length-1;h>=0;h--)u=f[h],u.valid&&s.end(u.name)}}}),r(_,[C,x,w,p],function(e,t,n,r){var i=r.makeMap,o=r.each,a=r.explode,s=r.extend;return function(r,l){function c(t){var n,r,o,a,s,c,d,f,p,h,m,g,v,y;for(m=i("tr,td,th,tbody,thead,tfoot,table"),h=l.getNonEmptyElements(),g=l.getTextBlockElements(),n=0;n<t.length;n++)if(r=t[n],r.parent&&!r.fixed)if(g[r.name]&&"li"==r.parent.name){for(v=r.next;v&&g[v.name];)v.name="li",v.fixed=!0,r.parent.insert(v,r.parent),v=v.next;r.unwrap(r)}else{for(a=[r],o=r.parent;o&&!l.isValidChild(o.name,r.name)&&!m[o.name];o=o.parent)a.push(o);if(o&&a.length>1){for(a.reverse(),s=c=u.filterNode(a[0].clone()),p=0;p<a.length-1;p++){for(l.isValidChild(c.name,a[p].name)?(d=u.filterNode(a[p].clone()),c.append(d)):d=c,f=a[p].firstChild;f&&f!=a[p+1];)y=f.next,d.append(f),f=y;c=d}s.isEmpty(h)?o.insert(r,a[0],!0):(o.insert(s,a[0],!0),o.insert(r,s)),o=a[0],(o.isEmpty(h)||o.firstChild===o.lastChild&&"br"===o.firstChild.name)&&o.empty().remove()}else if(r.parent){if("li"===r.name){if(v=r.prev,v&&("ul"===v.name||"ul"===v.name)){v.append(r);continue}if(v=r.next,v&&("ul"===v.name||"ul"===v.name)){v.insert(r,v.firstChild,!0);continue}r.wrap(u.filterNode(new e("ul",1)));continue}l.isValidChild(r.parent.name,"div")&&l.isValidChild("div",r.name)?r.wrap(u.filterNode(new e("div",1))):"style"===r.name||"script"===r.name?r.empty().remove():r.unwrap()}}}var u=this,d={},f=[],p={},h={};r=r||{},r.validate="validate"in r?r.validate:!0,r.root_name=r.root_name||"body",u.schema=l=l||new t,u.filterNode=function(e){var t,n,r;n in d&&(r=p[n],r?r.push(e):p[n]=[e]),t=f.length;for(;t--;)n=f[t].name,n in e.attributes.map&&(r=h[n],r?r.push(e):h[n]=[e]);return e},u.addNodeFilter=function(e,t){o(a(e),function(e){var n=d[e];n||(d[e]=n=[]),n.push(t)})},u.addAttributeFilter=function(e,t){o(a(e),function(e){var n;for(n=0;n<f.length;n++)if(f[n].name===e)return f[n].callbacks.push(t),void 0;f.push({name:e,callbacks:[t]})})},u.parse=function(t,o){function a(){function e(e){e&&(t=e.firstChild,t&&3==t.type&&(t.value=t.value.replace(R,"")),t=e.lastChild,t&&3==t.type&&(t.value=t.value.replace(L,"")))}var t=y.firstChild,n,i;if(l.isValidChild(y.name,I.toLowerCase())){for(;t;)n=t.next,3==t.type||1==t.type&&"p"!==t.name&&!T[t.name]&&!t.attr("data-mce-type")?i?i.append(t):(i=u(I,1),i.attr(r.forced_root_block_attrs),y.insert(i,t),i.append(t)):(e(i),i=null),t=n;e(i)}}function u(t,n){var r=new e(t,n),i;return t in d&&(i=p[t],i?i.push(r):p[t]=[r]),r}function m(e){var t,n,r;for(t=e.prev;t&&3===t.type;)n=t.value.replace(L,""),n.length>0?(t.value=n,t=t.prev):(r=t.prev,t.remove(),t=r)}function g(e){var t,n={};for(t in e)"li"!==t&&"p"!=t&&(n[t]=e[t]);return n}var v,y,b,C,x,w,_,N,E,k,S,T,R,A=[],B,L,H,D,M,P,O,I;if(o=o||{},p={},h={},T=s(i("script,style,head,html,body,title,meta,param"),l.getBlockElements()),O=l.getNonEmptyElements(),P=l.children,S=r.validate,I="forced_root_block"in o?o.forced_root_block:r.forced_root_block,M=l.getWhiteSpaceElements(),R=/^[ \t\r\n]+/,L=/[ \t\r\n]+$/,H=/[ \t\r\n]+/g,D=/^[ \t\r\n]+$/,v=new n({validate:S,allow_script_urls:r.allow_script_urls,allow_conditional_comments:r.allow_conditional_comments,self_closing_elements:g(l.getSelfClosingElements()),cdata:function(e){b.append(u("#cdata",4)).value=e},text:function(e,t){var n;B||(e=e.replace(H," "),b.lastChild&&T[b.lastChild.name]&&(e=e.replace(R,""))),0!==e.length&&(n=u("#text",3),n.raw=!!t,b.append(n).value=e)},comment:function(e){b.append(u("#comment",8)).value=e},pi:function(e,t){b.append(u(e,7)).value=t,m(b)},doctype:function(e){var t;t=b.append(u("#doctype",10)),t.value=e,m(b)},start:function(e,t,n){var r,i,o,a,s;if(o=S?l.getElementRule(e):{}){for(r=u(o.outputName||e,1),r.attributes=t,r.shortEnded=n,b.append(r),s=P[b.name],s&&P[r.name]&&!s[r.name]&&A.push(r),i=f.length;i--;)a=f[i].name,a in t.map&&(E=h[a],E?E.push(r):h[a]=[r]);T[e]&&m(r),n||(b=r),!B&&M[e]&&(B=!0)}},end:function(t){var n,r,i,o,a;if(r=S?l.getElementRule(t):{}){if(T[t]&&!B){if(n=b.firstChild,n&&3===n.type)if(i=n.value.replace(R,""),i.length>0)n.value=i,n=n.next;else for(o=n.next,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.next,(0===i.length||D.test(i))&&(n.remove(),n=o),n=o;if(n=b.lastChild,n&&3===n.type)if(i=n.value.replace(L,""),i.length>0)n.value=i,n=n.prev;else for(o=n.prev,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.prev,(0===i.length||D.test(i))&&(n.remove(),n=o),n=o}if(B&&M[t]&&(B=!1),(r.removeEmpty||r.paddEmpty)&&b.isEmpty(O))if(r.paddEmpty)b.empty().append(new e("#text","3")).value="\xa0";else if(!b.attributes.map.name&&!b.attributes.map.id)return a=b.parent,b.empty().remove(),b=a,void 0;b=b.parent}}},l),y=b=new e(o.context||r.root_name,11),v.parse(t),S&&A.length&&(o.context?o.invalid=!0:c(A)),I&&("body"==y.name||o.isRootContent)&&a(),!o.invalid){for(k in p){for(E=d[k],C=p[k],_=C.length;_--;)C[_].parent||C.splice(_,1);for(x=0,w=E.length;w>x;x++)E[x](C,k,o)}for(x=0,w=f.length;w>x;x++)if(E=f[x],E.name in h){for(C=h[E.name],_=C.length;_--;)C[_].parent||C.splice(_,1);for(_=0,N=E.callbacks.length;N>_;_++)E.callbacks[_](C,E.name,o)}}return y},r.remove_trailing_brs&&u.addNodeFilter("br",function(t){var n,r=t.length,i,o=s({},l.getBlockElements()),a=l.getNonEmptyElements(),c,u,d,f,p,h;for(o.body=1,n=0;r>n;n++)if(i=t[n],c=i.parent,o[i.parent.name]&&i===c.lastChild){for(d=i.prev;d;){if(f=d.name,"span"!==f||"bookmark"!==d.attr("data-mce-type")){if("br"!==f)break;if("br"===f){i=null;break}}d=d.prev}i&&(i.remove(),c.isEmpty(a)&&(p=l.getElementRule(c.name),p&&(p.removeEmpty?c.remove():p.paddEmpty&&(c.empty().append(new e("#text",3)).value="\xa0"))))}else{for(u=i;c&&c.firstChild===u&&c.lastChild===u&&(u=c,!o[c.name]);)c=c.parent;u===c&&(h=new e("#text",3),h.value="\xa0",i.replace(h))}}),r.allow_html_in_named_anchor||u.addAttributeFilter("id,name",function(e){for(var t=e.length,n,r,i,o;t--;)if(o=e[t],"a"===o.name&&o.firstChild&&!o.attr("href")){i=o.parent,n=o.lastChild;do r=n.prev,i.insert(n,o),n=r;while(n)}})}}),r(N,[m,p],function(e,t){var n=t.makeMap;return function(t){var r=[],i,o,a,s,l;return t=t||{},i=t.indent,o=n(t.indent_before||""),a=n(t.indent_after||""),s=e.getEncodeFunc(t.entity_encoding||"raw",t.entities),l="html"==t.element_format,{start:function(e,t,n){var c,u,d,f;if(i&&o[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n")),r.push("<",e),t)for(c=0,u=t.length;u>c;c++)d=t[c],r.push(" ",d.name,'="',s(d.value,!0),'"');r[r.length]=!n||l?">":" />",n&&i&&a[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n"))},end:function(e){var t;r.push("</",e,">"),i&&a[e]&&r.length>0&&(t=r[r.length-1],t.length>0&&"\n"!==t&&r.push("\n"))},text:function(e,t){e.length>0&&(r[r.length]=t?e:s(e))},cdata:function(e){r.push("<![CDATA[",e,"]]>")},comment:function(e){r.push("<!--",e,"-->")},pi:function(e,t){t?r.push("<?",e," ",t,"?>"):r.push("<?",e,"?>"),i&&r.push("\n")},doctype:function(e){r.push("<!DOCTYPE",e,">",i?"\n":"")},reset:function(){r.length=0},getContent:function(){return r.join("").replace(/\n$/,"")}}}}),r(E,[N,x],function(e,t){return function(n,r){var i=this,o=new e(n);n=n||{},n.validate="validate"in n?n.validate:!0,i.schema=r=r||new t,i.writer=o,i.serialize=function(e){function t(e){var n=i[e.type],s,l,c,u,d,f,p,h,m;if(n)n(e);else{if(s=e.name,l=e.shortEnded,c=e.attributes,a&&c&&c.length>1){for(f=[],f.map={},m=r.getElementRule(e.name),p=0,h=m.attributesOrder.length;h>p;p++)u=m.attributesOrder[p],u in c.map&&(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));for(p=0,h=c.length;h>p;p++)u=c[p].name,u in f.map||(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));c=f}if(o.start(e.name,c,l),!l){if(e=e.firstChild)do t(e);while(e=e.next);o.end(s)}}}var i,a;return a=n.validate,i={3:function(e){o.text(e.value,e.raw)},8:function(e){o.comment(e.value)},7:function(e){o.pi(e.name,e.value)},10:function(e){o.doctype(e.value)},4:function(e){o.cdata(e.value)},11:function(e){if(e=e.firstChild)do t(e);while(e=e.next)}},o.reset(),1!=e.type||n.inner?i[11](e):t(e),o.getContent()}}}),r(k,[v,_,m,E,C,x,g,p],function(e,t,n,r,i,o,a,s){var l=s.each,c=s.trim,u=e.DOM;return function(e,i){var s,d,f;return i&&(s=i.dom,d=i.schema),s=s||u,d=d||new o(e),e.entity_encoding=e.entity_encoding||"named",e.remove_trailing_brs="remove_trailing_brs"in e?e.remove_trailing_brs:!0,f=new t(e,d),f.addAttributeFilter("src,href,style",function(t,n){for(var r=t.length,i,o,a="data-mce-"+n,l=e.url_converter,c=e.url_converter_scope,u;r--;)i=t[r],o=i.attributes.map[a],o!==u?(i.attr(n,o.length>0?o:null),i.attr(a,null)):(o=i.attributes.map[n],"style"===n?o=s.serializeStyle(s.parseStyle(o),i.name):l&&(o=l.call(c,o,n,i.name)),i.attr(n,o.length>0?o:null))}),f.addAttributeFilter("class",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",r.length>0?r:null)}),f.addAttributeFilter("data-mce-type",function(e,t,n){for(var r=e.length,i;r--;)i=e[r],"bookmark"!==i.attributes.map["data-mce-type"]||n.cleanup||i.remove()}),f.addAttributeFilter("data-mce-expando",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),f.addNodeFilter("noscript",function(e){for(var t=e.length,r;t--;)r=e[t].firstChild,r&&(r.value=n.decode(r.value))}),f.addNodeFilter("script,style",function(e,t){function n(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}for(var r=e.length,i,o;r--;)if(i=e[r],o=i.firstChild?i.firstChild.value:"","script"===t){var a=(i.attr("type")||"text/javascript").replace(/^mce\-/,"");i.attr("type","text/javascript"===a?null:a),o.length>0&&(i.firstChild.value="// <![CDATA[\n"+n(o)+"\n// ]]>")}else o.length>0&&(i.firstChild.value="<!--\n"+n(o)+"\n-->")}),f.addNodeFilter("#comment",function(e){for(var t=e.length,n;t--;)n=e[t],0===n.value.indexOf("[CDATA[")?(n.name="#cdata",n.type=4,n.value=n.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===n.value.indexOf("mce:protected ")&&(n.name="#text",n.type=3,n.raw=!0,n.value=unescape(n.value).substr(14))}),f.addNodeFilter("xml:namespace,input",function(e,t){for(var n=e.length,r;n--;)r=e[n],7===r.type?r.remove():1===r.type&&("input"!==t||"type"in r.attributes.map||r.attr("type","text"))}),e.fix_list_elements&&f.addNodeFilter("ul,ol",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.parent,("ul"===r.name||"ol"===r.name)&&n.prev&&"li"===n.prev.name&&n.prev.append(n)}),f.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),{schema:d,addNodeFilter:f.addNodeFilter,addAttributeFilter:f.addAttributeFilter,serialize:function(t,n){var i=this,o,u,p,h,m;return a.ie&&s.select("script,style,select,map").length>0?(m=t.innerHTML,t=t.cloneNode(!1),s.setHTML(t,m)):t=t.cloneNode(!0),o=t.ownerDocument.implementation,o.createHTMLDocument&&(u=o.createHTMLDocument(""),l("BODY"==t.nodeName?t.childNodes:[t],function(e){u.body.appendChild(u.importNode(e,!0))}),t="BODY"!=t.nodeName?u.body.firstChild:u.body,p=s.doc,s.doc=u),n=n||{},n.format=n.format||"html",n.selection&&(n.forced_root_block=""),n.no_events||(n.node=t,i.onPreProcess(n)),h=new r(e,d),n.content=h.serialize(f.parse(c(n.getInner?t.innerHTML:s.getOuterHTML(t)),n)),n.cleanup||(n.content=n.content.replace(/\uFEFF/g,"")),n.no_events||i.onPostProcess(n),p&&(s.doc=p),n.node=null,n.content},addRules:function(e){d.addValidElements(e)},setRules:function(e){d.setValidElements(e)},onPreProcess:function(e){i&&i.fire("PreProcess",e)},onPostProcess:function(e){i&&i.fire("PostProcess",e)}}}}),r(S,[],function(){function e(e){function t(t,n){var r,i=0,o,a,s,l,c,u,d=-1,f;if(r=t.duplicate(),r.collapse(n),f=r.parentElement(),f.ownerDocument===e.dom.doc){for(;"false"===f.contentEditable;)f=f.parentNode;if(!f.hasChildNodes())return{node:f,inside:1};for(s=f.children,o=s.length-1;o>=i;)if(u=Math.floor((i+o)/2),l=s[u],r.moveToElementText(l),d=r.compareEndPoints(n?"StartToStart":"EndToEnd",t),d>0)o=u-1;else{if(!(0>d))return{node:l};i=u+1}if(0>d)for(l?r.collapse(!1):(r.moveToElementText(f),r.collapse(!0),l=f,a=!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",1)&&f==r.parentElement();)c++;else for(r.collapse(!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",-1)&&f==r.parentElement();)c++;return{node:l,position:d,offset:c,inside:a}}}function n(){function n(e){var n=t(o,e),r,i,s=0,l,c,u;if(r=n.node,i=n.offset,n.inside&&!r.hasChildNodes())return a[e?"setStart":"setEnd"](r,0),void 0;if(i===c)return a[e?"setStartBefore":"setEndAfter"](r),void 0;if(n.position<0){if(l=n.inside?r.firstChild:r.nextSibling,!l)return a[e?"setStartAfter":"setEndAfter"](r),void 0;if(!i)return 3==l.nodeType?a[e?"setStart":"setEnd"](l,0):a[e?"setStartBefore":"setEndBefore"](l),void 0;for(;l;){if(u=l.nodeValue,s+=u.length,s>=i){r=l,s-=i,s=u.length-s;break}l=l.nextSibling}}else{if(l=r.previousSibling,!l)return a[e?"setStartBefore":"setEndBefore"](r);if(!i)return 3==r.nodeType?a[e?"setStart":"setEnd"](l,r.nodeValue.length):a[e?"setStartAfter":"setEndAfter"](l),void 0;for(;l;){if(s+=l.nodeValue.length,s>=i){r=l,s-=i;break}l=l.previousSibling}}a[e?"setStart":"setEnd"](r,s)}var o=e.getRng(),a=i.createRng(),s,l,c,u,d;if(s=o.item?o.item(0):o.parentElement(),s.ownerDocument!=i.doc)return a;if(l=e.isCollapsed(),o.item)return a.setStart(s.parentNode,i.nodeIndex(s)),a.setEnd(a.startContainer,a.startOffset+1),a;try{n(!0),l||n()}catch(f){if(-2147024809!=f.number)throw f;d=r.getBookmark(2),c=o.duplicate(),c.collapse(!0),s=c.parentElement(),l||(c=o.duplicate(),c.collapse(!1),u=c.parentElement(),u.innerHTML=u.innerHTML),s.innerHTML=s.innerHTML,r.moveToBookmark(d),o=e.getRng(),n(!0),l||n()}return a}var r=this,i=e.dom,o=!1;this.getBookmark=function(n){function r(e){var t,n,r,o,a=[];
-for(t=e.parentNode,n=i.getRoot().parentNode;t!=n&&9!==t.nodeType;){for(r=t.children,o=r.length;o--;)if(e===r[o]){a.push(o);break}e=t,t=t.parentNode}return a}function o(e){var n;return n=t(a,e),n?{position:n.position,offset:n.offset,indexes:r(n.node),inside:n.inside}:void 0}var a=e.getRng(),s={};return 2===n&&(a.item?s.start={ctrl:!0,indexes:r(a.item(0))}:(s.start=o(!0),e.isCollapsed()||(s.end=o()))),s},this.moveToBookmark=function(e){function t(e){var t,n,r,o;for(t=i.getRoot(),n=e.length-1;n>=0;n--)o=t.children,r=e[n],r<=o.length-1&&(t=o[r]);return t}function n(n){var i=e[n?"start":"end"],a,s,l,c;i&&(a=i.position>0,s=o.createTextRange(),s.moveToElementText(t(i.indexes)),c=i.offset,c!==l?(s.collapse(i.inside||a),s.moveStart("character",a?-c:c)):s.collapse(n),r.setEndPoint(n?"StartToStart":"EndToStart",s),n&&r.collapse(!0))}var r,o=i.doc.body;e.start&&(e.start.ctrl?(r=o.createControlRange(),r.addElement(t(e.start.indexes)),r.select()):(r=o.createTextRange(),n(!0),n(),r.select()))},this.addRange=function(t){function n(e){var t,n,a,d,h;a=i.create("a"),t=e?s:c,n=e?l:u,d=r.duplicate(),(t==f||t==f.documentElement)&&(t=p,n=0),3==t.nodeType?(t.parentNode.insertBefore(a,t),d.moveToElementText(a),d.moveStart("character",n),i.remove(a),r.setEndPoint(e?"StartToStart":"EndToEnd",d)):(h=t.childNodes,h.length?(n>=h.length?i.insertAfter(a,h[h.length-1]):t.insertBefore(a,h[n]),d.moveToElementText(a)):t.canHaveHTML&&(t.innerHTML="<span>&#xFEFF;</span>",a=t.firstChild,d.moveToElementText(a),d.collapse(o)),r.setEndPoint(e?"StartToStart":"EndToEnd",d),i.remove(a))}var r,a,s,l,c,u,d,f=e.dom.doc,p=f.body,h,m;if(s=t.startContainer,l=t.startOffset,c=t.endContainer,u=t.endOffset,r=p.createTextRange(),s==c&&1==s.nodeType){if(l==u&&!s.hasChildNodes()){if(s.canHaveHTML)return d=s.previousSibling,d&&!d.hasChildNodes()&&i.isBlock(d)?d.innerHTML="&#xFEFF;":d=null,s.innerHTML="<span>&#xFEFF;</span><span>&#xFEFF;</span>",r.moveToElementText(s.lastChild),r.select(),i.doc.selection.clear(),s.innerHTML="",d&&(d.innerHTML=""),void 0;l=i.nodeIndex(s),s=s.parentNode}if(l==u-1)try{if(m=s.childNodes[l],a=p.createControlRange(),a.addElement(m),a.select(),h=e.getRng(),h.item&&m===h.item(0))return}catch(g){}}n(!0),n(),r.select()},this.getRangeAt=n}return e}),r(T,[g],function(e){return{BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey},metaKeyPressed:function(t){return(e.mac?t.ctrlKey||t.metaKey:t.ctrlKey)&&!t.altKey}}}),r(R,[T,p,g],function(e,t,n){return function(r,i){function o(e){return i.settings.object_resizing===!1?!1:/TABLE|IMG|DIV/.test(e.nodeName)?"false"===e.getAttribute("data-mce-resize")?!1:!0:!1}function a(t){var n,r;n=t.screenX-k,r=t.screenY-S,D=n*N[2]+A,M=r*N[3]+B,D=5>D?5:D,M=5>M?5:M,(e.modifierPressed(t)||"IMG"==x.nodeName&&0!==N[2]*N[3])&&(D=Math.round(M/L),M=Math.round(D*L)),b.setStyles(w,{width:D,height:M}),N[2]<0&&w.clientWidth<=D&&b.setStyle(w,"left",T+(A-D)),N[3]<0&&w.clientHeight<=M&&b.setStyle(w,"top",R+(B-M)),H||(i.fire("ObjectResizeStart",{target:x,width:A,height:B}),H=!0)}function s(){function e(e,t){t&&(x.style[e]||!i.schema.isValid(x.nodeName.toLowerCase(),e)?b.setStyle(x,e,t):b.setAttrib(x,e,t))}H=!1,e("width",D),e("height",M),b.unbind(P,"mousemove",a),b.unbind(P,"mouseup",s),O!=P&&(b.unbind(O,"mousemove",a),b.unbind(O,"mouseup",s)),b.remove(w),I&&"TABLE"!=x.nodeName||l(x),i.fire("ObjectResized",{target:x,width:D,height:M}),i.nodeChanged()}function l(e,t,n){var r,l,u,d,f,p=i.getBody();r=b.getPos(e,p),T=r.x,R=r.y,f=e.getBoundingClientRect(),l=f.width||f.right-f.left,u=f.height||f.bottom-f.top,x!=e&&(m(),x=e,D=M=0),d=i.fire("ObjectSelected",{target:e}),o(e)&&!d.isDefaultPrevented()?C(_,function(e,r){function o(t){H=!0,k=t.screenX,S=t.screenY,A=x.clientWidth,B=x.clientHeight,L=B/A,N=e,w=x.cloneNode(!0),b.addClass(w,"mce-clonedresizable"),w.contentEditable=!1,w.unSelectabe=!0,b.setStyles(w,{left:T,top:R,margin:0}),w.removeAttribute("data-mce-selected"),i.getBody().appendChild(w),b.bind(P,"mousemove",a),b.bind(P,"mouseup",s),O!=P&&(b.bind(O,"mousemove",a),b.bind(O,"mouseup",s))}var c,d;return t?(r==t&&o(n),void 0):(c=b.get("mceResizeHandle"+r),c?b.show(c):(d=i.getBody(),c=b.add(d,"div",{id:"mceResizeHandle"+r,"data-mce-bogus":!0,"class":"mce-resizehandle",contentEditable:!1,unSelectabe:!0,style:"cursor:"+r+"-resize; margin:0; padding:0"}),b.bind(c,"mousedown",function(e){e.preventDefault(),o(e)})),b.setStyles(c,{left:l*e[0]+T-c.offsetWidth/2,top:u*e[1]+R-c.offsetHeight/2}),void 0)}):c(),x.setAttribute("data-mce-selected","1")}function c(){var e,t;x&&x.removeAttribute("data-mce-selected");for(e in _)t=b.get("mceResizeHandle"+e),t&&(b.unbind(t),b.remove(t))}function u(e){function t(e,t){do if(e===t)return!0;while(e=e.parentNode)}var n;return C(b.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),n="mousedown"==e.type?e.target:r.getNode(),n=b.getParent(n,I?"table":"table,img,hr"),n&&(g(),t(r.getStart(),n)&&t(r.getEnd(),n)&&(!I||n!=r.getStart()&&"IMG"!==r.getStart().nodeName))?(l(n),void 0):(c(),void 0)}function d(e,t,n){e&&e.attachEvent&&e.attachEvent("on"+t,n)}function f(e,t,n){e&&e.detachEvent&&e.detachEvent("on"+t,n)}function p(e){var t=e.srcElement,n,r,o,a,s,c,u;n=t.getBoundingClientRect(),c=E.clientX-n.left,u=E.clientY-n.top;for(r in _)if(o=_[r],a=t.offsetWidth*o[0],s=t.offsetHeight*o[1],Math.abs(a-c)<8&&Math.abs(s-u)<8){N=o;break}H=!0,i.getDoc().selection.empty(),l(t,r,E)}function h(e){var t=e.srcElement;if(t!=x){if(m(),0===t.id.indexOf("mceResizeHandle"))return e.returnValue=!1,void 0;("IMG"==t.nodeName||"TABLE"==t.nodeName)&&(c(),x=t,d(t,"resizestart",p))}}function m(){f(x,"resizestart",p)}function g(){try{i.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}}function v(e){var t;if(I){t=P.body.createControlRange();try{return t.addElement(e),t.select(),!0}catch(n){}}}function y(){x=w=null,I&&(m(),f(i.getBody(),"controlselect",h))}var b=i.dom,C=t.each,x,w,_,N,E,k,S,T,R,A,B,L,H,D,M,P=i.getDoc(),O=document,I=n.ie&&n.ie<11;_={n:[.5,0,0,-1],e:[1,.5,1,0],s:[.5,1,0,1],w:[0,.5,-1,0],nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var F=".mce-content-body";return i.contentStyles.push(F+" div.mce-resizehandle {"+"position: absolute;"+"border: 1px solid black;"+"background: #FFF;"+"width: 5px;"+"height: 5px;"+"z-index: 10000"+"}"+F+" .mce-resizehandle:hover {"+"background: #000"+"}"+F+" img[data-mce-selected], hr[data-mce-selected] {"+"outline: 1px solid black;"+"resize: none"+"}"+F+" .mce-clonedresizable {"+"position: absolute;"+(n.gecko?"":"outline: 1px dashed black;")+"opacity: .5;"+"filter: alpha(opacity=50);"+"z-index: 10000"+"}"),i.on("init",function(){I?(i.on("ObjectResized",function(e){"TABLE"!=e.target.nodeName&&(c(),v(e.target))}),d(i.getBody(),"controlselect",h),i.on("mousedown",function(e){E=e})):(g(),n.ie>=11&&(i.on("mouseup",function(e){var t=e.target.nodeName;/^(TABLE|IMG|HR)$/.test(t)&&(i.selection.select(e.target,"TABLE"==t),i.nodeChanged())}),i.dom.bind(i.getBody(),"mscontrolselect",function(e){/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&e.preventDefault()}))),i.on("nodechange mousedown mouseup ResizeEditor",u),i.on("keydown keyup",function(e){x&&"TABLE"==x.nodeName&&u(e)})}),{controlSelect:v,destroy:y}}}),r(A,[f,S,R,g,p],function(e,n,r,i,o){function a(e,t,i,o){var a=this;a.dom=e,a.win=t,a.serializer=i,a.editor=o,a.controlSelection=new r(a,o),a.win.getSelection||(a.tridentSel=new n(a))}var s=o.each,l=o.grep,c=o.trim,u=i.ie,d=i.opera;return a.prototype={setCursorLocation:function(e,t){var n=this,r=n.dom.createRng();r.setStart(e,t),r.setEnd(e,t),n.setRng(r),n.collapse(!1)},getContent:function(e){var n=this,r=n.getRng(),i=n.dom.create("body"),o=n.getSel(),a,s,l;return e=e||{},a=s="",e.get=!0,e.format=e.format||"html",e.selection=!0,n.editor.fire("BeforeGetContent",e),"text"==e.format?n.isCollapsed()?"":r.text||(o.toString?o.toString():""):(r.cloneContents?(l=r.cloneContents(),l&&i.appendChild(l)):r.item!==t||r.htmlText!==t?(i.innerHTML="<br>"+(r.item?r.item(0).outerHTML:r.htmlText),i.removeChild(i.firstChild)):i.innerHTML=r.toString(),/^\s/.test(i.innerHTML)&&(a=" "),/\s+$/.test(i.innerHTML)&&(s=" "),e.getInner=!0,e.content=n.isCollapsed()?"":a+n.serializer.serialize(i,e)+s,n.editor.fire("GetContent",e),e.content)},setContent:function(e,t){var n=this,r=n.getRng(),i,o=n.win.document,a,s;if(t=t||{format:"html"},t.set=!0,t.selection=!0,e=t.content=e,t.no_events||n.editor.fire("BeforeSetContent",t),e=t.content,r.insertNode){e+='<span id="__caret">_</span>',r.startContainer==o&&r.endContainer==o?o.body.innerHTML=e:(r.deleteContents(),0===o.body.childNodes.length?o.body.innerHTML=e:r.createContextualFragment?r.insertNode(r.createContextualFragment(e)):(a=o.createDocumentFragment(),s=o.createElement("div"),a.appendChild(s),s.outerHTML=e,r.insertNode(a))),i=n.dom.get("__caret"),r=o.createRange(),r.setStartBefore(i),r.setEndBefore(i),n.setRng(r),n.dom.remove("__caret");try{n.setRng(r)}catch(l){}}else r.item&&(o.execCommand("Delete",!1,null),r=n.getRng()),/^\s+/.test(e)?(r.pasteHTML('<span id="__mce_tmp">_</span>'+e),n.dom.remove("__mce_tmp")):r.pasteHTML(e);t.no_events||n.editor.fire("SetContent",t)},getStart:function(){var e=this,t=e.getRng(),n,r,i,o;if(t.duplicate||t.item){if(t.item)return t.item(0);for(i=t.duplicate(),i.collapse(1),n=i.parentElement(),n.ownerDocument!==e.dom.doc&&(n=e.dom.getRoot()),r=o=t.parentElement();o=o.parentNode;)if(o==n){n=r;break}return n}return n=t.startContainer,1==n.nodeType&&n.hasChildNodes()&&(n=n.childNodes[Math.min(n.childNodes.length-1,t.startOffset)]),n&&3==n.nodeType?n.parentNode:n},getEnd:function(){var e=this,t=e.getRng(),n,r;return t.duplicate||t.item?t.item?t.item(0):(t=t.duplicate(),t.collapse(0),n=t.parentElement(),n.ownerDocument!==e.dom.doc&&(n=e.dom.getRoot()),n&&"BODY"==n.nodeName?n.lastChild||n:n):(n=t.endContainer,r=t.endOffset,1==n.nodeType&&n.hasChildNodes()&&(n=n.childNodes[r>0?r-1:r]),n&&3==n.nodeType?n.parentNode:n)},getBookmark:function(e,t){function n(e,t){var n=0;return s(a.select(e),function(e,r){e==t&&(n=r)}),n}function r(e){function t(t){var n,r,i,o=t?"start":"end";n=e[o+"Container"],r=e[o+"Offset"],1==n.nodeType&&"TR"==n.nodeName&&(i=n.childNodes,n=i[Math.min(t?r:r-1,i.length-1)],n&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r)))}return t(!0),t(),e}function i(){function e(e,n){var i=e[n?"startContainer":"endContainer"],a=e[n?"startOffset":"endOffset"],s=[],l,c,u=0;if(3==i.nodeType){if(t)for(l=i.previousSibling;l&&3==l.nodeType;l=l.previousSibling)a+=l.nodeValue.length;s.push(a)}else c=i.childNodes,a>=c.length&&c.length&&(u=1,a=Math.max(0,c.length-1)),s.push(o.dom.nodeIndex(c[a],t)+u);for(;i&&i!=r;i=i.parentNode)s.push(o.dom.nodeIndex(i,t));return s}var n=o.getRng(!0),r=a.getRoot(),i={};return i.start=e(n,!0),o.isCollapsed()||(i.end=e(n)),i}var o=this,a=o.dom,l,c,u,d,f,p,h="&#xFEFF;",m;if(2==e)return p=o.getNode(),f=p.nodeName,"IMG"==f?{name:f,index:n(f,p)}:o.tridentSel?o.tridentSel.getBookmark(e):i();if(e)return{rng:o.getRng()};if(l=o.getRng(),u=a.uniqueId(),d=o.isCollapsed(),m="overflow:hidden;line-height:0px",l.duplicate||l.item){if(l.item)return p=l.item(0),f=p.nodeName,{name:f,index:n(f,p)};c=l.duplicate();try{l.collapse(),l.pasteHTML('<span data-mce-type="bookmark" id="'+u+'_start" style="'+m+'">'+h+"</span>"),d||(c.collapse(!1),l.moveToElementText(c.parentElement()),0===l.compareEndPoints("StartToEnd",c)&&c.move("character",-1),c.pasteHTML('<span data-mce-type="bookmark" id="'+u+'_end" style="'+m+'">'+h+"</span>"))}catch(g){return null}}else{if(p=o.getNode(),f=p.nodeName,"IMG"==f)return{name:f,index:n(f,p)};c=r(l.cloneRange()),d||(c.collapse(!1),c.insertNode(a.create("span",{"data-mce-type":"bookmark",id:u+"_end",style:m},h))),l=r(l),l.collapse(!0),l.insertNode(a.create("span",{"data-mce-type":"bookmark",id:u+"_start",style:m},h))}return o.moveToBookmark({id:u,keep:1}),{id:u}},moveToBookmark:function(e){function t(t){var n=e[t?"start":"end"],r,i,o,s;if(n){for(o=n[0],i=c,r=n.length-1;r>=1;r--){if(s=i.childNodes,n[r]>s.length-1)return;i=s[n[r]]}3===i.nodeType&&(o=Math.min(n[0],i.nodeValue.length)),1===i.nodeType&&(o=Math.min(n[0],i.childNodes.length)),t?a.setStart(i,o):a.setEnd(i,o)}return!0}function n(t){var n=o.get(e.id+"_"+t),r,i,a,c,u=e.keep;if(n&&(r=n.parentNode,"start"==t?(u?(r=n.firstChild,i=1):i=o.nodeIndex(n),f=p=r,h=m=i):(u?(r=n.firstChild,i=1):i=o.nodeIndex(n),p=r,m=i),!u)){for(c=n.previousSibling,a=n.nextSibling,s(l(n.childNodes),function(e){3==e.nodeType&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});n=o.get(e.id+"_"+t);)o.remove(n,1);c&&a&&c.nodeType==a.nodeType&&3==c.nodeType&&!d&&(i=c.nodeValue.length,c.appendData(a.nodeValue),o.remove(a),"start"==t?(f=p=c,h=m=i):(p=c,m=i))}}function r(e){return!o.isBlock(e)||e.innerHTML||u||(e.innerHTML='<br data-mce-bogus="1" />'),e}var i=this,o=i.dom,a,c,f,p,h,m;if(e)if(e.start){if(a=o.createRng(),c=o.getRoot(),i.tridentSel)return i.tridentSel.moveToBookmark(e);t(!0)&&t()&&i.setRng(a)}else e.id?(n("start"),n("end"),f&&(a=o.createRng(),a.setStart(r(f),h),a.setEnd(r(p),m),i.setRng(a))):e.name?i.select(o.select(e.name)[e.index]):e.rng&&i.setRng(e.rng)},select:function(t,n){function r(t,n){var r=t,i=new e(t,r);do{if(3==t.nodeType&&0!==c(t.nodeValue).length)return n?a.setStart(t,0):a.setEnd(t,t.nodeValue.length),void 0;if(l[t.nodeName])return n?a.setStartBefore(t):"BR"==t.nodeName?a.setEndBefore(t):a.setEndAfter(t),void 0}while(t=n?i.next():i.prev());"BODY"==r.nodeName&&(n?a.setStart(r,0):a.setEnd(r,r.childNodes.length))}var i=this,o=i.dom,a=o.createRng(),s,l;if(i.lastFocusBookmark=null,l=o.schema.getNonEmptyElements(),t){if(!n&&i.controlSelection.controlSelect(t))return;s=o.nodeIndex(t),a.setStart(t.parentNode,s),a.setEnd(t.parentNode,s+1),n&&(r(t,1),r(t)),i.setRng(a)}return t},isCollapsed:function(){var e=this,t=e.getRng(),n=e.getSel();return!t||t.item?!1:t.compareEndPoints?0===t.compareEndPoints("StartToEnd",t):!n||t.collapsed},collapse:function(e){var t=this,n=t.getRng(),r;n.item&&(r=n.item(0),n=t.win.document.body.createTextRange(),n.moveToElementText(r)),n.collapse(!!e),t.setRng(n)},getSel:function(){var e=this.win;return e.getSelection?e.getSelection():e.document.selection},getRng:function(e){var t=this,n,r,i,o=t.win.document,a;if(!e&&t.lastFocusBookmark){var s=t.lastFocusBookmark;return s.startContainer?(r=o.createRange(),r.setStart(s.startContainer,s.startOffset),r.setEnd(s.endContainer,s.endOffset)):r=s,r}if(e&&t.tridentSel)return t.tridentSel.getRangeAt(0);try{(n=t.getSel())&&(r=n.rangeCount>0?n.getRangeAt(0):n.createRange?n.createRange():o.createRange())}catch(l){}if(u&&r&&r.setStart){try{a=o.selection.createRange()}catch(l){}a&&a.item&&(i=a.item(0),r=o.createRange(),r.setStartBefore(i),r.setEndAfter(i))}return r||(r=o.createRange?o.createRange():o.body.createTextRange()),r.setStart&&9===r.startContainer.nodeType&&r.collapsed&&(i=t.dom.getRoot(),r.setStart(i,0),r.setEnd(i,0)),t.selectedRange&&t.explicitRange&&(0===r.compareBoundaryPoints(r.START_TO_START,t.selectedRange)&&0===r.compareBoundaryPoints(r.END_TO_END,t.selectedRange)?r=t.explicitRange:(t.selectedRange=null,t.explicitRange=null)),r},setRng:function(e,t){var n=this,r;if(e.select)try{e.select()}catch(i){}else if(n.tridentSel){if(e.cloneRange)try{return n.tridentSel.addRange(e),void 0}catch(i){}}else if(r=n.getSel()){n.explicitRange=e;try{r.removeAllRanges(),r.addRange(e)}catch(i){}t===!1&&r.extend&&(r.collapse(e.endContainer,e.endOffset),r.extend(e.startContainer,e.startOffset)),n.selectedRange=r.rangeCount>0?r.getRangeAt(0):null}},setNode:function(e){var t=this;return t.setContent(t.dom.getOuterHTML(e)),e},getNode:function(){function e(e,t){for(var n=e;e&&3===e.nodeType&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n}var t=this,n=t.getRng(),r,i=n.startContainer,o=n.endContainer,a=n.startOffset,s=n.endOffset,l=t.dom.getRoot();return n?n.setStart?(r=n.commonAncestorContainer,!n.collapsed&&(i==o&&2>s-a&&i.hasChildNodes()&&(r=i.childNodes[a]),3===i.nodeType&&3===o.nodeType&&(i=i.length===a?e(i.nextSibling,!0):i.parentNode,o=0===s?e(o.previousSibling,!1):o.parentNode,i&&i===o))?i:r&&3==r.nodeType?r.parentNode:r):(r=n.item?n.item(0):n.parentElement(),r.ownerDocument!==t.win.document&&(r=l),r):l},getSelectedBlocks:function(t,n){var r=this,i=r.dom,o,a,s=[];if(a=i.getRoot(),t=i.getParent(t||r.getStart(),i.isBlock),n=i.getParent(n||r.getEnd(),i.isBlock),t&&t!=a&&s.push(t),t&&n&&t!=n){o=t;for(var l=new e(t,a);(o=l.next())&&o!=n;)i.isBlock(o)&&s.push(o)}return n&&t!=n&&n!=a&&s.push(n),s},isForward:function(){var e=this.dom,t=this.getSel(),n,r;return t&&t.anchorNode&&t.focusNode?(n=e.createRng(),n.setStart(t.anchorNode,t.anchorOffset),n.collapse(!0),r=e.createRng(),r.setStart(t.focusNode,t.focusOffset),r.collapse(!0),n.compareBoundaryPoints(n.START_TO_START,r)<=0):!0},normalize:function(){function t(t){function a(t,n){for(var r=new e(t,f.getParent(t.parentNode,f.isBlock)||p);t=r[n?"prev":"next"]();)if("BR"===t.nodeName)return!0}function s(e,t){return e.previousSibling&&e.previousSibling.nodeName==t}function l(t,n){var r,a;for(n=n||c,r=new e(n,f.getParent(n.parentNode,f.isBlock)||p);h=r[t?"prev":"next"]();){if(3===h.nodeType&&h.nodeValue.length>0)return c=h,u=t?h.nodeValue.length:0,i=!0,void 0;if(f.isBlock(h)||m[h.nodeName.toLowerCase()])return;a=h}o&&a&&(c=a,i=!0,u=0)}var c,u,d,f=n.dom,p=f.getRoot(),h,m,g;if(c=r[(t?"start":"end")+"Container"],u=r[(t?"start":"end")+"Offset"],m=f.schema.getNonEmptyElements(),9===c.nodeType&&(c=f.getRoot(),u=0),c===p){if(t&&(h=c.childNodes[u>0?u-1:0],h&&(g=h.nodeName.toLowerCase(),m[h.nodeName]||"TABLE"==h.nodeName)))return;if(c.hasChildNodes()&&(u=Math.min(!t&&u>0?u-1:u,c.childNodes.length-1),c=c.childNodes[u],u=0,c.hasChildNodes()&&!/TABLE/.test(c.nodeName))){h=c,d=new e(c,p);do{if(3===h.nodeType&&h.nodeValue.length>0){u=t?0:h.nodeValue.length,c=h,i=!0;break}if(m[h.nodeName.toLowerCase()]){u=f.nodeIndex(h),c=h.parentNode,"IMG"!=h.nodeName||t||u++,i=!0;break}}while(h=t?d.next():d.prev())}}o&&(3===c.nodeType&&0===u&&l(!0),1===c.nodeType&&(h=c.childNodes[u],!h||"BR"!==h.nodeName||s(h,"A")||a(h)||a(h,!0)||l(!0,c.childNodes[u]))),t&&!o&&3===c.nodeType&&u===c.nodeValue.length&&l(!1),i&&r["set"+(t?"Start":"End")](c,u)}var n=this,r,i,o;u||(r=n.getRng(),o=r.collapsed,t(!0),o||t(),i&&(o&&r.collapse(!0),n.setRng(r,n.isForward())))},selectorChanged:function(e,t){var n=this,r;return n.selectorChangedData||(n.selectorChangedData={},r={},n.editor.on("NodeChange",function(e){var t=e.element,i=n.dom,o=i.getParents(t,null,i.getRoot()),a={};s(n.selectorChangedData,function(e,t){s(o,function(n){return i.is(n,t)?(r[t]||(s(e,function(e){e(!0,{node:n,selector:t,parents:o})}),r[t]=e),a[t]=e,!1):void 0})}),s(r,function(e,n){a[n]||(delete r[n],s(e,function(e){e(!1,{node:t,selector:n,parents:o})}))})})),n.selectorChangedData[e]||(n.selectorChangedData[e]=[]),n.selectorChangedData[e].push(t),n},getScrollContainer:function(){for(var e,t=this.dom.getRoot();t&&"BODY"!=t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e){function t(e){for(var t=0,n=0,r=e;r&&r.nodeType;)t+=r.offsetLeft||0,n+=r.offsetTop||0,r=r.offsetParent;return{x:t,y:n}}var n,r,i=this,o=i.dom,a=o.getRoot(),s,l;if("BODY"!=a.nodeName){var c=i.getScrollContainer();if(c)return n=t(e).y-t(c).y,l=c.clientHeight,s=c.scrollTop,(s>n||n+25>s+l)&&(c.scrollTop=s>n?n:n-l+25),void 0}r=o.getViewPort(i.editor.getWin()),n=o.getPos(e).y,s=r.y,l=r.h,(n<r.y||n+25>s+l)&&i.editor.getWin().scrollTo(0,s>n?n:n-l+25)},destroy:function(){this.win=null,this.controlSelection.destroy()}},a}),r(B,[p],function(e){function t(e){this.walk=function(t,r){function i(e){var t;return t=e[0],3===t.nodeType&&t===l&&c>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===d&&e.length>0&&t===u&&3===t.nodeType&&e.splice(e.length-1,1),e}function o(e,t,n){for(var r=[];e&&e!=n;e=e[t])r.push(e);return r}function a(e,t){do{if(e.parentNode==t)return e;e=e.parentNode}while(e)}function s(e,t,n){var a=n?"nextSibling":"previousSibling";for(m=e,g=m.parentNode;m&&m!=t;m=g)g=m.parentNode,v=o(m==e?m:m[a],a),v.length&&(n||v.reverse(),r(i(v)))}var l=t.startContainer,c=t.startOffset,u=t.endContainer,d=t.endOffset,f,p,h,m,g,v,y;if(y=e.select("td.mce-item-selected,th.mce-item-selected"),y.length>0)return n(y,function(e){r([e])}),void 0;if(1==l.nodeType&&l.hasChildNodes()&&(l=l.childNodes[c]),1==u.nodeType&&u.hasChildNodes()&&(u=u.childNodes[Math.min(d-1,u.childNodes.length-1)]),l==u)return r(i([l]));for(f=e.findCommonAncestor(l,u),m=l;m;m=m.parentNode){if(m===u)return s(l,f,!0);if(m===f)break}for(m=u;m;m=m.parentNode){if(m===l)return s(u,f);if(m===f)break}p=a(l,f)||l,h=a(u,f)||u,s(l,p,!0),v=o(p==l?p:p.nextSibling,"nextSibling",h==u?h.nextSibling:h),v.length&&r(i(v)),s(u,h)},this.split=function(e){function t(e,t){return e.splitText(t)}var n=e.startContainer,r=e.startOffset,i=e.endContainer,o=e.endOffset;return n==i&&3==n.nodeType?r>0&&r<n.nodeValue.length&&(i=t(n,r),n=i.previousSibling,o>r?(o-=r,n=i=t(i,o).previousSibling,o=i.nodeValue.length,r=0):o=0):(3==n.nodeType&&r>0&&r<n.nodeValue.length&&(n=t(n,r),r=0),3==i.nodeType&&o>0&&o<i.nodeValue.length&&(i=t(i,o).previousSibling,o=i.nodeValue.length)),{startContainer:n,startOffset:r,endContainer:i,endOffset:o}}}var n=e.each;return t.compareRanges=function(e,t){if(e&&t){if(!e.item&&!e.duplicate)return e.startContainer==t.startContainer&&e.startOffset==t.startOffset;if(e.item&&t.item&&e.item(0)===t.item(0))return!0;if(e.isEqual&&t.isEqual&&t.isEqual(e))return!0}return!1},t}),r(L,[f,B,p],function(e,t,n){return function(r){function i(e){return e.nodeType&&(e=e.nodeName),!!r.schema.getTextBlockElements()[e.toLowerCase()]}function o(e,t){return I.getParents(e,t,I.getRoot())}function a(e){return 1===e.nodeType&&"_mce_caret"===e.id}function s(){u({alignleft:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},defaultBlock:"div"},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"}}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},defaultBlock:"div"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:!1},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:!1},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(){return!0},onformat:function(e,t,n){et(n,function(t,n){I.setAttrib(e,n,t)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike,sub,sup",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]}),et("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){u(e,{block:e,remove:"all"})}),u(r.settings.formats)}function l(){r.addShortcut("ctrl+b","bold_desc","Bold"),r.addShortcut("ctrl+i","italic_desc","Italic"),r.addShortcut("ctrl+u","underline_desc","Underline");for(var e=1;6>=e;e++)r.addShortcut("ctrl+"+e,"",["FormatBlock",!1,"h"+e]);r.addShortcut("ctrl+7","",["FormatBlock",!1,"p"]),r.addShortcut("ctrl+8","",["FormatBlock",!1,"div"]),r.addShortcut("ctrl+9","",["FormatBlock",!1,"address"])}function c(e){return e?O[e]:O}function u(e,t){e&&("string"!=typeof e?et(e,function(e,t){u(t,e)}):(t=t.length?t:[t],et(t,function(e){e.deep===X&&(e.deep=!e.selector),e.split===X&&(e.split=!e.selector||e.inline),e.remove===X&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),O[e]=t))}function d(e){var t;return r.dom.getParent(e,function(e){return t=r.dom.getStyle(e,"text-decoration"),t&&"none"!==t}),t}function f(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=d(e.parentNode),r.dom.getStyle(e,"color")&&t?r.dom.setStyle(e,"text-decoration",t):r.dom.getStyle(e,"textdecoration")===t&&r.dom.setStyle(e,"text-decoration",null))}function p(t,n,o){function s(e,t){t=t||m,e&&(t.onformat&&t.onformat(e,t,n,o),et(t.styles,function(t,r){I.setStyle(e,r,E(t,n))}),et(t.attributes,function(t,r){I.setAttrib(e,r,E(t,n))}),et(t.classes,function(t){t=E(t,n),I.hasClass(e,t)||I.addClass(e,t)}))}function l(){function t(t,n){var r=new e(n);for(o=r.current();o;o=r.prev())if(o.childNodes.length>1||o==t||"BR"==o.tagName)return o}var n=r.selection.getRng(),i=n.startContainer,a=n.endContainer;if(i!=a&&0===n.endOffset){var s=t(i,a),l=3==s.nodeType?s.length:s.childNodes.length;n.setEnd(s,l)}return n}function u(e,t,n,r,i){var o=[],a=-1,s,l=-1,c=-1,u;return et(e.childNodes,function(e,t){return"UL"===e.nodeName||"OL"===e.nodeName?(a=t,s=e,!1):void 0}),et(e.childNodes,function(e,n){"SPAN"===e.nodeName&&"bookmark"==I.getAttrib(e,"data-mce-type")&&(e.id==t.id+"_start"?l=n:e.id==t.id+"_end"&&(c=n))}),0>=a||a>l&&c>a?(et(tt(e.childNodes),i),0):(u=I.clone(n,K),et(tt(e.childNodes),function(e,t){(a>l&&a>t||l>a&&t>a)&&(o.push(e),e.parentNode.removeChild(e))}),a>l?e.insertBefore(u,s):l>a&&e.insertBefore(u,s.nextSibling),r.push(u),et(o,function(e){u.appendChild(e)}),u)}function d(e,r,o){var l=[],c,d,f=!0;c=m.inline||m.block,d=I.create(c),s(d),z.walk(e,function(e){function p(e){var y,C,x,_,N;return N=f,y=e.nodeName.toLowerCase(),C=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&J(e)&&(N=f,f="true"===J(e),_=!0),w(y,"br")?(v=0,m.block&&I.remove(e),void 0):m.wrapper&&g(e,t,n)?(v=0,void 0):f&&!_&&m.block&&!m.wrapper&&i(y)&&W(C,c)?(e=I.rename(e,c),s(e),l.push(e),v=0,void 0):m.selector&&(et(h,function(t){"collapsed"in t&&t.collapsed!==b||I.is(e,t.selector)&&!a(e)&&(s(e,t),x=!0)}),!m.inline||x)?(v=0,void 0):(!f||_||!W(c,y)||!W(C,c)||!o&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||a(e)||m.inline&&V(e)?"li"==y&&r?v=u(e,r,d,l,p):(v=0,et(tt(e.childNodes),p),_&&(f=N),v=0):(v||(v=I.clone(d,K),e.parentNode.insertBefore(v,e),l.push(v)),v.appendChild(e)),void 0)}var v;et(e,p)}),m.wrap_links===!1&&et(l,function(e){function t(e){var n,r,i;if("A"===e.nodeName){for(r=I.clone(d,K),l.push(r),i=tt(e.childNodes),n=0;n<i.length;n++)r.appendChild(i[n]);e.appendChild(r)}et(tt(e.childNodes),t)}t(e)}),et(l,function(e){function r(e){var t=0;return et(e.childNodes,function(e){k(e)||L(e)||t++}),t}function i(e){var t,n;return et(e.childNodes,function(e){return 1!=e.nodeType||L(e)||a(e)?void 0:(t=e,K)}),t&&x(t,m)&&(n=I.clone(t,K),s(n),I.replace(n,e,G),I.remove(t,1)),n||e}var o;if(o=r(e),(l.length>1||!V(e))&&0===o)return I.remove(e,1),void 0;if(m.inline||m.wrapper){if(m.exact||1!==o||(e=i(e)),et(h,function(t){et(I.select(t.inline,e),function(e){var r;if(t.wrap_links===!1){r=e.parentNode;do if("A"===r.nodeName)return;while(r=r.parentNode)}R(t,n,e,t.exact?e:null)})}),g(e.parentNode,t,n))return I.remove(e,1),e=0,G;m.merge_with_parents&&I.getParent(e.parentNode,function(r){return g(r,t,n)?(I.remove(e,1),e=0,G):void 0}),e&&m.merge_siblings!==!1&&(e=H(B(e),e),e=H(e,B(e,G)))}})}var h=c(t),m=h[0],v,y,b=!o&&F.isCollapsed();if(m)if(o)o.nodeType?(y=I.createRng(),y.setStartBefore(o),y.setEndAfter(o),d(T(y,h),null,!0)):d(o,null,!0);else if(b&&m.inline&&!I.select("td.mce-item-selected,th.mce-item-selected").length)M("apply",t,n);else{var C=r.selection.getNode();U||!h[0].defaultBlock||I.getParent(C,I.isBlock)||p(h[0].defaultBlock),r.selection.setRng(l()),v=F.getBookmark(),d(T(F.getRng(G),h),v),m.styles&&(m.styles.color||m.styles.textDecoration)&&(nt(C,f,"childNodes"),f(C)),F.moveToBookmark(v),P(F.getRng(G)),r.nodeChanged()}}function h(e,t,n){function i(e){var n,r,o,a,s;if(1===e.nodeType&&J(e)&&(a=b,b="true"===J(e),s=!0),n=tt(e.childNodes),b&&!s)for(r=0,o=p.length;o>r&&!R(p[r],t,e,e);r++);if(h.deep&&n.length){for(r=0,o=n.length;o>r;r++)i(n[r]);s&&(b=a)}}function a(n){var r;return et(o(n.parentNode).reverse(),function(n){var i;r||"_start"==n.id||"_end"==n.id||(i=g(n,e,t),i&&i.split!==!1&&(r=n))}),r}function s(e,n,r,i){var o,a,s,l,c,u;if(e){for(u=e.parentNode,o=n.parentNode;o&&o!=u;o=o.parentNode){for(a=I.clone(o,K),c=0;c<p.length;c++)if(R(p[c],t,a,a)){a=0;break}a&&(s&&a.appendChild(s),l||(l=a),s=a)}!i||h.mixed&&V(e)||(n=I.split(e,n)),s&&(r.parentNode.insertBefore(s,r),l.appendChild(r))}return n}function l(e){return s(a(e),e,e,!0)}function u(e){var t=I.get(e?"_start":"_end"),n=t[e?"firstChild":"lastChild"];return L(n)&&(n=n[e?"firstChild":"lastChild"]),I.remove(t,!0),n}function f(e){var t,n,o=e.commonAncestorContainer;e=T(e,p,G),h.split&&(t=D(e,G),n=D(e),t!=n?(/^(TR|TH|TD)$/.test(t.nodeName)&&t.firstChild&&(t="TR"==t.nodeName?t.firstChild.firstChild||t:t.firstChild||t),o&&/^T(HEAD|BODY|FOOT|R)$/.test(o.nodeName)&&/^(TH|TD)$/.test(n.nodeName)&&n.firstChild&&(n=n.firstChild||n),t=S(t,"span",{id:"_start","data-mce-type":"bookmark"}),n=S(n,"span",{id:"_end","data-mce-type":"bookmark"}),l(t),l(n),t=u(G),n=u()):t=n=l(t),e.startContainer=t.parentNode,e.startOffset=q(t),e.endContainer=n.parentNode,e.endOffset=q(n)+1),z.walk(e,function(e){et(e,function(e){i(e),1===e.nodeType&&"underline"===r.dom.getStyle(e,"text-decoration")&&e.parentNode&&"underline"===d(e.parentNode)&&R({deep:!1,exact:!0,inline:"span",styles:{textDecoration:"underline"}},null,e)})})}var p=c(e),h=p[0],m,y,b=!0;return n?(n.nodeType?(y=I.createRng(),y.setStartBefore(n),y.setEndAfter(n),f(y)):f(n),void 0):(F.isCollapsed()&&h.inline&&!I.select("td.mce-item-selected,th.mce-item-selected").length?M("remove",e,t):(m=F.getBookmark(),f(F.getRng(G)),F.moveToBookmark(m),h.inline&&v(e,t,F.getStart())&&P(F.getRng(!0)),r.nodeChanged()),void 0)}function m(e,t,n){var r=c(e);!v(e,t,n)||"toggle"in r[0]&&!r[0].toggle?p(e,t,n):h(e,t,n)}function g(e,t,n,r){function i(e,t,i){var o,a,s=t[i],l;if(t.onmatch)return t.onmatch(e,t,i);if(s)if(s.length===X){for(o in s)if(s.hasOwnProperty(o)){if(a="attributes"===i?I.getAttrib(e,o):_(e,o),r&&!a&&!t.exact)return;if((!r||t.exact)&&!w(a,N(E(s[o],n),o)))return}}else for(l=0;l<s.length;l++)if("attributes"===i?I.getAttrib(e,s[l]):_(e,s[l]))return t;return t}var o=c(t),a,s,l;if(o&&e)for(s=0;s<o.length;s++)if(a=o[s],x(e,a)&&i(e,a,"attributes")&&i(e,a,"styles")){if(l=a.classes)for(s=0;s<l.length;s++)if(!I.hasClass(e,l[s]))return;return a}}function v(e,t,n){function r(n){var r=I.getRoot();return n=I.getParent(n,function(n){return n.parentNode===r||!!g(n,e,t,!0)}),g(n,e,t)}var i;return n?r(n):(n=F.getNode(),r(n)?G:(i=F.getStart(),i!=n&&r(i)?G:K))}function y(e,t){var n,r=[],i={};return n=F.getStart(),I.getParent(n,function(n){var o,a;for(o=0;o<e.length;o++)a=e[o],!i[a]&&g(n,a,t)&&(i[a]=!0,r.push(a))},I.getRoot()),r}function b(e){var t=c(e),n,r,i,a,s;if(t)for(n=F.getStart(),r=o(n),a=t.length-1;a>=0;a--){if(s=t[a].selector,!s||t[a].defaultBlock)return G;for(i=r.length-1;i>=0;i--)if(I.is(r[i],s))return G}return K}function C(e,t,n){var i;return Y||(Y={},i={},r.on("NodeChange",function(e){var t=o(e.element),n={};et(Y,function(e,r){et(t,function(o){return g(o,r,{},e.similar)?(i[r]||(et(e,function(e){e(!0,{node:o,format:r,parents:t})
-}),i[r]=e),n[r]=e,!1):void 0})}),et(i,function(r,o){n[o]||(delete i[o],et(r,function(n){n(!1,{node:e.element,format:o,parents:t})}))})})),et(e.split(","),function(e){Y[e]||(Y[e]=[],Y[e].similar=n),Y[e].push(t)}),this}function x(e,t){return w(e,t.inline)?G:w(e,t.block)?G:t.selector?1==e.nodeType&&I.is(e,t.selector):void 0}function w(e,t){return e=e||"",t=t||"",e=""+(e.nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()==t.toLowerCase()}function _(e,t){return N(I.getStyle(e,t),t)}function N(e,t){return("color"==t||"backgroundColor"==t)&&(e=I.toHex(e)),"fontWeight"==t&&700==e&&(e="bold"),"fontFamily"==t&&(e=e.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+e}function E(e,t){return"string"!=typeof e?e=e(t):t&&(e=e.replace(/%(\w+)/g,function(e,n){return t[n]||e})),e}function k(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)}function S(e,t,n){var r=I.create(t,n);return e.parentNode.insertBefore(r,e),r.appendChild(e),r}function T(t,n,a){function s(e){function t(e){return"BR"==e.nodeName&&e.getAttribute("data-mce-bogus")&&!e.nextSibling}var r,i,o,a,s;if(r=i=e?g:y,a=e?"previousSibling":"nextSibling",s=I.getRoot(),3==r.nodeType&&!k(r)&&(e?v>0:b<r.nodeValue.length))return r;for(;;){if(!n[0].block_expand&&V(i))return i;for(o=i[a];o;o=o[a])if(!L(o)&&!k(o)&&!t(o))return i;if(i.parentNode==s){r=i;break}i=i.parentNode}return r}function l(e,t){for(t===X&&(t=3===e.nodeType?e.length:e.childNodes.length);e&&e.hasChildNodes();)e=e.childNodes[t],e&&(t=3===e.nodeType?e.length:e.childNodes.length);return{node:e,offset:t}}function c(e){for(var t=e;t;){if(1===t.nodeType&&J(t))return"false"===J(t)?t:e;t=t.parentNode}return e}function u(t,n,i){function o(e,t){var n,r,o=e.nodeValue;return"undefined"==typeof t&&(t=i?o.length:0),i?(n=o.lastIndexOf(" ",t),r=o.lastIndexOf("\xa0",t),n=n>r?n:r,-1===n||a||n++):(n=o.indexOf(" ",t),r=o.indexOf("\xa0",t),n=-1!==n&&(-1===r||r>n)?n:r),n}var s,l,c,u;if(3===t.nodeType){if(c=o(t,n),-1!==c)return{container:t,offset:c};u=t}for(s=new e(t,I.getParent(t,V)||r.getBody());l=s[i?"prev":"next"]();)if(3===l.nodeType){if(u=l,c=o(l),-1!==c)return{container:l,offset:c}}else if(V(l))break;return u?(n=i?0:u.length,{container:u,offset:n}):void 0}function d(e,r){var i,a,s,l;for(3==e.nodeType&&0===e.nodeValue.length&&e[r]&&(e=e[r]),i=o(e),a=0;a<i.length;a++)for(s=0;s<n.length;s++)if(l=n[s],!("collapsed"in l&&l.collapsed!==t.collapsed)&&I.is(i[a],l.selector))return i[a];return e}function f(e,t){var r,a=I.getRoot();if(n[0].wrapper||(r=I.getParent(e,n[0].block)),r||(r=I.getParent(3==e.nodeType?e.parentNode:e,function(e){return e!=a&&i(e)})),r&&n[0].wrapper&&(r=o(r,"ul,ol").reverse()[0]||r),!r)for(r=e;r[t]&&!V(r[t])&&(r=r[t],!w(r,"br")););return r||e}var p,h,m,g=t.startContainer,v=t.startOffset,y=t.endContainer,b=t.endOffset;if(1==g.nodeType&&g.hasChildNodes()&&(p=g.childNodes.length-1,g=g.childNodes[v>p?p:v],3==g.nodeType&&(v=0)),1==y.nodeType&&y.hasChildNodes()&&(p=y.childNodes.length-1,y=y.childNodes[b>p?p:b-1],3==y.nodeType&&(b=y.nodeValue.length)),g=c(g),y=c(y),(L(g.parentNode)||L(g))&&(g=L(g)?g:g.parentNode,g=g.nextSibling||g,3==g.nodeType&&(v=0)),(L(y.parentNode)||L(y))&&(y=L(y)?y:y.parentNode,y=y.previousSibling||y,3==y.nodeType&&(b=y.length)),n[0].inline&&(t.collapsed&&(m=u(g,v,!0),m&&(g=m.container,v=m.offset),m=u(y,b),m&&(y=m.container,b=m.offset)),h=l(y,b),h.node)){for(;h.node&&0===h.offset&&h.node.previousSibling;)h=l(h.node.previousSibling);h.node&&h.offset>0&&3===h.node.nodeType&&" "===h.node.nodeValue.charAt(h.offset-1)&&h.offset>1&&(y=h.node,y.splitText(h.offset-1))}return(n[0].inline||n[0].block_expand)&&(n[0].inline&&3==g.nodeType&&0!==v||(g=s(!0)),n[0].inline&&3==y.nodeType&&b!==y.nodeValue.length||(y=s())),n[0].selector&&n[0].expand!==K&&!n[0].inline&&(g=d(g,"previousSibling"),y=d(y,"nextSibling")),(n[0].block||n[0].selector)&&(g=f(g,"previousSibling"),y=f(y,"nextSibling"),n[0].block&&(V(g)||(g=s(!0)),V(y)||(y=s()))),1==g.nodeType&&(v=q(g),g=g.parentNode),1==y.nodeType&&(b=q(y)+1,y=y.parentNode),{startContainer:g,startOffset:v,endContainer:y,endOffset:b}}function R(e,t,n,r){var i,o,a;if(!x(n,e))return K;if("all"!=e.remove)for(et(e.styles,function(e,i){e=N(E(e,t),i),"number"==typeof i&&(i=e,r=0),(!r||w(_(r,i),e))&&I.setStyle(n,i,""),a=1}),a&&""===I.getAttrib(n,"style")&&(n.removeAttribute("style"),n.removeAttribute("data-mce-style")),et(e.attributes,function(e,i){var o;if(e=E(e,t),"number"==typeof i&&(i=e,r=0),!r||w(I.getAttrib(r,i),e)){if("class"==i&&(e=I.getAttrib(n,i),e&&(o="",et(e.split(/\s+/),function(e){/mce\w+/.test(e)&&(o+=(o?" ":"")+e)}),o)))return I.setAttrib(n,i,o),void 0;"class"==i&&n.removeAttribute("className"),j.test(i)&&n.removeAttribute("data-mce-"+i),n.removeAttribute(i)}}),et(e.classes,function(e){e=E(e,t),(!r||I.hasClass(r,e))&&I.removeClass(n,e)}),o=I.getAttribs(n),i=0;i<o.length;i++)if(0!==o[i].nodeName.indexOf("_"))return K;return"none"!=e.remove?(A(n,e),G):void 0}function A(e,t){function n(e,t,n){return e=B(e,t,n),!e||"BR"==e.nodeName||V(e)}var i=e.parentNode,o;t.block&&(U?i==I.getRoot()&&(t.list_block&&w(e,t.list_block)||et(tt(e.childNodes),function(e){W(U,e.nodeName.toLowerCase())?o?o.appendChild(e):(o=S(e,U),I.setAttribs(o,r.settings.forced_root_block_attrs)):o=0})):V(e)&&!V(i)&&(n(e,K)||n(e.firstChild,G,1)||e.insertBefore(I.create("br"),e.firstChild),n(e,G)||n(e.lastChild,K,1)||e.appendChild(I.create("br")))),t.selector&&t.inline&&!w(t.inline,e)||I.remove(e,1)}function B(e,t,n){if(e)for(t=t?"nextSibling":"previousSibling",e=n?e:e[t];e;e=e[t])if(1==e.nodeType||!k(e))return e}function L(e){return e&&1==e.nodeType&&"bookmark"==e.getAttribute("data-mce-type")}function H(e,t){function n(e,t){function n(e){var t={};return et(I.getAttribs(e),function(n){var r=n.nodeName.toLowerCase();0!==r.indexOf("_")&&"style"!==r&&(t[r]=I.getAttrib(e,r))}),t}function r(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(n=t[r],n===X)return K;if(e[r]!=n)return K;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return K;return G}return e.nodeName!=t.nodeName?K:r(n(e),n(t))?r(I.parseStyle(I.getAttrib(e,"style")),I.parseStyle(I.getAttrib(t,"style")))?G:K:K}function r(e,t){for(i=e;i;i=i[t]){if(3==i.nodeType&&0!==i.nodeValue.length)return e;if(1==i.nodeType&&!L(i))return i}return e}var i,o;if(e&&t&&(e=r(e,"previousSibling"),t=r(t,"nextSibling"),n(e,t))){for(i=e.nextSibling;i&&i!=t;)o=i,i=i.nextSibling,e.appendChild(o);return I.remove(t),et(tt(t.childNodes),function(t){e.appendChild(t)}),e}return t}function D(t,n){var i,o,a;return i=t[n?"startContainer":"endContainer"],o=t[n?"startOffset":"endOffset"],1==i.nodeType&&(a=i.childNodes.length-1,!n&&o&&o--,i=i.childNodes[o>a?a:o]),3===i.nodeType&&n&&o>=i.nodeValue.length&&(i=new e(i,r.getBody()).next()||i),3!==i.nodeType||n||0!==o||(i=new e(i,r.getBody()).prev()||i),i}function M(t,n,o){function a(e){var t=I.create("span",{id:y,"data-mce-bogus":!0,style:b?"color:red":""});return e&&t.appendChild(r.getDoc().createTextNode($)),t}function s(e,t){for(;e;){if(3===e.nodeType&&e.nodeValue!==$||e.childNodes.length>1)return!1;t&&1===e.nodeType&&t.push(e),e=e.firstChild}return!0}function l(e){for(;e;){if(e.id===y)return e;e=e.parentNode}}function u(t){var n;if(t)for(n=new e(t,t),t=n.current();t;t=n.next())if(3===t.nodeType)return t}function d(e,t){var n,r;if(e)r=F.getRng(!0),s(e)?(t!==!1&&(r.setStartBefore(e),r.setEndBefore(e)),I.remove(e)):(n=u(e),n.nodeValue.charAt(0)===$&&(n=n.deleteData(0,1)),I.remove(e,1)),F.setRng(r);else if(e=l(F.getStart()),!e)for(;e=I.get(y);)d(e,!1)}function f(){var e,t,r,i,s,d,f;e=F.getRng(!0),i=e.startOffset,d=e.startContainer,f=d.nodeValue,t=l(F.getStart()),t&&(r=u(t)),f&&i>0&&i<f.length&&/\w/.test(f.charAt(i))&&/\w/.test(f.charAt(i-1))?(s=F.getBookmark(),e.collapse(!0),e=T(e,c(n)),e=z.split(e),p(n,o,e),F.moveToBookmark(s)):(t&&r.nodeValue===$?p(n,o,t):(t=a(!0),r=t.firstChild,e.insertNode(t),i=1,p(n,o,t)),F.setCursorLocation(r,i))}function m(){var e=F.getRng(!0),t,r,s,l,u,d,f=[],p,m;for(t=e.startContainer,r=e.startOffset,u=t,3==t.nodeType&&((r!=t.nodeValue.length||t.nodeValue===$)&&(l=!0),u=u.parentNode);u;){if(g(u,n,o)){d=u;break}u.nextSibling&&(l=!0),f.push(u),u=u.parentNode}if(d)if(l)s=F.getBookmark(),e.collapse(!0),e=T(e,c(n),!0),e=z.split(e),h(n,o,e),F.moveToBookmark(s);else{for(m=a(),u=m,p=f.length-1;p>=0;p--)u.appendChild(I.clone(f[p],!1)),u=u.firstChild;u.appendChild(I.doc.createTextNode($)),u=u.firstChild;var v=I.getParent(d,i);v&&I.isEmpty(v)?d.parentNode.replaceChild(m,d):I.insertAfter(m,d),F.setCursorLocation(u,1),I.isEmpty(d)&&I.remove(d)}}function v(){var e;e=l(F.getStart()),e&&!I.isEmpty(e)&&nt(e,function(e){1!=e.nodeType||e.id===y||I.isEmpty(e)||I.setAttrib(e,"data-mce-bogus",null)},"childNodes")}var y="_mce_caret",b=r.settings.caret_debug;r._hasCaretEvents||(Z=function(){var e=[],t;if(s(l(F.getStart()),e))for(t=e.length;t--;)I.setAttrib(e[t],"data-mce-bogus","1")},Q=function(e){var t=e.keyCode;d(),(8==t||37==t||39==t)&&d(l(F.getStart())),v()},r.on("SetContent",function(e){e.selection&&v()}),r._hasCaretEvents=!0),"apply"==t?f():m()}function P(t){var n=t.startContainer,r=t.startOffset,i,o,a,s,l;if(3==n.nodeType&&r>=n.nodeValue.length&&(r=q(n),n=n.parentNode,i=!0),1==n.nodeType)for(s=n.childNodes,n=s[Math.min(r,s.length-1)],o=new e(n,I.getParent(n,I.isBlock)),(r>s.length-1||i)&&o.next(),a=o.current();a;a=o.next())if(3==a.nodeType&&!k(a))return l=I.create("a",null,$),a.parentNode.insertBefore(l,a),t.setStart(a,0),F.setRng(t),I.remove(l),void 0}var O={},I=r.dom,F=r.selection,z=new t(I),W=r.schema.isValidChild,V=I.isBlock,U=r.settings.forced_root_block,q=I.nodeIndex,$="\ufeff",j=/^(src|href|style)$/,K=!1,G=!0,Y,X,J=I.getContentEditable,Q,Z,et=n.each,tt=n.grep,nt=n.walk,rt=n.extend;rt(this,{get:c,register:u,apply:p,remove:h,toggle:m,match:v,matchAll:y,matchNode:g,canApply:b,formatChanged:C}),s(),l(),r.on("BeforeGetContent",function(){Z&&Z()}),r.on("mouseup keydown",function(e){Q&&Q(e)})}}),r(H,[g,p],function(e,t){var n=t.trim,r;return r=new RegExp(["<span[^>]+data-mce-bogus[^>]+>[\u200b\ufeff]+<\\/span>","<div[^>]+data-mce-bogus[^>]+><\\/div>",'\\s?data-mce-selected="[^"]+"'].join("|"),"gi"),function(t){function i(){return n(t.getContent({format:"raw",no_events:1}).replace(r,""))}function o(){a.typing=!1,a.add()}var a,s=0,l=[],c,u,d;return t.on("init",function(){a.add()}),t.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&a.beforeChange()}),t.on("ExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&a.add()}),t.on("ObjectResizeStart",function(){a.beforeChange()}),t.on("SaveContent ObjectResized",o),t.dom.bind(t.dom.getRoot(),"dragend",o),t.dom.bind(t.getBody(),"focusout",function(){!t.removed&&a.typing&&o()}),t.on("KeyUp",function(n){var r=n.keyCode;(r>=33&&36>=r||r>=37&&40>=r||45==r||13==r||n.ctrlKey)&&(o(),t.nodeChanged()),(46==r||8==r||e.mac&&(91==r||93==r))&&t.nodeChanged(),u&&a.typing&&(t.isDirty()||(t.isNotDirty=!l[0]||i()==l[0].content,t.isNotDirty||t.fire("change",{level:l[0],lastLevel:null})),t.fire("TypingUndo"),u=!1,t.nodeChanged())}),t.on("KeyDown",function(e){var t=e.keyCode;return t>=33&&36>=t||t>=37&&40>=t||45==t?(a.typing&&o(),void 0):((16>t||t>20)&&224!=t&&91!=t&&!a.typing&&(a.beforeChange(),a.typing=!0,a.add(),u=!0),void 0)}),t.on("MouseDown",function(){a.typing&&o()}),t.addShortcut("ctrl+z","","Undo"),t.addShortcut("ctrl+y,ctrl+shift+z","","Redo"),t.on("AddUndo Undo Redo ClearUndos MouseUp",function(e){e.isDefaultPrevented()||t.nodeChanged()}),a={data:l,typing:!1,beforeChange:function(){d||(c=t.selection.getBookmark(2,!0))},add:function(e){var n,r=t.settings,o;if(e=e||{},e.content=i(),d||t.fire("BeforeAddUndo",{level:e}).isDefaultPrevented())return null;if(o=l[s],o&&o.content==e.content)return null;if(l[s]&&(l[s].beforeBookmark=c),r.custom_undo_redo_levels&&l.length>r.custom_undo_redo_levels){for(n=0;n<l.length-1;n++)l[n]=l[n+1];l.length--,s=l.length}e.bookmark=t.selection.getBookmark(2,!0),s<l.length-1&&(l.length=s+1),l.push(e),s=l.length-1;var a={level:e,lastLevel:o};return t.fire("AddUndo",a),s>0&&(t.fire("change",a),t.isNotDirty=!1),e},undo:function(){var e;return a.typing&&(a.add(),a.typing=!1),s>0&&(e=l[--s],0===s&&(t.isNotDirty=!0),t.setContent(e.content,{format:"raw"}),t.selection.moveToBookmark(e.beforeBookmark),t.fire("undo",{level:e})),e},redo:function(){var e;return s<l.length-1&&(e=l[++s],t.setContent(e.content,{format:"raw"}),t.selection.moveToBookmark(e.bookmark),t.fire("redo",{level:e})),e},clear:function(){l=[],s=0,a.typing=!1,t.fire("ClearUndos")},hasUndo:function(){return s>0||a.typing&&l[0]&&i()!=l[0].content},hasRedo:function(){return s<l.length-1&&!this.typing},transact:function(e){a.beforeChange(),d=!0,e(),d=!1,a.add()}}}}),r(D,[f,g],function(e,t){var n=t.ie&&t.ie<11;return function(t){function r(r){function u(e){return e&&i.isBlock(e)&&!/^(TD|TH|CAPTION|FORM)$/.test(e.nodeName)&&!/^(fixed|absolute)/i.test(e.style.position)&&"true"!==i.getContentEditable(e)}function d(e){var t;i.isBlock(e)&&(t=o.getRng(),e.appendChild(i.create("span",null,"\xa0")),o.select(e),e.lastChild.outerHTML="",o.setRng(t))}function f(e){for(var t=e,n=[],r;t=t.firstChild;){if(i.isBlock(t))return;1!=t.nodeType||c[t.nodeName.toLowerCase()]||n.push(t)}for(r=n.length;r--;)t=n[r],!t.hasChildNodes()||t.firstChild==t.lastChild&&""===t.firstChild.nodeValue?i.remove(t):"A"==t.nodeName&&" "===(t.innerText||t.textContent)&&i.remove(t)}function p(t){function n(e){for(;e;){if(1==e.nodeType||3==e.nodeType&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}}var r,a,s,l=t,u;if("LI"==t.nodeName){var d=n(t.firstChild);d&&/^(UL|OL)$/.test(d.nodeName)&&t.insertBefore(i.doc.createTextNode("\xa0"),t.firstChild)}if(s=i.createRng(),t.hasChildNodes()){for(r=new e(t,t);a=r.current();){if(3==a.nodeType){s.setStart(a,0),s.setEnd(a,0);break}if(c[a.nodeName.toLowerCase()]){s.setStartBefore(a),s.setEndBefore(a);break}l=a,a=r.next()}a||(s.setStart(l,0),s.setEnd(l,0))}else"BR"==t.nodeName?t.nextSibling&&i.isBlock(t.nextSibling)?((!A||9>A)&&(u=i.create("br"),t.parentNode.insertBefore(u,t)),s.setStartBefore(t),s.setEndBefore(t)):(s.setStartAfter(t),s.setEndAfter(t)):(s.setStart(t,0),s.setEnd(t,0));o.setRng(s),i.remove(u),o.scrollIntoView(t)}function h(e){var t=a.forced_root_block;t&&t.toLowerCase()===e.tagName.toLowerCase()&&i.setAttribs(e,a.forced_root_block_attrs)}function m(e){var t=S,r,o,s;if(e||"TABLE"==M?(r=i.create(e||O),h(r)):r=R.cloneNode(!1),s=r,a.keep_styles!==!1)do if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(t.nodeName)){if("_mce_caret"==t.id)continue;o=t.cloneNode(!1),i.setAttrib(o,"id",""),r.hasChildNodes()?(o.appendChild(r.firstChild),r.appendChild(o)):(s=o,r.appendChild(o))}while(t=t.parentNode);return n||(s.innerHTML='<br data-mce-bogus="1">'),r}function g(t){var n,r,i;if(3==S.nodeType&&(t?T>0:T<S.nodeValue.length))return!1;if(S.parentNode==R&&I&&!t)return!0;if(t&&1==S.nodeType&&S==R.firstChild)return!0;if("TABLE"===S.nodeName||S.previousSibling&&"TABLE"==S.previousSibling.nodeName)return I&&!t||!I&&t;for(n=new e(S,R),3==S.nodeType&&(t&&0===T?n.prev():t||T!=S.nodeValue.length||n.next());r=n.current();){if(1===r.nodeType){if(!r.getAttribute("data-mce-bogus")&&(i=r.nodeName.toLowerCase(),c[i]&&"br"!==i))return!1}else if(3===r.nodeType&&!/^[ \t\r\n]*$/.test(r.nodeValue))return!1;t?n.prev():n.next()}return!0}function v(e,n){var r,o,a,s,c,d,f=O||"P";if(o=i.getParent(e,i.isBlock),d=t.getBody().nodeName.toLowerCase(),!o||!u(o)){if(o=o||k,!o.hasChildNodes())return r=i.create(f),h(r),o.appendChild(r),N.setStart(r,0),N.setEnd(r,0),r;for(s=e;s.parentNode!=o;)s=s.parentNode;for(;s&&!i.isBlock(s);)a=s,s=s.previousSibling;if(a&&l.isValidChild(d,f.toLowerCase())){for(r=i.create(f),h(r),a.parentNode.insertBefore(r,a),s=a;s&&!i.isBlock(s);)c=s.nextSibling,r.appendChild(s),s=c;N.setStart(e,n),N.setEnd(e,n)}}return e}function y(){function e(e){for(var t=D[e?"firstChild":"lastChild"];t&&1!=t.nodeType;)t=t[e?"nextSibling":"previousSibling"];return t===R}function t(){var e=D.parentNode;return"LI"==e.nodeName?e:D}var n=D.parentNode.nodeName;/^(OL|UL|LI)$/.test(n)&&(O="LI"),L=O?m(O):i.create("BR"),e(!0)&&e()?"LI"==n?i.insertAfter(L,t()):i.replace(L,D):e(!0)?"LI"==n?(i.insertAfter(L,t()),L.appendChild(i.doc.createTextNode(" ")),L.appendChild(D)):D.parentNode.insertBefore(L,D):e()?(i.insertAfter(L,t()),d(L)):(D=t(),E=N.cloneRange(),E.setStartAfter(R),E.setEndAfter(D),H=E.extractContents(),"LI"==O&&"LI"==H.firstChild.nodeName?(L=H.firstChild,i.insertAfter(H,D)):(i.insertAfter(H,D),i.insertAfter(L,D))),i.remove(R),p(L),s.add()}function b(){for(var t=new e(S,R),n;n=t.next();)if(c[n.nodeName.toLowerCase()]||n.length>0)return!0}function C(){var e,t,r;S&&3==S.nodeType&&T>=S.nodeValue.length&&(n||b()||(e=i.create("br"),N.insertNode(e),N.setStartAfter(e),N.setEndAfter(e),t=!0)),e=i.create("br"),N.insertNode(e),n&&"PRE"==M&&(!A||8>A)&&e.parentNode.insertBefore(i.doc.createTextNode("\r"),e),r=i.create("span",{},"&nbsp;"),e.parentNode.insertBefore(r,e),o.scrollIntoView(r),i.remove(r),t?(N.setStartBefore(e),N.setEndBefore(e)):(N.setStartAfter(e),N.setEndAfter(e)),o.setRng(N),s.add()}function x(e){do 3===e.nodeType&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;while(e)}function w(e){var t=i.getRoot(),n,r;for(n=e;n!==t&&"false"!==i.getContentEditable(n);)"true"===i.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==t?r:t}function _(e){var t;n||(e.normalize(),t=e.lastChild,(!t||/^(left|right)$/gi.test(i.getStyle(t,"float",!0)))&&i.add(e,"br"))}var N=o.getRng(!0),E,k,S,T,R,A,B,L,H,D,M,P,O,I;if(!N.collapsed)return t.execCommand("Delete"),void 0;if(!r.isDefaultPrevented()&&(S=N.startContainer,T=N.startOffset,O=(a.force_p_newlines?"p":"")||a.forced_root_block,O=O?O.toUpperCase():"",A=i.doc.documentMode,B=r.shiftKey,1==S.nodeType&&S.hasChildNodes()&&(I=T>S.childNodes.length-1,S=S.childNodes[Math.min(T,S.childNodes.length-1)]||S,T=I&&3==S.nodeType?S.nodeValue.length:0),k=w(S))){if(s.beforeChange(),!i.isBlock(k)&&k!=i.getRoot())return(!O||B)&&C(),void 0;if((O&&!B||!O&&B)&&(S=v(S,T)),R=i.getParent(S,i.isBlock),D=R?i.getParent(R.parentNode,i.isBlock):null,M=R?R.nodeName.toUpperCase():"",P=D?D.nodeName.toUpperCase():"","LI"!=P||r.ctrlKey||(R=D,M=P),"LI"==M){if(!O&&B)return C(),void 0;if(i.isEmpty(R))return y(),void 0}if("PRE"==M&&a.br_in_pre!==!1){if(!B)return C(),void 0}else if(!O&&!B&&"LI"!=M||O&&B)return C(),void 0;O&&R===t.getBody()||(O=O||"P",g()?(L=/^(H[1-6]|PRE|FIGURE)$/.test(M)&&"HGROUP"!=P?m(O):m(),a.end_container_on_empty_block&&u(D)&&i.isEmpty(R)?L=i.split(D,R):i.insertAfter(L,R),p(L)):g(!0)?(L=R.parentNode.insertBefore(m(),R),d(L),p(R)):(E=N.cloneRange(),E.setEndAfter(R),H=E.extractContents(),x(H),L=H.firstChild,i.insertAfter(H,R),f(L),_(R),p(L)),i.setAttrib(L,"id",""),t.fire("NewBlock",{newBlock:L}),s.add())}}var i=t.dom,o=t.selection,a=t.settings,s=t.undoManager,l=t.schema,c=l.getNonEmptyElements();t.on("keydown",function(e){13==e.keyCode&&r(e)!==!1&&e.preventDefault()})}}),r(M,[],function(){return function(e){function t(){var t=i.getStart(),s=e.getBody(),l,c,u,d,f,p,h,m=-16777215,g,v,y,b,C;if(C=n.forced_root_block,t&&1===t.nodeType&&C){for(;t&&t!=s;){if(a[t.nodeName])return;t=t.parentNode}if(l=i.getRng(),l.setStart){c=l.startContainer,u=l.startOffset,d=l.endContainer,f=l.endOffset;try{v=e.getDoc().activeElement===s}catch(x){}}else l.item&&(t=l.item(0),l=e.getDoc().body.createTextRange(),l.moveToElementText(t)),v=l.parentElement().ownerDocument===e.getDoc(),y=l.duplicate(),y.collapse(!0),u=-1*y.move("character",m),y.collapsed||(y=l.duplicate(),y.collapse(!1),f=-1*y.move("character",m)-u);for(t=s.firstChild,b=s.nodeName.toLowerCase();t;)if((3===t.nodeType||1==t.nodeType&&!a[t.nodeName])&&o.isValidChild(b,C.toLowerCase())){if(3===t.nodeType&&0===t.nodeValue.length){h=t,t=t.nextSibling,r.remove(h);continue}p||(p=r.create(C,e.settings.forced_root_block_attrs),t.parentNode.insertBefore(p,t),g=!0),h=t,t=t.nextSibling,p.appendChild(h)}else p=null,t=t.nextSibling;if(g&&v){if(l.setStart)l.setStart(c,u),l.setEnd(d,f),i.setRng(l);else try{l=e.getDoc().body.createTextRange(),l.moveToElementText(s),l.collapse(!0),l.moveStart("character",u),f>0&&l.moveEnd("character",f),l.select()}catch(x){}e.nodeChanged()}}}var n=e.settings,r=e.dom,i=e.selection,o=e.schema,a=o.getBlockElements();n.forced_root_block&&e.on("NodeChange",t)}}),r(P,[E,g,p],function(e,n,r){var i=r.each,o=r.extend,a=r.map,s=r.inArray,l=r.explode,c=n.gecko,u=n.ie,d=!0,f=!1;return function(n){function r(e,t,n){var r;return e=e.toLowerCase(),(r=_.exec[e])?(r(e,t,n),d):f}function p(e){var t;return e=e.toLowerCase(),(t=_.state[e])?t(e):-1}function h(e){var t;return e=e.toLowerCase(),(t=_.value[e])?t(e):f}function m(e,t){t=t||"exec",i(e,function(e,n){i(n.toLowerCase().split(","),function(n){_[t][n]=e})})}function g(e,r,i){return r===t&&(r=f),i===t&&(i=null),n.getDoc().execCommand(e,r,i)}function v(e){return E.match(e)}function y(e,r){E.toggle(e,r?{value:r}:t),n.nodeChanged()}function b(e){k=w.getBookmark(e)}function C(){w.moveToBookmark(k)}var x=n.dom,w=n.selection,_={state:{},exec:{},value:{}},N=n.settings,E=n.formatter,k;o(this,{execCommand:r,queryCommandState:p,queryCommandValue:h,addCommands:m}),m({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(e){var t=n.getDoc(),r;try{g(e)}catch(i){r=d}(r||!t.queryCommandSupported(e))&&n.windowManager.alert("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.")},unlink:function(e){w.isCollapsed()&&w.select(w.getNode()),g(e),w.collapse(f)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t=e.substring(7);"full"==t&&(t="justify"),i("left,center,right,justify".split(","),function(e){t!=e&&E.remove("align"+e)}),y("align"+t),r("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;g(e),t=x.getParent(w.getNode(),"ol,ul"),t&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(b(),x.split(n,t),C()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){y(e)},"ForeColor,HiliteColor,FontName":function(e,t,n){y(e,n)},FontSize:function(e,t,n){var r,i;n>=1&&7>=n&&(i=l(N.font_size_style_values),r=l(N.font_size_classes),n=r?r[n-1]||n:i[n-1]||n),y(e,n)},RemoveFormat:function(e){E.remove(e)},mceBlockQuote:function(){y("blockquote")},FormatBlock:function(e,t,n){return y(n||"p")},mceCleanup:function(){var e=w.getBookmark();n.setContent(n.getContent({cleanup:d}),{cleanup:d}),w.moveToBookmark(e)},mceRemoveNode:function(e,t,r){var i=r||w.getNode();i!=n.getBody()&&(b(),n.dom.remove(i,d),C())},mceSelectNodeDepth:function(e,t,r){var i=0;x.getParent(w.getNode(),function(e){return 1==e.nodeType&&i++==r?(w.select(e),f):void 0},n.getBody())},mceSelectNode:function(e,t,n){w.select(n)},mceInsertContent:function(t,r,i){function o(e){function t(e){return r[e]&&3==r[e].nodeType}var n,r,i;return n=w.getRng(!0),r=n.startContainer,i=n.startOffset,3==r.nodeType&&(i>0?e=e.replace(/^&nbsp;/," "):t("previousSibling")||(e=e.replace(/^ /,"&nbsp;")),i<r.length?e=e.replace(/&nbsp;(<br>|)$/," "):t("nextSibling")||(e=e.replace(/(&nbsp;| )(<br>|)$/,"&nbsp;"))),e}var a,s,l,c,d,f,p,h,m,g,v;/^ | $/.test(i)&&(i=o(i)),a=n.parser,s=new e({},n.schema),v='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;</span>',f={content:i,format:"html",selection:!0},n.fire("BeforeSetContent",f),i=f.content,-1==i.indexOf("{$caret}")&&(i+="{$caret}"),i=i.replace(/\{\$caret\}/,v);var y=n.getBody();x.isBlock(y.firstChild)&&x.isEmpty(y.firstChild)&&(y.firstChild.appendChild(x.doc.createTextNode("\xa0")),w.select(y.firstChild,!0),x.remove(y.firstChild.lastChild)),w.isCollapsed()||n.getDoc().execCommand("Delete",!1,null),l=w.getNode();var b={context:l.nodeName.toLowerCase()};if(d=a.parse(i,b),m=d.lastChild,"mce_marker"==m.attr("id"))for(p=m,m=m.prev;m;m=m.walk(!0))if(3==m.type||!x.isBlock(m.name)){m.parent.insert(p,m,"br"===m.name);break}if(b.invalid){for(w.setContent(v),l=w.getNode(),c=n.getBody(),9==l.nodeType?l=m=c:m=l;m!==c;)l=m,m=m.parentNode;i=l==c?c.innerHTML:x.getOuterHTML(l),i=s.serialize(a.parse(i.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return s.serialize(d)}))),l==c?x.setHTML(c,i):x.setOuterHTML(l,i)}else i=s.serialize(d),m=l.firstChild,g=l.lastChild,!m||m===g&&"BR"===m.nodeName?x.setHTML(l,i):w.setContent(i);p=x.get("mce_marker"),w.scrollIntoView(p),h=x.createRng(),m=p.previousSibling,m&&3==m.nodeType?(h.setStart(m,m.nodeValue.length),u||(g=p.nextSibling,g&&3==g.nodeType&&(m.appendData(g.data),g.parentNode.removeChild(g)))):(h.setStartBefore(p),h.setEndBefore(p)),x.remove(p),w.setRng(h),n.fire("SetContent",f),n.addVisual()},mceInsertRawHTML:function(e,t,r){w.setContent("tiny_mce_marker"),n.setContent(n.getContent().replace(/tiny_mce_marker/g,function(){return r}))},mceToggleFormat:function(e,t,n){y(n)},mceSetContent:function(e,t,r){n.setContent(r)},"Indent,Outdent":function(e){var t,n,r;t=N.indentation,n=/[a-z%]+$/i.exec(t),t=parseInt(t,10),p("InsertUnorderedList")||p("InsertOrderedList")?g(e):(N.forced_root_block||x.getParent(w.getNode(),x.isBlock)||E.apply("div"),i(w.getSelectedBlocks(),function(i){var o;"LI"!=i.nodeName&&(o="rtl"==x.getStyle(i,"direction",!0)?"paddingRight":"paddingLeft","outdent"==e?(r=Math.max(0,parseInt(i.style[o]||0,10)-t),x.setStyle(i,o,r?r+n:"")):(r=parseInt(i.style[o]||0,10)+t+n,x.setStyle(i,o,r)))}))},mceRepaint:function(){if(c)try{b(d),w.getSel()&&w.getSel().selectAllChildren(n.getBody()),w.collapse(d),C()}catch(e){}},InsertHorizontalRule:function(){n.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual,n.addVisual()},mceReplaceContent:function(e,t,r){n.execCommand("mceInsertContent",!1,r.replace(/\{\$selection\}/g,w.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=x.getParent(w.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||E.remove("link"),n.href&&E.apply("link",n,r)},selectAll:function(){var e=x.getRoot(),t=x.createRng();w.getRng().setStart?(t.setStart(e,0),t.setEnd(e,e.childNodes.length),w.setRng(t)):g("SelectAll")},mceNewDocument:function(){n.setContent("")}}),m({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t="align"+e.substring(7),n=w.isCollapsed()?[x.getParent(w.getNode(),x.isBlock)]:w.getSelectedBlocks(),r=a(n,function(e){return!!E.matchNode(e,t)});return-1!==s(r,d)},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return v(e)},mceBlockQuote:function(){return v("blockquote")},Outdent:function(){var e;if(N.inline_styles){if((e=x.getParent(w.getStart(),x.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return d;if((e=x.getParent(w.getEnd(),x.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return d}return p("InsertUnorderedList")||p("InsertOrderedList")||!N.inline_styles&&!!x.getParent(w.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=x.getParent(w.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),m({"FontSize,FontName":function(e){var t=0,n;return(n=x.getParent(w.getNode(),"span"))&&(t="fontsize"==e?n.style.fontSize:n.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()),t}},"value"),m({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}),r(O,[p],function(e){function t(e,i){var o=this,a,s;return e=r(e),i=o.settings=i||{},/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e)?(o.source=e,void 0):(0===e.indexOf("/")&&0!==e.indexOf("//")&&(e=(i.base_uri?i.base_uri.protocol||"http":"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(s=i.base_uri?i.base_uri.path:new t(location.href).directory,e=(i.base_uri&&i.base_uri.protocol||"http")+"://mce_host"+o.toAbsPath(s,e)),e=e.replace(/@@/g,"(mce_at)"),e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),n(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(t,n){var r=e[n];r&&(r=r.replace(/\(mce_at\)/g,"@@")),o[t]=r}),a=i.base_uri,a&&(o.protocol||(o.protocol=a.protocol),o.userInfo||(o.userInfo=a.userInfo),o.port||"mce_host"!==o.host||(o.port=a.port),o.host&&"mce_host"!==o.host||(o.host=a.host),o.source=""),void 0)}var n=e.each,r=e.trim;return t.prototype={setPath:function(e){var t=this;e=/^(.*?)\/?(\w+)?$/.exec(e),t.path=e[0],t.directory=e[1],t.file=e[2],t.source="",t.getURI()},toRelative:function(e){var n=this,r;if("./"===e)return e;if(e=new t(e,{base_uri:n}),"mce_host"!=e.host&&n.host!=e.host&&e.host||n.port!=e.port||n.protocol!=e.protocol)return e.getURI();var i=n.getURI(),o=e.getURI();return i==o||"/"==i.charAt(i.length-1)&&i.substr(0,i.length-1)==o?i:(r=n.toRelPath(n.path,e.path),e.query&&(r+="?"+e.query),e.anchor&&(r+="#"+e.anchor),r)},toAbsolute:function(e,n){return e=new t(e,{base_uri:this}),e.getURI(this.host==e.host&&this.protocol==e.protocol?n:0)},toRelPath:function(e,t){var n,r=0,i="",o,a;if(e=e.substring(0,e.lastIndexOf("/")),e=e.split("/"),n=t.split("/"),e.length>=n.length)for(o=0,a=e.length;a>o;o++)if(o>=n.length||e[o]!=n[o]){r=o+1;break}if(e.length<n.length)for(o=0,a=n.length;a>o;o++)if(o>=e.length||e[o]!=n[o]){r=o+1;break}if(1===r)return t;for(o=0,a=e.length-(r-1);a>o;o++)i+="../";for(o=r-1,a=n.length;a>o;o++)i+=o!=r-1?"/"+n[o]:n[o];return i},toAbsPath:function(e,t){var r,i=0,o=[],a,s;for(a=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),n(e,function(e){e&&o.push(e)}),e=o,r=t.length-1,o=[];r>=0;r--)0!==t[r].length&&"."!==t[r]&&(".."!==t[r]?i>0?i--:o.push(t[r]):i++);return r=e.length-i,s=0>=r?o.reverse().join("/"):e.slice(0,r).join("/")+"/"+o.reverse().join("/"),0!==s.indexOf("/")&&(s="/"+s),a&&s.lastIndexOf("/")!==s.length-1&&(s+=a),s},getURI:function(e){var t,n=this;return(!n.source||e)&&(t="",e||(n.protocol&&(t+=n.protocol+"://"),n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},t}),r(I,[p],function(e){function t(){}var n=e.each,r=e.extend,i,o;return t.extend=i=function(e){function t(){var e,t,n,r;if(!o&&(r=this,r.init&&r.init.apply(r,arguments),t=r.Mixins))for(e=t.length;e--;)n=t[e],n.init&&n.init.apply(r,arguments)}function a(){return this}function s(e,t){return function(){var n=this,r=n._super,i;return n._super=c[e],i=t.apply(n,arguments),n._super=r,i}}var l=this,c=l.prototype,u,d,f;o=!0,u=new l,o=!1,e.Mixins&&(n(e.Mixins,function(t){t=t;for(var n in t)"init"!==n&&(e[n]=t[n])}),c.Mixins&&(e.Mixins=c.Mixins.concat(e.Mixins))),e.Methods&&n(e.Methods.split(","),function(t){e[t]=a}),e.Properties&&n(e.Properties.split(","),function(t){var n="_"+t;e[t]=function(e){var t=this,r;return e!==r?(t[n]=e,t):t[n]}}),e.Statics&&n(e.Statics,function(e,n){t[n]=e}),e.Defaults&&c.Defaults&&(e.Defaults=r({},c.Defaults,e.Defaults));for(d in e)f=e[d],u[d]="function"==typeof f&&c[d]?s(d,f):f;return t.prototype=u,t.constructor=t,t.extend=i,t},t}),r(F,[I],function(e){function t(e){for(var t=[],n=e.length,r;n--;)r=e[n],r.__checked||(t.push(r),r.__checked=1);for(n=t.length;n--;)delete t[n].__checked;return t}var n=/^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,r=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,i=/^\s*|\s*$/g,o,a=e.extend({init:function(e){function t(e){return e?(e=e.toLowerCase(),function(t){return"*"===e||t.type===e}):void 0}function o(e){return e?function(t){return t._name===e}:void 0}function a(e){return e?(e=e.split("."),function(t){for(var n=e.length;n--;)if(!t.hasClass(e[n]))return!1;return!0}):void 0}function s(e,t,n){return e?function(r){var i=r[e]?r[e]():"";return t?"="===t?i===n:"*="===t?i.indexOf(n)>=0:"~="===t?(" "+i+" ").indexOf(" "+n+" ")>=0:"!="===t?i!=n:"^="===t?0===i.indexOf(n):"$="===t?i.substr(i.length-n.length)===n:!1:!!n
-}:void 0}function l(e){var t;return e?(e=/(?:not\((.+)\))|(.+)/i.exec(e),e[1]?(t=u(e[1],[]),function(e){return!d(e,t)}):(e=e[2],function(t,n,r){return"first"===e?0===n:"last"===e?n===r-1:"even"===e?0===n%2:"odd"===e?1===n%2:t[e]?t[e]():!1})):void 0}function c(e,r,c){function u(e){e&&r.push(e)}var d;return d=n.exec(e.replace(i,"")),u(t(d[1])),u(o(d[2])),u(a(d[3])),u(s(d[4],d[5],d[6])),u(l(d[7])),r.psuedo=!!d[7],r.direct=c,r}function u(e,t){var n=[],i,o,a;do if(r.exec(""),o=r.exec(e),o&&(e=o[3],n.push(o[1]),o[2])){i=o[3];break}while(o);for(i&&u(i,t),e=[],a=0;a<n.length;a++)">"!=n[a]&&e.push(c(n[a],[],">"===n[a-1]));return t.push(e),t}var d=this.match;this._selectors=u(e,[])},match:function(e,t){var n,r,i,o,a,s,l,c,u,d,f,p,h;for(t=t||this._selectors,n=0,r=t.length;r>n;n++){for(a=t[n],o=a.length,h=e,p=0,i=o-1;i>=0;i--)for(c=a[i];h;){if(c.psuedo)for(f=h.parent().items(),u=d=f.length;u--&&f[u]!==h;);for(s=0,l=c.length;l>s;s++)if(!c[s](h,u,d)){s=l+1;break}if(s===l){p++;break}if(i===o-1)break;h=h.parent()}if(p===o)return!0}return!1},find:function(e){function n(e,t,i){var o,a,s,l,c,u=t[i];for(o=0,a=e.length;a>o;o++){for(c=e[o],s=0,l=u.length;l>s;s++)if(!u[s](c,o,a)){s=l+1;break}if(s===l)i==t.length-1?r.push(c):c.items&&n(c.items(),t,i+1);else if(u.direct)return;c.items&&n(c.items(),t,i)}}var r=[],i,s,l=this._selectors;if(e.items){for(i=0,s=l.length;s>i;i++)n(e.items(),l[i],0);s>1&&(r=t(r))}return o||(o=a.Collection),new o(r)}});return a}),r(z,[p,F,I],function(e,t,n){var r,i,o=Array.prototype.push,a=Array.prototype.slice;return i={length:0,init:function(e){e&&this.add(e)},add:function(t){var n=this;return e.isArray(t)?o.apply(n,t):t instanceof r?n.add(t.toArray()):o.call(n,t),n},set:function(e){var t=this,n=t.length,r;for(t.length=0,t.add(e),r=t.length;n>r;r++)delete t[r];return t},filter:function(e){var n=this,i,o,a=[],s,l;for("string"==typeof e?(e=new t(e),l=function(t){return e.match(t)}):l=e,i=0,o=n.length;o>i;i++)s=n[i],l(s)&&a.push(s);return new r(a)},slice:function(){return new r(a.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},each:function(t){return e.each(this,t),this},toArray:function(){return e.toArray(this)},indexOf:function(e){for(var t=this,n=t.length;n--&&t[n]!==e;);return n},reverse:function(){return new r(e.toArray(this).reverse())},hasClass:function(e){return this[0]?this[0].hasClass(e):!1},prop:function(e,t){var n=this,r,i;return t!==r?(n.each(function(n){n[e]&&n[e](t)}),n):(i=n[0],i&&i[e]?i[e]():void 0)},exec:function(t){var n=this,r=e.toArray(arguments).slice(1);return n.each(function(e){e[t]&&e[t].apply(e,r)}),n},remove:function(){for(var e=this.length;e--;)this[e].remove();return this}},e.each("fire on off show hide addClass removeClass append prepend before after reflow".split(" "),function(t){i[t]=function(){var n=e.toArray(arguments);return this.each(function(e){t in e&&e[t].apply(e,n)}),this}}),e.each("text name disabled active selected checked visible parent value data".split(" "),function(e){i[e]=function(t){return this.prop(e,t)}}),r=n.extend(i),t.Collection=r,r}),r(W,[p,v],function(e,t){return{id:function(){return t.DOM.uniqueId()},createFragment:function(e){return t.DOM.createFragment(e)},getWindowSize:function(){return t.DOM.getViewPort()},getSize:function(e){var t,n;if(e.getBoundingClientRect){var r=e.getBoundingClientRect();t=Math.max(r.width||r.right-r.left,e.offsetWidth),n=Math.max(r.height||r.bottom-r.bottom,e.offsetHeight)}else t=e.offsetWidth,n=e.offsetHeight;return{width:t,height:n}},getPos:function(e,n){return t.DOM.getPos(e,n)},getViewPort:function(e){return t.DOM.getViewPort(e)},get:function(e){return document.getElementById(e)},addClass:function(e,n){return t.DOM.addClass(e,n)},removeClass:function(e,n){return t.DOM.removeClass(e,n)},hasClass:function(e,n){return t.DOM.hasClass(e,n)},toggleClass:function(e,n,r){return t.DOM.toggleClass(e,n,r)},css:function(e,n,r){return t.DOM.setStyle(e,n,r)},on:function(e,n,r,i){return t.DOM.bind(e,n,r,i)},off:function(e,n,r){return t.DOM.unbind(e,n,r)},fire:function(e,n,r){return t.DOM.fire(e,n,r)},innerHtml:function(e,n){t.DOM.setHTML(e,n)}}}),r(V,[I,p,z,W],function(e,t,n,r){var i=t.makeMap("focusin focusout scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave wheel keydown keypress keyup contextmenu"," "),o={},a="onmousewheel"in document,s=!1,l=e.extend({Statics:{controlIdLookup:{},elementIdCache:o},isRtl:function(){return l.rtl},classPrefix:"mce-",init:function(e){var n=this,i,o;if(n.settings=e=t.extend({},n.Defaults,e),n._id=r.id(),n._text=n._name="",n._width=n._height=0,n._aria={role:e.role},i=e.classes)for(i=i.split(" "),i.map={},o=i.length;o--;)i.map[i[o]]=!0;n._classes=i||[],n.visible(!0),t.each("title text width height name classes visible disabled active value".split(" "),function(t){var r=e[t],i;r!==i?n[t](r):n["_"+t]===i&&(n["_"+t]=!1)}),n.on("click",function(){return n.disabled()?!1:void 0}),e.classes&&t.each(e.classes.split(" "),function(e){n.addClass(e)}),n.settings=e,n._borderBox=n.parseBox(e.border),n._paddingBox=n.parseBox(e.padding),n._marginBox=n.parseBox(e.margin),e.hidden&&n.hide()},Properties:"parent,title,text,width,height,disabled,active,name,value",Methods:"renderHtml",getContainerElm:function(){return document.body},getParentCtrl:function(e){for(var t;e&&!(t=l.controlIdLookup[e.id]);)e=e.parentNode;return t},parseBox:function(e){var t,n=10;if(e)return"number"==typeof e?(e=e||0,{top:e,left:e,bottom:e,right:e}):(e=e.split(" "),t=e.length,1===t?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],n)||0,right:parseInt(e[1],n)||0,bottom:parseInt(e[2],n)||0,left:parseInt(e[3],n)||0})},borderBox:function(){return this._borderBox},paddingBox:function(){return this._paddingBox},marginBox:function(){return this._marginBox},measureBox:function(e,t){function n(t){var n=document.defaultView;return n?(t=t.replace(/[A-Z]/g,function(e){return"-"+e}),n.getComputedStyle(e,null).getPropertyValue(t)):e.currentStyle[t]}function r(e){var t=parseFloat(n(e),10);return isNaN(t)?0:t}return{top:r(t+"TopWidth"),right:r(t+"RightWidth"),bottom:r(t+"BottomWidth"),left:r(t+"LeftWidth")}},initLayoutRect:function(){var e=this,t=e.settings,n,i,o=e.getEl(),a,s,l,c,u,d,f,p;n=e._borderBox=e._borderBox||e.measureBox(o,"border"),e._paddingBox=e._paddingBox||e.measureBox(o,"padding"),e._marginBox=e._marginBox||e.measureBox(o,"margin"),p=r.getSize(o),d=t.minWidth,f=t.minHeight,l=d||p.width,c=f||p.height,a=t.width,s=t.height,u=t.autoResize,u="undefined"!=typeof u?u:!a&&!s,a=a||l,s=s||c;var h=n.left+n.right,m=n.top+n.bottom,g=t.maxWidth||65535,v=t.maxHeight||65535;return e._layoutRect=i={x:t.x||0,y:t.y||0,w:a,h:s,deltaW:h,deltaH:m,contentW:a-h,contentH:s-m,innerW:a-h,innerH:s-m,startMinWidth:d||0,startMinHeight:f||0,minW:Math.min(l,g),minH:Math.min(c,v),maxW:g,maxH:v,autoResize:u,scrollW:0},e._lastLayoutRect={},i},layoutRect:function(e){var t=this,n=t._layoutRect,r,i,o,a,s,c;return n||(n=t.initLayoutRect()),e?(o=n.deltaW,a=n.deltaH,e.x!==s&&(n.x=e.x),e.y!==s&&(n.y=e.y),e.minW!==s&&(n.minW=e.minW),e.minH!==s&&(n.minH=e.minH),i=e.w,i!==s&&(i=i<n.minW?n.minW:i,i=i>n.maxW?n.maxW:i,n.w=i,n.innerW=i-o),i=e.h,i!==s&&(i=i<n.minH?n.minH:i,i=i>n.maxH?n.maxH:i,n.h=i,n.innerH=i-a),i=e.innerW,i!==s&&(i=i<n.minW-o?n.minW-o:i,i=i>n.maxW-o?n.maxW-o:i,n.innerW=i,n.w=i+o),i=e.innerH,i!==s&&(i=i<n.minH-a?n.minH-a:i,i=i>n.maxH-a?n.maxH-a:i,n.innerH=i,n.h=i+a),e.contentW!==s&&(n.contentW=e.contentW),e.contentH!==s&&(n.contentH=e.contentH),r=t._lastLayoutRect,(r.x!==n.x||r.y!==n.y||r.w!==n.w||r.h!==n.h)&&(c=l.repaintControls,c&&c.map&&!c.map[t._id]&&(c.push(t),c.map[t._id]=!0),r.x=n.x,r.y=n.y,r.w=n.w,r.h=n.h),t):n},repaint:function(){var e=this,t,n,r,i,o=0,a=0,s;t=e.getEl().style,r=e._layoutRect,s=e._lastRepaintRect||{},i=e._borderBox,o=i.left+i.right,a=i.top+i.bottom,r.x!==s.x&&(t.left=r.x+"px",s.x=r.x),r.y!==s.y&&(t.top=r.y+"px",s.y=r.y),r.w!==s.w&&(t.width=r.w-o+"px",s.w=r.w),r.h!==s.h&&(t.height=r.h-a+"px",s.h=r.h),e._hasBody&&r.innerW!==s.innerW&&(n=e.getEl("body").style,n.width=r.innerW+"px",s.innerW=r.innerW),e._hasBody&&r.innerH!==s.innerH&&(n=n||e.getEl("body").style,n.height=r.innerH+"px",s.innerH=r.innerH),e._lastRepaintRect=s,e.fire("repaint",{},!1)},on:function(e,t){function n(e){var t,n;return function(i){return t||r.parents().each(function(r){var i=r.settings.callbacks;return i&&(t=i[e])?(n=r,!1):void 0}),t.call(n,i)}}var r=this,o,a,s,l;if(t)for("string"==typeof t&&(t=n(t)),s=e.toLowerCase().split(" "),l=s.length;l--;)e=s[l],o=r._bindings,o||(o=r._bindings={}),a=o[e],a||(a=o[e]=[]),a.push(t),i[e]&&(r._nativeEvents?r._nativeEvents[e]=!0:r._nativeEvents={name:!0},r._rendered&&r.bindPendingEvents());return r},off:function(e,t){var n=this,r,i=n._bindings,o,a,s,l;if(i)if(e)for(s=e.toLowerCase().split(" "),r=s.length;r--;){if(e=s[r],o=i[e],!e){for(a in i)i[a].length=0;return n}if(o)if(t)for(l=o.length;l--;)o[l]===t&&o.splice(l,1);else o.length=0}else n._bindings=[];return n},fire:function(e,t,n){function r(){return!1}function i(){return!0}var o=this,a,s,l,c;if(e=e.toLowerCase(),t=t||{},t.type||(t.type=e),t.control||(t.control=o),t.preventDefault||(t.preventDefault=function(){t.isDefaultPrevented=i},t.stopPropagation=function(){t.isPropagationStopped=i},t.stopImmediatePropagation=function(){t.isImmediatePropagationStopped=i},t.isDefaultPrevented=r,t.isPropagationStopped=r,t.isImmediatePropagationStopped=r),o._bindings&&(l=o._bindings[e]))for(a=0,s=l.length;s>a&&(t.isImmediatePropagationStopped()||l[a].call(o,t)!==!1);a++);if(n!==!1)for(c=o.parent();c&&!t.isPropagationStopped();)c.fire(e,t,!1),c=c.parent();return t},hasEventListeners:function(e){return e in this._bindings},parents:function(e){var t=this,r=new n;for(t=t.parent();t;t=t.parent())r.add(t);return e&&(r=r.filter(e)),r},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},findCommonAncestor:function(e,t){for(var n;e;){for(n=t;n&&e!=n;)n=n.parent();if(e==n)break;e=e.parent()}return e},hasClass:function(e,t){var n=this._classes[t||"control"];return e=this.classPrefix+e,n&&!!n.map[e]},addClass:function(e,t){var n=this,r,i;return e=this.classPrefix+e,r=n._classes[t||"control"],r||(r=[],r.map={},n._classes[t||"control"]=r),r.map[e]||(r.map[e]=e,r.push(e),n._rendered&&(i=n.getEl(t),i&&(i.className=r.join(" ")))),n},removeClass:function(e,t){var n=this,r,i,o;if(e=this.classPrefix+e,r=n._classes[t||"control"],r&&r.map[e])for(delete r.map[e],i=r.length;i--;)r[i]===e&&r.splice(i,1);return n._rendered&&(o=n.getEl(t),o&&(o.className=r.join(" "))),n},toggleClass:function(e,t,n){var r=this;return t?r.addClass(e,n):r.removeClass(e,n),r},classes:function(e){var t=this._classes[e||"control"];return t?t.join(" "):""},innerHtml:function(e){return r.innerHtml(this.getEl(),e),this},getEl:function(e,t){var n,i=e?this._id+"-"+e:this._id;return n=o[i]=(t===!0?null:o[i])||r.get(i)},visible:function(e){var t=this,n;return"undefined"!=typeof e?(t._visible!==e&&(t._rendered&&(t.getEl().style.display=e?"":"none"),t._visible=e,n=t.parent(),n&&(n._lastRect=null),t.fire(e?"show":"hide")),t):t._visible},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,r=n.getEl();return"undefined"==typeof t?n._aria[e]:(n._aria[e]=t,n._rendered&&("label"==e&&r.setAttribute("aria-labeledby",n._id),r.setAttribute("role"==e?e:"aria-"+e,t)),n)},encode:function(e,t){return t!==!1&&l.translate&&(e=l.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},before:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t),!0),t},after:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t)),t},remove:function(){var e=this,t=e.getEl(),n=e.parent(),i,a;if(e.items){var s=e.items().toArray();for(a=s.length;a--;)s[a].remove()}if(n&&n.items&&(i=[],n.items().each(function(t){t!==e&&i.push(t)}),n.items().set(i),n._lastRect=null),e._eventsRoot&&e._eventsRoot==e&&r.off(t),delete l.controlIdLookup[e._id],delete o[e._id],t&&t.parentNode){var c=t.getElementsByTagName("*");for(a=c.length;a--;)delete o[c[a].id];t.parentNode.removeChild(t)}return e},renderBefore:function(e){var t=this;return e.parentNode.insertBefore(r.createFragment(t.renderHtml()),e),t.postRender(),t},renderTo:function(e){var t=this;return e=e||t.getContainerElm(),e.appendChild(r.createFragment(t.renderHtml())),t.postRender(),t},postRender:function(){var e=this,t=e.settings,n,i,o,a,s;for(a in t)0===a.indexOf("on")&&e.on(a.substr(2),t[a]);if(e._eventsRoot){for(o=e.parent();!s&&o;o=o.parent())s=o._eventsRoot;if(s)for(a in s._nativeEvents)e._nativeEvents[a]=!0}e.bindPendingEvents(),t.style&&(n=e.getEl(),n&&(n.setAttribute("style",t.style),n.style.cssText=t.style)),e._visible||r.css(e.getEl(),"display","none"),e.settings.border&&(i=e.borderBox(),r.css(e.getEl(),{"border-top-width":i.top,"border-right-width":i.right,"border-bottom-width":i.bottom,"border-left-width":i.left})),l.controlIdLookup[e._id]=e;for(var c in e._aria)e.aria(c,e._aria[c]);e.fire("postrender",{},!1)},scrollIntoView:function(e){function t(e,t){var n,r,i=e;for(n=r=0;i&&i!=t&&i.nodeType;)n+=i.offsetLeft||0,r+=i.offsetTop||0,i=i.offsetParent;return{x:n,y:r}}var n=this.getEl(),r=n.parentNode,i,o,a,s,l,c,u=t(n,r);return i=u.x,o=u.y,a=n.offsetWidth,s=n.offsetHeight,l=r.clientWidth,c=r.clientHeight,"end"==e?(i-=l-a,o-=c-s):"center"==e&&(i-=l/2-a/2,o-=c/2-s/2),r.scrollLeft=i,r.scrollTop=o,this},bindPendingEvents:function(){function e(e){var t=o.getParentCtrl(e.target);t&&t.fire(e.type,e)}function t(){var e=d._lastHoverCtrl;e&&(e.fire("mouseleave",{target:e.getEl()}),e.parents().each(function(e){e.fire("mouseleave",{target:e.getEl()})}),d._lastHoverCtrl=null)}function n(e){var t=o.getParentCtrl(e.target),n=d._lastHoverCtrl,r=0,i,a,s;if(t!==n){if(d._lastHoverCtrl=t,a=t.parents().toArray().reverse(),a.push(t),n){for(s=n.parents().toArray().reverse(),s.push(n),r=0;r<s.length&&a[r]===s[r];r++);for(i=s.length-1;i>=r;i--)n=s[i],n.fire("mouseleave",{target:n.getEl()})}for(i=r;i<a.length;i++)t=a[i],t.fire("mouseenter",{target:t.getEl()})}}function i(e){e.preventDefault(),"mousewheel"==e.type?(e.deltaY=-1/40*e.wheelDelta,e.wheelDeltaX&&(e.deltaX=-1/40*e.wheelDeltaX)):(e.deltaX=0,e.deltaY=e.detail),e=o.fire("wheel",e)}var o=this,l,c,u,d,f,p;if(o._rendered=!0,f=o._nativeEvents){for(u=o.parents().toArray(),u.unshift(o),l=0,c=u.length;!d&&c>l;l++)d=u[l]._eventsRoot;for(d||(d=u[u.length-1]||o),o._eventsRoot=d,c=l,l=0;c>l;l++)u[l]._eventsRoot=d;for(p in f){if(!f)return!1;"wheel"!==p||s?("mouseenter"===p||"mouseleave"===p?d._hasMouseEnter||(r.on(d.getEl(),"mouseleave",t),r.on(d.getEl(),"mouseover",n),d._hasMouseEnter=1):d[p]||(r.on(d.getEl(),p,e),d[p]=!0),f[p]=!1):a?r.on(o.getEl(),"mousewheel",i):r.on(o.getEl(),"DOMMouseScroll",i)}}},reflow:function(){return this.repaint(),this}});return l}),r(U,[],function(){var e={},t;return{add:function(t,n){e[t.toLowerCase()]=n},has:function(t){return!!e[t.toLowerCase()]},create:function(n,r){var i,o,a;if(!t){a=tinymce.ui;for(o in a)e[o.toLowerCase()]=a[o];t=!0}if("string"==typeof n?(r=r||{},r.type=n):(r=n,n=r.type),n=n.toLowerCase(),i=e[n],!i)throw new Error("Could not find control by type: "+n);return i=new i(r),i.type=n,i}}}),r(q,[V,z,F,U,p,W],function(e,t,n,r,i,o){var a={};return e.extend({layout:"",innerClass:"container-inner",init:function(e){var n=this;n._super(e),e=n.settings,n._fixed=e.fixed,n._items=new t,n.isRtl()&&n.addClass("rtl"),n.addClass("container"),n.addClass("container-body","body"),e.containerCls&&n.addClass(e.containerCls),n._layout=r.create((e.layout||n.layout)+"layout"),n.settings.items&&n.add(n.settings.items),n._hasBody=!0},items:function(){return this._items},find:function(e){return e=a[e]=a[e]||new n(e),e.find(this)},add:function(e){var t=this;return t.items().add(t.create(e)).parent(t),t},focus:function(){var e=this;return e.keyNav?e.keyNav.focusFirst():e._super(),e},replace:function(e,t){for(var n,r=this.items(),i=r.length;i--;)if(r[i]===e){r[i]=t;break}i>=0&&(n=t.getEl(),n&&n.parentNode.removeChild(n),n=e.getEl(),n&&n.parentNode.removeChild(n)),t.parent(this)},create:function(t){var n=this,o,a=[];return i.isArray(t)||(t=[t]),i.each(t,function(t){t&&(t instanceof e||("string"==typeof t&&(t={type:t}),o=i.extend({},n.settings.defaults,t),t.type=o.type=o.type||t.type||n.settings.defaultType||(o.defaults?o.defaults.type:null),t=r.create(o)),a.push(t))}),a},renderNew:function(){var e=this;return e.items().each(function(t,n){var r,i;t.parent(e),t._rendered||(r=e.getEl("body"),i=o.createFragment(t.renderHtml()),r.hasChildNodes()&&n<=r.childNodes.length-1?r.insertBefore(i,r.childNodes[n]):r.appendChild(i),t.postRender())}),e._layout.applyClasses(e),e._lastRect=null,e},append:function(e){return this.add(e).renderNew()},prepend:function(e){var t=this;return t.items().set(t.create(e).concat(t.items().toArray())),t.renderNew()},insert:function(e,t,n){var r=this,i,o,a;return e=r.create(e),i=r.items(),!n&&t<i.length-1&&(t+=1),t>=0&&t<i.length&&(o=i.slice(0,t).toArray(),a=i.slice(t).toArray(),i.set(o.concat(e,a))),r.renderNew()},fromJSON:function(e){var t=this;for(var n in e)t.find("#"+n).value(e[n]);return t},toJSON:function(){var e=this,t={};return e.find("*").each(function(e){var n=e.name(),r=e.value();n&&"undefined"!=typeof r&&(t[n]=r)}),t},preRender:function(){},renderHtml:function(){var e=this,t=e._layout;return e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'" role="'+this.settings.role+'">'+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</div>"},postRender:function(){var e=this,t;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e._rendered=!0,e.settings.style&&o.css(e.getEl(),e.settings.style),e.settings.border&&(t=e.borderBox(),o.css(e.getEl(),{"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e},initLayoutRect:function(){var e=this,t=e._super();return e._layout.recalc(e),t},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;return n&&n.w==t.w&&n.h==t.h?void 0:(e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0)},reflow:function(){var t,n;if(this.visible()){for(e.repaintControls=[],e.repaintControls.map={},n=this.recalc(),t=e.repaintControls.length;t--;)e.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),e.repaintControls=[]}return this}})}),r($,[W],function(e){function t(){var e=document,t,n,r,i,o,a,s,l,c=Math.max;return t=e.documentElement,n=e.body,r=c(t.scrollWidth,n.scrollWidth),i=c(t.clientWidth,n.clientWidth),o=c(t.offsetWidth,n.offsetWidth),a=c(t.scrollHeight,n.scrollHeight),s=c(t.clientHeight,n.clientHeight),l=c(t.offsetHeight,n.offsetHeight),{width:o>r?i:r,height:l>a?s:a}}return function(n,r){function i(){return a.getElementById(r.handle||n)}var o,a=document,s,l,c,u,d,f;r=r||{},l=function(n){var l=t(),p,h;n.preventDefault(),s=n.button,p=i(),d=n.screenX,f=n.screenY,h=window.getComputedStyle?window.getComputedStyle(p,null).getPropertyValue("cursor"):p.runtimeStyle.cursor,o=a.createElement("div"),e.css(o,{position:"absolute",top:0,left:0,width:l.width,height:l.height,zIndex:2147483647,opacity:1e-4,background:"red",cursor:h}),a.body.appendChild(o),e.on(a,"mousemove",u),e.on(a,"mouseup",c),r.start(n)},u=function(e){return e.button!==s?c(e):(e.deltaX=e.screenX-d,e.deltaY=e.screenY-f,e.preventDefault(),r.drag(e),void 0)},c=function(t){e.off(a,"mousemove",u),e.off(a,"mouseup",c),o.parentNode.removeChild(o),r.stop&&r.stop(t)},this.destroy=function(){e.off(i())},e.on(i(),"mousedown",l)}}),r(j,[W,$],function(e,t){return{init:function(){var e=this;e.on("repaint",e.renderScroll)},renderScroll:function(){function n(){function t(t,a,s,l,c,u){var d,f,p,h,m,g,v,y,b;if(f=i.getEl("scroll"+t)){if(y=a.toLowerCase(),b=s.toLowerCase(),i.getEl("absend")&&e.css(i.getEl("absend"),y,i.layoutRect()[l]-1),!c)return e.css(f,"display","none"),void 0;e.css(f,"display","block"),d=i.getEl("body"),p=i.getEl("scroll"+t+"t"),h=d["client"+s]-2*o,h-=n&&r?f["client"+u]:0,m=d["scroll"+s],g=h/m,v={},v[y]=d["offset"+a]+o,v[b]=h,e.css(f,v),v={},v[y]=d["scroll"+a]*g,v[b]=h*g,e.css(p,v)}}var n,r,a;a=i.getEl("body"),n=a.scrollWidth>a.clientWidth,r=a.scrollHeight>a.clientHeight,t("h","Left","Width","contentW",n,"Height"),t("v","Top","Height","contentH",r,"Width")}function r(){function n(n,r,a,s,l){var c,u=i._id+"-scroll"+n,d=i.classPrefix;i.getEl().appendChild(e.createFragment('<div id="'+u+'" class="'+d+"scrollbar "+d+"scrollbar-"+n+'">'+'<div id="'+u+'t" class="'+d+'scrollbar-thumb"></div>'+"</div>")),i.draghelper=new t(u+"t",{start:function(){c=i.getEl("body")["scroll"+r],e.addClass(e.get(u),d+"active")},drag:function(e){var t,u,d,f,p=i.layoutRect();u=p.contentW>p.innerW,d=p.contentH>p.innerH,f=i.getEl("body")["client"+a]-2*o,f-=u&&d?i.getEl("scroll"+n)["client"+l]:0,t=f/i.getEl("body")["scroll"+a],i.getEl("body")["scroll"+r]=c+e["delta"+s]/t},stop:function(){e.removeClass(e.get(u),d+"active")}})}i.addClass("scroll"),n("v","Top","Height","Y","Width"),n("h","Left","Width","X","Height")}var i=this,o=2;i.settings.autoScroll&&(i._hasScroll||(i._hasScroll=!0,r(),i.on("wheel",function(e){var t=i.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),e.on(i.getEl("body"),"scroll",n)),n())}}}),r(K,[q,j],function(e,t){return e.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[t],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),"undefined"==typeof n?n='<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+t.renderHtml(e)+"</div>":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e._preBodyHtml||"")+n+"</div>"}})}),r(G,[W],function(e){function t(t,n,r){var i,o,a,s,l,c,u,d,f,p;return f=e.getViewPort(),o=e.getPos(n),a=o.x,s=o.y,t._fixed&&(a-=f.x,s-=f.y),i=t.getEl(),p=e.getSize(i),l=p.width,c=p.height,p=e.getSize(n),u=p.width,d=p.height,r=(r||"").split(""),"b"===r[0]&&(s+=d),"r"===r[1]&&(a+=u),"c"===r[0]&&(s+=Math.round(d/2)),"c"===r[1]&&(a+=Math.round(u/2)),"b"===r[3]&&(s-=c),"r"===r[4]&&(a-=l),"c"===r[3]&&(s-=Math.round(c/2)),"c"===r[4]&&(a-=Math.round(l/2)),{x:a,y:s,w:l,h:c}}return{testMoveRel:function(n,r){for(var i=e.getViewPort(),o=0;o<r.length;o++){var a=t(this,n,r[o]);if(this._fixed){if(a.x>0&&a.x+a.w<i.w&&a.y>0&&a.y+a.h<i.h)return r[o]}else if(a.x>i.x&&a.x+a.w<i.w+i.x&&a.y>i.y&&a.y+a.h<i.h+i.y)return r[o]}return r[0]},moveRel:function(e,n){"string"!=typeof n&&(n=this.testMoveRel(e,n));var r=t(this,e,n);return this.moveTo(r.x,r.y)},moveBy:function(e,t){var n=this,r=n.layoutRect();return n.moveTo(r.x+e,r.y+t),n},moveTo:function(t,n){function r(e,t,n){return 0>e?0:e+n>t?(e=t-n,0>e?0:e):e}var i=this;if(i.settings.constrainToViewport){var o=e.getViewPort(window),a=i.layoutRect();t=r(t,o.w+o.x,a.w),n=r(n,o.h+o.y,a.h)}return i._rendered?i.layoutRect({x:t,y:n}).repaint():(i.settings.x=t,i.settings.y=n),i.fire("move",{x:t,y:n}),i}}}),r(Y,[W],function(e){return{resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,n){if(1>=t||1>=n){var r=e.getWindowSize();t=1>=t?t*r.w:t,n=1>=n?n*r.h:n}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:n,w:t,h:n}).reflow()},resizeBy:function(e,t){var n=this,r=n.layoutRect();return n.resizeTo(r.w+e,r.h+t)}}}),r(X,[K,G,Y,W],function(e,t,n,r){function i(e){var t;for(t=s.length;t--;)s[t]===e&&s.splice(t,1);for(t=l.length;t--;)l[t]===e&&l.splice(t,1)}var o,a,s=[],l=[],c,u=e.extend({Mixins:[t,n],init:function(e){function t(){var e,t=u.zIndex||65535,n;if(l.length)for(e=0;e<l.length;e++)l[e].modal&&(t++,n=l[e]),l[e].getEl().style.zIndex=t,l[e].zIndex=t,t++;var i=document.getElementById(d.classPrefix+"modal-block");n?r.css(i,"z-index",n.zIndex-1):i&&(i.parentNode.removeChild(i),c=!1),u.currentZIndex=t}function n(e,t){for(;e;){if(e==t)return!0;e=e.parent()}}function i(e){function t(t,n){for(var r,i=0;i<s.length;i++)if(s[i]!=e)for(r=s[i].parent();r&&(r=r.parent());)r==e&&s[i].fixed(t).moveBy(0,n).repaint()}var n=r.getViewPort().y;e.settings.autofix&&(e._fixed?e._autoFixY>n&&(e.fixed(!1).layoutRect({y:e._autoFixY}).repaint(),t(!1,e._autoFixY-n)):(e._autoFixY=e.layoutRect().y,e._autoFixY<n&&(e.fixed(!0).layoutRect({y:0}).repaint(),t(!0,n-e._autoFixY))))}var d=this;d._super(e),d._eventsRoot=d,d.addClass("floatpanel"),e.autohide&&(o||(o=function(e){var t,r=d.getParentCtrl(e.target);for(t=s.length;t--;){var i=s[t];if(i.settings.autohide){if(r&&(n(r,i)||i.parent()===r))continue;e=i.fire("autohide",{target:e.target}),e.isDefaultPrevented()||i.hide()}}},r.on(document,"click",o)),s.push(d)),e.autofix&&(a||(a=function(){var e;for(e=s.length;e--;)i(s[e])},r.on(window,"scroll",a)),d.on("move",function(){i(this)})),d.on("postrender show",function(e){if(e.control==d){var n,i=d.classPrefix;d.modal&&!c&&(n=r.createFragment('<div id="'+i+'modal-block" class="'+i+"reset "+i+'fade"></div>'),n=n.firstChild,d.getContainerElm().appendChild(n),setTimeout(function(){r.addClass(n,i+"in"),r.addClass(d.getEl(),i+"in")},0),c=!0),l.push(d),t()}}),d.on("close hide",function(e){if(e.control==d){for(var n=l.length;n--;)l[n]===d&&l.splice(n,1);t()}}),d.on("show",function(){d.parents().each(function(e){return e._fixed?(d.fixed(!0),!1):void 0})}),e.popover&&(d._preBodyHtml='<div class="'+d.classPrefix+'arrow"></div>',d.addClass("popover").addClass("bottom").addClass(d.isRtl()?"end":"start"))},fixed:function(e){var t=this;if(t._fixed!=e){if(t._rendered){var n=r.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.toggleClass("fixed",e),t._fixed=e}return t},show:function(){var e=this,t,n=e._super();for(t=s.length;t--&&s[t]!==e;);return-1===t&&s.push(e),n},hide:function(){return i(this),this._super()},hideAll:function(){u.hideAll()},close:function(){var e=this;return e.fire("close"),e.remove()},remove:function(){i(this),this._super()}});return u.hideAll=function(){for(var e=s.length;e--;){var t=s[e];t.settings.autohide&&(t.fire("cancel",{},!1),t.hide(),s.splice(e,1))}},u}),r(J,[W],function(e){return function(t){function n(){if(!h)if(h=[],d.find)d.find("*").each(function(e){e.canFocus&&h.push(e.getEl())});else for(var e=d.getEl().getElementsByTagName("*"),t=0;t<e.length;t++)e[t].id&&e[t]&&h.push(e[t])}function r(){return document.getElementById(m)}function i(e){return e=e||r(),e&&e.getAttribute("role")}function o(e){for(var t,n=e||r();n=n.parentNode;)if(t=i(n))return t}function a(e){var t=document.getElementById(m);return t?t.getAttribute("aria-"+e):void 0}function s(){var n=r();if(!n||"TEXTAREA"!=n.nodeName&&"text"!=n.type)return t.onAction?t.onAction(m):e.fire(r(),"click",{keyboard:!0}),!0}function l(){var e;t.onCancel?((e=r())&&e.blur(),t.onCancel()):t.root.fire("cancel")}function c(e){function r(e){for(var t=d?d.getEl():document.body;e&&e!=t;){if("none"==e.style.display)return!1;e=e.parentNode}return!0}var i=-1,o,a,l=[];for(n(),a=l.length,a=0;a<h.length;a++)r(h[a])&&l.push(h[a]);for(a=l.length;a--;)if(l[a].id===m){i=a;break}i+=e,0>i?i=l.length-1:i>=l.length&&(i=0),o=l[i],o.focus(),m=o.id,t.actOnFocus&&s()}function u(){var e,r;for(r=i(t.root.getEl()),n(),e=h.length;e--;)if("toolbar"==r&&h[e].id===m)return h[e].focus(),void 0;h[0].focus()}var d=t.root,f=t.enableUpDown!==!1,p=t.enableLeftRight!==!1,h=t.items,m;return d.on("keydown",function(e){var n=37,r=39,u=38,d=40,h=27,m=14,g=13,v=32,y=9,b;switch(e.keyCode){case n:p&&(t.leftAction?t.leftAction():c(-1),b=!0);break;case r:p&&("menuitem"==i()&&"menu"==o()?a("haspopup")&&s():c(1),b=!0);break;case u:f&&(c(-1),b=!0);break;case d:f&&("menuitem"==i()&&"menubar"==o()?s():"button"==i()&&a("haspopup")?s():c(1),b=!0);break;case y:b=!0,e.shiftKey?c(-1):c(1);break;case h:b=!0,l();break;case m:case g:case v:b=s()}b&&(e.stopPropagation(),e.preventDefault())}),d.on("focusin",function(e){n(),m=e.target.id}),{moveFocus:c,focusFirst:u,cancel:l}}}),r(Q,[X,K,W,J,$],function(e,t,n,r,i){var o=e.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(e){var n=this;n._super(e),n.isRtl()&&n.addClass("rtl"),n.addClass("window"),n._fixed=!0,e.buttons&&(n.statusbar=new t({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:n.isRtl()?"start":"end",defaults:{type:"button"},items:e.buttons}),n.statusbar.addClass("foot"),n.statusbar.parent(n)),n.on("click",function(e){-1!=e.target.className.indexOf(n.classPrefix+"close")&&n.close()}),n.aria("label",e.title),n._fullscreen=!1},recalc:function(){var e=this,t=e.statusbar,r,i,o,a;e._fullscreen&&(e.layoutRect(n.getWindowSize()),e.layoutRect().contentH=e.layoutRect().innerH),e._super(),r=e.layoutRect(),e.settings.title&&!e._fullscreen&&(i=r.headerW,i>r.w&&(o=r.x-Math.max(0,i/2),e.layoutRect({w:i,x:o}),a=!0)),t&&(t.layoutRect({w:e.layoutRect().innerW}).recalc(),i=t.layoutRect().minW+r.deltaW,i>r.w&&(o=r.x-Math.max(0,i-r.w),e.layoutRect({w:i,x:o}),a=!0)),a&&e.recalc()},initLayoutRect:function(){var e=this,t=e._super(),r=0,i;if(e.settings.title&&!e._fullscreen){i=e.getEl("head");var o=n.getSize(i);t.headerW=o.width,t.headerH=o.height,r+=t.headerH}e.statusbar&&(r+=e.statusbar.layoutRect().h),t.deltaH+=r,t.minH+=r,t.h+=r;var a=n.getWindowSize();return t.x=Math.max(0,a.w/2-t.w/2),t.y=Math.max(0,a.h/2-t.h/2),t},renderHtml:function(){var e=this,t=e._layout,n=e._id,r=e.classPrefix,i=e.settings,o="",a="",s=i.html;return e.preRender(),t.preRender(e),i.title&&(o='<div id="'+n+'-head" class="'+r+'window-head">'+'<div class="'+r+'title">'+e.encode(i.title)+"</div>"+'<button type="button" class="'+r+'close" aria-hidden="true">&times;</button>'+'<div id="'+n+'-dragh" class="'+r+'dragh"></div>'+"</div>"),i.url&&(s='<iframe src="'+i.url+'" tabindex="-1"></iframe>'),"undefined"==typeof s&&(s=t.renderHtml(e)),e.statusbar&&(a=e.statusbar.renderHtml()),'<div id="'+n+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+o+'<div id="'+n+'-body" class="'+e.classes("body")+'">'+s+"</div>"+a+"</div>"},fullscreen:function(e){var t=this,r=document.documentElement,i,o=t.classPrefix,a;if(e!=t._fullscreen)if(n.on(window,"resize",function(){var e;if(t._fullscreen)if(i)t._timer||(t._timer=setTimeout(function(){var e=n.getWindowSize();t.moveTo(0,0).resizeTo(e.w,e.h),t._timer=0},50));else{e=(new Date).getTime();var r=n.getWindowSize();t.moveTo(0,0).resizeTo(r.w,r.h),(new Date).getTime()-e>50&&(i=!0)}}),a=t.layoutRect(),t._fullscreen=e,e){t._initial={x:a.x,y:a.y,w:a.w,h:a.h},t._borderBox=t.parseBox("0"),t.getEl("head").style.display="none",a.deltaH-=a.headerH+2,n.addClass(r,o+"fullscreen"),n.addClass(document.body,o+"fullscreen"),t.addClass("fullscreen");var s=n.getWindowSize();t.moveTo(0,0).resizeTo(s.w,s.h)}else t._borderBox=t.parseBox(t.settings.border),t.getEl("head").style.display="",a.deltaH+=a.headerH,n.removeClass(r,o+"fullscreen"),n.removeClass(document.body,o+"fullscreen"),t.removeClass("fullscreen"),t.moveTo(t._initial.x,t._initial.y).resizeTo(t._initial.w,t._initial.h);return t.reflow()},postRender:function(){var e=this,t=[],n,o,a;setTimeout(function(){e.addClass("in")},0),e.keyboardNavigation=new r({root:e,enableLeftRight:!1,enableUpDown:!1,items:t,onCancel:function(){e.close()}}),e.find("*").each(function(e){e.canFocus&&(o=o||e.settings.autofocus,n=n||e,"filepicker"==e.type?(t.push(e.getEl("inp")),e.getEl("open")&&t.push(e.getEl("open"))):t.push(e.getEl()))}),e.statusbar&&e.statusbar.find("*").each(function(e){e.canFocus&&(o=o||e.settings.autofocus,n=n||e,t.push(e.getEl()))}),e._super(),e.statusbar&&e.statusbar.postRender(),!o&&n&&n.focus(),this.dragHelper=new i(e._id+"-dragh",{start:function(){a={x:e.layoutRect().x,y:e.layoutRect().y}
-},drag:function(t){e.moveTo(a.x+t.deltaX,a.y+t.deltaY)}}),e.on("submit",function(t){t.isDefaultPrevented()||e.close()})},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var e=this;e.dragHelper.destroy(),e._super(),e.statusbar&&this.statusbar.remove()}});return o}),r(Z,[Q],function(e){var t=e.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(n){var r,i=n.callback||function(){};switch(n.buttons){case t.OK_CANCEL:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}},{type:"button",text:"Cancel",onClick:function(e){e.control.parents()[1].close(),i(!1)}}];break;case t.YES_NO:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}}];break;case t.YES_NO_CANCEL:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close()}}];break;default:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}}]}return new e({padding:20,x:n.x,y:n.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:r,title:n.title,items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:n.text},onClose:n.onClose}).renderTo(document.body).reflow()},alert:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,t.msgBox(e)},confirm:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,e.buttons=t.OK_CANCEL,t.msgBox(e)}}});return t}),r(et,[Q,Z],function(e,t){return function(n){function r(){return o.length?o[o.length-1]:void 0}var i=this,o=[];i.windows=o,i.open=function(t,r){var i;return n.editorManager.activeEditor=n,t.title=t.title||" ",t.url=t.url||t.file,t.url&&(t.width=parseInt(t.width||320,10),t.height=parseInt(t.height||240,10)),t.body&&(t.items={defaults:t.defaults,type:t.bodyType||"form",items:t.body}),t.url||t.buttons||(t.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit(),i.close()}},{text:"Cancel",onclick:function(){i.close()}}]),i=new e(t),o.push(i),i.on("close",function(){for(var e=o.length;e--;)o[e]===i&&o.splice(e,1);n.focus()}),t.data&&i.on("postRender",function(){this.find("*").each(function(e){var n=e.name();n in t.data&&e.value(t.data[n])})}),i.features=t||{},i.params=r||{},n.nodeChanged(),i.renderTo(document.body).reflow()},i.alert=function(e,n,r){t.alert(e,function(){n&&n.call(r||this)})},i.confirm=function(e,n,r){t.confirm(e,function(e){n.call(r||this,e)})},i.close=function(){r()&&r().close()},i.getParams=function(){return r()?r().params:null},i.setParams=function(e){r()&&(r().params=e)}}}),r(tt,[T,B,C,m,g,p],function(e,t,n,r,i,o){return function(a){function s(e,t){try{a.getDoc().execCommand(e,!1,t)}catch(n){}}function l(){var e=a.getDoc().documentMode;return e?e:6}function c(e){return e.isDefaultPrevented()}function u(){function t(e){function t(){if(3==l.nodeType){if(e&&c==l.length)return!0;if(!e&&0===c)return!0}}var n,r,i,s,l,c,u;n=W.getRng();var d=[n.startContainer,n.startOffset,n.endContainer,n.endOffset];if(n.collapsed||(e=!0),l=n[(e?"start":"end")+"Container"],c=n[(e?"start":"end")+"Offset"],3==l.nodeType&&(r=z.getParent(n.startContainer,z.isBlock),e&&(r=z.getNext(r,z.isBlock)),!r||!t()&&n.collapsed||(i=z.create("em",{id:"__mceDel"}),O(o.grep(r.childNodes),function(e){i.appendChild(e)}),r.appendChild(i))),n=z.createRng(),n.setStart(d[0],d[1]),n.setEnd(d[2],d[3]),W.setRng(n),a.getDoc().execCommand(e?"ForwardDelete":"Delete",!1,null),i){for(s=W.getBookmark();u=z.get("__mceDel");)z.remove(u,!0);W.moveToBookmark(s)}}a.on("keydown",function(n){var r;r=n.keyCode==F,c(n)||!r&&n.keyCode!=I||e.modifierPressed(n)||(n.preventDefault(),t(r))}),a.addCommand("Delete",function(){t()})}function d(){function e(e){var t=z.create("body"),n=e.cloneContents();return t.appendChild(n),W.serializer.serialize(t,{format:"html"})}function t(t){var n=e(t),r=z.createRng();r.selectNode(a.getBody());var i=e(r);return n===i}a.on("keydown",function(e){var n=e.keyCode,r;if(!c(e)&&(n==F||n==I)){if(r=a.selection.isCollapsed(),r&&!z.isEmpty(a.getBody()))return;if(j&&!r)return;if(!r&&!t(a.selection.getRng()))return;e.preventDefault(),a.setContent(""),a.selection.setCursorLocation(a.getBody(),0),a.nodeChanged()}})}function f(){a.on("keydown",function(t){!c(t)&&65==t.keyCode&&e.metaKeyPressed(t)&&(t.preventDefault(),a.execCommand("SelectAll"))})}function p(){a.settings.content_editable||(z.bind(a.getDoc(),"focusin",function(){W.setRng(W.getRng())}),z.bind(a.getDoc(),"mousedown",function(e){e.target==a.getDoc().documentElement&&(a.getWin().focus(),W.setRng(W.getRng()))}))}function h(){a.on("keydown",function(e){if(!c(e)&&e.keyCode===I&&W.isCollapsed()&&0===W.getRng(!0).startOffset){var t=W.getNode(),n=t.previousSibling;if("HR"==t.nodeName)return z.remove(t),e.preventDefault(),void 0;n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(z.remove(n),e.preventDefault())}})}function m(){window.Range.prototype.getClientRects||a.on("mousedown",function(e){if(!c(e)&&"HTML"===e.target.nodeName){var t=a.getBody();t.blur(),setTimeout(function(){t.focus()},0)}})}function g(){a.on("click",function(e){e=e.target,/^(IMG|HR)$/.test(e.nodeName)&&W.getSel().setBaseAndExtent(e,0,e,1),"A"==e.nodeName&&z.hasClass(e,"mce-item-anchor")&&W.select(e),a.nodeChanged()})}function v(){function e(){var e=z.getAttribs(W.getStart().cloneNode(!1));return function(){var t=W.getStart();t!==a.getBody()&&(z.setAttrib(t,"style",null),O(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}}function t(){return!W.isCollapsed()&&z.getParent(W.getStart(),z.isBlock)!=z.getParent(W.getEnd(),z.isBlock)}a.on("keypress",function(n){var r;return c(n)||8!=n.keyCode&&46!=n.keyCode||!t()?void 0:(r=e(),a.getDoc().execCommand("delete",!1,null),r(),n.preventDefault(),!1)}),z.bind(a.getDoc(),"cut",function(n){var r;!c(n)&&t()&&(r=e(),setTimeout(function(){r()},0))})}function y(){var e,n;a.on("selectionchange",function(){n&&(clearTimeout(n),n=0),n=window.setTimeout(function(){var n=W.getRng();e&&t.compareRanges(n,e)||(a.nodeChanged(),e=n)},50)})}function b(){document.body.setAttribute("role","application")}function C(){a.on("keydown",function(e){if(!c(e)&&e.keyCode===I&&W.isCollapsed()&&0===W.getRng(!0).startOffset){var t=W.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})}function x(){l()>7||(s("RespectVisibilityInDesign",!0),a.contentStyles.push(".mceHideBrInPre pre br {display: none}"),z.addClass(a.getBody(),"mceHideBrInPre"),U.addNodeFilter("pre",function(e){for(var t=e.length,r,i,o,a;t--;)for(r=e[t].getAll("br"),i=r.length;i--;)o=r[i],a=o.prev,a&&3===a.type&&"\n"!=a.value.charAt(a.value-1)?a.value+="\n":o.parent.insert(new n("#text",3),o,!0).value="\n"}),q.addNodeFilter("pre",function(e){for(var t=e.length,n,r,i,o;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)i=n[r],o=i.prev,o&&3==o.type&&(o.value=o.value.replace(/\r?\n$/,""))}))}function w(){z.bind(a.getBody(),"mouseup",function(){var e,t=W.getNode();"IMG"==t.nodeName&&((e=z.getStyle(t,"width"))&&(z.setAttrib(t,"width",e.replace(/[^0-9%]+/g,"")),z.setStyle(t,"width","")),(e=z.getStyle(t,"height"))&&(z.setAttrib(t,"height",e.replace(/[^0-9%]+/g,"")),z.setStyle(t,"height","")))})}function _(){a.on("keydown",function(t){var n,r,i,o,s,l,u,d;if(n=t.keyCode==F,!c(t)&&(n||t.keyCode==I)&&!e.modifierPressed(t)&&(r=W.getRng(),i=r.startContainer,o=r.startOffset,u=r.collapsed,3==i.nodeType&&i.nodeValue.length>0&&(0===o&&!u||u&&o===(n?0:1)))){if(l=i.previousSibling,l&&"IMG"==l.nodeName)return;d=a.schema.getNonEmptyElements(),t.preventDefault(),s=z.create("br",{id:"__tmp"}),i.parentNode.insertBefore(s,i),a.getDoc().execCommand(n?"ForwardDelete":"Delete",!1,null),i=W.getRng().startContainer,l=i.previousSibling,l&&1==l.nodeType&&!z.isBlock(l)&&z.isEmpty(l)&&!d[l.nodeName.toLowerCase()]&&z.remove(l),z.remove("__tmp")}})}function N(){a.on("keydown",function(t){var n,r,i,o,s;if(!c(t)&&t.keyCode==e.BACKSPACE&&(n=W.getRng(),r=n.startContainer,i=n.startOffset,o=z.getRoot(),s=r,n.collapsed&&0===i)){for(;s&&s.parentNode&&s.parentNode.firstChild==s&&s.parentNode!=o;)s=s.parentNode;"BLOCKQUOTE"===s.tagName&&(a.formatter.toggle("blockquote",null,s),n=z.createRng(),n.setStart(r,0),n.setEnd(r,0),W.setRng(n))}})}function E(){function e(){a._refreshContentEditable(),s("StyleWithCSS",!1),s("enableInlineTableEditing",!1),V.object_resizing||s("enableObjectResizing",!1)}V.readonly||a.on("BeforeExecCommand MouseDown",e)}function k(){function e(){O(z.select("a"),function(e){var t=e.parentNode,n=z.getRoot();if(t.lastChild===e){for(;t&&!z.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}z.add(t,"br",{"data-mce-bogus":1})}})}a.on("SetContent ExecCommand",function(t){("setcontent"==t.type||"mceInsertLink"===t.command)&&e()})}function S(){V.forced_root_block&&a.on("init",function(){s("DefaultParagraphSeparator",V.forced_root_block)})}function T(){a.on("Undo Redo SetContent",function(e){e.initial||a.execCommand("mceRepaint")})}function R(){a.on("keydown",function(e){var t;c(e)||e.keyCode!=I||(t=a.getDoc().selection.createRange(),t&&t.item&&(e.preventDefault(),a.undoManager.beforeChange(),z.remove(t.item(0)),a.undoManager.add()))})}function A(){var e;l()>=10&&(e="",O("p div h1 h2 h3 h4 h5 h6".split(" "),function(t,n){e+=(n>0?",":"")+t+":empty"}),a.contentStyles.push(e+"{padding-right: 1px !important}"))}function B(){l()<9&&(U.addNodeFilter("noscript",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.firstChild,r&&n.attr("data-mce-innertext",r.value)}),q.addNodeFilter("noscript",function(e){for(var t=e.length,i,o,a;t--;)i=e[t],o=e[t].firstChild,o?o.value=r.decode(o.value):(a=i.attributes.map["data-mce-innertext"],a&&(i.attr("data-mce-innertext",null),o=new n("#text",3),o.value=a,o.raw=!0,i.append(o)))}))}function L(){function e(e,t){var n=i.createTextRange();try{n.moveToPoint(e,t)}catch(r){n=null}return n}function t(t){var r;t.button?(r=e(t.x,t.y),r&&(r.compareEndPoints("StartToStart",a)>0?r.setEndPoint("StartToStart",a):r.setEndPoint("EndToEnd",a),r.select())):n()}function n(){var e=r.selection.createRange();a&&!e.item&&0===e.compareEndPoints("StartToEnd",e)&&a.select(),z.unbind(r,"mouseup",n),z.unbind(r,"mousemove",t),a=o=0}var r=z.doc,i=r.body,o,a,s;r.documentElement.unselectable=!0,z.bind(r,"mousedown contextmenu",function(i){if("HTML"===i.target.nodeName){if(o&&n(),s=r.documentElement,s.scrollHeight>s.clientHeight)return;o=1,a=e(i.x,i.y),a&&(z.bind(r,"mouseup",n),z.bind(r,"mousemove",t),z.win.focus(),a.select())}})}function H(){a.on("keyup focusin",function(t){65==t.keyCode&&e.metaKeyPressed(t)||W.normalize()})}function D(){a.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")}function M(){a.inline||a.on("keydown",function(){document.activeElement==document.body&&a.getWin().focus()})}function P(){a.inline||(a.contentStyles.push("body {min-height: 150px}"),a.on("click",function(e){"HTML"==e.target.nodeName&&(a.execCommand("SelectAll"),a.selection.collapse(!0),a.nodeChanged())}))}var O=o.each,I=e.BACKSPACE,F=e.DELETE,z=a.dom,W=a.selection,V=a.settings,U=a.parser,q=a.serializer,$=i.gecko,j=i.ie,K=i.webkit;C(),N(),d(),H(),K&&(_(),u(),p(),g(),S(),i.iOS?(y(),M()):f()),j&&i.ie<11&&(h(),b(),x(),w(),R(),A(),B(),L()),i.ie>=11&&P(),$&&(h(),m(),v(),E(),k(),T(),D())}}),r(nt,[p],function(e){function t(){return!1}function n(){return!0}var r="__bindings",i=e.makeMap("focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave keydown keypress keyup contextmenu dragend dragover draggesture dragdrop drop drag"," ");return{fire:function(e,i,o){var a=this,s,l,c,u,d;if(e=e.toLowerCase(),i=i||{},i.type=e,i.target||(i.target=a),i.preventDefault||(i.preventDefault=function(){i.isDefaultPrevented=n},i.stopPropagation=function(){i.isPropagationStopped=n},i.stopImmediatePropagation=function(){i.isImmediatePropagationStopped=n},i.isDefaultPrevented=t,i.isPropagationStopped=t,i.isImmediatePropagationStopped=t),a[r]&&(s=a[r][e]))for(l=0,c=s.length;c>l&&(s[l]=u=s[l],!i.isImmediatePropagationStopped());l++)if(u.call(a,i)===!1)return i.preventDefault(),i;if(o!==!1&&a.parent)for(d=a.parent();d&&!i.isPropagationStopped();)d.fire(e,i,!1),d=d.parent();return i},on:function(e,t){var n=this,o,a,s,l;if(t===!1&&(t=function(){return!1}),t)for(s=e.toLowerCase().split(" "),l=s.length;l--;)e=s[l],o=n[r],o||(o=n[r]={}),a=o[e],a||(a=o[e]=[],n.bindNative&&i[e]&&n.bindNative(e)),a.push(t);return n},off:function(e,t){var n=this,o,a=n[r],s,l,c,u;if(a)if(e)for(c=e.toLowerCase().split(" "),o=c.length;o--;){if(e=c[o],s=a[e],!e){for(l in a)a[e].length=0;return n}if(s){if(t)for(u=s.length;u--;)s[u]===t&&s.splice(u,1);else s.length=0;!s.length&&n.unbindNative&&i[e]&&(n.unbindNative(e),delete a[e])}}else{if(n.unbindNative)for(e in a)n.unbindNative(e);n[r]=[]}return n},hasEventListeners:function(e){var t=this[r];return e=e.toLowerCase(),!(!t||!t[e]||0===t[e].length)}}}),r(rt,[p,g],function(e,t){var n=e.each,r=e.explode,i={f9:120,f10:121,f11:122};return function(o){var a=this,s={};o.on("keyup keypress keydown",function(e){(e.altKey||e.ctrlKey||e.metaKey)&&n(s,function(n){var r=t.mac?e.ctrlKey||e.metaKey:e.ctrlKey;if(n.ctrl==r&&n.alt==e.altKey&&n.shift==e.shiftKey)return e.keyCode==n.keyCode||e.charCode&&e.charCode==n.charCode?(e.preventDefault(),"keydown"==e.type&&n.func.call(n.scope),!0):void 0})}),a.add=function(t,a,l,c){var u;return u=l,"string"==typeof l?l=function(){o.execCommand(u,!1,null)}:e.isArray(u)&&(l=function(){o.execCommand(u[0],u[1],u[2])}),n(r(t.toLowerCase()),function(e){var t={func:l,scope:c||o,desc:o.translate(a),alt:!1,ctrl:!1,shift:!1};n(r(e,"+"),function(e){switch(e){case"alt":case"ctrl":case"shift":t[e]=!0;break;default:t.charCode=e.charCodeAt(0),t.keyCode=i[e]||e.toUpperCase().charCodeAt(0)}}),s[(t.ctrl?"ctrl":"")+","+(t.alt?"alt":"")+","+(t.shift?"shift":"")+","+t.keyCode]=t}),!0}}}),r(it,[v,b,C,k,E,A,L,H,D,M,P,O,y,l,et,x,_,tt,g,p,nt,rt],function(e,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v,y,b,C,x,w){function _(e,t){return"selectionchange"==t||"drop"==t?e.getDoc():!e.inline&&/^mouse|click|contextmenu/.test(t)?e.getDoc():e.getBody()}function N(e,t,r){var i=this,o,a;o=i.documentBaseUrl=r.documentBaseURL,a=r.baseURI,i.settings=t=T({id:e,theme:"modern",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:o,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,padd_empty_editor:!0,render_ui:!0,indentation:"30px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",validate:!0,entity_encoding:"named",url_converter:i.convertURL,url_converter_scope:i,ie7_compat:!0},t),n.language=t.language||"en",n.languageLoad=t.language_load,n.baseURL=r.baseURL,i.id=t.id=e,i.isNotDirty=!0,i.plugins={},i.documentBaseURI=new f(t.document_base_url||o,{base_uri:a}),i.baseURI=a,i.contentCSS=[],i.contentStyles=[],i.shortcuts=new w(i),i.execCommands={},i.queryStateCommands={},i.queryValueCommands={},i.loadedCSS={},i.suffix=r.suffix,i.editorManager=r,i.inline=t.inline,i.execCallback("setup",i),r.fire("SetupEditor",i)}var E=e.DOM,k=n.ThemeManager,S=n.PluginManager,T=C.extend,R=C.each,A=C.explode,B=C.inArray,L=C.trim,H=C.resolve,D=h.Event,M=b.gecko,P=b.ie;return N.prototype={render:function(){function e(){E.unbind(window,"ready",e),n.render()}function t(){var e=p.ScriptLoader;if(r.language&&"en"!=r.language&&(r.language_url=n.editorManager.baseURL+"/langs/"+r.language+".js"),r.language_url&&e.add(r.language_url),r.theme&&"function"!=typeof r.theme&&"-"!=r.theme.charAt(0)&&!k.urls[r.theme]){var t=r.theme_url;t=t?n.documentBaseURI.toAbsolute(t):"themes/"+r.theme+"/theme"+o+".js",k.load(r.theme,t)}C.isArray(r.plugins)&&(r.plugins=r.plugins.join(" ")),R(r.external_plugins,function(e,t){S.load(t,e),r.plugins+=" "+t}),R(r.plugins.split(/[ ,]/),function(e){if(e=L(e),e&&!S.urls[e])if("-"==e.charAt(0)){e=e.substr(1,e.length);var t=S.dependencies(e);R(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"};e=S.createUrl(t,e),S.load(e.resource,e)})}else S.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"})}),e.loadQueue(function(){n.removed||n.init()})}var n=this,r=n.settings,i=n.id,o=n.suffix;if(!D.domLoaded)return E.bind(window,"ready",e),void 0;if(n.getElement()&&b.contentEditable){r.inline?n.inline=!0:(n.orgVisibility=n.getElement().style.visibility,n.getElement().style.visibility="hidden");var a=n.getElement().form||E.getParent(i,"form");a&&(n.formElement=a,r.hidden_input&&!/TEXTAREA|INPUT/i.test(n.getElement().nodeName)&&(E.insertAfter(E.create("input",{type:"hidden",name:i}),i),n.hasHiddenInput=!0),n.formEventDelegate=function(e){n.fire(e.type,e)},E.bind(a,"submit reset",n.formEventDelegate),n.on("reset",function(){n.setContent(n.startContent,{format:"raw"})}),!r.submit_patch||a.submit.nodeType||a.submit.length||a._mceOldSubmit||(a._mceOldSubmit=a.submit,a.submit=function(){return n.editorManager.triggerSave(),n.isNotDirty=!0,a._mceOldSubmit(a)})),n.windowManager=new m(n),"xml"==r.encoding&&n.on("GetContent",function(e){e.save&&(e.content=E.encode(e.content))}),r.add_form_submit_trigger&&n.on("submit",function(){n.initialized&&n.save()}),r.add_unload_trigger&&(n._beforeUnload=function(){!n.initialized||n.destroyed||n.isHidden()||n.save({format:"raw",no_events:!0,set_dirty:!1})},n.editorManager.on("BeforeUnload",n._beforeUnload)),t()}},init:function(){function e(n){var r=S.get(n),i,o;i=S.urls[n]||t.documentBaseUrl.replace(/\/$/,""),n=L(n),r&&-1===B(h,n)&&(R(S.dependencies(n),function(t){e(t)}),o=new r(t,i),t.plugins[n]=o,o.init&&(o.init(t,i),h.push(n)))}var t=this,n=t.settings,r=t.getElement(),i,o,a,s,l,c,u,d,f,p,h=[];if(t.rtl=this.editorManager.i18n.rtl,t.editorManager.add(t),n.aria_label=n.aria_label||E.getAttrib(r,"aria-label",t.getLang("aria.rich_text_area")),n.theme&&("function"!=typeof n.theme?(n.theme=n.theme.replace(/-/,""),l=k.get(n.theme),t.theme=new l(t,k.urls[n.theme]),t.theme.init&&t.theme.init(t,k.urls[n.theme]||t.documentBaseUrl.replace(/\/$/,""))):t.theme=n.theme),R(n.plugins.replace(/\-/g,"").split(/[ ,]/),e),t.fire("BeforeRenderUI"),n.render_ui&&t.theme&&(t.orgDisplay=r.style.display,"function"!=typeof n.theme?(i=n.width||r.style.width||r.offsetWidth,o=n.height||r.style.height||r.offsetHeight,a=n.min_height||100,f=/^[0-9\.]+(|px)$/i,f.test(""+i)&&(i=Math.max(parseInt(i,10)+(l.deltaWidth||0),100)),f.test(""+o)&&(o=Math.max(parseInt(o,10)+(l.deltaHeight||0),a)),l=t.theme.renderUI({targetNode:r,width:i,height:o,deltaWidth:n.delta_width,deltaHeight:n.delta_height}),n.content_editable||(E.setStyles(l.sizeContainer||l.editorContainer,{wi2dth:i,h2eight:o}),o=(l.iframeHeight||o)+("number"==typeof o?l.deltaHeight||0:""),a>o&&(o=a))):(l=n.theme(t,r),l.editorContainer.nodeType&&(l.editorContainer=l.editorContainer.id=l.editorContainer.id||t.id+"_parent"),l.iframeContainer.nodeType&&(l.iframeContainer=l.iframeContainer.id=l.iframeContainer.id||t.id+"_iframecontainer"),o=l.iframeHeight||r.offsetHeight),t.editorContainer=l.editorContainer),n.content_css&&R(A(n.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),n.content_style&&t.contentStyles.push(n.content_style),n.content_editable)return r=s=l=null,t.initContentBody();for(t.iframeHTML=n.doctype+"<html><head>",n.document_base_url!=t.documentBaseUrl&&(t.iframeHTML+='<base href="'+t.documentBaseURI.getURI()+'" />'),!b.caretAfter&&n.ie7_compat&&(t.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'),t.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />',p=0;p<t.contentCSS.length;p++){var m=t.contentCSS[p];t.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+m+'" />',t.loadedCSS[m]=!0}u=n.body_id||"tinymce",-1!=u.indexOf("=")&&(u=t.getParam("body_id","","hash"),u=u[t.id]||u),d=n.body_class||"",-1!=d.indexOf("=")&&(d=t.getParam("body_class","","hash"),d=d[t.id]||""),t.iframeHTML+='</head><body id="'+u+'" class="mce-content-body '+d+'" '+"onload=\"window.parent.tinymce.get('"+t.id+"').fire('load');\"><br></body></html>";var g='javascript:(function(){document.open();document.domain="'+document.domain+'";'+'var ed = window.parent.tinymce.get("'+t.id+'");document.write(ed.iframeHTML);'+"document.close();ed.initContentBody(true);})()";if(document.domain!=location.hostname&&(c=g),s=E.add(l.iframeContainer,"iframe",{id:t.id+"_ifr",src:c||'javascript:""',frameBorder:"0",allowTransparency:"true",title:t.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),style:{width:"100%",height:o,display:"block"}}),P)try{t.getDoc()}catch(v){s.src=c=g}t.contentAreaContainer=l.iframeContainer,l.editorContainer&&(E.get(l.editorContainer).style.display=t.orgDisplay),E.get(t.id).style.display="none",E.setAttrib(t.id,"aria-hidden",!0),c||t.initContentBody(),r=s=l=null},initContentBody:function(t){var n=this,o=n.settings,f=E.get(n.id),p=n.getDoc(),h,m;o.inline||(n.getElement().style.visibility=n.orgVisibility),t||o.content_editable||(p.open(),p.write(n.iframeHTML),p.close()),o.content_editable&&(n.on("remove",function(){var e=this.getBody();E.removeClass(e,"mce-content-body"),E.removeClass(e,"mce-edit-focus"),E.setAttrib(e,"tabIndex",null),E.setAttrib(e,"contentEditable",null)}),E.addClass(f,"mce-content-body"),f.tabIndex=-1,n.contentDocument=p=o.content_document||document,n.contentWindow=o.content_window||window,n.bodyElement=f,o.content_document=o.content_window=null,o.root_name=f.nodeName.toLowerCase()),h=n.getBody(),h.disabled=!0,o.readonly||(n.inline&&"static"==E.getStyle(h,"position",!0)&&(h.style.position="relative"),h.contentEditable=n.getParam("content_editable_state",!0)),h.disabled=!1,n.schema=new g(o),n.dom=new e(p,{keep_values:!0,url_converter:n.convertURL,url_converter_scope:n,hex_colors:o.force_hex_style_colors,class_filter:o.class_filter,update_styles:!0,root_element:o.content_editable?n.id:null,collect:o.content_editable,schema:n.schema,onSetAttrib:function(e){n.fire("SetAttrib",e)}}),n.parser=new v(o,n.schema),n.parser.addAttributeFilter("src,href,style",function(e,t){for(var r=e.length,i,o=n.dom,a,s;r--;)i=e[r],a=i.attr(t),s="data-mce-"+t,i.attributes.map[s]||("style"===t?i.attr(s,o.serializeStyle(o.parseStyle(a),i.name)):i.attr(s,n.convertURL(a,t,i.name)))}),n.parser.addNodeFilter("script",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("type","mce-"+(n.attr("type")||"text/javascript"))}),n.parser.addNodeFilter("#cdata",function(e){for(var t=e.length,n;t--;)n=e[t],n.type=8,n.name="#comment",n.value="[CDATA["+n.value+"]]"}),n.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t=e.length,i,o=n.schema.getNonEmptyElements();t--;)i=e[t],i.isEmpty(o)&&(i.empty().append(new r("br",1)).shortEnded=!0)}),n.serializer=new i(o,n),n.selection=new a(n.dom,n.getWin(),n.serializer,n),n.formatter=new s(n),n.undoManager=new l(n),n.forceBlocks=new u(n),n.enterKey=new c(n),n.editorCommands=new d(n),n.fire("PreInit"),o.browser_spellcheck||o.gecko_spellcheck||(p.body.spellcheck=!1,E.setAttrib(h,"spellcheck","false")),n.fire("PostRender"),n.quirks=y(n),o.directionality&&(h.dir=o.directionality),o.nowrap&&(h.style.whiteSpace="nowrap"),o.protect&&n.on("BeforeSetContent",function(e){R(o.protect,function(t){e.content=e.content.replace(t,function(e){return"<!--mce:protected "+escape(e)+"-->"})})}),n.on("SetContent",function(){n.addVisual(n.getBody())}),o.padd_empty_editor&&n.on("PostProcess",function(e){e.content=e.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")}),n.load({initial:!0,format:"html"}),n.startContent=n.getContent({format:"raw"}),n.initialized=!0,R(n._pendingNativeEvents,function(e){n.dom.bind(_(n,e),e,function(e){n.fire(e.type,e)})}),n.fire("init"),n.focus(!0),n.nodeChanged({initial:!0}),n.execCallback("init_instance_callback",n),n.contentStyles.length>0&&(m="",R(n.contentStyles,function(e){m+=e+"\r\n"}),n.dom.addStyle(m)),R(n.contentCSS,function(e){n.loadedCSS[e]||(n.dom.loadCSS(e),n.loadedCSS[e]=!0)}),o.auto_focus&&setTimeout(function(){var e=n.editorManager.get(o.auto_focus);e.selection.select(e.getBody(),1),e.selection.collapse(1),e.getBody().focus(),e.getWin().focus()},100),f=p=h=null},focus:function(e){var t,n=this,r=n.selection,i=n.settings.content_editable,o,a,s=n.getDoc(),l;e||(o=r.getRng(),o.item&&(a=o.item(0)),n._refreshContentEditable(),i||(b.opera||n.getBody().focus(),n.getWin().focus()),(M||i)&&(l=n.getBody(),l.setActive&&b.ie<11?l.setActive():l.focus(),i&&r.normalize()),a&&a.ownerDocument==s&&(o=s.body.createControlRange(),o.addElement(a),o.select())),n.editorManager.activeEditor!=n&&((t=n.editorManager.activeEditor)&&t.fire("deactivate",{relatedTarget:n}),n.fire("activate",{relatedTarget:t})),n.editorManager.activeEditor=n},execCallback:function(e){var t=this,n=t.settings[e],r;if(n)return t.callbackLookup&&(r=t.callbackLookup[e])&&(n=r.func,r=r.scope),"string"==typeof n&&(r=n.replace(/\.\w+$/,""),r=r?H(r):0,n=H(n),t.callbackLookup=t.callbackLookup||{},t.callbackLookup[e]={func:n,scope:r}),n.apply(r||t,Array.prototype.slice.call(arguments,1))},translate:function(e){var t=this.settings.language||"en",n=this.editorManager.i18n;return e?n.data[t+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,r){return n.data[t+"."+r]||"{#"+r+"}"}):""},getLang:function(e,n){return this.editorManager.i18n.data[(this.settings.language||"en")+"."+e]||(n!==t?n:"{#"+e+"}")},getParam:function(e,t,n){var r=e in this.settings?this.settings[e]:t,i;return"hash"===n?(i={},"string"==typeof r?R(r.indexOf("=")>0?r.split(/[;,](?![^=;,]*(?:[;,]|$))/):r.split(","),function(e){e=e.split("="),i[L(e[0])]=e.length>1?L(e[1]):L(e)}):i=r,i):r},nodeChanged:function(){var e=this,t=e.selection,n,r,i;e.initialized&&!e.settings.disable_nodechange&&(i=e.getBody(),n=t.getStart()||i,n=P&&n.ownerDocument!=e.getDoc()?e.getBody():n,"IMG"==n.nodeName&&t.isCollapsed()&&(n=n.parentNode),r=[],e.dom.getParent(n,function(e){return e===i?!0:(r.push(e),void 0)}),e.fire("NodeChange",{element:n,parents:r}))},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.text||t.icon||(t.icon=e),n.buttons=n.buttons||{},t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems=n.menuItems||{},n.menuItems[e]=t},addCommand:function(e,t,n){this.execCommands[e]={func:t,scope:n||this}},addQueryStateHandler:function(e,t,n){this.queryStateCommands[e]={func:t,scope:n||this}},addQueryValueHandler:function(e,t,n){this.queryValueCommands[e]={func:t,scope:n||this}},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){var i=this,o=0,a;return/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(e)||r&&r.skip_focus||i.focus(),r=T({},r),r=i.fire("BeforeExecCommand",{command:e,ui:t,value:n}),r.isDefaultPrevented()?!1:(a=i.execCommands[e])&&a.func.call(a.scope,t,n)!==!0?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):(R(i.plugins,function(r){return r.execCommand&&r.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),o=!0,!1):void 0}),o?o:i.theme&&i.theme.execCommand&&i.theme.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):i.editorCommands.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):(i.getDoc().execCommand(e,t,n),i.fire("ExecCommand",{command:e,ui:t,value:n}),void 0))},queryCommandState:function(e){var t=this,n,r;if(!t._isHidden()){if((n=t.queryStateCommands[e])&&(r=n.func.call(n.scope),r!==!0))return r;if(r=t.editorCommands.queryCommandState(e),-1!==r)return r;try{return t.getDoc().queryCommandState(e)}catch(i){}}},queryCommandValue:function(e){var n=this,r,i;if(!n._isHidden()){if((r=n.queryValueCommands[e])&&(i=r.func.call(r.scope),i!==!0))return i;if(i=n.editorCommands.queryCommandValue(e),i!==t)return i;try{return n.getDoc().queryCommandValue(e)}catch(o){}}},show:function(){var e=this;E.show(e.getContainer()),E.hide(e.id),e.load(),e.fire("show")},hide:function(){var e=this,t=e.getDoc();P&&t&&t.execCommand("SelectAll"),e.save(),E.hide(e.getContainer()),E.setStyle(e.id,"display",e.orgDisplay),e.fire("hide")},isHidden:function(){return!E.isHidden(this.id)},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var n=this,r=n.getElement(),i;return r?(e=e||{},e.load=!0,i=n.setContent(r.value!==t?r.value:r.innerHTML,e),e.element=r,e.no_events||n.fire("LoadContent",e),e.element=r=null,i):void 0},save:function(e){var t=this,n=t.getElement(),r,i;if(n&&t.initialized)return e=e||{},e.save=!0,e.element=n,r=e.content=t.getContent(e),e.no_events||t.fire("SaveContent",e),r=e.content,/TEXTAREA|INPUT/i.test(n.nodeName)?n.value=r:(n.innerHTML=r,(i=E.getParent(t.id,"form"))&&R(i.elements,function(e){return e.name==t.id?(e.value=r,!1):void 0})),e.element=n=null,e.set_dirty!==!1&&(t.isNotDirty=!0),r},setContent:function(e,t){var n=this,r=n.getBody(),i;return t=t||{},t.format=t.format||"html",t.set=!0,t.content=e,t.no_events||n.fire("BeforeSetContent",t),e=t.content,0===e.length||/^\s+$/.test(e)?(i=n.settings.forced_root_block,i&&n.schema.isValidChild(r.nodeName.toLowerCase(),i.toLowerCase())?(e=P&&11>P?"":'<br data-mce-bogus="1">',e=n.dom.createHTML(i,n.settings.forced_root_block_attrs,e)):(!P||11>P)&&(e='<br data-mce-bogus="1">'),r.innerHTML=e,n.fire("SetContent",t)):("raw"!==t.format&&(e=new o({},n.schema).serialize(n.parser.parse(e,{isRootContent:!0}))),t.content=L(e),n.dom.setHTML(r,t.content),t.no_events||n.fire("SetContent",t)),t.content},getContent:function(e){var t=this,n,r=t.getBody();return e=e||{},e.format=e.format||"html",e.get=!0,e.getInner=!0,e.no_events||t.fire("BeforeGetContent",e),n="raw"==e.format?r.innerHTML:"text"==e.format?r.innerText||r.textContent:t.serializer.serialize(r,e),e.content="text"!=e.format?L(n):n,e.no_events||t.fire("GetContent",e),e.content},insertContent:function(e){this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},getContainer:function(){var e=this;return e.container||(e.container=E.get(e.editorContainer||e.id+"_parent")),e.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return E.get(this.settings.content_element||this.id)},getWin:function(){var e=this,t;return e.contentWindow||(t=E.get(e.id+"_ifr"),t&&(e.contentWindow=t.contentWindow)),e.contentWindow},getDoc:function(){var e=this,t;return e.contentDocument||(t=e.getWin(),t&&(e.contentDocument=t.document)),e.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(e,t,n){var r=this,i=r.settings;return i.urlconverter_callback?r.execCallback("urlconverter_callback",e,n,!0,t):!i.convert_urls||n&&"LINK"==n.nodeName||0===e.indexOf("file:")||0===e.length?e:i.relative_urls?r.documentBaseURI.toRelative(e):e=r.documentBaseURI.toAbsolute(e,i.remove_script_host)},addVisual:function(e){var n=this,r=n.settings,i=n.dom,o;e=e||n.getBody(),n.hasVisual===t&&(n.hasVisual=r.visual),R(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return o=r.visual_table_class||"mce-item-table",t=i.getAttrib(e,"border"),t&&"0"!=t||(n.hasVisual?i.addClass(e,o):i.removeClass(e,o)),void 0;
-case"A":return i.getAttrib(e,"href",!1)||(t=i.getAttrib(e,"name")||e.id,o="mce-item-anchor",t&&(n.hasVisual?i.addClass(e,o):i.removeClass(e,o))),void 0}}),n.fire("VisualAid",{element:e,hasVisual:n.hasVisual})},remove:function(){var e=this;if(!e.removed){e.removed=1,e.hasHiddenInput&&E.remove(e.getElement().nextSibling);var t=e.getDoc();P&&t&&t.execCommand("SelectAll"),e.save(),E.setStyle(e.id,"display",e.orgDisplay),e.settings.content_editable||(D.unbind(e.getWin()),D.unbind(e.getDoc()));var n=e.getContainer();D.unbind(e.getBody()),D.unbind(n),e.fire("remove"),e.editorManager.remove(e),E.remove(n),e.destroy()}},bindNative:function(e){var t=this;t.settings.readonly||(t.initialized?t.dom.bind(_(t,e),e,function(n){t.fire(e,n)}):t._pendingNativeEvents?t._pendingNativeEvents.push(e):t._pendingNativeEvents=[e])},unbindNative:function(e){var t=this;t.initialized&&t.dom.unbind(e)},destroy:function(e){var t=this,n;if(!t.destroyed){if(!e&&!t.removed)return t.remove(),void 0;e&&M&&(D.unbind(t.getDoc()),D.unbind(t.getWin()),D.unbind(t.getBody())),e||(t.editorManager.off("beforeunload",t._beforeUnload),t.theme&&t.theme.destroy&&t.theme.destroy(),t.selection.destroy(),t.dom.destroy()),n=t.formElement,n&&(n._mceOldSubmit&&(n.submit=n._mceOldSubmit,n._mceOldSubmit=null),E.unbind(n,"submit reset",t.formEventDelegate)),t.contentAreaContainer=t.formElement=t.container=null,t.settings.content_element=t.bodyElement=t.contentDocument=t.contentWindow=null,t.selection&&(t.selection=t.selection.win=t.selection.dom=t.selection.dom.doc=null),t.destroyed=1}},_refreshContentEditable:function(){var e=this,t,n;e._isHidden()&&(t=e.getBody(),n=t.parentNode,n.removeChild(t),n.appendChild(t),t.focus())},_isHidden:function(){var e;return M?(e=this.selection.getSel(),!e||!e.rangeCount||0===e.rangeCount):0}},T(N.prototype,x),N}),r(ot,[],function(){var e={};return{rtl:!1,add:function(t,n){for(var r in n)e[r]=n[r];this.rtl=this.rtl||"rtl"===e._dir},translate:function(t){if("undefined"==typeof t)return t;if("string"!=typeof t&&t.raw)return t.raw;if(t.push){var n=t.slice(1);t=(e[t[0]]||t[0]).replace(/\{([^\}]+)\}/g,function(e,t){return n[t]})}return e[t]||t},data:e}}),r(at,[v,g],function(e,t){function n(r){function i(){try{return document.activeElement}catch(e){return document.body}}function o(e){return e&&e.startContainer?{startContainer:e.startContainer,startOffset:e.startOffset,endContainer:e.endContainer,endOffset:e.endOffset}:e}function a(e,t){var n;return t.startContainer?(n=e.getDoc().createRange(),n.setStart(t.startContainer,t.startOffset),n.setEnd(t.endContainer,t.endOffset)):n=t,n}function s(s){function l(t){return!!e.DOM.getParent(t,n.isEditorUIElement)}var c=s.editor,u,d;c.on("init",function(){"onbeforedeactivate"in document&&t.ie<11?c.dom.bind(c.getBody(),"beforedeactivate",function(){var e=c.getDoc().selection;try{u=e&&e.createRange?e.createRange():c.selection.getRng()}catch(t){}}):(c.inline||t.ie>10)&&(c.on("nodechange keyup",function(){var e,t=document.activeElement;for(t&&t.id==c.id+"_ifr"&&(t=c.getBody());t;){if(t==c.getBody()){e=!0;break}t=t.parentNode}e&&(u=c.selection.getRng())}),t.webkit&&(d=function(){var e=c.selection.getRng();e.collapsed||(u=e)},e.DOM.bind(document,"selectionchange",d),c.on("remove",function(){e.DOM.unbind(document,"selectionchange",d)})))}),c.on("setcontent",function(){u=null}),c.on("mousedown",function(){c.selection.lastFocusBookmark=null}),c.on("focusin",function(){var e=r.focusedEditor;c.selection.lastFocusBookmark&&(c.selection.setRng(a(c,c.selection.lastFocusBookmark)),c.selection.lastFocusBookmark=null),e!=c&&(e&&e.fire("blur",{focusedEditor:c}),r.activeEditor=c,c.fire("focus",{blurredEditor:e}),c.focus(!1),r.focusedEditor=c),u=null}),c.on("focusout",function(){c.selection.lastFocusBookmark=o(u),window.setTimeout(function(){var e=r.focusedEditor;e!=c&&(c.selection.lastFocusBookmark=null),l(i())||e!=c||(c.fire("blur",{focusedEditor:null}),r.focusedEditor=null,c.selection.lastFocusBookmark=null)},0)})}r.on("AddEditor",s)}return n.isEditorUIElement=function(e){return-1!==e.className.indexOf("mce-")},n}),r(st,[it,v,O,g,p,nt,ot,at],function(e,n,r,i,o,a,s,l){var c=n.DOM,u=o.explode,d=o.each,f=o.extend,p=0,h,m={majorVersion:"4",minorVersion:"0.10",releaseDate:"2013-10-28",editors:[],i18n:s,activeEditor:null,setup:function(){var e=this,t,n,i="",o;if(n=document.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/"),o=window.tinymce||window.tinyMCEPreInit)t=o.base||o.baseURL,i=o.suffix;else for(var a=document.getElementsByTagName("script"),s=0;s<a.length;s++){var c=a[s].src;if(/tinymce(\.jquery|)(\.min|\.dev|)\.js/.test(c)){-1!=c.indexOf(".min")&&(i=".min"),t=c.substring(0,c.lastIndexOf("/"));break}}e.baseURL=new r(n).toAbsolute(t),e.documentBaseURL=n,e.baseURI=new r(e.baseURL),e.suffix=i,e.focusManager=new l(e)},init:function(t){function n(e){var t=e.id;return t||(t=e.name,t=t&&!c.get(t)?e.name:c.uniqueId(),e.setAttribute("id",t)),t}function r(e,t,n){var r=e[t];if(r)return r.apply(n||this,Array.prototype.slice.call(arguments,2))}function i(e,t){return t.constructor===RegExp?t.test(e.className):c.hasClass(e,t)}function o(){var h,m;if(c.unbind(window,"ready",o),r(t,"onpageload"),t.types)return d(t.types,function(r){d(c.select(r.selector),function(i){var o=new e(n(i),f({},t,r),a);s.push(o),o.render(1)})}),void 0;if(t.selector)return d(c.select(t.selector),function(r){var i=new e(n(r),t,a);s.push(i),i.render(1)}),void 0;switch(t.mode){case"exact":h=t.elements||"",h.length>0&&d(u(h),function(n){c.get(n)?(l=new e(n,t,a),s.push(l),l.render(!0)):d(document.forms,function(r){d(r.elements,function(r){r.name===n&&(n="mce_editor_"+p++,c.setAttrib(r,"id",n),l=new e(n,t,a),s.push(l),l.render(1))})})});break;case"textareas":case"specific_textareas":d(c.select("textarea"),function(r){t.editor_deselector&&i(r,t.editor_deselector)||(!t.editor_selector||i(r,t.editor_selector))&&(l=new e(n(r),t,a),s.push(l),l.render(!0))})}t.oninit&&(h=m=0,d(s,function(e){m++,e.initialized?h++:e.on("init",function(){h++,h==m&&r(t,"oninit")}),h==m&&r(t,"oninit")}))}var a=this,s=[],l;a.settings=t,c.bind(window,"ready",o)},get:function(e){return e===t?this.editors:this.editors[e]},add:function(e){var t=this,n=t.editors;return n[e.id]=e,n.push(e),t.activeEditor=e,t.fire("AddEditor",{editor:e}),h||(h=function(){t.fire("BeforeUnload")},c.bind(window,"beforeunload",h)),e},createEditor:function(t,n){return this.add(new e(t,n,this))},remove:function(e){var t=this,n,r=t.editors,i,o;{if(e){if("string"==typeof e)return e=e.selector||e,d(c.select(e),function(e){t.remove(r[e.id])}),void 0;if(i=e,!r[i.id])return null;for(delete r[i.id],n=0;n<r.length;n++)if(r[n]==i){r.splice(n,1),o=!0;break}return t.activeEditor==i&&(t.activeEditor=r[0]),o&&t.fire("RemoveEditor",{editor:i}),r.length||c.unbind(window,"beforeunload",h),i.remove(),i}for(n=r.length-1;n>=0;n--)t.remove(r[n])}},execCommand:function(t,n,r){var i=this,o=i.get(r);switch(t){case"mceAddEditor":return i.get(r)||new e(r,i.settings,i).render(),!0;case"mceRemoveEditor":return o&&o.remove(),!0;case"mceToggleEditor":return o?(o.isHidden()?o.show():o.hide(),!0):(i.execCommand("mceAddEditor",0,r),!0)}return i.activeEditor?i.activeEditor.execCommand(t,n,r):!1},triggerSave:function(){d(this.editors,function(e){e.save()})},addI18n:function(e,t){s.add(e,t)},translate:function(e){return s.translate(e)}};return f(m,a),m.setup(),window.tinymce=window.tinyMCE=m,m}),r(lt,[st,p],function(e,t){var n=t.each,r=t.explode;e.on("AddEditor",function(e){var t=e.editor;t.on("preInit",function(){function e(e,t){n(t,function(t,n){t&&s.setStyle(e,n,t)}),s.rename(e,"span")}function i(e){s=t.dom,l.convert_fonts_to_spans&&n(s.select("font,u,strike",e.node),function(e){o[e.nodeName.toLowerCase()](s,e)})}var o,a,s,l=t.settings;l.inline_styles&&(a=r(l.font_size_legacy_values),o={font:function(t,n){e(n,{backgroundColor:n.style.backgroundColor,color:n.color,fontFamily:n.face,fontSize:a[parseInt(n.size,10)-1]})},u:function(t,n){e(n,{textDecoration:"underline"})},strike:function(t,n){e(n,{textDecoration:"line-through"})}},t.on("PreProcess SetContent",i))})})}),r(ct,[],function(){return{send:function(e){function t(){!e.async||4==n.readyState||r++>1e4?(e.success&&1e4>r&&200==n.status?e.success.call(e.success_scope,""+n.responseText,n,e):e.error&&e.error.call(e.error_scope,r>1e4?"TIMED_OUT":"GENERAL",n,e),n=null):setTimeout(t,10)}var n,r=0;if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=e.async===!1?!1:!0,e.data=e.data||"",n=new XMLHttpRequest){if(n.overrideMimeType&&n.overrideMimeType(e.content_type),n.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.content_type&&n.setRequestHeader("Content-Type",e.content_type),n.setRequestHeader("X-Requested-With","XMLHttpRequest"),n.send(e.data),!e.async)return t();setTimeout(t,10)}}}}),r(ut,[],function(){function e(t,n){var r,i,o,a;if(n=n||'"',null===t)return"null";if(o=typeof t,"string"==o)return i="\bb	t\nn\ff\rr\"\"''\\\\",n+t.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=i.indexOf(t),r+1?"\\"+i.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e))})+n;if("object"==o){if(t.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(t)){for(r=0,i="[";r<t.length;r++)i+=(r>0?",":"")+e(t[r],n);return i+"]"}i="{";for(a in t)t.hasOwnProperty(a)&&(i+="function"!=typeof t[a]?(i.length>1?","+n:n)+a+n+":"+e(t[a],n):"");return i+"}"}return""+t}return{serialize:e,parse:function(e){try{return window[String.fromCharCode(101)+"val"]("("+e+")")}catch(t){}}}}),r(dt,[ut,ct,p],function(e,t,n){function r(e){this.settings=i({},e),this.count=0}var i=n.extend;return r.sendRPC=function(e){return(new r).send(e)},r.prototype={send:function(n){var r=n.error,o=n.success;n=i(this.settings,n),n.success=function(t,i){t=e.parse(t),"undefined"==typeof t&&(t={error:"JSON Parse error."}),t.error?r.call(n.error_scope||n.scope,t.error,i):o.call(n.success_scope||n.scope,t.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=e.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",t.send(n)}},r}),r(ft,[v],function(e){return{callbacks:{},count:0,send:function(n){var r=this,i=e.DOM,o=n.count!==t?n.count:r.count,a="tinymce_jsonp_"+o;r.callbacks[o]=function(e){i.remove(a),delete r.callbacks[o],n.callback(e)},i.add(i.doc.body,"script",{id:a,src:n.url,type:"text/javascript"}),r.count++}}}),r(pt,[],function(){function e(){s=[];for(var e in a)s.push(e);i.length=s.length}function n(){function n(e){var n,r;return r=e!==t?u+e:i.indexOf(",",u),-1===r||r>i.length?null:(n=i.substring(u,r),u=r+1,n)}var r,i,s,u=0;if(a={},c){o.load(l),i=o.getAttribute(l)||"";do{var d=n();if(null===d)break;if(r=n(parseInt(d,32)||0),null!==r){if(d=n(),null===d)break;s=n(parseInt(d,32)||0),r&&(a[r]=s)}}while(null!==r);e()}}function r(){var t,n="";if(c){for(var r in a)t=a[r],n+=(n?",":"")+r.length.toString(32)+","+r+","+t.length.toString(32)+","+t;o.setAttribute(l,n);try{o.save(l)}catch(i){}e()}}var i,o,a,s,l,c;try{if(window.localStorage)return localStorage}catch(u){}return l="tinymce",o=document.documentElement,c=!!o.addBehavior,c&&o.addBehavior("#default#userData"),i={key:function(e){return s[e]},getItem:function(e){return e in a?a[e]:null},setItem:function(e,t){a[e]=""+t,r()},removeItem:function(e){delete a[e],r()},clear:function(){a={},r()}},n(),i}),r(ht,[v,l,y,b,p,g],function(e,t,n,r,i,o){var a=window.tinymce;return a.DOM=e.DOM,a.ScriptLoader=n.ScriptLoader,a.PluginManager=r.PluginManager,a.ThemeManager=r.ThemeManager,a.dom=a.dom||{},a.dom.Event=t.Event,i.each(i,function(e,t){a[t]=e}),i.each("isOpera isWebKit isIE isGecko isMac".split(" "),function(e){a[e]=o[e.substr(2).toLowerCase()]}),{}}),r(mt,[I,p],function(e,t){return e.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=t.extend({},this.Defaults,e)},preRender:function(e){e.addClass(this.settings.containerClass,"body")},applyClasses:function(e){var t=this,n=t.settings,r,i,o;r=e.items().filter(":visible"),i=n.firstControlClass,o=n.lastControlClass,r.each(function(e){e.removeClass(i).removeClass(o),n.controlClass&&e.addClass(n.controlClass)}),r.eq(0).addClass(i),r.eq(-1).addClass(o)},renderHtml:function(e){var t=this,n=t.settings,r,i="";return r=e.items(),r.eq(0).addClass(n.firstControlClass),r.eq(-1).addClass(n.lastControlClass),r.each(function(e){n.controlClass&&e.addClass(n.controlClass),i+=e.renderHtml()}),i},recalc:function(){},postRender:function(){}})}),r(gt,[mt],function(e){return e.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'<div id="'+e._id+'-absend" class="'+e.classPrefix+'abs-end"></div>'+this._super(e)}})}),r(vt,[V,G],function(e,t){return e.extend({Mixins:[t],Defaults:{classes:"widget tooltip tooltip-n"},text:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t._rendered&&(t.getEl().lastChild.innerHTML=t.encode(e)),t):t._value},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes()+'" role="presentation">'+'<div class="'+t+'tooltip-arrow"></div>'+'<div class="'+t+'tooltip-inner">'+e.encode(e._text)+"</div>"+"</div>"},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=131070}})}),r(yt,[V,vt],function(e,t){var n,r=e.extend({init:function(e){var t=this;t._super(e),t.canFocus=!0,e.tooltip&&r.tooltips!==!1&&t.on("mouseenter mouseleave",function(n){var r=t.tooltip().moveTo(-65535);if(n.control==t&&"mouseenter"==n.type){var i=r.text(e.tooltip).show().testMoveRel(t.getEl(),["bc-tc","bc-tl","bc-tr"]);r.toggleClass("tooltip-n","bc-tc"==i),r.toggleClass("tooltip-nw","bc-tl"==i),r.toggleClass("tooltip-ne","bc-tr"==i),r.moveRel(t.getEl(),i)}else r.hide()}),t.aria("label",e.tooltip)},tooltip:function(){var e=this;return n||(n=new t({type:"tooltip"}),n.renderTo(e.getContainerElm())),n},active:function(e){var t=this,n;return e!==n&&(t.aria("pressed",e),t.toggleClass("active",e)),t._super(e)},disabled:function(e){var t=this,n;return e!==n&&(t.aria("disabled",e),t.toggleClass("disabled",e)),t._super(e)},postRender:function(){var e=this,t=e.settings;e._rendered=!0,e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&setTimeout(function(){e.focus()},0)},remove:function(){this._super(),n&&(n.remove(),n=null)}});return r}),r(bt,[yt],function(e){return e.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t=this,n;t.on("click mousedown",function(e){e.preventDefault()}),t._super(e),n=e.size,e.subtype&&t.addClass(e.subtype),n&&t.addClass("btn-"+n)},repaint:function(){var e=this.getEl().firstChild.style;e.width=e.height="100%",this._super()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon,i="";return e.settings.image&&(r="none",i=" style=\"background-image: url('"+e.settings.image+"')\""),r=e.settings.icon?n+"ico "+n+"i-"+r:"",'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1">'+'<button role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+i+"></i>":"")+(e._text?(r?"\xa0":"")+e.encode(e._text):"")+"</button>"+"</div>"}})}),r(Ct,[q],function(e){return e.extend({Defaults:{defaultType:"button",role:"toolbar"},renderHtml:function(){var e=this,t=e._layout;return e.addClass("btn-group"),e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'">'+'<div id="'+e._id+'-body">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</div>"}})}),r(xt,[yt],function(e){return e.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked)},checked:function(e){var t=this;return"undefined"!=typeof e?(e?t.addClass("checked"):t.removeClass("checked"),t._checked=e,t.aria("checked",e),t):t._checked},value:function(e){return this.checked(e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'<div id="'+t+'" class="'+e.classes()+'" unselectable="on" aria-labeledby="'+t+'-al" tabindex="-1">'+'<i class="'+n+"ico "+n+'i-checkbox"></i>'+'<span id="'+t+'-al" class="'+n+'label">'+e.encode(e._text)+"</span>"+"</div>"}})}),r(wt,[bt,X],function(e,t){return e.extend({showPanel:function(){var e=this,n=e.settings;if(e.active(!0),e.panel)e.panel.show();else{var r=n.panel;r.type&&(r={layout:"grid",items:r}),r.popover=!0,r.autohide=!0,e.panel=new t(r).on("hide",function(){e.active(!1)}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()}e.panel.moveRel(e.getEl(),n.popoverAlign||(e.isRtl()?["bc-tr","bc-tc"]:["bc-tl","bc-tc"]))},hidePanel:function(){var e=this;e.panel&&e.panel.hide()},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():e.showPanel())}),e._super()}})}),r(_t,[wt,v],function(e,t){var n=t.DOM;return e.extend({init:function(e){this._super(e),this.addClass("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",i=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"";return'<div id="'+t+'" class="'+e.classes()+'">'+'<button role="presentation" hidefocus type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+i+"></i>":"")+'<span id="'+t+'-preview" class="'+n+'preview"></span>'+(e._text?(r?" ":"")+e._text:"")+"</button>"+'<button type="button" class="'+n+'open" hidefocus tabindex="-1">'+' <i class="'+n+'caret"></i>'+"</button>"+"</div>"},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(r){r.control!=e||n.getParent(r.target,"."+e.classPrefix+"open")||(r.stopImmediatePropagation(),t.call(e,r))}),delete e.settings.onclick,e._super()}})}),r(Nt,[yt,W],function(e,t){return e.extend({init:function(e){var n=this;n._super(e),n.addClass("combobox"),n.on("click",function(e){for(var t=e.target;t;)t.id&&-1!=t.id.indexOf("-open")&&n.fire("action"),t=t.parentNode}),n.on("keydown",function(e){"INPUT"==e.target.nodeName&&13==e.keyCode&&n.parents().reverse().each(function(t){return e.preventDefault(),n.fire("change"),t.hasEventListeners("submit")&&t.toJSON?(t.fire("submit",{data:t.toJSON()}),!1):void 0})}),e.placeholder&&(n.addClass("placeholder"),n.on("focusin",function(){n._hasOnChange||(t.on(n.getEl("inp"),"change",function(){n.fire("change")}),n._hasOnChange=!0),n.hasClass("placeholder")&&(n.getEl("inp").value="",n.removeClass("placeholder"))}),n.on("focusout",function(){0===n.value().length&&(n.getEl("inp").value=e.placeholder,n.addClass("placeholder"))}))},value:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t.removeClass("placeholder"),t._rendered&&(t.getEl("inp").value=e),t):t._rendered?(e=t.getEl("inp").value,e!=t.settings.placeholder?e:""):t._value},disabled:function(e){var t=this;return t._rendered&&"undefined"!=typeof e&&(t.getEl("inp").disabled=e),t._super(e)},focus:function(){this.getEl("inp").focus()},repaint:function(){var e=this,n=e.getEl(),r=e.getEl("open"),i=e.layoutRect(),o,a;o=r?i.w-t.getSize(r).width-10:i.w-10;var s=document;return s.all&&(!s.documentMode||s.documentMode<=8)&&(a=e.layoutRect().h-2+"px"),t.css(n.firstChild,{width:o,lineHeight:a}),e._super(),e},postRender:function(){var e=this;return t.on(this.getEl("inp"),"change",function(){e.fire("change")}),e._super()},remove:function(){t.off(this.getEl("inp")),this._super()},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=n.value||n.placeholder||"",o,a,s="";return o=n.icon?r+"ico "+r+"i-"+n.icon:"",a=e._text,(o||a)&&(s='<div id="'+t+'-open" class="'+r+"btn "+r+'open" tabIndex="-1">'+'<button id="'+t+'-action" type="button" hidefocus tabindex="-1">'+(o?'<i class="'+o+'"></i>':'<i class="'+r+'caret"></i>')+(a?(o?" ":"")+a:"")+"</button>"+"</div>",e.addClass("has-open")),'<div id="'+t+'" class="'+e.classes()+'">'+'<input id="'+t+'-inp" class="'+r+"textbox "+r+'placeholder" value="'+i+'" hidefocus="true"'+(e.disabled()?' disabled="disabled"':"")+">"+s+"</div>"}})}),r(Et,[yt,J],function(e,t){return e.extend({init:function(e){var t=this;e.delimiter||(e.delimiter="\xbb"),t._super(e),t.addClass("path"),t.canFocus=!0,t.on("click",function(e){var n,r=e.target;(n=r.getAttribute("data-index"))&&t.fire("select",{value:t.data()[n],index:n})})},focus:function(){var e=this;return e.keyNav=new t({root:e,enableLeftRight:!0}),e.keyNav.focusFirst(),e},data:function(e){var t=this;return"undefined"!=typeof e?(t._data=e,t.update(),t):t._data},update:function(){this.innerHtml(this._getPathHtml())},postRender:function(){var e=this;e._super(),e.data(e.settings.data)},renderHtml:function(){var e=this;return'<div id="'+e._id+'" class="'+e.classes()+'">'+e._getPathHtml()+"</div>"},_getPathHtml:function(){var e=this,t=e._data||[],n,r,i="",o=e.classPrefix;for(n=0,r=t.length;r>n;n++)i+=(n>0?'<div class="'+o+'divider" aria-hidden="true"> '+e.settings.delimiter+" </div>":"")+'<div role="button" class="'+o+"path-item"+(n==r-1?" "+o+"last":"")+'" data-index="'+n+'" tabindex="-1" id="'+e._id+"-"+n+'">'+t[n].name+"</div>";return i||(i='<div class="'+o+'path-item">&nbsp;</div>'),i}})}),r(kt,[Et,st],function(e,t){return e.extend({postRender:function(){function e(e){if(1===e.nodeType){if("BR"==e.nodeName||e.getAttribute("data-mce-bogus"))return!0;if("bookmark"===e.getAttribute("data-mce-type"))return!0}return!1}var n=this,r=t.activeEditor;return n.on("select",function(t){var n=[],i,o=r.getBody();for(r.focus(),i=r.selection.getStart();i&&i!=o;)e(i)||n.push(i),i=i.parentNode;r.selection.select(n[n.length-1-t.index]),r.nodeChanged()}),r.on("nodeChange",function(t){for(var i=[],o=t.parents,a=o.length;a--;)if(1==o[a].nodeType&&!e(o[a])){var s=r.fire("ResolveName",{name:o[a].nodeName.toLowerCase(),target:o[a]});i.push({name:s.name})}n.data(i)}),n._super()}})}),r(St,[q],function(e){return e.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.addClass("formitem"),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e.settings.title?'<div id="'+e._id+'-title" class="'+n+'title">'+e.settings.title+"</div>":"")+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</div>"}})}),r(Tt,[q,St],function(e,t){return e.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:20,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var e=this,n=e.items();n.each(function(n){var r,i=n.settings.label;i&&(r=new t({layout:"flex",autoResize:"overflow",defaults:{flex:1},items:[{type:"label",text:i,flex:0,forId:n._id}]}),r.type="formitem","undefined"==typeof n.settings.flex&&(n.settings.flex=1),e.replace(n,r),r.add(n))})},recalcLabels:function(){var e=this,t=0,n=[],r,i;if(e.settings.labelGapCalc!==!1)for(e.items().filter("formitem").each(function(e){var r=e.items()[0],i=r.getEl().clientWidth;t=i>t?i:t,n.push(r)}),i=e.settings.labelGap||0,r=n.length;r--;)n[r].settings.minWidth=t+i},visible:function(e){var t=this._super(e);return e===!0&&this._rendered&&this.recalcLabels(),t},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){var e=this;e._super(),e.recalcLabels(),e.fromJSON(e.settings.data)}})}),r(Rt,[Tt],function(e){return e.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'<fieldset id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e.settings.title?'<legend id="'+e._id+'-title" class="'+n+'fieldset-title">'+e.settings.title+"</legend>":"")+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div>"+"</fieldset>"}})}),r(At,[Nt],function(e){return e.extend({init:function(e){var t=this,n=tinymce.activeEditor,r;e.spellcheck=!1,r=n.settings.file_browser_callback,r&&(e.icon="browse",e.onaction=function(){r(t.getEl("inp").id,t.getEl("inp").value,e.filetype,window)}),t._super(e)}})}),r(Bt,[gt],function(e){return e.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox();e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}})}),r(Lt,[gt],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v=[],y,b,C,x,w,_,N,E,k,S,T,R,A,B,L,H,D,M,P,O,I,F,z,W,V=Math.max,U=Math.min;for(r=e.items().filter(":visible"),i=e.layoutRect(),o=e._paddingBox,a=e.settings,f=e.isRtl()?a.direction||"row-reversed":a.direction,s=a.align,l=e.isRtl()?a.pack||"end":a.pack,c=a.spacing||0,("row-reversed"==f||"column-reverse"==f)&&(r=r.set(r.toArray().reverse()),f=f.split("-")[0]),"column"==f?(k="y",N="h",E="minH",S="maxH",R="innerH",T="top",A="bottom",B="deltaH",L="contentH",I="left",M="w",H="x",D="innerW",P="minW",O="maxW",F="right",z="deltaW",W="contentW"):(k="x",N="w",E="minW",S="maxW",R="innerW",T="left",A="right",B="deltaW",L="contentW",I="top",M="h",H="y",D="innerH",P="minH",O="maxH",F="bottom",z="deltaH",W="contentH"),d=i[R]-o[T]-o[T],_=u=0,t=0,n=r.length;n>t;t++)p=r[t],h=p.layoutRect(),m=p.settings,g=m.flex,d-=n-1>t?c:0,g>0&&(u+=g,h[S]&&v.push(p),h.flex=g),d-=h[E],y=o[I]+h[P]+o[F],y>_&&(_=y);if(x={},x[E]=0>d?i[E]-d+i[B]:i[R]-d+i[B],x[P]=_+i[z],x[L]=i[R]-d,x[W]=_,x.minW=U(x.minW,i.maxW),x.minH=U(x.minH,i.maxH),x.minW=V(x.minW,i.startMinWidth),x.minH=V(x.minH,i.startMinHeight),!i.autoResize||x.minW==i.minW&&x.minH==i.minH){for(C=d/u,t=0,n=v.length;n>t;t++)p=v[t],h=p.layoutRect(),b=h[S],y=h[E]+Math.ceil(h.flex*C),y>b?(d-=h[S]-h[E],u-=h.flex,h.flex=0,h.maxFlexSize=b):h.maxFlexSize=0;for(C=d/u,w=o[T],x={},0===u&&("end"==l?w=d+o[T]:"center"==l?(w=Math.round(i[R]/2-(i[R]-d)/2)+o[T],0>w&&(w=o[T])):"justify"==l&&(w=o[T],c=Math.floor(d/(r.length-1)))),x[H]=o[I],t=0,n=r.length;n>t;t++)p=r[t],h=p.layoutRect(),y=h.maxFlexSize||h[E],"center"===s?x[H]=Math.round(i[D]/2-h[M]/2):"stretch"===s?(x[M]=V(h[P]||0,i[D]-o[I]-o[F]),x[H]=o[I]):"end"===s&&(x[H]=i[D]-h[M]-o.top),h.flex>0&&(y+=Math.ceil(h.flex*C)),x[N]=y,x[k]=w,p.layoutRect(x),p.recalc&&p.recalc(),w+=y+c}else if(x.w=x.minW,x.h=x.minH,e.layoutRect(x),this.recalc(e),null===e._lastRect){var q=e.parent();q&&(q._lastRect=null,q.recalc())}}})}),r(Ht,[mt],function(e){return e.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})}})}),r(Dt,[V,yt,X,p,st,g],function(e,t,n,r,i,o){function a(e){function t(t){function n(e){return e.replace(/%(\w+)/g,"")}var r,i,o=e.dom,a="",l,c;return c=e.settings.preview_styles,c===!1?"":(c||(c="font-family font-size font-weight text-decoration text-transform color background-color border border-radius"),(t=e.formatter.get(t))?(t=t[0],r=t.block||t.inline||"span",i=o.create(r),s(t.styles,function(e,t){e=n(e),e&&o.setStyle(i,t,e)}),s(t.attributes,function(e,t){e=n(e),e&&o.setAttrib(i,t,e)}),s(t.classes,function(e){e=n(e),o.hasClass(i,e)||o.addClass(i,e)}),e.fire("PreviewFormats"),o.setStyles(i,{position:"absolute",left:-65535}),e.getBody().appendChild(i),l=o.getStyle(e.getBody(),"fontSize",!0),l=/px$/.test(l)?parseInt(l,10):0,s(c.split(" "),function(t){var n=o.getStyle(i,t,!0);if(!("background-color"==t&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(n)&&(n=o.getStyle(e.getBody(),t,!0),"#ffffff"==o.toHex(n).toLowerCase())||"color"==t&&"#000000"==o.toHex(n).toLowerCase())){if("font-size"==t&&/em|%$/.test(n)){if(0===l)return;n=parseFloat(n,10)/(/%$/.test(n)?100:1),n=n*l+"px"}"border"==t&&n&&(a+="padding:0 2px;"),a+=t+":"+n+";"}}),e.fire("AfterPreviewFormats"),o.remove(i),a):void 0)}function r(t,n){return function(){var r=this;e.on("nodeChange",function(i){var o=e.formatter,a=null;s(i.parents,function(e){return s(t,function(t){return n?o.matchNode(e,n,{value:t.value})&&(a=t.value):o.matchNode(e,t.value)&&(a=t.value),a?!1:void 0}),a?!1:void 0}),r.value(a)})}}function i(e){e=e.split(";");for(var t=e.length;t--;)e[t]=e[t].split("=");return e}function o(){function n(e){var t=[];if(e)return s(e,function(e){var o={text:e.title,icon:e.icon};if(e.items)o.menu=n(e.items);else{var a=e.format||"custom"+r++;e.format||(e.name=a,i.push(e)),o.format=a}t.push(o)}),t}var r=0,i=[],o=[{title:"Headers",items:[{title:"Header 1",format:"h1"},{title:"Header 2",format:"h2"},{title:"Header 3",format:"h3"},{title:"Header 4",format:"h4"},{title:"Header 5",format:"h5"},{title:"Header 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}];e.on("init",function(){s(i,function(t){e.formatter.register(t.name,t)})});var a=n(e.settings.style_formats||o);return a={type:"menu",items:a,onPostRender:function(t){e.fire("renderFormatsMenu",{control:t.control})},itemDefaults:{preview:!0,textStyle:function(){return this.settings.format?t(this.settings.format):void 0},onPostRender:function(){var t=this,n=this.settings.format;n&&t.parent().on("show",function(){t.disabled(!e.formatter.canApply(n)),t.active(e.formatter.match(n))})},onclick:function(){this.settings.format&&f(this.settings.format)}}}}function a(){return e.undoManager?e.undoManager.hasUndo():!1}function l(){return e.undoManager?e.undoManager.hasRedo():!1}function c(){var t=this;t.disabled(!a()),e.on("Undo Redo AddUndo TypingUndo",function(){t.disabled(!a())})}function u(){var t=this;t.disabled(!l()),e.on("Undo Redo AddUndo TypingUndo",function(){t.disabled(!l())})}function d(){var t=this;e.on("VisualAid",function(e){t.active(e.hasVisual)}),t.active(e.hasVisual)}function f(t){t.control&&(t=t.control.value()),t&&e.execCommand("mceToggleFormat",!1,t)}var p;p=o(),s({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(t,n){e.addButton(n,{tooltip:t,onPostRender:function(){var t=this;e.formatter?e.formatter.formatChanged(n,function(e){t.active(e)}):e.on("init",function(){e.formatter.formatChanged(n,function(e){t.active(e)})})},onclick:function(){f(n)}})}),s({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],hr:["Insert horizontal rule","InsertHorizontalRule"],removeformat:["Clear formatting","RemoveFormat"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1]})}),s({blockquote:["Toggle blockquote","mceBlockQuote"],numlist:["Numbered list","InsertOrderedList"],bullist:["Bullet list","InsertUnorderedList"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1],onPostRender:function(){var t=this;
-e.formatter?e.formatter.formatChanged(n,function(e){t.active(e)}):e.on("init",function(){e.formatter.formatChanged(n,function(e){t.active(e)})})}})}),e.addButton("undo",{tooltip:"Undo",onPostRender:c,cmd:"undo"}),e.addButton("redo",{tooltip:"Redo",onPostRender:u,cmd:"redo"}),e.addMenuItem("newdocument",{text:"New document",shortcut:"Ctrl+N",icon:"newdocument",cmd:"mceNewDocument"}),e.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Ctrl+Z",onPostRender:c,cmd:"undo"}),e.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Ctrl+Y",onPostRender:u,cmd:"redo"}),e.addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:d,cmd:"mceToggleVisualAid"}),s({cut:["Cut","Cut","Ctrl+X"],copy:["Copy","Copy","Ctrl+C"],paste:["Paste","Paste","Ctrl+V"],selectall:["Select all","SelectAll","Ctrl+A"],bold:["Bold","Bold","Ctrl+B"],italic:["Italic","Italic","Ctrl+I"],underline:["Underline","Underline"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"]},function(t,n){e.addMenuItem(n,{text:t[0],icon:n,shortcut:t[2],cmd:t[1]})}),e.on("mousedown",function(){n.hideAll()}),e.addButton("styleselect",{type:"menubutton",text:"Formats",menu:p}),e.addButton("formatselect",function(){var n=[],o=i(e.settings.block_formats||"Paragraph=p;Address=address;Pre=pre;Header 1=h1;Header 2=h2;Header 3=h3;Header 4=h4;Header 5=h5;Header 6=h6");return s(o,function(e){n.push({text:e[0],value:e[1],textStyle:function(){return t(e[1])}})}),{type:"listbox",text:{raw:o[0][0]},values:n,fixedWidth:!0,onselect:f,onPostRender:r(n)}}),e.addButton("fontselect",function(){var t="Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",n=[],o=i(e.settings.font_formats||t);return s(o,function(e){n.push({text:{raw:e[0]},value:e[1],textStyle:-1==e[1].indexOf("dings")?"font-family:"+e[1]:""})}),{type:"listbox",text:"Font Family",tooltip:"Font Family",values:n,fixedWidth:!0,onPostRender:r(n,"fontname"),onselect:function(t){t.control.settings.value&&e.execCommand("FontName",!1,t.control.settings.value)}}}),e.addButton("fontsizeselect",function(){var t=[],n="8pt 10pt 12pt 14pt 18pt 24pt 36pt",i=e.settings.fontsize_formats||n;return s(i.split(" "),function(e){t.push({text:e,value:e})}),{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:t,fixedWidth:!0,onPostRender:r(t,"fontsize"),onclick:function(t){t.control.settings.value&&e.execCommand("FontSize",!1,t.control.settings.value)}}}),e.addMenuItem("formats",{text:"Formats",menu:p})}var s=r.each;i.on("AddEditor",function(t){t.editor.rtl&&(e.rtl=!0),a(t.editor)}),e.translate=function(e){return i.translate(e)},t.tooltips=!o.iOS}),r(Mt,[gt],function(e){return e.extend({recalc:function(e){var t=e.settings,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v,y,b,C,x,w,_,N=[],E=[],k,S,T,R,A,B;for(t=e.settings,i=e.items().filter(":visible"),o=e.layoutRect(),r=t.columns||Math.ceil(Math.sqrt(i.length)),n=Math.ceil(i.length/r),y=t.spacingH||t.spacing||0,b=t.spacingV||t.spacing||0,C=t.alignH||t.align,x=t.alignV||t.align,g=e._paddingBox,C&&"string"==typeof C&&(C=[C]),x&&"string"==typeof x&&(x=[x]),d=0;r>d;d++)N.push(0);for(f=0;n>f;f++)E.push(0);for(f=0;n>f;f++)for(d=0;r>d&&(u=i[f*r+d],u);d++)c=u.layoutRect(),k=c.minW,S=c.minH,N[d]=k>N[d]?k:N[d],E[f]=S>E[f]?S:E[f];for(A=o.innerW-g.left-g.right,w=0,d=0;r>d;d++)w+=N[d]+(d>0?y:0),A-=(d>0?y:0)+N[d];for(B=o.innerH-g.top-g.bottom,_=0,f=0;n>f;f++)_+=E[f]+(f>0?b:0),B-=(f>0?b:0)+E[f];if(w+=g.left+g.right,_+=g.top+g.bottom,l={},l.minW=w+(o.w-o.innerW),l.minH=_+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW==o.minW&&l.minH==o.minH){o.autoResize&&(l=e.layoutRect(l),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH);var L;L="start"==t.packV?0:B>0?Math.floor(B/n):0;var H=0,D=t.flexWidths;if(D)for(d=0;d<D.length;d++)H+=D[d];else H=r;var M=A/H;for(d=0;r>d;d++)N[d]+=D?Math.ceil(D[d]*M):M;for(h=g.top,f=0;n>f;f++){for(p=g.left,s=E[f]+L,d=0;r>d&&(u=i[f*r+d],u);d++)m=u.settings,c=u.layoutRect(),a=Math.max(N[d],c.startMinWidth),T=R=0,c.x=p,c.y=h,v=m.alignH||(C?C[d]||C[0]:null),"center"==v?c.x=p+a/2-c.w/2:"right"==v?c.x=p+a-c.w:"stretch"==v&&(c.w=a),v=m.alignV||(x?x[d]||x[0]:null),"center"==v?c.y=h+s/2-c.h/2:"bottom"==v?c.y=h+s-c.h:"stretch"==v&&(c.h=s),u.layoutRect(c),p+=a+y,u.recalc&&u.recalc();h+=s+b}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var P=e.parent();P&&(P._lastRect=null,P.recalc())}}})}),r(Pt,[yt],function(e){return e.extend({renderHtml:function(){var e=this;return e.addClass("iframe"),e.canFocus=!1,'<iframe id="'+e._id+'" class="'+e.classes()+'" tabindex="-1" src="'+(e.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(e){this.getEl().src=e},html:function(e,t){var n=this,r=this.getEl().contentWindow.document.body;return r?(r.innerHTML=e,t&&t()):setTimeout(function(){n.html(e)},0),this}})}),r(Ot,[yt,W],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t.addClass("widget"),t.addClass("label"),t.canFocus=!1,e.multiline&&t.addClass("autoscroll"),e.strong&&t.addClass("strong")},initLayoutRect:function(){var e=this,n=e._super();if(e.settings.multiline){var r=t.getSize(e.getEl());r.width>n.maxW&&(n.minW=n.maxW,e.addClass("multiline")),e.getEl().style.width=n.minW+"px",n.startMinH=n.h=n.minH=Math.min(n.maxH,t.getSize(e.getEl()).height)}return n},repaint:function(){var e=this;return e.settings.multiline||(e.getEl().style.lineHeight=e.layoutRect().h+"px"),e._super()},text:function(e){var t=this;return t._rendered&&e&&this.innerHtml(t.encode(e)),t._super(e)},renderHtml:function(){var e=this,t=e.settings.forId;return'<label id="'+e._id+'" class="'+e.classes()+'"'+(t?' for="'+t:"")+'">'+e.encode(e._text)+"</label>"}})}),r(It,[q,J],function(e,t){return e.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){var t=this;t._super(e),t.addClass("toolbar")},postRender:function(){var e=this;return e.items().addClass("toolbar-item"),e.keyNav=new t({root:e,enableLeftRight:!0}),e._super()}})}),r(Ft,[It],function(e){return e.extend({Defaults:{role:"menubar",containerCls:"menubar",defaults:{type:"menubutton"}}})}),r(zt,[bt,U,Ft],function(e,t,n){function r(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}var i=e.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),t.addClass("menubtn"),e.fixedWidth&&t.addClass("fixed-width"),t.aria("haspopup",!0),t.hasPopup=!0},showMenu:function(){var e=this,n=e.settings,r;return e.menu&&e.menu.visible()?e.hideMenu():(e.menu||(r=n.menu||[],r.length?r={type:"menu",items:r}:r.type=r.type||"menu",e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control==e.menu&&e.activeMenu("show"==t.type)}).fire("show"),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]),void 0)},hideMenu:function(){var e=this;e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1))},activeMenu:function(e){this.toggleClass("active",e)},renderHtml:function(){var e=this,t=e._id,r=e.classPrefix,i=e.settings.icon?r+"ico "+r+"i-"+e.settings.icon:"";return e.aria("role",e.parent()instanceof n?"menuitem":"button"),'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1">'+'<button id="'+t+'-open" role="presentation" type="button" tabindex="-1">'+(i?'<i class="'+i+'"></i>':"")+"<span>"+(e._text?(i?"\xa0":"")+e.encode(e._text):"")+"</span>"+' <i class="'+r+'caret"></i>'+"</button>"+"</div>"},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&r(t.target,e.getEl())&&(e.showMenu(),t.keyboard&&e.menu.items()[0].focus())}),e.on("mouseenter",function(t){var n=t.control,r=e.parent(),o;n&&r&&n instanceof i&&n.parent()==r&&(r.items().filter("MenuButton").each(function(e){e.hideMenu&&e!=n&&(e.menu&&e.menu.visible()&&(o=!0),e.hideMenu())}),o&&(n.focus(),n.showMenu()))}),e._super()},text:function(e){var t=this,n,r;if(t._rendered)for(r=t.getEl("open").getElementsByTagName("span"),n=0;n<r.length;n++)r[n].innerHTML=t.encode(e);return this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}});return i}),r(Wt,[zt],function(e){return e.extend({init:function(e){var t=this,n,r,i,o,a;if(t._values=n=e.values,n){for(r=0;r<n.length;r++)i=n[r].selected||e.value===n[r].value,i&&(o=o||n[r].text,t._value=n[r].value);e.menu=n}e.text=e.text||o||n[0].text,t._super(e),t.addClass("listbox"),t.on("select",function(n){var r=n.control;a&&(n.lastControl=a),e.multiple?r.active(!r.active()):t.value(n.control.settings.value),a=r})},value:function(e){function t(e,n){e.items().each(function(e){r=e.value()===n,r&&(i=i||e.text()),e.active(r),e.menu&&t(e.menu,n)})}var n=this,r,i,o,a;if("undefined"!=typeof e){if(n.menu)t(n.menu,e);else for(o=n.settings.menu,a=0;a<o.length;a++)r=o[a].value==e,r&&(i=i||o[a].text),o[a].active=r;n.text(i||this.settings.text)}return n._super(e)}})}),r(Vt,[yt,U],function(e,t){return e.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t=this;t.hasPopup=!0,t._super(e),e=t.settings,t.addClass("menu-item"),e.menu&&t.addClass("menu-item-expand"),e.preview&&t.addClass("menu-item-preview"),("-"===t._text||"|"===t._text)&&(t.addClass("menu-item-sep"),t.aria("role","separator"),t.canFocus=!1,t._text="-"),e.selectable&&(t.aria("role","menuitemcheckbox"),t.aria("checked",!0),t.addClass("menu-item-checkbox"),e.icon="selected"),e.preview||e.selectable||t.addClass("menu-item-normal"),t.on("mousedown",function(e){e.preventDefault()}),t.on("mouseenter click",function(n){n.control===t&&(e.menu||"click"!==n.type?(t.showMenu(),n.keyboard&&setTimeout(function(){t.menu.items()[0].focus()},0)):(t.parent().hideAll(),t.fire("cancel"),t.fire("select")))}),e.menu&&t.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e=this,n=e.settings,r,i=e.parent();if(i.items().each(function(t){t!==e&&t.hideMenu()}),n.menu){r=e.menu,r?r.show():(r=n.menu,r.length?r={type:"menu",items:r}:r.type=r.type||"menu",i.settings.itemDefaults&&(r.itemDefaults=i.settings.itemDefaults),r=e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),r.reflow(),r.fire("show"),r.on("cancel",function(){e.focus()}),r.on("hide",function(t){t.control===r&&e.removeClass("selected")})),r._parentMenu=i,r.addClass("menu-sub");var o=r.testMoveRel(e.getEl(),e.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);r.moveRel(e.getEl(),o),r.rel=o,o="menu-sub-"+o,r.removeClass(r._lastRel),r.addClass(o),r._lastRel=o,e.addClass("selected"),e.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=e.encode(e._text),o=e.settings.icon,a="";return o&&e.parent().addClass("menu-has-icons"),n.image&&(o="none",a=" style=\"background-image: url('"+n.image+"')\""),o=r+"ico "+r+"i-"+(e.settings.icon||"none"),'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1">'+("-"!==i?'<i class="'+o+'"'+a+"></i>&nbsp;":"")+("-"!==i?'<span id="'+t+'-text" class="'+r+'text">'+i+"</span>":"")+(n.shortcut?'<div id="'+t+'-shortcut" class="'+r+'menu-shortcut">'+n.shortcut+"</div>":"")+(n.menu?'<div class="'+r+'caret"></div>':"")+"</div>"},postRender:function(){var e=this,t=e.settings,n=t.textStyle;if("function"==typeof n&&(n=n.call(this)),n){var r=e.getEl("text");r&&r.setAttribute("style",n)}return e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}})}),r(Ut,[X,J,Vt,p],function(e,t,n,r){var i=e.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"menu"},init:function(e){var i=this;if(e.autohide=!0,e.constrainToViewport=!0,e.itemDefaults)for(var o=e.items,a=o.length;a--;)o[a]=r.extend({},e.itemDefaults,o[a]);i._super(e),i.addClass("menu"),i.keyNav=new t({root:i,enableUpDown:!0,enableLeftRight:!0,leftAction:function(){i.parent()instanceof n&&i.keyNav.cancel()},onCancel:function(){i.fire("cancel",{},!1),i.hide()}})},repaint:function(){return this.toggleClass("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){var e=this;e.hideAll(),e.fire("cancel"),e.fire("select")},hideAll:function(){var e=this;return this.find("menuitem").exec("hideMenu"),e._super()},preRender:function(){var e=this;return e.items().each(function(t){var n=t.settings;return n.icon||n.selectable?(e._hasIcons=!0,!1):void 0}),e._super()}});return i}),r(qt,[xt],function(e){return e.extend({Defaults:{classes:"radio",role:"radio"}})}),r($t,[yt,$],function(e,t){return e.extend({renderHtml:function(){var e=this,t=e.classPrefix;return e.addClass("resizehandle"),"both"==e.settings.direction&&e.addClass("resizehandle-both"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes()+'">'+'<i class="'+t+"ico "+t+'i-resize"></i>'+"</div>"},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new t(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!=e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},end:function(){e.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}})}),r(jt,[yt],function(e){return e.extend({renderHtml:function(){var e=this;return e.addClass("spacer"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes()+'"></div>'}})}),r(Kt,[zt,W],function(e,t){return e.extend({Defaults:{classes:"widget btn splitbtn",role:"splitbutton"},repaint:function(){var e=this,n=e.getEl(),r=e.layoutRect(),i,o;return e._super(),i=n.firstChild,o=n.lastChild,t.css(i,{width:r.w-t.getSize(o).width,height:r.h-2}),t.css(o,{height:r.h-2}),e},activeMenu:function(e){var n=this;t.toggleClass(n.getEl().lastChild,n.classPrefix+"active",e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"";return'<div id="'+t+'" class="'+e.classes()+'">'+'<button type="button" hidefocus tabindex="-1">'+(r?'<i class="'+r+'"></i>':"")+(e._text?(r?" ":"")+e._text:"")+"</button>"+'<button type="button" class="'+n+'open" hidefocus tabindex="-1">'+(e._menuBtnText?(r?"\xa0":"")+e._menuBtnText:"")+' <i class="'+n+'caret"></i>'+"</button>"+"</div>"},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(e){var n=e.target;if(e.control==this)for(;n;){if("BUTTON"==n.nodeName&&-1==n.className.indexOf("open"))return e.stopImmediatePropagation(),t.call(this,e),void 0;n=n.parentNode}}),delete e.settings.onclick,e._super()}})}),r(Gt,[Ht],function(e){return e.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"}})}),r(Yt,[K,W],function(e,t){return e.extend({lastIdx:0,Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(e){this.activeTabId&&t.removeClass(this.getEl(this.activeTabId),this.classPrefix+"active"),this.activeTabId="t"+e,t.addClass(this.getEl("t"+e),this.classPrefix+"active"),e!=this.lastIdx&&(this.items()[this.lastIdx].hide(),this.lastIdx=e),this.items()[e].show().fire("showtab"),this.reflow()},renderHtml:function(){var e=this,t=e._layout,n="",r=e.classPrefix;return e.preRender(),t.preRender(e),e.items().each(function(t,i){n+='<div id="'+e._id+"-t"+i+'" class="'+r+'tab" unselectable="on">'+e.encode(t.settings.title)+"</div>"}),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+'<div id="'+e._id+'-head" class="'+r+'tabs">'+n+"</div>"+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+t.renderHtml(e)+"</div>"+"</div>"},postRender:function(){var e=this;e._super(),e.settings.activeTab=e.settings.activeTab||0,e.activateTab(e.settings.activeTab),this.on("click",function(t){var n=t.target.parentNode;if(t.target.parentNode.id==e._id+"-head")for(var r=n.childNodes.length;r--;)n.childNodes[r]==t.target&&e.activateTab(r)})},initLayoutRect:function(){var e=this,n,r,i;r=t.getSize(e.getEl("head")).width,r=0>r?0:r,i=0,e.items().each(function(t,n){r=Math.max(r,t.layoutRect().minW),i=Math.max(i,t.layoutRect().minH),e.settings.activeTab!=n&&t.hide()}),e.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=r,e.settings.h=i,e.layoutRect({x:0,y:0,w:r,h:i})});var o=t.getSize(e.getEl("head")).height;return e.settings.minWidth=r,e.settings.minHeight=i+o,n=e._super(),n.deltaH+=o,n.innerH=n.h-n.deltaH,n}})}),r(Xt,[yt,W],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t._value=e.value||"",t.addClass("textbox"),e.multiline?t.addClass("multiline"):t.on("keydown",function(e){13==e.keyCode&&t.parents().reverse().each(function(t){return e.preventDefault(),t.hasEventListeners("submit")&&t.toJSON?(t.fire("submit",{data:t.toJSON()}),!1):void 0})})},disabled:function(e){var t=this;return t._rendered&&"undefined"!=typeof e&&(t.getEl().disabled=e),t._super(e)},value:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t._rendered&&(t.getEl().value=e),t):t._rendered?t.getEl().value:t._value},repaint:function(){var e=this,t,n,r,i=0,o=0,a;t=e.getEl().style,n=e._layoutRect,a=e._lastRepaintRect||{};var s=document;return!e.settings.multiline&&s.all&&(!s.documentMode||s.documentMode<=8)&&(t.lineHeight=n.h-o+"px"),r=e._borderBox,i=r.left+r.right+8,o=r.top+r.bottom+(e.settings.multiline?8:0),n.x!==a.x&&(t.left=n.x+"px",a.x=n.x),n.y!==a.y&&(t.top=n.y+"px",a.y=n.y),n.w!==a.w&&(t.width=n.w-i+"px",a.w=n.w),n.h!==a.h&&(t.height=n.h-o+"px",a.h=n.h),e._lastRepaintRect=a,e.fire("repaint",{},!1),e},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.encode(e._value,!1),i="";return"spellcheck"in n&&(i+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(i+=' maxlength="'+n.maxLength+'"'),n.size&&(i+=' size="'+n.size+'"'),n.subtype&&(i+=' type="'+n.subtype+'"'),e.disabled()&&(i+=' disabled="disabled"'),n.multiline?'<textarea id="'+t+'" class="'+e.classes()+'" '+(n.rows?' rows="'+n.rows+'"':"")+' hidefocus="true"'+i+">"+r+"</textarea>":'<input id="'+t+'" class="'+e.classes()+'" value="'+r+'" hidefocus="true"'+i+">"},postRender:function(){var e=this;return t.on(e.getEl(),"change",function(t){e.fire("change",t)}),e._super()},remove:function(){t.off(this.getEl()),this._super()}})}),r(Jt,[W],function(e){return function(t){var n=this,r;n.show=function(i){return n.hide(),r=!0,window.setTimeout(function(){r&&t.appendChild(e.createFragment('<div class="mce-throbber"></div>'))},i||0),n},n.hide=function(){var e=t.lastChild;return e&&-1!=e.className.indexOf("throbber")&&e.parentNode.removeChild(e),r=!1,n}}}),a([l,c,u,d,f,p,h,m,g,v,y,b,C,x,w,_,N,E,k,S,T,R,A,B,L,H,D,M,P,O,I,F,z,W,V,U,q,$,j,K,G,Y,X,J,Q,Z,et,tt,nt,rt,it,ot,at,st,lt,ct,ut,dt,ft,pt,ht,mt,gt,vt,yt,bt,Ct,xt,wt,_t,Nt,Et,kt,St,Tt,Rt,At,Bt,Lt,Ht,Dt,Mt,Pt,Ot,It,Ft,zt,Wt,Vt,Ut,qt,$t,jt,Kt,Gt,Yt,Xt,Jt])}(this);
\ No newline at end of file
+// 4.0.12 (2013-12-18)
+!function(e,t){"use strict";function n(e,t){for(var n,r=[],i=0;i<e.length;++i){if(n=s[e[i]]||o(e[i]),!n)throw"module definition dependecy not found: "+e[i];r.push(n)}t.apply(null,r)}function r(e,r,i){if("string"!=typeof e)throw"invalid module definition, module id must be defined and be a string";if(r===t)throw"invalid module definition, dependencies must be specified";if(i===t)throw"invalid module definition, definition function must be specified";n(r,function(){s[e]=i.apply(null,arguments)})}function i(e){return!!s[e]}function o(t){for(var n=e,r=t.split(/[.\/]/),i=0;i<r.length;++i){if(!n[r[i]])return;n=n[r[i]]}return n}function a(n){for(var r=0;r<n.length;r++){for(var i=e,o=n[r],a=o.split(/[.\/]/),l=0;l<a.length-1;++l)i[a[l]]===t&&(i[a[l]]={}),i=i[a[l]];i[a[a.length-1]]=s[o]}}var s={},l="tinymce/dom/EventUtils",c="tinymce/dom/Sizzle",u="tinymce/dom/DomQuery",d="tinymce/html/Styles",f="tinymce/dom/TreeWalker",p="tinymce/util/Tools",h="tinymce/dom/Range",m="tinymce/html/Entities",g="tinymce/Env",v="tinymce/dom/DOMUtils",y="tinymce/dom/ScriptLoader",b="tinymce/AddOnManager",C="tinymce/html/Node",x="tinymce/html/Schema",w="tinymce/html/SaxParser",_="tinymce/html/DomParser",N="tinymce/html/Writer",E="tinymce/html/Serializer",k="tinymce/dom/Serializer",S="tinymce/dom/TridentSelection",T="tinymce/util/VK",R="tinymce/dom/ControlSelection",A="tinymce/dom/Selection",B="tinymce/dom/RangeUtils",L="tinymce/Formatter",D="tinymce/UndoManager",H="tinymce/EnterKey",M="tinymce/ForceBlocks",P="tinymce/EditorCommands",O="tinymce/util/URI",I="tinymce/util/Class",F="tinymce/ui/Selector",z="tinymce/ui/Collection",W="tinymce/ui/DomUtils",V="tinymce/ui/Control",U="tinymce/ui/Factory",q="tinymce/ui/Container",$="tinymce/ui/DragHelper",j="tinymce/ui/Scrollable",K="tinymce/ui/Panel",Y="tinymce/ui/Movable",G="tinymce/ui/Resizable",X="tinymce/ui/FloatPanel",J="tinymce/ui/KeyboardNavigation",Q="tinymce/ui/Window",Z="tinymce/ui/MessageBox",et="tinymce/WindowManager",tt="tinymce/util/Quirks",nt="tinymce/util/Observable",rt="tinymce/Shortcuts",it="tinymce/Editor",ot="tinymce/util/I18n",at="tinymce/FocusManager",st="tinymce/EditorManager",lt="tinymce/LegacyInput",ct="tinymce/util/XHR",ut="tinymce/util/JSON",dt="tinymce/util/JSONRequest",ft="tinymce/util/JSONP",pt="tinymce/util/LocalStorage",ht="tinymce/Compat",mt="tinymce/ui/Layout",gt="tinymce/ui/AbsoluteLayout",vt="tinymce/ui/Tooltip",yt="tinymce/ui/Widget",bt="tinymce/ui/Button",Ct="tinymce/ui/ButtonGroup",xt="tinymce/ui/Checkbox",wt="tinymce/ui/PanelButton",_t="tinymce/ui/ColorButton",Nt="tinymce/ui/ComboBox",Et="tinymce/ui/Path",kt="tinymce/ui/ElementPath",St="tinymce/ui/FormItem",Tt="tinymce/ui/Form",Rt="tinymce/ui/FieldSet",At="tinymce/ui/FilePicker",Bt="tinymce/ui/FitLayout",Lt="tinymce/ui/FlexLayout",Dt="tinymce/ui/FlowLayout",Ht="tinymce/ui/FormatControls",Mt="tinymce/ui/GridLayout",Pt="tinymce/ui/Iframe",Ot="tinymce/ui/Label",It="tinymce/ui/Toolbar",Ft="tinymce/ui/MenuBar",zt="tinymce/ui/MenuButton",Wt="tinymce/ui/ListBox",Vt="tinymce/ui/MenuItem",Ut="tinymce/ui/Menu",qt="tinymce/ui/Radio",$t="tinymce/ui/ResizeHandle",jt="tinymce/ui/Spacer",Kt="tinymce/ui/SplitButton",Yt="tinymce/ui/StackLayout",Gt="tinymce/ui/TabPanel",Xt="tinymce/ui/TextBox",Jt="tinymce/ui/Throbber";r(l,[],function(){function e(e,t,n,r){e.addEventListener?e.addEventListener(t,n,r||!1):e.attachEvent&&e.attachEvent("on"+t,n)}function t(e,t,n,r){e.removeEventListener?e.removeEventListener(t,n,r||!1):e.detachEvent&&e.detachEvent("on"+t,n)}function n(e,t){function n(){return!1}function r(){return!0}var i,o=t||{},l;for(i in e)s[i]||(o[i]=e[i]);if(o.target||(o.target=o.srcElement||document),e&&a.test(e.type)&&e.pageX===l&&e.clientX!==l){var c=o.target.ownerDocument||document,u=c.documentElement,d=c.body;o.pageX=e.clientX+(u&&u.scrollLeft||d&&d.scrollLeft||0)-(u&&u.clientLeft||d&&d.clientLeft||0),o.pageY=e.clientY+(u&&u.scrollTop||d&&d.scrollTop||0)-(u&&u.clientTop||d&&d.clientTop||0)}return o.preventDefault=function(){o.isDefaultPrevented=r,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},o.stopPropagation=function(){o.isPropagationStopped=r,e&&(e.stopPropagation?e.stopPropagation():e.cancelBubble=!0)},o.stopImmediatePropagation=function(){o.isImmediatePropagationStopped=r,o.stopPropagation()},o.isDefaultPrevented||(o.isDefaultPrevented=n,o.isPropagationStopped=n,o.isImmediatePropagationStopped=n),o}function r(n,r,i){function o(){i.domLoaded||(i.domLoaded=!0,r(c))}function a(){"complete"===l.readyState&&(t(l,"readystatechange",a),o())}function s(){try{l.documentElement.doScroll("left")}catch(e){return setTimeout(s,0),void 0}o()}var l=n.document,c={type:"ready"};return i.domLoaded?(r(c),void 0):(l.addEventListener?"complete"===l.readyState?o():e(n,"DOMContentLoaded",o):(e(l,"readystatechange",a),l.documentElement.doScroll&&n===n.top&&s()),e(n,"load",o),void 0)}function i(){function i(e,t){var n,r,i,o,a=s[t];if(n=a&&a[e.type])for(r=0,i=n.length;i>r;r++)if(o=n[r],o&&o.func.call(o.scope,e)===!1&&e.preventDefault(),e.isImmediatePropagationStopped())return}var a=this,s={},l,c,u,d,f;c=o+(+new Date).toString(32),d="onmouseenter"in document.documentElement,u="onfocusin"in document.documentElement,f={mouseenter:"mouseover",mouseleave:"mouseout"},l=1,a.domLoaded=!1,a.events=s,a.bind=function(t,o,p,h){function m(e){i(n(e||_.event),g)}var g,v,y,b,C,x,w,_=window;if(t&&3!==t.nodeType&&8!==t.nodeType){for(t[c]?g=t[c]:(g=l++,t[c]=g,s[g]={}),h=h||t,o=o.split(" "),y=o.length;y--;)b=o[y],x=m,C=w=!1,"DOMContentLoaded"===b&&(b="ready"),a.domLoaded&&"ready"===b&&"complete"==t.readyState?p.call(h,n({type:b})):(d||(C=f[b],C&&(x=function(e){var t,r;if(t=e.currentTarget,r=e.relatedTarget,r&&t.contains)r=t.contains(r);else for(;r&&r!==t;)r=r.parentNode;r||(e=n(e||_.event),e.type="mouseout"===e.type?"mouseleave":"mouseenter",e.target=t,i(e,g))})),u||"focusin"!==b&&"focusout"!==b||(w=!0,C="focusin"===b?"focus":"blur",x=function(e){e=n(e||_.event),e.type="focus"===e.type?"focusin":"focusout",i(e,g)}),v=s[g][b],v?"ready"===b&&a.domLoaded?p({type:b}):v.push({func:p,scope:h}):(s[g][b]=v=[{func:p,scope:h}],v.fakeName=C,v.capture=w,v.nativeHandler=x,"ready"===b?r(t,x,a):e(t,C||b,x,w)));return t=v=0,p}},a.unbind=function(e,n,r){var i,o,l,u,d,f;if(!e||3===e.nodeType||8===e.nodeType)return a;if(i=e[c]){if(f=s[i],n){for(n=n.split(" "),l=n.length;l--;)if(d=n[l],o=f[d]){if(r)for(u=o.length;u--;)if(o[u].func===r){var p=o.nativeHandler;o=o.slice(0,u).concat(o.slice(u+1)),o.nativeHandler=p,f[d]=o}r&&0!==o.length||(delete f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture))}}else{for(d in f)o=f[d],t(e,o.fakeName||d,o.nativeHandler,o.capture);f={}}for(d in f)return a;delete s[i];try{delete e[c]}catch(h){e[c]=null}}return a},a.fire=function(e,t,r){var o;if(!e||3===e.nodeType||8===e.nodeType)return a;r=n(null,r),r.type=t,r.target=e;do o=e[c],o&&i(r,o),e=e.parentNode||e.ownerDocument||e.defaultView||e.parentWindow;while(e&&!r.isPropagationStopped());return a},a.clean=function(e){var t,n,r=a.unbind;if(!e||3===e.nodeType||8===e.nodeType)return a;if(e[c]&&r(e),e.getElementsByTagName||(e=e.document),e&&e.getElementsByTagName)for(r(e),n=e.getElementsByTagName("*"),t=n.length;t--;)e=n[t],e[c]&&r(e);return a},a.destroy=function(){s={}},a.cancel=function(e){return e&&(e.preventDefault(),e.stopImmediatePropagation()),!1}}var o="mce-data-",a=/^(?:mouse|contextmenu)|click/,s={keyLocation:1,layerX:1,layerY:1,returnValue:1};return i.Event=new i,i.Event.bind(window,"ready",function(){}),i}),r(c,[],function(){function e(e){return mt.test(e+"")}function n(){var e,t=[];return e=function(n,r){return t.push(n+=" ")>_.cacheLength&&delete e[t.shift()],e[n]=r,r}}function r(e){return e[I]=!0,e}function i(e){var t=B.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t=null}}function o(e,t,n,r){var i,o,a,s,l,c,f,p,h,m;if((t?t.ownerDocument||t:F)!==B&&A(t),t=t||B,n=n||[],!e||"string"!=typeof e)return n;if(1!==(s=t.nodeType)&&9!==s)return[];if(D&&!r){if(i=gt.exec(e))if(a=i[1]){if(9===s){if(o=t.getElementById(a),!o||!o.parentNode)return n;if(o.id===a)return n.push(o),n}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(a))&&O(t,o)&&o.id===a)return n.push(o),n}else{if(i[2])return Z.apply(n,t.getElementsByTagName(e)),n;if((a=i[3])&&z.getElementsByClassName&&t.getElementsByClassName)return Z.apply(n,t.getElementsByClassName(a)),n}if(z.qsa&&!H.test(e)){if(f=!0,p=I,h=t,m=9===s&&e,1===s&&"object"!==t.nodeName.toLowerCase()){for(c=u(e),(f=t.getAttribute("id"))?p=f.replace(bt,"\\$&"):t.setAttribute("id",p),p="[id='"+p+"'] ",l=c.length;l--;)c[l]=p+d(c[l]);h=ht.test(e)&&t.parentNode||t,m=c.join(",")}if(m)try{return Z.apply(n,h.querySelectorAll(m)),n}catch(g){}finally{f||t.removeAttribute("id")}}}return b(e.replace(lt,"$1"),t,n,r)}function a(e,t){var n=t&&e,r=n&&(~t.sourceIndex||G)-(~e.sourceIndex||G);if(r)return r;if(n)for(;n=n.nextSibling;)if(n===t)return-1;return e?1:-1}function s(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function l(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function c(e){return r(function(t){return t=+t,r(function(n,r){for(var i,o=e([],n.length,t),a=o.length;a--;)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function u(e,t){var n,r,i,a,s,l,c,u=q[e+" "];if(u)return t?0:u.slice(0);for(s=e,l=[],c=_.preFilter;s;){(!n||(r=ct.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=ut.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(lt," ")}),s=s.slice(n.length));for(a in _.filter)!(r=pt[a].exec(s))||c[a]&&!(r=c[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?o.error(e):q(e,l).slice(0)}function d(e){for(var t=0,n=e.length,r="";n>t;t++)r+=e[t].value;return r}function f(e,t,n){var r=t.dir,i=n&&"parentNode"===r,o=V++;return t.first?function(t,n,o){for(;t=t[r];)if(1===t.nodeType||i)return e(t,n,o)}:function(t,n,a){var s,l,c,u=W+" "+o;if(a){for(;t=t[r];)if((1===t.nodeType||i)&&e(t,n,a))return!0}else for(;t=t[r];)if(1===t.nodeType||i)if(c=t[I]||(t[I]={}),(l=c[r])&&l[0]===u){if((s=l[1])===!0||s===w)return s===!0}else if(l=c[r]=[u],l[1]=e(t,n,a)||w,l[1]===!0)return!0}}function p(e){return e.length>1?function(t,n,r){for(var i=e.length;i--;)if(!e[i](t,n,r))return!1;return!0}:e[0]}function h(e,t,n,r,i){for(var o,a=[],s=0,l=e.length,c=null!=t;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),c&&t.push(s));return a}function m(e,t,n,i,o,a){return i&&!i[I]&&(i=m(i)),o&&!o[I]&&(o=m(o,a)),r(function(r,a,s,l){var c,u,d,f=[],p=[],m=a.length,g=r||y(t||"*",s.nodeType?[s]:s,[]),v=!e||!r&&t?g:h(g,f,e,s,l),b=n?o||(r?e:m||i)?[]:a:v;if(n&&n(v,b,s,l),i)for(c=h(b,p),i(c,[],s,l),u=c.length;u--;)(d=c[u])&&(b[p[u]]=!(v[p[u]]=d));if(r){if(o||e){if(o){for(c=[],u=b.length;u--;)(d=b[u])&&c.push(v[u]=d);o(null,b=[],c,l)}for(u=b.length;u--;)(d=b[u])&&(c=o?tt.call(r,d):f[u])>-1&&(r[c]=!(a[c]=d))}}else b=h(b===a?b.splice(m,b.length):b),o?o(null,a,b,l):Z.apply(a,b)})}function g(e){for(var t,n,r,i=e.length,o=_.relative[e[0].type],a=o||_.relative[" "],s=o?1:0,l=f(function(e){return e===t},a,!0),c=f(function(e){return tt.call(t,e)>-1},a,!0),u=[function(e,n,r){return!o&&(r||n!==S)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];i>s;s++)if(n=_.relative[e[s].type])u=[f(p(u),n)];else{if(n=_.filter[e[s].type].apply(null,e[s].matches),n[I]){for(r=++s;i>r&&!_.relative[e[r].type];r++);return m(s>1&&p(u),s>1&&d(e.slice(0,s-1)).replace(lt,"$1"),n,r>s&&g(e.slice(s,r)),i>r&&g(e=e.slice(r)),i>r&&d(e))}u.push(n)}return p(u)}function v(e,t){var n=0,i=t.length>0,a=e.length>0,s=function(r,s,l,c,u){var d,f,p,m=[],g=0,v="0",y=r&&[],b=null!=u,C=S,x=r||a&&_.find.TAG("*",u&&s.parentNode||s),N=W+=null==C?1:Math.random()||.1;for(b&&(S=s!==B&&s,w=n);null!=(d=x[v]);v++){if(a&&d){for(f=0;p=e[f++];)if(p(d,s,l)){c.push(d);break}b&&(W=N,w=++n)}i&&((d=!p&&d)&&g--,r&&y.push(d))}if(g+=v,i&&v!==g){for(f=0;p=t[f++];)p(y,m,s,l);if(r){if(g>0)for(;v--;)y[v]||m[v]||(m[v]=J.call(c));m=h(m)}Z.apply(c,m),b&&!r&&m.length>0&&g+t.length>1&&o.uniqueSort(c)}return b&&(W=N,S=C),y};return i?r(s):s}function y(e,t,n){for(var r=0,i=t.length;i>r;r++)o(e,t[r],n);return n}function b(e,t,n,r){var i,o,a,s,l,c=u(e);if(!r&&1===c.length){if(o=c[0]=c[0].slice(0),o.length>2&&"ID"===(a=o[0]).type&&9===t.nodeType&&D&&_.relative[o[1].type]){if(t=(_.find.ID(a.matches[0].replace(xt,wt),t)||[])[0],!t)return n;e=e.slice(o.shift().value.length)}for(i=pt.needsContext.test(e)?0:o.length;i--&&(a=o[i],!_.relative[s=a.type]);)if((l=_.find[s])&&(r=l(a.matches[0].replace(xt,wt),ht.test(o[0].type)&&t.parentNode||t))){if(o.splice(i,1),e=r.length&&d(o),!e)return Z.apply(n,r),n;break}}return k(e,c)(r,t,!D,n,ht.test(e)),n}function C(){}var x,w,_,N,E,k,S,T,R,A,B,L,D,H,M,P,O,I="sizzle"+-new Date,F=window.document,z={},W=0,V=0,U=n(),q=n(),$=n(),j=!1,K=function(){return 0},Y=typeof t,G=1<<31,X=[],J=X.pop,Q=X.push,Z=X.push,et=X.slice,tt=X.indexOf||function(e){for(var t=0,n=this.length;n>t;t++)if(this[t]===e)return t;return-1},nt="[\\x20\\t\\r\\n\\f]",rt="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",it=rt.replace("w","w#"),ot="([*^$|!~]?=)",at="\\["+nt+"*("+rt+")"+nt+"*(?:"+ot+nt+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+it+")|)|)"+nt+"*\\]",st=":("+rt+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+at.replace(3,8)+")*)|.*)\\)|)",lt=new RegExp("^"+nt+"+|((?:^|[^\\\\])(?:\\\\.)*)"+nt+"+$","g"),ct=new RegExp("^"+nt+"*,"+nt+"*"),ut=new RegExp("^"+nt+"*([\\x20\\t\\r\\n\\f>+~])"+nt+"*"),dt=new RegExp(st),ft=new RegExp("^"+it+"$"),pt={ID:new RegExp("^#("+rt+")"),CLASS:new RegExp("^\\.("+rt+")"),NAME:new RegExp("^\\[name=['\"]?("+rt+")['\"]?\\]"),TAG:new RegExp("^("+rt.replace("w","w*")+")"),ATTR:new RegExp("^"+at),PSEUDO:new RegExp("^"+st),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+nt+"*(even|odd|(([+-]|)(\\d*)n|)"+nt+"*(?:([+-]|)"+nt+"*(\\d+)|))"+nt+"*\\)|)","i"),needsContext:new RegExp("^"+nt+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+nt+"*((?:-\\d)?\\d*)"+nt+"*\\)|)(?=[^-]|$)","i")},ht=/[\x20\t\r\n\f]*[+~]/,mt=/^[^{]+\{\s*\[native code/,gt=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,vt=/^(?:input|select|textarea|button)$/i,yt=/^h\d$/i,bt=/'|\\/g,Ct=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,xt=/\\([\da-fA-F]{1,6}[\x20\t\r\n\f]?|.)/g,wt=function(e,t){var n="0x"+t-65536;return n!==n?t:0>n?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320)};try{Z.apply(X=et.call(F.childNodes),F.childNodes),X[F.childNodes.length].nodeType}catch(_t){Z={apply:X.length?function(e,t){Q.apply(e,et.call(t))}:function(e,t){for(var n=e.length,r=0;e[n++]=t[r++];);e.length=n-1}}}E=o.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},A=o.setDocument=function(n){var r=n?n.ownerDocument||n:F;return r!==B&&9===r.nodeType&&r.documentElement?(B=r,L=r.documentElement,D=!E(r),z.getElementsByTagName=i(function(e){return e.appendChild(r.createComment("")),!e.getElementsByTagName("*").length}),z.attributes=i(function(e){e.innerHTML="<select></select>";var t=typeof e.lastChild.getAttribute("multiple");return"boolean"!==t&&"string"!==t}),z.getElementsByClassName=i(function(e){return e.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",e.getElementsByClassName&&e.getElementsByClassName("e").length?(e.lastChild.className="e",2===e.getElementsByClassName("e").length):!1}),z.getByName=i(function(e){e.id=I+0,e.appendChild(B.createElement("a")).setAttribute("name",I),e.appendChild(B.createElement("i")).setAttribute("name",I),L.appendChild(e);var t=r.getElementsByName&&r.getElementsByName(I).length===2+r.getElementsByName(I+0).length;return L.removeChild(e),t}),z.sortDetached=i(function(e){return e.compareDocumentPosition&&1&e.compareDocumentPosition(B.createElement("div"))}),_.attrHandle=i(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild&&typeof e.firstChild.getAttribute!==Y&&"#"===e.firstChild.getAttribute("href")})?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},z.getByName?(_.find.ID=function(e,t){if(typeof t.getElementById!==Y&&D){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},_.filter.ID=function(e){var t=e.replace(xt,wt);return function(e){return e.getAttribute("id")===t}}):(_.find.ID=function(e,n){if(typeof n.getElementById!==Y&&D){var r=n.getElementById(e);return r?r.id===e||typeof r.getAttributeNode!==Y&&r.getAttributeNode("id").value===e?[r]:t:[]}},_.filter.ID=function(e){var t=e.replace(xt,wt);return function(e){var n=typeof e.getAttributeNode!==Y&&e.getAttributeNode("id");return n&&n.value===t}}),_.find.TAG=z.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==Y?t.getElementsByTagName(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){for(;n=o[i++];)1===n.nodeType&&r.push(n);return r}return o},_.find.NAME=z.getByName&&function(e,t){return typeof t.getElementsByName!==Y?t.getElementsByName(name):void 0},_.find.CLASS=z.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==Y&&D?t.getElementsByClassName(e):void 0},M=[],H=[":focus"],(z.qsa=e(r.querySelectorAll))&&(i(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||H.push("\\["+nt+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||H.push(":checked")}),i(function(e){e.innerHTML="<input type='hidden' i=''/>",e.querySelectorAll("[i^='']").length&&H.push("[*^$]="+nt+"*(?:\"\"|'')"),e.querySelectorAll(":enabled").length||H.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),H.push(",.*:")})),(z.matchesSelector=e(P=L.matchesSelector||L.mozMatchesSelector||L.webkitMatchesSelector||L.oMatchesSelector||L.msMatchesSelector))&&i(function(e){z.disconnectedMatch=P.call(e,"div"),P.call(e,"[s!='']:x"),M.push("!=",st)}),H=new RegExp(H.join("|")),M=M.length&&new RegExp(M.join("|")),O=e(L.contains)||L.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)for(;t=t.parentNode;)if(t===e)return!0;return!1},K=L.compareDocumentPosition?function(e,t){if(e===t)return j=!0,0;var n=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return n?1&n||T&&t.compareDocumentPosition(e)===n?e===r||O(F,e)?-1:t===r||O(F,t)?1:R?tt.call(R,e)-tt.call(R,t):0:4&n?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var n,i=0,o=e.parentNode,s=t.parentNode,l=[e],c=[t];if(e===t)return j=!0,0;if(!o||!s)return e===r?-1:t===r?1:o?-1:s?1:0;if(o===s)return a(e,t);for(n=e;n=n.parentNode;)l.unshift(n);for(n=t;n=n.parentNode;)c.unshift(n);for(;l[i]===c[i];)i++;return i?a(l[i],c[i]):l[i]===F?-1:c[i]===F?1:0},B):B},o.matches=function(e,t){return o(e,null,null,t)},o.matchesSelector=function(e,t){if((e.ownerDocument||e)!==B&&A(e),t=t.replace(Ct,"='$1']"),z.matchesSelector&&D&&(!M||!M.test(t))&&!H.test(t))try{var n=P.call(e,t);if(n||z.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(r){}return o(t,B,null,[e]).length>0},o.contains=function(e,t){return(e.ownerDocument||e)!==B&&A(e),O(e,t)},o.attr=function(e,t){var n;return(e.ownerDocument||e)!==B&&A(e),D&&(t=t.toLowerCase()),(n=_.attrHandle[t])?n(e):!D||z.attributes?e.getAttribute(t):((n=e.getAttributeNode(t))||e.getAttribute(t))&&e[t]===!0?t:n&&n.specified?n.value:null},o.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},o.uniqueSort=function(e){var t,n=[],r=0,i=0;if(j=!z.detectDuplicates,T=!z.sortDetached,R=!z.sortStable&&e.slice(0),e.sort(K),j){for(;t=e[i++];)t===e[i]&&(r=n.push(i));for(;r--;)e.splice(n[r],1)}return e},N=o.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=N(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=N(t);return n},_=o.selectors={cacheLength:50,createPseudo:r,match:pt,find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(xt,wt),e[3]=(e[4]||e[5]||"").replace(xt,wt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||o.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&o.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return pt.CHILD.test(e[0])?null:(e[4]?e[2]=e[4]:n&&dt.test(n)&&(t=u(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){return"*"===e?function(){return!0}:(e=e.replace(xt,wt).toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=U[e+" "];return t||(t=new RegExp("(^|"+nt+")"+e+"("+nt+"|$)"))&&U(e,function(e){return t.test(e.className||typeof e.getAttribute!==Y&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=o.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var c,u,d,f,p,h,m=o!==a?"nextSibling":"previousSibling",g=t.parentNode,v=s&&t.nodeName.toLowerCase(),y=!l&&!s;if(g){if(o){for(;m;){for(d=t;d=d[m];)if(s?d.nodeName.toLowerCase()===v:1===d.nodeType)return!1;h=m="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?g.firstChild:g.lastChild],a&&y){for(u=g[I]||(g[I]={}),c=u[e]||[],p=c[0]===W&&c[1],f=c[0]===W&&c[2],d=p&&g.childNodes[p];d=++p&&d&&d[m]||(f=p=0)||h.pop();)if(1===d.nodeType&&++f&&d===t){u[e]=[W,p,f];break}}else if(y&&(c=(t[I]||(t[I]={}))[e])&&c[0]===W)f=c[1];else for(;(d=++p&&d&&d[m]||(f=p=0)||h.pop())&&((s?d.nodeName.toLowerCase()!==v:1!==d.nodeType)||!++f||(y&&((d[I]||(d[I]={}))[e]=[W,f]),d!==t)););return f-=i,f===r||f%r===0&&f/r>=0}}},PSEUDO:function(e,t){var n,i=_.pseudos[e]||_.setFilters[e.toLowerCase()]||o.error("unsupported pseudo: "+e);return i[I]?i(t):i.length>1?(n=[e,e,"",t],_.setFilters.hasOwnProperty(e.toLowerCase())?r(function(e,n){for(var r,o=i(e,t),a=o.length;a--;)r=tt.call(e,o[a]),e[r]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:r(function(e){var t=[],n=[],i=k(e.replace(lt,"$1"));return i[I]?r(function(e,t,n,r){for(var o,a=i(e,null,r,[]),s=e.length;s--;)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,r,o){return t[0]=e,i(t,null,o,n),!n.pop()}}),has:r(function(e){return function(t){return o(e,t).length>0}}),contains:r(function(e){return function(t){return(t.textContent||t.innerText||N(t)).indexOf(e)>-1}}),lang:r(function(e){return ft.test(e||"")||o.error("unsupported lang: "+e),e=e.replace(xt,wt).toLowerCase(),function(t){var n;do if(n=D?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(e){var t=window.location&&window.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===L},focus:function(e){return e===B.activeElement&&(!B.hasFocus||B.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!_.pseudos.empty(e)},header:function(e){return yt.test(e.nodeName)},input:function(e){return vt.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:c(function(){return[0]}),last:c(function(e,t){return[t-1]}),eq:c(function(e,t,n){return[0>n?n+t:n]}),even:c(function(e,t){for(var n=0;t>n;n+=2)e.push(n);return e}),odd:c(function(e,t){for(var n=1;t>n;n+=2)e.push(n);return e}),lt:c(function(e,t,n){for(var r=0>n?n+t:n;--r>=0;)e.push(r);return e}),gt:c(function(e,t,n){for(var r=0>n?n+t:n;++r<t;)e.push(r);return e})}};for(x in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})_.pseudos[x]=s(x);for(x in{submit:!0,reset:!0})_.pseudos[x]=l(x);return k=o.compile=function(e,t){var n,r=[],i=[],o=$[e+" "];if(!o){for(t||(t=u(e)),n=t.length;n--;)o=g(t[n]),o[I]?r.push(o):i.push(o);o=$(e,v(i,r))}return o},_.pseudos.nth=_.pseudos.eq,C.prototype=_.filters=_.pseudos,_.setFilters=new C,z.sortStable=I.split("").sort(K).join("")===I,A(),[0,0].sort(K),z.detectDuplicates=j,o}),r(u,[l,c],function(e,n){function r(e){return"undefined"!=typeof e}function i(e){return"string"==typeof e}function o(e){var t,n,r;for(r=g.createElement("div"),t=g.createDocumentFragment(),r.innerHTML=e;n=r.firstChild;)t.appendChild(n);return t}function a(e,t,n){var r;if("string"==typeof t)t=o(t);else if(t.length){for(r=0;r<t.length;r++)a(e,t[r],n);return e}for(r=e.length;r--;)n.call(e[r],t.parentNode?t:t);return e}function s(e,t){return e&&t&&-1!==(" "+e.className+" ").indexOf(" "+t+" ")}function l(e,t){var n;for(e=e||[],"string"==typeof e&&(e=e.split(" ")),t=t||{},n=e.length;n--;)t[e[n]]={};return t}function c(e,t){return new c.fn.init(e,t)}function u(e){var t=arguments,n,r,i;for(r=1;r<t.length;r++){n=t[r];for(i in n)e[i]=n[i]}return e}function d(e){var t=[],n,r;for(n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function f(e,t){var n;if(t.indexOf)return t.indexOf(e);for(n=t.length;n--;)if(t[n]===e)return n;return-1}function p(e,t){var n,r,i,o,a;if(e)if(n=e.length,n===o){for(r in e)if(e.hasOwnProperty(r)&&(a=e[r],t.call(a,a,r)===!1))break}else for(i=0;n>i&&(a=e[i],t.call(a,a,r)!==!1);i++);return e}function h(e,n,r){for(var i=[],o=e[n];o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!c(o).is(r));)1===o.nodeType&&i.push(o),o=o[n];return i}function m(e,t,n,r){for(var i=[];e;e=e[n])r&&e.nodeType!==r||e===t||i.push(e);return i}var g=document,v=Array.prototype.push,y=Array.prototype.slice,b=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,C=e.Event,x=l("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"),w=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)},_=/^\s*|\s*$/g,N=function(e){return null===e||e===t?"":(""+e).replace(_,"")};return c.fn=c.prototype={constructor:c,selector:"",length:0,init:function(e,t){var n=this,r,a;if(!e)return n;if(e.nodeType)return n.context=n[0]=e,n.length=1,n;if(i(e)){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:b.exec(e),!r)return c(t||document).find(e);if(r[1])for(a=o(e).firstChild;a;)this.add(a),a=a.nextSibling;else{if(a=g.getElementById(r[2]),a.id!==r[2])return n.find(e);n.length=1,n[0]=a}}else this.add(e);return n},toArray:function(){return d(this)},add:function(e){var t=this;return w(e)?v.apply(t,e):e instanceof c?t.add(e.toArray()):v.call(t,e),t},attr:function(e,n){var i=this;if("object"==typeof e)p(e,function(e,t){i.attr(t,e)});else{if(!r(n))return i[0]&&1===i[0].nodeType?i[0].getAttribute(e):t;this.each(function(){1===this.nodeType&&this.setAttribute(e,n)})}return i},css:function(e,n){var i=this;if("object"==typeof e)p(e,function(e,t){i.css(t,e)});else{if(e=e.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),!r(n))return i[0]?i[0].style[e]:t;"number"!=typeof n||x[e]||(n+="px"),i.each(function(){var t=this.style;"opacity"===e&&this.runtimeStyle&&"undefined"==typeof this.runtimeStyle.opacity&&(t.filter=""===n?"":"alpha(opacity="+100*n+")");try{t[e]=n}catch(r){}})}return i},remove:function(){for(var e=this,t,n=this.length;n--;)t=e[n],C.clean(t),t.parentNode&&t.parentNode.removeChild(t);return this},empty:function(){for(var e=this,t,n=this.length;n--;)for(t=e[n];t.firstChild;)t.removeChild(t.firstChild);return this},html:function(e){var t=this,n;if(r(e)){for(n=t.length;n--;)t[n].innerHTML=e;return t}return t[0]?t[0].innerHTML:""},text:function(e){var t=this,n;if(r(e)){for(n=t.length;n--;)t[n].innerText=t[0].textContent=e;return t}return t[0]?t[0].innerText||t[0].textContent:""},append:function(){return a(this,arguments,function(e){1===this.nodeType&&this.appendChild(e)})},prepend:function(){return a(this,arguments,function(e){1===this.nodeType&&this.insertBefore(e,this.firstChild)})},before:function(){var e=this;return e[0]&&e[0].parentNode?a(e,arguments,function(e){this.parentNode.insertBefore(e,this.nextSibling)}):e},after:function(){var e=this;return e[0]&&e[0].parentNode?a(e,arguments,function(e){this.parentNode.insertBefore(e,this)}):e},appendTo:function(e){return c(e).append(this),this},addClass:function(e){return this.toggleClass(e,!0)},removeClass:function(e){return this.toggleClass(e,!1)},toggleClass:function(e,t){var n=this;return-1!==e.indexOf(" ")?p(e.split(" "),function(){n.toggleClass(this,t)}):n.each(function(){var n=this,r;s(n,e)!==t&&(r=n.className,t?n.className+=r?" "+e:e:n.className=N((" "+r+" ").replace(" "+e+" "," ")))}),n},hasClass:function(e){return s(this[0],e)},each:function(e){return p(this,e)},on:function(e,t){return this.each(function(){C.bind(this,e,t)})},off:function(e,t){return this.each(function(){C.unbind(this,e,t)})},show:function(){return this.css("display","")},hide:function(){return this.css("display","none")},slice:function(){return new c(y.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},replaceWith:function(e){var t=this;return t[0]&&t[0].parentNode.replaceChild(c(e)[0],t[0]),t},wrap:function(e){return e=c(e)[0],this.each(function(){var t=this,n=e.cloneNode(!1);t.parentNode.insertBefore(n,t),n.appendChild(t)})},unwrap:function(){return this.each(function(){for(var e=this,t=e.firstChild,n;t;)n=t,t=t.nextSibling,e.parentNode.insertBefore(n,e)})},clone:function(){var e=[];return this.each(function(){e.push(this.cloneNode(!0))}),c(e)},find:function(e){var t,n,r=[];for(t=0,n=this.length;n>t;t++)c.find(e,this[t],r);return c(r)},push:v,sort:[].sort,splice:[].splice},u(c,{extend:u,toArray:d,inArray:f,isArray:w,each:p,trim:N,makeMap:l,find:n,expr:n.selectors,unique:n.uniqueSort,text:n.getText,isXMLDoc:n.isXML,contains:n.contains,filter:function(e,t,n){return n&&(e=":not("+e+")"),1===t.length?c.find.matchesSelector(t[0],e)?[t[0]]:[]:c.find.matches(e,t)}}),p({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t){return h(e,"parentNode",t)},next:function(e){return m(e,"nextSibling",1)},prev:function(e){return m(e,"previousSibling",1)},nextNodes:function(e){return m(e,"nextSibling")},prevNodes:function(e){return m(e,"previousSibling")},children:function(e){return m(e.firstChild,"nextSibling",1)},contents:function(e){return d(("iframe"===e.nodeName?e.contentDocument||e.contentWindow.document:e).childNodes)}},function(e,t){c.fn[e]=function(n){var r=this,i;if(r.length>1)throw new Error("DomQuery only supports traverse functions on a single node.");return r[0]&&(i=t(r[0],n)),i=c(i),n&&"parentsUntil"!==e?i.filter(n):i}}),c.fn.filter=function(e){return c.filter(e)},c.fn.is=function(e){return!!e&&this.filter(e).length>0},c.fn.init.prototype=c.fn,c}),r(d,[],function(){return function(e,t){function n(e,t,n,r){function i(e){return e=parseInt(e,10).toString(16),e.length>1?e:"0"+e}return"#"+i(t)+i(n)+i(r)}var r=/rgb\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\s*\)/gi,i=/(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi,o=/\s*([^:]+):\s*([^;]+);?/g,a=/\s+$/,s,l,c={},u,d="\ufeff";
+for(e=e||{},u=("\\\" \\' \\; \\: ; : "+d).split(" "),l=0;l<u.length;l++)c[u[l]]=d+l,c[d+l]=u[l];return{toHex:function(e){return e.replace(r,n)},parse:function(t){function s(e,t,n){var r,i,o,a;if(r=m[e+"-top"+t],r&&(i=m[e+"-right"+t],i&&(o=m[e+"-bottom"+t],o&&(a=m[e+"-left"+t])))){var s=[r,i,o,a];for(l=s.length-1;l--&&s[l]===s[l+1];);l>-1&&n||(m[e+t]=-1==l?s[0]:s.join(" "),delete m[e+"-top"+t],delete m[e+"-right"+t],delete m[e+"-bottom"+t],delete m[e+"-left"+t])}}function u(e){var t=m[e],n;if(t){for(t=t.split(" "),n=t.length;n--;)if(t[n]!==t[0])return!1;return m[e]=t[0],!0}}function d(e,t,n,r){u(t)&&u(n)&&u(r)&&(m[e]=m[t]+" "+m[n]+" "+m[r],delete m[t],delete m[n],delete m[r])}function f(e){return b=!0,c[e]}function p(e,t){return b&&(e=e.replace(/\uFEFF[0-9]/g,function(e){return c[e]})),t||(e=e.replace(/\\([\'\";:])/g,"$1")),e}function h(t,n,r,i,o,a){return(o=o||a)?(o=p(o),"'"+o.replace(/\'/g,"\\'")+"'"):(n=p(n||r||i),!e.allow_script_urls&&/(java|vb)script:/i.test(n.replace(/[\s\r\n]+/,""))?"":(C&&(n=C.call(x,n,"style")),"url('"+n.replace(/\'/g,"\\'")+"')"))}var m={},g,v,y,b,C=e.url_converter,x=e.url_converter_scope||this;if(t){for(t=t.replace(/[\u0000-\u001F]/g,""),t=t.replace(/\\[\"\';:\uFEFF]/g,f).replace(/\"[^\"]+\"|\'[^\']+\'/g,function(e){return e.replace(/[;:]/g,f)});g=o.exec(t);){if(v=g[1].replace(a,"").toLowerCase(),y=g[2].replace(a,""),v&&y.length>0){if(!e.allow_script_urls&&("behavior"==v||/expression\s*\(/.test(y)))continue;"font-weight"===v&&"700"===y?y="bold":("color"===v||"background-color"===v)&&(y=y.toLowerCase()),y=y.replace(r,n),y=y.replace(i,h),m[v]=b?p(y,!0):y}o.lastIndex=g.index+g[0].length}s("border","",!0),s("border","-width"),s("border","-color"),s("border","-style"),s("padding",""),s("margin",""),d("border","border-width","border-style","border-color"),"medium none"===m.border&&delete m.border,"none"===m["border-image"]&&delete m["border-image"]}return m},serialize:function(e,n){function r(n){var r,o,a,l;if(r=t.styles[n])for(o=0,a=r.length;a>o;o++)n=r[o],l=e[n],l!==s&&l.length>0&&(i+=(i.length>0?" ":"")+n+": "+l+";")}var i="",o,a;if(n&&t&&t.styles)r("*"),r(n);else for(o in e)a=e[o],a!==s&&a.length>0&&(i+=(i.length>0?" ":"")+o+": "+a+";");return i}}}}),r(f,[],function(){return function(e,t){function n(e,n,r,i){var o,a;if(e){if(!i&&e[n])return e[n];if(e!=t){if(o=e[r])return o;for(a=e.parentNode;a&&a!=t;a=a.parentNode)if(o=a[r])return o}}}var r=e;this.current=function(){return r},this.next=function(e){return r=n(r,"firstChild","nextSibling",e)},this.prev=function(e){return r=n(r,"lastChild","previousSibling",e)}}}),r(p,[],function(){function e(e,n){return n?"array"==n&&g(e)?!0:typeof e==n:e!==t}function n(e){var t=[],n,r;for(n=0,r=e.length;r>n;n++)t[n]=e[n];return t}function r(e,t,n){var r;for(e=e||[],t=t||",","string"==typeof e&&(e=e.split(t)),n=n||{},r=e.length;r--;)n[e[r]]={};return n}function i(e,n,r){var i,o;if(!e)return 0;if(r=r||e,e.length!==t){for(i=0,o=e.length;o>i;i++)if(n.call(r,e[i],i,e)===!1)return 0}else for(i in e)if(e.hasOwnProperty(i)&&n.call(r,e[i],i,e)===!1)return 0;return 1}function o(e,t){var n=[];return i(e,function(e){n.push(t(e))}),n}function a(e,t){var n=[];return i(e,function(e){(!t||t(e))&&n.push(e)}),n}function s(e,t,n){var r=this,i,o,a,s,l,c=0;if(e=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(e),a=e[3].match(/(^|\.)(\w+)$/i)[2],o=r.createNS(e[3].replace(/\.\w+$/,""),n),!o[a]){if("static"==e[2])return o[a]=t,this.onCreate&&this.onCreate(e[2],e[3],o[a]),void 0;t[a]||(t[a]=function(){},c=1),o[a]=t[a],r.extend(o[a].prototype,t),e[5]&&(i=r.resolve(e[5]).prototype,s=e[5].match(/\.(\w+)$/i)[1],l=o[a],o[a]=c?function(){return i[s].apply(this,arguments)}:function(){return this.parent=i[s],l.apply(this,arguments)},o[a].prototype[a]=o[a],r.each(i,function(e,t){o[a].prototype[t]=i[t]}),r.each(t,function(e,t){i[t]?o[a].prototype[t]=function(){return this.parent=i[t],e.apply(this,arguments)}:t!=a&&(o[a].prototype[t]=e)})),r.each(t["static"],function(e,t){o[a][t]=e})}}function l(e,t){var n,r;if(e)for(n=0,r=e.length;r>n;n++)if(e[n]===t)return n;return-1}function c(e,n){var r,i,o,a=arguments,s;for(r=1,i=a.length;i>r;r++){n=a[r];for(o in n)n.hasOwnProperty(o)&&(s=n[o],s!==t&&(e[o]=s))}return e}function u(e,t,n,r){r=r||this,e&&(n&&(e=e[n]),i(e,function(e,i){return t.call(r,e,i,n)===!1?!1:(u(e,t,n,r),void 0)}))}function d(e,t){var n,r;for(t=t||window,e=e.split("."),n=0;n<e.length;n++)r=e[n],t[r]||(t[r]={}),t=t[r];return t}function f(e,t){var n,r;for(t=t||window,e=e.split("."),n=0,r=e.length;r>n&&(t=t[e[n]],t);n++);return t}function p(t,n){return!t||e(t,"array")?t:o(t.split(n||","),m)}var h=/^\s*|\s*$/g,m=function(e){return null===e||e===t?"":(""+e).replace(h,"")},g=Array.isArray||function(e){return"[object Array]"===Object.prototype.toString.call(e)};return{trim:m,isArray:g,is:e,toArray:n,makeMap:r,each:i,map:o,grep:a,inArray:l,extend:c,create:s,walk:u,createNS:d,resolve:f,explode:p}}),r(h,[p],function(e){function t(n){function r(){return M.createDocumentFragment()}function i(e,t){_(F,e,t)}function o(e,t){_(z,e,t)}function a(e){i(e.parentNode,j(e))}function s(e){i(e.parentNode,j(e)+1)}function l(e){o(e.parentNode,j(e))}function c(e){o(e.parentNode,j(e)+1)}function u(e){e?(H[U]=H[V],H[q]=H[W]):(H[V]=H[U],H[W]=H[q]),H.collapsed=F}function d(e){a(e),c(e)}function f(e){i(e,0),o(e,1===e.nodeType?e.childNodes.length:e.nodeValue.length)}function p(e,t){var n=H[V],r=H[W],i=H[U],o=H[q],a=t.startContainer,s=t.startOffset,l=t.endContainer,c=t.endOffset;return 0===e?w(n,r,a,s):1===e?w(i,o,a,s):2===e?w(i,o,l,c):3===e?w(n,r,l,c):void 0}function h(){N(I)}function m(){return N(P)}function g(){return N(O)}function v(e){var t=this[V],r=this[W],i,o;3!==t.nodeType&&4!==t.nodeType||!t.nodeValue?(t.childNodes.length>0&&(o=t.childNodes[r]),o?t.insertBefore(e,o):3==t.nodeType?n.insertAfter(e,t):t.appendChild(e)):r?r>=t.nodeValue.length?n.insertAfter(e,t):(i=t.splitText(r),t.parentNode.insertBefore(e,i)):t.parentNode.insertBefore(e,t)}function y(e){var t=H.extractContents();H.insertNode(e),e.appendChild(t),H.selectNode(e)}function b(){return $(new t(n),{startContainer:H[V],startOffset:H[W],endContainer:H[U],endOffset:H[q],collapsed:H.collapsed,commonAncestorContainer:H.commonAncestorContainer})}function C(e,t){var n;if(3==e.nodeType)return e;if(0>t)return e;for(n=e.firstChild;n&&t>0;)--t,n=n.nextSibling;return n?n:e}function x(){return H[V]==H[U]&&H[W]==H[q]}function w(e,t,r,i){var o,a,s,l,c,u;if(e==r)return t==i?0:i>t?-1:1;for(o=r;o&&o.parentNode!=e;)o=o.parentNode;if(o){for(a=0,s=e.firstChild;s!=o&&t>a;)a++,s=s.nextSibling;return a>=t?-1:1}for(o=e;o&&o.parentNode!=r;)o=o.parentNode;if(o){for(a=0,s=r.firstChild;s!=o&&i>a;)a++,s=s.nextSibling;return i>a?-1:1}for(l=n.findCommonAncestor(e,r),c=e;c&&c.parentNode!=l;)c=c.parentNode;for(c||(c=l),u=r;u&&u.parentNode!=l;)u=u.parentNode;if(u||(u=l),c==u)return 0;for(s=l.firstChild;s;){if(s==c)return-1;if(s==u)return 1;s=s.nextSibling}}function _(e,t,r){var i,o;for(e?(H[V]=t,H[W]=r):(H[U]=t,H[q]=r),i=H[U];i.parentNode;)i=i.parentNode;for(o=H[V];o.parentNode;)o=o.parentNode;o==i?w(H[V],H[W],H[U],H[q])>0&&H.collapse(e):H.collapse(e),H.collapsed=x(),H.commonAncestorContainer=n.findCommonAncestor(H[V],H[U])}function N(e){var t,n=0,r=0,i,o,a,s,l,c;if(H[V]==H[U])return E(e);for(t=H[U],i=t.parentNode;i;t=i,i=i.parentNode){if(i==H[V])return k(t,e);++n}for(t=H[V],i=t.parentNode;i;t=i,i=i.parentNode){if(i==H[U])return S(t,e);++r}for(o=r-n,a=H[V];o>0;)a=a.parentNode,o--;for(s=H[U];0>o;)s=s.parentNode,o++;for(l=a.parentNode,c=s.parentNode;l!=c;l=l.parentNode,c=c.parentNode)a=l,s=c;return T(a,s,e)}function E(e){var t,n,i,o,a,s,l,c,u;if(e!=I&&(t=r()),H[W]==H[q])return t;if(3==H[V].nodeType){if(n=H[V].nodeValue,i=n.substring(H[W],H[q]),e!=O&&(o=H[V],c=H[W],u=H[q]-H[W],0===c&&u>=o.nodeValue.length-1?o.parentNode.removeChild(o):o.deleteData(c,u),H.collapse(F)),e==I)return;return i.length>0&&t.appendChild(M.createTextNode(i)),t}for(o=C(H[V],H[W]),a=H[q]-H[W];o&&a>0;)s=o.nextSibling,l=L(o,e),t&&t.appendChild(l),--a,o=s;return e!=O&&H.collapse(F),t}function k(e,t){var n,i,o,a,s,l;if(t!=I&&(n=r()),i=R(e,t),n&&n.appendChild(i),o=j(e),a=o-H[W],0>=a)return t!=O&&(H.setEndBefore(e),H.collapse(z)),n;for(i=e.previousSibling;a>0;)s=i.previousSibling,l=L(i,t),n&&n.insertBefore(l,n.firstChild),--a,i=s;return t!=O&&(H.setEndBefore(e),H.collapse(z)),n}function S(e,t){var n,i,o,a,s,l;for(t!=I&&(n=r()),o=A(e,t),n&&n.appendChild(o),i=j(e),++i,a=H[q]-i,o=e.nextSibling;o&&a>0;)s=o.nextSibling,l=L(o,t),n&&n.appendChild(l),--a,o=s;return t!=O&&(H.setStartAfter(e),H.collapse(F)),n}function T(e,t,n){var i,o,a,s,l,c,u,d;for(n!=I&&(o=r()),i=A(e,n),o&&o.appendChild(i),a=e.parentNode,s=j(e),l=j(t),++s,c=l-s,u=e.nextSibling;c>0;)d=u.nextSibling,i=L(u,n),o&&o.appendChild(i),u=d,--c;return i=R(t,n),o&&o.appendChild(i),n!=O&&(H.setStartAfter(e),H.collapse(F)),o}function R(e,t){var n=C(H[U],H[q]-1),r,i,o,a,s,l=n!=H[U];if(n==e)return B(n,l,z,t);for(r=n.parentNode,i=B(r,z,z,t);r;){for(;n;)o=n.previousSibling,a=B(n,l,z,t),t!=I&&i.insertBefore(a,i.firstChild),l=F,n=o;if(r==e)return i;n=r.previousSibling,r=r.parentNode,s=B(r,z,z,t),t!=I&&s.appendChild(i),i=s}}function A(e,t){var n=C(H[V],H[W]),r=n!=H[V],i,o,a,s,l;if(n==e)return B(n,r,F,t);for(i=n.parentNode,o=B(i,z,F,t);i;){for(;n;)a=n.nextSibling,s=B(n,r,F,t),t!=I&&o.appendChild(s),r=F,n=a;if(i==e)return o;n=i.nextSibling,i=i.parentNode,l=B(i,z,F,t),t!=I&&l.appendChild(o),o=l}}function B(e,t,r,i){var o,a,s,l,c;if(t)return L(e,i);if(3==e.nodeType){if(o=e.nodeValue,r?(l=H[W],a=o.substring(l),s=o.substring(0,l)):(l=H[q],a=o.substring(0,l),s=o.substring(l)),i!=O&&(e.nodeValue=s),i==I)return;return c=n.clone(e,z),c.nodeValue=a,c}if(i!=I)return n.clone(e,z)}function L(e,t){return t!=I?t==O?n.clone(e,F):e:(e.parentNode.removeChild(e),void 0)}function D(){return n.create("body",null,g()).outerText}var H=this,M=n.doc,P=0,O=1,I=2,F=!0,z=!1,W="startOffset",V="startContainer",U="endContainer",q="endOffset",$=e.extend,j=n.nodeIndex;return $(H,{startContainer:M,startOffset:0,endContainer:M,endOffset:0,collapsed:F,commonAncestorContainer:M,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:i,setEnd:o,setStartBefore:a,setStartAfter:s,setEndBefore:l,setEndAfter:c,collapse:u,selectNode:d,selectNodeContents:f,compareBoundaryPoints:p,deleteContents:h,extractContents:m,cloneContents:g,insertNode:v,surroundContents:y,cloneRange:b,toStringIE:D}),H}return t.prototype.toString=function(){return this.toStringIE()},t}),r(m,[p],function(e){function t(e){var t;return t=document.createElement("div"),t.innerHTML=e,t.textContent||t.innerText||e}function n(e,t){var n,r,i,a={};if(e){for(e=e.split(","),t=t||10,n=0;n<e.length;n+=2)r=String.fromCharCode(parseInt(e[n],t)),o[r]||(i="&"+e[n+1]+";",a[r]=i,a[i]=r);return a}}var r=e.makeMap,i,o,a,s=/[&<>\"\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,l=/[<>&\u007E-\uD7FF\uE000-\uFFEF]|[\uD800-\uDBFF][\uDC00-\uDFFF]/g,c=/[<>&\"\']/g,u=/&(#x|#)?([\w]+);/g,d={128:"\u20ac",130:"\u201a",131:"\u0192",132:"\u201e",133:"\u2026",134:"\u2020",135:"\u2021",136:"\u02c6",137:"\u2030",138:"\u0160",139:"\u2039",140:"\u0152",142:"\u017d",145:"\u2018",146:"\u2019",147:"\u201c",148:"\u201d",149:"\u2022",150:"\u2013",151:"\u2014",152:"\u02dc",153:"\u2122",154:"\u0161",155:"\u203a",156:"\u0153",158:"\u017e",159:"\u0178"};o={'"':"&quot;","'":"&#39;","<":"&lt;",">":"&gt;","&":"&amp;"},a={"&lt;":"<","&gt;":">","&amp;":"&","&quot;":'"',"&apos;":"'"},i=n("50,nbsp,51,iexcl,52,cent,53,pound,54,curren,55,yen,56,brvbar,57,sect,58,uml,59,copy,5a,ordf,5b,laquo,5c,not,5d,shy,5e,reg,5f,macr,5g,deg,5h,plusmn,5i,sup2,5j,sup3,5k,acute,5l,micro,5m,para,5n,middot,5o,cedil,5p,sup1,5q,ordm,5r,raquo,5s,frac14,5t,frac12,5u,frac34,5v,iquest,60,Agrave,61,Aacute,62,Acirc,63,Atilde,64,Auml,65,Aring,66,AElig,67,Ccedil,68,Egrave,69,Eacute,6a,Ecirc,6b,Euml,6c,Igrave,6d,Iacute,6e,Icirc,6f,Iuml,6g,ETH,6h,Ntilde,6i,Ograve,6j,Oacute,6k,Ocirc,6l,Otilde,6m,Ouml,6n,times,6o,Oslash,6p,Ugrave,6q,Uacute,6r,Ucirc,6s,Uuml,6t,Yacute,6u,THORN,6v,szlig,70,agrave,71,aacute,72,acirc,73,atilde,74,auml,75,aring,76,aelig,77,ccedil,78,egrave,79,eacute,7a,ecirc,7b,euml,7c,igrave,7d,iacute,7e,icirc,7f,iuml,7g,eth,7h,ntilde,7i,ograve,7j,oacute,7k,ocirc,7l,otilde,7m,ouml,7n,divide,7o,oslash,7p,ugrave,7q,uacute,7r,ucirc,7s,uuml,7t,yacute,7u,thorn,7v,yuml,ci,fnof,sh,Alpha,si,Beta,sj,Gamma,sk,Delta,sl,Epsilon,sm,Zeta,sn,Eta,so,Theta,sp,Iota,sq,Kappa,sr,Lambda,ss,Mu,st,Nu,su,Xi,sv,Omicron,t0,Pi,t1,Rho,t3,Sigma,t4,Tau,t5,Upsilon,t6,Phi,t7,Chi,t8,Psi,t9,Omega,th,alpha,ti,beta,tj,gamma,tk,delta,tl,epsilon,tm,zeta,tn,eta,to,theta,tp,iota,tq,kappa,tr,lambda,ts,mu,tt,nu,tu,xi,tv,omicron,u0,pi,u1,rho,u2,sigmaf,u3,sigma,u4,tau,u5,upsilon,u6,phi,u7,chi,u8,psi,u9,omega,uh,thetasym,ui,upsih,um,piv,812,bull,816,hellip,81i,prime,81j,Prime,81u,oline,824,frasl,88o,weierp,88h,image,88s,real,892,trade,89l,alefsym,8cg,larr,8ch,uarr,8ci,rarr,8cj,darr,8ck,harr,8dl,crarr,8eg,lArr,8eh,uArr,8ei,rArr,8ej,dArr,8ek,hArr,8g0,forall,8g2,part,8g3,exist,8g5,empty,8g7,nabla,8g8,isin,8g9,notin,8gb,ni,8gf,prod,8gh,sum,8gi,minus,8gn,lowast,8gq,radic,8gt,prop,8gu,infin,8h0,ang,8h7,and,8h8,or,8h9,cap,8ha,cup,8hb,int,8hk,there4,8hs,sim,8i5,cong,8i8,asymp,8j0,ne,8j1,equiv,8j4,le,8j5,ge,8k2,sub,8k3,sup,8k4,nsub,8k6,sube,8k7,supe,8kl,oplus,8kn,otimes,8l5,perp,8m5,sdot,8o8,lceil,8o9,rceil,8oa,lfloor,8ob,rfloor,8p9,lang,8pa,rang,9ea,loz,9j0,spades,9j3,clubs,9j5,hearts,9j6,diams,ai,OElig,aj,oelig,b0,Scaron,b1,scaron,bo,Yuml,m6,circ,ms,tilde,802,ensp,803,emsp,809,thinsp,80c,zwnj,80d,zwj,80e,lrm,80f,rlm,80j,ndash,80k,mdash,80o,lsquo,80p,rsquo,80q,sbquo,80s,ldquo,80t,rdquo,80u,bdquo,810,dagger,811,Dagger,81g,permil,81p,lsaquo,81q,rsaquo,85c,euro",32);var f={encodeRaw:function(e,t){return e.replace(t?s:l,function(e){return o[e]||e})},encodeAllRaw:function(e){return(""+e).replace(c,function(e){return o[e]||e})},encodeNumeric:function(e,t){return e.replace(t?s:l,function(e){return e.length>1?"&#"+(1024*(e.charCodeAt(0)-55296)+(e.charCodeAt(1)-56320)+65536)+";":o[e]||"&#"+e.charCodeAt(0)+";"})},encodeNamed:function(e,t,n){return n=n||i,e.replace(t?s:l,function(e){return o[e]||n[e]||e})},getEncodeFunc:function(e,t){function a(e,n){return e.replace(n?s:l,function(e){return o[e]||t[e]||"&#"+e.charCodeAt(0)+";"||e})}function c(e,n){return f.encodeNamed(e,n,t)}return t=n(t)||i,e=r(e.replace(/\+/g,",")),e.named&&e.numeric?a:e.named?t?c:f.encodeNamed:e.numeric?f.encodeNumeric:f.encodeRaw},decode:function(e){return e.replace(u,function(e,n,r){return n?(r=parseInt(r,2===n.length?16:10),r>65535?(r-=65536,String.fromCharCode(55296+(r>>10),56320+(1023&r))):d[r]||String.fromCharCode(r)):a[e]||i[e]||t(e)})}};return f}),r(g,[],function(){var e=navigator,t=e.userAgent,n,r,i,o,a,s,l;n=window.opera&&window.opera.buildNumber,r=/WebKit/.test(t),i=!r&&!n&&/MSIE/gi.test(t)&&/Explorer/gi.test(e.appName),i=i&&/MSIE (\w+)\./.exec(t)[1],o=-1==t.indexOf("Trident/")||-1==t.indexOf("rv:")&&-1==e.appName.indexOf("Netscape")?!1:11,i=i||o,a=!r&&!o&&/Gecko/.test(t),s=-1!=t.indexOf("Mac"),l=/(iPad|iPhone)/.test(t);var c=!l||t.match(/AppleWebKit\/(\d*)/)[1]>=534;return{opera:n,webkit:r,ie:i,gecko:a,mac:s,iOS:l,contentEditable:c,transparentSrc:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",caretAfter:8!=i,range:window.getSelection&&"Range"in window,documentMode:i?document.documentMode||7:10}}),r(v,[c,d,l,f,h,m,g,p],function(e,n,r,i,o,a,s,l){function c(e,t){var i=this,o;i.doc=e,i.win=window,i.files={},i.counter=0,i.stdMode=!g||e.documentMode>=8,i.boxModel=!g||"CSS1Compat"==e.compatMode||i.stdMode,i.hasOuterHTML="outerHTML"in e.createElement("a"),this.boundEvents=[],i.settings=t=h({keep_values:!1,hex_colors:1},t),i.schema=t.schema,i.styles=new n({url_converter:t.url_converter,url_converter_scope:t.url_converter_scope},t.schema),i.fixDoc(e),i.events=t.ownEvents?new r(t.proxy):r.Event,o=t.schema?t.schema.getBlockElements():{},i.isBlock=function(e){if(!e)return!1;var t=e.nodeType;return t?!(1!==t||!o[e.nodeName]):!!o[e]}}var u=l.each,d=l.is,f=l.grep,p=l.trim,h=l.extend,m=s.webkit,g=s.ie,v=/^([a-z0-9],?)+$/i,y=/^[ \t\r\n]*$/,b=l.makeMap("fillOpacity fontWeight lineHeight opacity orphans widows zIndex zoom"," ");return c.prototype={root:null,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},fixDoc:function(e){var t=this.settings,n;if(g&&t.schema){"abbr article aside audio canvas details figcaption figure footer header hgroup mark menu meter nav output progress section summary time video".replace(/\w+/g,function(t){e.createElement(t)});for(n in t.schema.getCustomElements())e.createElement(n)}},clone:function(e,t){var n=this,r,i;return!g||1!==e.nodeType||t?e.cloneNode(t):(i=n.doc,t?r.firstChild:(r=i.createElement(e.nodeName),u(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),r))},getRoot:function(){var e=this;return e.get(e.settings.root_element)||e.doc.body},getViewPort:function(e){var t,n;return e=e?e:this.win,t=e.document,n=this.boxModel?t.documentElement:t.body,{x:e.pageXOffset||n.scrollLeft,y:e.pageYOffset||n.scrollTop,w:e.innerWidth||n.clientWidth,h:e.innerHeight||n.clientHeight}},getRect:function(e){var t=this,n,r;return e=t.get(e),n=t.getPos(e),r=t.getSize(e),{x:n.x,y:n.y,w:r.w,h:r.h}},getSize:function(e){var t=this,n,r;return e=t.get(e),n=t.getStyle(e,"width"),r=t.getStyle(e,"height"),-1===n.indexOf("px")&&(n=0),-1===r.indexOf("px")&&(r=0),{w:parseInt(n,10)||e.offsetWidth||e.clientWidth,h:parseInt(r,10)||e.offsetHeight||e.clientHeight}},getParent:function(e,t,n){return this.getParents(e,t,n,!1)},getParents:function(e,n,r,i){var o=this,a,s=[];for(e=o.get(e),i=i===t,r=r||("BODY"!=o.getRoot().nodeName?o.getRoot().parentNode:null),d(n,"string")&&(a=n,n="*"===n?function(e){return 1==e.nodeType}:function(e){return o.is(e,a)});e&&e!=r&&e.nodeType&&9!==e.nodeType;){if(!n||n(e)){if(!i)return e;s.push(e)}e=e.parentNode}return i?s:null},get:function(e){var t;return e&&this.doc&&"string"==typeof e&&(t=e,e=this.doc.getElementById(e),e&&e.id!==t)?this.doc.getElementsByName(t)[1]:e},getNext:function(e,t){return this._findSib(e,t,"nextSibling")},getPrev:function(e,t){return this._findSib(e,t,"previousSibling")},select:function(t,n){var r=this;return e(t,r.get(n)||r.get(r.settings.root_element)||r.doc,[])},is:function(n,r){var i;if(n.length===t){if("*"===r)return 1==n.nodeType;if(v.test(r)){for(r=r.toLowerCase().split(/,/),n=n.nodeName.toLowerCase(),i=r.length-1;i>=0;i--)if(r[i]==n)return!0;return!1}}return n.nodeType&&1!=n.nodeType?!1:e.matches(r,n.nodeType?[n]:n).length>0},add:function(e,t,n,r,i){var o=this;return this.run(e,function(e){var a;return a=d(t,"string")?o.doc.createElement(t):t,o.setAttribs(a,n),r&&(r.nodeType?a.appendChild(r):o.setHTML(a,r)),i?a:e.appendChild(a)})},create:function(e,t,n){return this.add(this.doc.createElement(e),e,t,n,1)},createHTML:function(e,t,n){var r="",i;r+="<"+e;for(i in t)t.hasOwnProperty(i)&&null!==t[i]&&(r+=" "+i+'="'+this.encode(t[i])+'"');return"undefined"!=typeof n?r+">"+n+"</"+e+">":r+" />"},createFragment:function(e){var t,n,r=this.doc,i;for(i=r.createElement("div"),t=r.createDocumentFragment(),e&&(i.innerHTML=e);n=i.firstChild;)t.appendChild(n);return t},remove:function(e,t){return this.run(e,function(e){var n,r=e.parentNode;if(!r)return null;if(t)for(;n=e.firstChild;)!g||3!==n.nodeType||n.nodeValue?r.insertBefore(n,e):e.removeChild(n);return r.removeChild(e)})},setStyle:function(e,t,n){return this.run(e,function(e){var r=this,i,o;if(t)if("string"==typeof t){i=e.style,t=t.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"number"!=typeof n||b[t]||(n+="px"),"opacity"===t&&e.runtimeStyle&&"undefined"==typeof e.runtimeStyle.opacity&&(i.filter=""===n?"":"alpha(opacity="+100*n+")"),"float"==t&&(t="cssFloat"in e.style?"cssFloat":"styleFloat");try{i[t]=n}catch(a){}r.settings.update_styles&&e.removeAttribute("data-mce-style")}else for(o in t)r.setStyle(e,o,t[o])})},getStyle:function(e,n,r){if(e=this.get(e)){if(this.doc.defaultView&&r){n=n.replace(/[A-Z]/g,function(e){return"-"+e});try{return this.doc.defaultView.getComputedStyle(e,null).getPropertyValue(n)}catch(i){return null}}return n=n.replace(/-(\D)/g,function(e,t){return t.toUpperCase()}),"float"==n&&(n=g?"styleFloat":"cssFloat"),e.currentStyle&&r?e.currentStyle[n]:e.style?e.style[n]:t}},setStyles:function(e,t){this.setStyle(e,t)},css:function(e,t,n){this.setStyle(e,t,n)},removeAllAttribs:function(e){return this.run(e,function(e){var t,n=e.attributes;for(t=n.length-1;t>=0;t--)e.removeAttributeNode(n.item(t))})},setAttrib:function(e,t,n){var r=this;if(e&&t)return this.run(e,function(e){var i=r.settings,o=e.getAttribute(t);if(null!==n)switch(t){case"style":if(!d(n,"string"))return u(n,function(t,n){r.setStyle(e,n,t)}),void 0;i.keep_values&&(n?e.setAttribute("data-mce-style",n,2):e.removeAttribute("data-mce-style",2)),e.style.cssText=n;break;case"class":e.className=n||"";break;case"src":case"href":i.keep_values&&(i.url_converter&&(n=i.url_converter.call(i.url_converter_scope||r,n,t,e)),r.setAttrib(e,"data-mce-"+t,n,2));break;case"shape":e.setAttribute("data-mce-style",n)}d(n)&&null!==n&&0!==n.length?e.setAttribute(t,""+n,2):e.removeAttribute(t,2),o!=n&&i.onSetAttrib&&i.onSetAttrib({attrElm:e,attrName:t,attrValue:n})})},setAttribs:function(e,t){var n=this;return this.run(e,function(e){u(t,function(t,r){n.setAttrib(e,r,t)})})},getAttrib:function(e,t,n){var r,i=this,o;if(e=i.get(e),!e||1!==e.nodeType)return n===o?!1:n;if(d(n)||(n=""),/^(src|href|style|coords|shape)$/.test(t)&&(r=e.getAttribute("data-mce-"+t)))return r;if(g&&i.props[t]&&(r=e[i.props[t]],r=r&&r.nodeValue?r.nodeValue:r),r||(r=e.getAttribute(t,2)),/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(t))return e[i.props[t]]===!0&&""===r?t:r?t:"";if("FORM"===e.nodeName&&e.getAttributeNode(t))return e.getAttributeNode(t).nodeValue;if("style"===t&&(r=r||e.style.cssText,r&&(r=i.serializeStyle(i.parseStyle(r),e.nodeName),i.settings.keep_values&&e.setAttribute("data-mce-style",r))),m&&"class"===t&&r&&(r=r.replace(/(apple|webkit)\-[a-z\-]+/gi,"")),g)switch(t){case"rowspan":case"colspan":1===r&&(r="");break;case"size":("+0"===r||20===r||0===r)&&(r="");break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":0===r&&(r="");break;case"hspace":-1===r&&(r="");break;case"maxlength":case"tabindex":(32768===r||2147483647===r||"32768"===r)&&(r="");break;case"multiple":case"compact":case"noshade":case"nowrap":return 65535===r?t:n;case"shape":r=r.toLowerCase();break;default:0===t.indexOf("on")&&r&&(r=(""+r).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1"))}return r!==o&&null!==r&&""!==r?""+r:n},getPos:function(e,t){var n=this,r=0,i=0,o,a=n.doc,s;if(e=n.get(e),t=t||a.body,e){if(t===a.body&&e.getBoundingClientRect)return s=e.getBoundingClientRect(),t=n.boxModel?a.documentElement:a.body,r=s.left+(a.documentElement.scrollLeft||a.body.scrollLeft)-t.clientTop,i=s.top+(a.documentElement.scrollTop||a.body.scrollTop)-t.clientLeft,{x:r,y:i};for(o=e;o&&o!=t&&o.nodeType;)r+=o.offsetLeft||0,i+=o.offsetTop||0,o=o.offsetParent;for(o=e.parentNode;o&&o!=t&&o.nodeType;)r-=o.scrollLeft||0,i-=o.scrollTop||0,o=o.parentNode}return{x:r,y:i}},parseStyle:function(e){return this.styles.parse(e)},serializeStyle:function(e,t){return this.styles.serialize(e,t)},addStyle:function(e){var t=this,n=t.doc,r,i;if(t!==c.DOM&&n===document){var o=c.DOM.addedStyles;if(o=o||[],o[e])return;o[e]=!0,c.DOM.addedStyles=o}i=n.getElementById("mceDefaultStyles"),i||(i=n.createElement("style"),i.id="mceDefaultStyles",i.type="text/css",r=n.getElementsByTagName("head")[0],r.firstChild?r.insertBefore(i,r.firstChild):r.appendChild(i)),i.styleSheet?i.styleSheet.cssText+=e:i.appendChild(n.createTextNode(e))},loadCSS:function(e){var t=this,n=t.doc,r;return t!==c.DOM&&n===document?(c.DOM.loadCSS(e),void 0):(e||(e=""),r=n.getElementsByTagName("head")[0],u(e.split(","),function(e){var i;t.files[e]||(t.files[e]=!0,i=t.create("link",{rel:"stylesheet",href:e}),g&&n.documentMode&&n.recalc&&(i.onload=function(){n.recalc&&n.recalc(),i.onload=null}),r.appendChild(i))}),void 0)},addClass:function(e,t){return this.run(e,function(e){var n;return t?this.hasClass(e,t)?e.className:(n=this.removeClass(e,t),e.className=n=(""!==n?n+" ":"")+t,n):0})},removeClass:function(e,t){var n=this,r;return n.run(e,function(e){var i;return n.hasClass(e,t)?(r||(r=new RegExp("(^|\\s+)"+t+"(\\s+|$)","g")),i=e.className.replace(r," "),i=p(" "!=i?i:""),e.className=i,i||(e.removeAttribute("class"),e.removeAttribute("className")),i):e.className})},hasClass:function(e,t){return e=this.get(e),e&&t?-1!==(" "+e.className+" ").indexOf(" "+t+" "):!1},toggleClass:function(e,n,r){r=r===t?!this.hasClass(e,n):r,this.hasClass(e,n)!==r&&(r?this.addClass(e,n):this.removeClass(e,n))},show:function(e){return this.setStyle(e,"display","block")},hide:function(e){return this.setStyle(e,"display","none")},isHidden:function(e){return e=this.get(e),!e||"none"==e.style.display||"none"==this.getStyle(e,"display")},uniqueId:function(e){return(e?e:"mce_")+this.counter++},setHTML:function(e,t){var n=this;return n.run(e,function(e){if(g){for(;e.firstChild;)e.removeChild(e.firstChild);try{e.innerHTML="<br />"+t,e.removeChild(e.firstChild)}catch(r){var i=n.create("div");i.innerHTML="<br />"+t,u(f(i.childNodes),function(t,n){n&&e.canHaveHTML&&e.appendChild(t)})}}else e.innerHTML=t;return t})},getOuterHTML:function(e){var t,n=this;return(e=n.get(e))?1===e.nodeType&&n.hasOuterHTML?e.outerHTML:(t=(e.ownerDocument||n.doc).createElement("body"),t.appendChild(e.cloneNode(!0)),t.innerHTML):null},setOuterHTML:function(e,t,n){var r=this;return r.run(e,function(e){function i(){var i,o;for(o=n.createElement("body"),o.innerHTML=t,i=o.lastChild;i;)r.insertAfter(i.cloneNode(!0),e),i=i.previousSibling;r.remove(e)}if(1==e.nodeType)if(n=n||e.ownerDocument||r.doc,g)try{1==e.nodeType&&r.hasOuterHTML?e.outerHTML=t:i()}catch(o){i()}else i()})},decode:a.decode,encode:a.encodeAllRaw,insertAfter:function(e,t){return t=this.get(t),this.run(e,function(e){var n,r;return n=t.parentNode,r=t.nextSibling,r?n.insertBefore(e,r):n.appendChild(e),e})},replace:function(e,t,n){var r=this;return r.run(t,function(t){return d(t,"array")&&(e=e.cloneNode(!0)),n&&u(f(t.childNodes),function(t){e.appendChild(t)}),t.parentNode.replaceChild(e,t)})},rename:function(e,t){var n=this,r;return e.nodeName!=t.toUpperCase()&&(r=n.create(t),u(n.getAttribs(e),function(t){n.setAttrib(r,t.nodeName,n.getAttrib(e,t.nodeName))}),n.replace(r,e,1)),r||e},findCommonAncestor:function(e,t){for(var n=e,r;n;){for(r=t;r&&n!=r;)r=r.parentNode;if(n==r)break;n=n.parentNode}return!n&&e.ownerDocument?e.ownerDocument.documentElement:n},toHex:function(e){return this.styles.toHex(l.trim(e))},run:function(e,t,n){var r=this,i;return"string"==typeof e&&(e=r.get(e)),e?(n=n||this,e.nodeType||!e.length&&0!==e.length?t.call(n,e):(i=[],u(e,function(e,o){e&&("string"==typeof e&&(e=r.get(e)),i.push(t.call(n,e,o)))}),i)):!1},getAttribs:function(e){var t;if(e=this.get(e),!e)return[];if(g){if(t=[],"OBJECT"==e.nodeName)return e.attributes;"OPTION"===e.nodeName&&this.getAttrib(e,"selected")&&t.push({specified:1,nodeName:"selected"});var n=/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi;return e.cloneNode(!1).outerHTML.replace(n,"").replace(/[\w:\-]+/gi,function(e){t.push({specified:1,nodeName:e})}),t}return e.attributes},isEmpty:function(e,t){var n=this,r,o,a,s,l,c=0;if(e=e.firstChild){s=new i(e,e.parentNode),t=t||n.schema?n.schema.getNonEmptyElements():null;do{if(a=e.nodeType,1===a){if(e.getAttribute("data-mce-bogus"))continue;if(l=e.nodeName.toLowerCase(),t&&t[l]){if("br"===l){c++;continue}return!1}for(o=n.getAttribs(e),r=e.attributes.length;r--;)if(l=e.attributes[r].nodeName,"name"===l||"data-mce-bookmark"===l)return!1}if(8==a)return!1;if(3===a&&!y.test(e.nodeValue))return!1}while(e=s.next())}return 1>=c},createRng:function(){var e=this.doc;return e.createRange?e.createRange():new o(this)},nodeIndex:function(e,t){var n=0,r,i,o;if(e)for(r=e.nodeType,e=e.previousSibling,i=e;e;e=e.previousSibling)o=e.nodeType,(!t||3!=o||o!=r&&e.nodeValue.length)&&(n++,r=o);return n},split:function(e,t,n){function r(e){function t(e){var t=e.previousSibling&&"SPAN"==e.previousSibling.nodeName,n=e.nextSibling&&"SPAN"==e.nextSibling.nodeName;return t&&n}var n,o=e.childNodes,a=e.nodeType;if(1!=a||"bookmark"!=e.getAttribute("data-mce-type")){for(n=o.length-1;n>=0;n--)r(o[n]);if(9!=a){if(3==a&&e.nodeValue.length>0){var s=p(e.nodeValue).length;if(!i.isBlock(e.parentNode)||s>0||0===s&&t(e))return}else if(1==a&&(o=e.childNodes,1==o.length&&o[0]&&1==o[0].nodeType&&"bookmark"==o[0].getAttribute("data-mce-type")&&e.parentNode.insertBefore(o[0],e),o.length||/^(br|hr|input|img)$/i.test(e.nodeName)))return;i.remove(e)}return e}}var i=this,o=i.createRng(),a,s,l;return e&&t?(o.setStart(e.parentNode,i.nodeIndex(e)),o.setEnd(t.parentNode,i.nodeIndex(t)),a=o.extractContents(),o=i.createRng(),o.setStart(t.parentNode,i.nodeIndex(t)+1),o.setEnd(e.parentNode,i.nodeIndex(e)+1),s=o.extractContents(),l=e.parentNode,l.insertBefore(r(a),e),n?l.replaceChild(n,t):l.insertBefore(t,e),l.insertBefore(r(s),e),i.remove(e),n||t):void 0},bind:function(e,t,n,r){var i=this;if(l.isArray(e)){for(var o=e.length;o--;)e[o]=i.bind(e[o],t,n,r);return e}return!i.settings.collect||e!==i.doc&&e!==i.win||i.boundEvents.push([e,t,n,r]),i.events.bind(e,t,n,r||i)},unbind:function(e,t,n){var r=this,i;if(l.isArray(e)){for(i=e.length;i--;)e[i]=r.unbind(e[i],t,n);return e}if(r.boundEvents&&(e===r.doc||e===r.win))for(i=r.boundEvents.length;i--;){var o=r.boundEvents[i];e!=o[0]||t&&t!=o[1]||n&&n!=o[2]||this.events.unbind(o[0],o[1],o[2])}return this.events.unbind(e,t,n)},fire:function(e,t,n){return this.events.fire(e,t,n)},getContentEditable:function(e){var t;return 1!=e.nodeType?null:(t=e.getAttribute("data-mce-contenteditable"),t&&"inherit"!==t?t:"inherit"!==e.contentEditable?e.contentEditable:null)},destroy:function(){var t=this;if(t.boundEvents){for(var n=t.boundEvents.length;n--;){var r=t.boundEvents[n];this.events.unbind(r[0],r[1],r[2])}t.boundEvents=null}e.setDocument&&e.setDocument(),t.win=t.doc=t.root=t.events=t.frag=null},dumpRng:function(e){return"startContainer: "+e.startContainer.nodeName+", startOffset: "+e.startOffset+", endContainer: "+e.endContainer.nodeName+", endOffset: "+e.endOffset},_findSib:function(e,t,n){var r=this,i=t;if(e)for("string"==typeof i&&(i=function(e){return r.is(e,t)}),e=e[n];e;e=e[n])if(i(e))return e;return null}},c.DOM=new c(document),c}),r(y,[v,p],function(e,t){function n(){function e(e,t){function n(){o.remove(s),a&&(a.onreadystatechange=a.onload=a=null),t()}function i(){"undefined"!=typeof console&&console.log&&console.log("Failed to load: "+e)}var o=r,a,s;s=o.uniqueId(),a=document.createElement("script"),a.id=s,a.type="text/javascript",a.src=e,"onreadystatechange"in a?a.onreadystatechange=function(){/loaded|complete/.test(a.readyState)&&n()}:a.onload=n,a.onerror=i,(document.getElementsByTagName("head")[0]||document.body).appendChild(a)}var t=0,n=1,a=2,s={},l=[],c={},u=[],d=0,f;this.isDone=function(e){return s[e]==a},this.markDone=function(e){s[e]=a},this.add=this.load=function(e,n,r){var i=s[e];i==f&&(l.push(e),s[e]=t),n&&(c[e]||(c[e]=[]),c[e].push({func:n,scope:r||this}))},this.loadQueue=function(e,t){this.loadScripts(l,e,t)},this.loadScripts=function(t,r,l){function p(e){i(c[e],function(e){e.func.call(e.scope)}),c[e]=f}var h;u.push({func:r,scope:l||this}),h=function(){var r=o(t);t.length=0,i(r,function(t){return s[t]==a?(p(t),void 0):(s[t]!=n&&(s[t]=n,d++,e(t,function(){s[t]=a,d--,p(t),h()})),void 0)}),d||(i(u,function(e){e.func.call(e.scope)}),u.length=0)},h()}}var r=e.DOM,i=t.each,o=t.grep;return n.ScriptLoader=new n,n}),r(b,[y,p],function(e,n){function r(){var e=this;e.items=[],e.urls={},e.lookup={}}var i=n.each;return r.prototype={get:function(e){return this.lookup[e]?this.lookup[e].instance:t
+},dependencies:function(e){var t;return this.lookup[e]&&(t=this.lookup[e].dependencies),t||[]},requireLangPack:function(t,n){if(r.language&&r.languageLoad!==!1){if(n&&new RegExp("([, ]|\\b)"+r.language+"([, ]|\\b)").test(n)===!1)return;e.ScriptLoader.add(this.urls[t]+"/langs/"+r.language+".js")}},add:function(e,t,n){return this.items.push(t),this.lookup[e]={instance:t,dependencies:n},t},createUrl:function(e,t){return"object"==typeof t?t:{prefix:e.prefix,resource:t,suffix:e.suffix}},addComponents:function(t,n){var r=this.urls[t];i(n,function(t){e.ScriptLoader.add(r+"/"+t)})},load:function(n,o,a,s){function l(){var r=c.dependencies(n);i(r,function(e){var n=c.createUrl(o,e);c.load(n.resource,n,t,t)}),a&&(s?a.call(s):a.call(e))}var c=this,u=o;c.urls[n]||("object"==typeof o&&(u=o.prefix+o.resource+o.suffix),0!==u.indexOf("/")&&-1==u.indexOf("://")&&(u=r.baseURL+"/"+u),c.urls[n]=u.substring(0,u.lastIndexOf("/")),c.lookup[n]?l():e.ScriptLoader.add(u,l,s))}},r.PluginManager=new r,r.ThemeManager=new r,r}),r(C,[],function(){function e(e,t,n){var r,i,o=n?"lastChild":"firstChild",a=n?"prev":"next";if(e[o])return e[o];if(e!==t){if(r=e[a])return r;for(i=e.parent;i&&i!==t;i=i.parent)if(r=i[a])return r}}function t(e,t){this.name=e,this.type=t,1===t&&(this.attributes=[],this.attributes.map={})}var n=/^[ \t\r\n]*$/,r={"#text":3,"#comment":8,"#cdata":4,"#pi":7,"#doctype":10,"#document-fragment":11};return t.prototype={replace:function(e){var t=this;return e.parent&&e.remove(),t.insert(e,t),t.remove(),t},attr:function(e,t){var n=this,r,i,o;if("string"!=typeof e){for(i in e)n.attr(i,e[i]);return n}if(r=n.attributes){if(t!==o){if(null===t){if(e in r.map)for(delete r.map[e],i=r.length;i--;)if(r[i].name===e)return r=r.splice(i,1),n;return n}if(e in r.map){for(i=r.length;i--;)if(r[i].name===e){r[i].value=t;break}}else r.push({name:e,value:t});return r.map[e]=t,n}return r.map[e]}},clone:function(){var e=this,n=new t(e.name,e.type),r,i,o,a,s;if(o=e.attributes){for(s=[],s.map={},r=0,i=o.length;i>r;r++)a=o[r],"id"!==a.name&&(s[s.length]={name:a.name,value:a.value},s.map[a.name]=a.value);n.attributes=s}return n.value=e.value,n.shortEnded=e.shortEnded,n},wrap:function(e){var t=this;return t.parent.insert(e,t),e.append(t),t},unwrap:function(){var e=this,t,n;for(t=e.firstChild;t;)n=t.next,e.insert(t,e,!0),t=n;e.remove()},remove:function(){var e=this,t=e.parent,n=e.next,r=e.prev;return t&&(t.firstChild===e?(t.firstChild=n,n&&(n.prev=null)):r.next=n,t.lastChild===e?(t.lastChild=r,r&&(r.next=null)):n.prev=r,e.parent=e.next=e.prev=null),e},append:function(e){var t=this,n;return e.parent&&e.remove(),n=t.lastChild,n?(n.next=e,e.prev=n,t.lastChild=e):t.lastChild=t.firstChild=e,e.parent=t,e},insert:function(e,t,n){var r;return e.parent&&e.remove(),r=t.parent||this,n?(t===r.firstChild?r.firstChild=e:t.prev.next=e,e.prev=t.prev,e.next=t,t.prev=e):(t===r.lastChild?r.lastChild=e:t.next.prev=e,e.next=t.next,e.prev=t,t.next=e),e.parent=r,e},getAll:function(t){var n=this,r,i=[];for(r=n.firstChild;r;r=e(r,n))r.name===t&&i.push(r);return i},empty:function(){var t=this,n,r,i;if(t.firstChild){for(n=[],i=t.firstChild;i;i=e(i,t))n.push(i);for(r=n.length;r--;)i=n[r],i.parent=i.firstChild=i.lastChild=i.next=i.prev=null}return t.firstChild=t.lastChild=null,t},isEmpty:function(t){var r=this,i=r.firstChild,o,a;if(i)do{if(1===i.type){if(i.attributes.map["data-mce-bogus"])continue;if(t[i.name])return!1;for(o=i.attributes.length;o--;)if(a=i.attributes[o].name,"name"===a||0===a.indexOf("data-mce-"))return!1}if(8===i.type)return!1;if(3===i.type&&!n.test(i.value))return!1}while(i=e(i,r));return!0},walk:function(t){return e(this,null,t)}},t.create=function(e,n){var i,o;if(i=new t(e,r[e]||1),n)for(o in n)i.attr(o,n[o]);return i},t}),r(x,[p],function(e){function t(e,t){return e?e.split(t||" "):[]}function n(e){function n(e,n,r){function i(e){var t={},n,r;for(n=0,r=e.length;r>n;n++)t[e[n]]={};return t}var o,l,c,u=arguments;for(r=r||[],n=n||"","string"==typeof r&&(r=t(r)),l=3;l<u.length;l++)"string"==typeof u[l]&&(u[l]=t(u[l])),r.push.apply(r,u[l]);for(e=t(e),o=e.length;o--;)c=[].concat(s,t(n)),a[e[o]]={attributes:i(c),attributesOrder:c,children:i(r)}}function i(e,n){var r,i,o,s;for(e=t(e),r=e.length,n=t(n);r--;)for(i=a[e[r]],o=0,s=n.length;s>o;o++)i.attributes[n[o]]={},i.attributesOrder.push(n[o])}var a={},s,l,c,u,d,f,p;return r[e]?r[e]:(s=t("id accesskey class dir lang style tabindex title"),l=t("onabort onblur oncancel oncanplay oncanplaythrough onchange onclick onclose oncontextmenu oncuechange ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange onemptied onended onerror onfocus oninput oninvalid onkeydown onkeypress onkeyup onload onloadeddata onloadedmetadata onloadstart onmousedown onmousemove onmouseout onmouseover onmouseup onmousewheel onpause onplay onplaying onprogress onratechange onreset onscroll onseeked onseeking onseeking onselect onshow onstalled onsubmit onsuspend ontimeupdate onvolumechange onwaiting"),c=t("address blockquote div dl fieldset form h1 h2 h3 h4 h5 h6 hr menu ol p pre table ul"),u=t("a abbr b bdo br button cite code del dfn em embed i iframe img input ins kbd label map noscript object q s samp script select small span strong sub sup textarea u var #text #comment"),"html4"!=e&&(s.push.apply(s,t("contenteditable contextmenu draggable dropzone hidden spellcheck translate")),c.push.apply(c,t("article aside details dialog figure header footer hgroup section nav")),u.push.apply(u,t("audio canvas command datalist mark meter output progress time wbr video ruby bdi keygen"))),"html5-strict"!=e&&(s.push("xml:lang"),p=t("acronym applet basefont big font strike tt"),u.push.apply(u,p),o(p,function(e){n(e,"",u)}),f=t("center dir isindex noframes"),c.push.apply(c,f),d=[].concat(c,u),o(f,function(e){n(e,"",d)})),d=d||[].concat(c,u),n("html","manifest","head body"),n("head","","base command link meta noscript script style title"),n("title hr noscript br"),n("base","href target"),n("link","href rel media hreflang type sizes hreflang"),n("meta","name http-equiv content charset"),n("style","media type scoped"),n("script","src async defer type charset"),n("body","onafterprint onbeforeprint onbeforeunload onblur onerror onfocus onhashchange onload onmessage onoffline ononline onpagehide onpageshow onpopstate onresize onscroll onstorage onunload",d),n("address dt dd div caption","",d),n("h1 h2 h3 h4 h5 h6 pre p abbr code var samp kbd sub sup i b u bdo span legend em strong small s cite dfn","",u),n("blockquote","cite",d),n("ol","reversed start type","li"),n("ul","","li"),n("li","value",d),n("dl","","dt dd"),n("a","href target rel media hreflang type",u),n("q","cite",u),n("ins del","cite datetime",d),n("img","src alt usemap ismap width height"),n("iframe","src name width height",d),n("embed","src type width height"),n("object","data type typemustmatch name usemap form width height",d,"param"),n("param","name value"),n("map","name",d,"area"),n("area","alt coords shape href target rel media hreflang type"),n("table","border","caption colgroup thead tfoot tbody tr"+("html4"==e?" col":"")),n("colgroup","span","col"),n("col","span"),n("tbody thead tfoot","","tr"),n("tr","","td th"),n("td","colspan rowspan headers",d),n("th","colspan rowspan headers scope abbr",d),n("form","accept-charset action autocomplete enctype method name novalidate target",d),n("fieldset","disabled form name",d,"legend"),n("label","form for",u),n("input","accept alt autocomplete checked dirname disabled form formaction formenctype formmethod formnovalidate formtarget height list max maxlength min multiple name pattern readonly required size src step type value width"),n("button","disabled form formaction formenctype formmethod formnovalidate formtarget name type value","html4"==e?d:u),n("select","disabled form multiple name required size","option optgroup"),n("optgroup","disabled label","option"),n("option","disabled label selected value"),n("textarea","cols dirname disabled form maxlength name readonly required rows wrap"),n("menu","type label",d,"li"),n("noscript","",d),"html4"!=e&&(n("wbr"),n("ruby","",u,"rt rp"),n("figcaption","",d),n("mark rt rp summary bdi","",u),n("canvas","width height",d),n("video","src crossorigin poster preload autoplay mediagroup loop muted controls width height",d,"track source"),n("audio","src crossorigin preload autoplay mediagroup loop muted controls",d,"track source"),n("source","src type media"),n("track","kind src srclang label default"),n("datalist","",u,"option"),n("article section nav aside header footer","",d),n("hgroup","","h1 h2 h3 h4 h5 h6"),n("figure","",d,"figcaption"),n("time","datetime",u),n("dialog","open",d),n("command","type label icon disabled checked radiogroup command"),n("output","for form name",u),n("progress","value max",u),n("meter","value min max low high optimum",u),n("details","open",d,"summary"),n("keygen","autofocus challenge disabled form keytype name")),"html5-strict"!=e&&(i("script","language xml:space"),i("style","xml:space"),i("object","declare classid codebase codetype archive standby align border hspace vspace"),i("param","valuetype type"),i("a","charset name rev shape coords"),i("br","clear"),i("applet","codebase archive code object alt name width height align hspace vspace"),i("img","name longdesc align border hspace vspace"),i("iframe","longdesc frameborder marginwidth marginheight scrolling align"),i("font basefont","size color face"),i("input","usemap align"),i("select","onchange"),i("textarea"),i("h1 h2 h3 h4 h5 h6 div p legend caption","align"),i("ul","type compact"),i("li","type"),i("ol dl menu dir","compact"),i("pre","width xml:space"),i("hr","align noshade size width"),i("isindex","prompt"),i("table","summary width frame rules cellspacing cellpadding align bgcolor"),i("col","width align char charoff valign"),i("colgroup","width align char charoff valign"),i("thead","align char charoff valign"),i("tr","align char charoff valign bgcolor"),i("th","axis align char charoff valign nowrap bgcolor width height"),i("form","accept"),i("td","abbr axis scope align char charoff valign nowrap bgcolor width height"),i("tfoot","align char charoff valign"),i("tbody","align char charoff valign"),i("area","nohref"),i("body","background bgcolor text link vlink alink")),"html4"!=e&&(i("input button select textarea","autofocus"),i("input textarea","placeholder"),i("a","download"),i("link script img","crossorigin"),i("iframe","srcdoc sandbox seamless allowfullscreen")),o(t("a form meter progress dfn"),function(e){a[e]&&delete a[e].children[e]}),delete a.caption.children.table,r[e]=a,a)}var r={},i=e.makeMap,o=e.each,a=e.extend,s=e.explode,l=e.inArray;return function(e){function c(t,n,o){var s=e[t];return s?s=i(s,",",i(s.toUpperCase()," ")):(s=r[t],s||(s=i(n," ",i(n.toUpperCase()," ")),s=a(s,o),r[t]=s)),s}function u(e){return new RegExp("^"+e.replace(/([?+*])/g,".$1")+"$")}function d(e){var n,r,o,a,s,c,d,f,p,h,m,g,y,C,x,w,_,N,E,k=/^([#+\-])?([^\[!\/]+)(?:\/([^\[!]+))?(?:(!?)\[([^\]]+)\])?$/,S=/^([!\-])?(\w+::\w+|[^=:<]+)?(?:([=:<])(.*))?$/,T=/[*?+]/;if(e)for(e=t(e,","),v["@"]&&(w=v["@"].attributes,_=v["@"].attributesOrder),n=0,r=e.length;r>n;n++)if(s=k.exec(e[n])){if(C=s[1],p=s[2],x=s[3],f=s[5],g={},y=[],c={attributes:g,attributesOrder:y},"#"===C&&(c.paddEmpty=!0),"-"===C&&(c.removeEmpty=!0),"!"===s[4]&&(c.removeEmptyAttrs=!0),w){for(N in w)g[N]=w[N];y.push.apply(y,_)}if(f)for(f=t(f,"|"),o=0,a=f.length;a>o;o++)if(s=S.exec(f[o])){if(d={},m=s[1],h=s[2].replace(/::/g,":"),C=s[3],E=s[4],"!"===m&&(c.attributesRequired=c.attributesRequired||[],c.attributesRequired.push(h),d.required=!0),"-"===m){delete g[h],y.splice(l(y,h),1);continue}C&&("="===C&&(c.attributesDefault=c.attributesDefault||[],c.attributesDefault.push({name:h,value:E}),d.defaultValue=E),":"===C&&(c.attributesForced=c.attributesForced||[],c.attributesForced.push({name:h,value:E}),d.forcedValue=E),"<"===C&&(d.validValues=i(E,"?"))),T.test(h)?(c.attributePatterns=c.attributePatterns||[],d.pattern=u(h),c.attributePatterns.push(d)):(g[h]||y.push(h),g[h]=d)}w||"@"!=p||(w=g,_=y),x&&(c.outputName=p,v[x]=c),T.test(p)?(c.pattern=u(p),b.push(c)):v[p]=c}}function f(e){v={},b=[],d(e),o(x,function(e,t){y[t]=e.children})}function p(e){var n=/^(~)?(.+)$/;e&&o(t(e,","),function(e){var t=n.exec(e),r="~"===t[1],i=r?"span":"div",s=t[2];if(y[s]=y[i],R[s]=i,r||(k[s.toUpperCase()]={},k[s]={}),!v[s]){var l=v[i];l=a({},l),delete l.removeEmptyAttrs,delete l.removeEmpty,v[s]=l}o(y,function(e){e[i]&&(e[s]=e[i])})})}function h(e){var n=/^([+\-]?)(\w+)\[([^\]]+)\]$/;e&&o(t(e,","),function(e){var r=n.exec(e),i,a;r&&(a=r[1],i=a?y[r[2]]:y[r[2]]={"#comment":{}},i=y[r[2]],o(t(r[3],"|"),function(e){"-"===a?delete i[e]:i[e]={}}))})}function m(e){var t=v[e],n;if(t)return t;for(n=b.length;n--;)if(t=b[n],t.pattern.test(e))return t}var g=this,v={},y={},b=[],C,x,w,_,N,E,k,S,T,R={},A={};e=e||{},x=n(e.schema),e.verify_html===!1&&(e.valid_elements="*[*]"),e.valid_styles&&(C={},o(e.valid_styles,function(e,t){C[t]=s(e)})),w=c("whitespace_elements","pre script noscript style textarea video audio iframe object"),_=c("self_closing_elements","colgroup dd dt li option p td tfoot th thead tr"),N=c("short_ended_elements","area base basefont br col frame hr img input isindex link meta param embed source wbr track"),E=c("boolean_attributes","checked compact declare defer disabled ismap multiple nohref noresize noshade nowrap readonly selected autoplay loop controls"),S=c("non_empty_elements","td th iframe video audio object script",N),T=c("text_block_elements","h1 h2 h3 h4 h5 h6 p div address pre form blockquote center dir fieldset header footer article section hgroup aside nav figure"),k=c("block_elements","hr table tbody thead tfoot th tr td li ol ul caption dl dt dd noscript menu isindex samp option datalist select optgroup",T),o((e.special||"script noscript style textarea").split(" "),function(e){A[e]=new RegExp("</"+e+"[^>]*>","gi")}),e.valid_elements?f(e.valid_elements):(o(x,function(e,t){v[t]={attributes:e.attributes,attributesOrder:e.attributesOrder},y[t]=e.children}),"html5"!=e.schema&&o(t("strong/b em/i"),function(e){e=t(e,"/"),v[e[1]].outputName=e[0]}),v.img.attributesDefault=[{name:"alt",value:""}],o(t("ol ul sub sup blockquote span font a table tbody tr strong em b i"),function(e){v[e]&&(v[e].removeEmpty=!0)}),o(t("p h1 h2 h3 h4 h5 h6 th td pre div address caption"),function(e){v[e].paddEmpty=!0}),o(t("span"),function(e){v[e].removeEmptyAttrs=!0})),p(e.custom_elements),h(e.valid_children),d(e.extended_valid_elements),h("+ol[ul|ol],+ul[ul|ol]"),e.invalid_elements&&o(s(e.invalid_elements),function(e){v[e]&&delete v[e]}),m("span")||d("span[!data-mce-type|*]"),g.children=y,g.styles=C,g.getBoolAttrs=function(){return E},g.getBlockElements=function(){return k},g.getTextBlockElements=function(){return T},g.getShortEndedElements=function(){return N},g.getSelfClosingElements=function(){return _},g.getNonEmptyElements=function(){return S},g.getWhiteSpaceElements=function(){return w},g.getSpecialElements=function(){return A},g.isValidChild=function(e,t){var n=y[e];return!(!n||!n[t])},g.isValid=function(e,t){var n,r,i=m(e);if(i){if(!t)return!0;if(i.attributes[t])return!0;if(n=i.attributePatterns)for(r=n.length;r--;)if(n[r].pattern.test(e))return!0}return!1},g.getElementRule=m,g.getCustomElements=function(){return R},g.addValidElements=d,g.setValidElements=f,g.addCustomElements=p,g.addValidChildren=h,g.elements=v}}),r(w,[x,m,p],function(e,t,n){var r=n.each;return function(i,o){var a=this,s=function(){};i=i||{},a.schema=o=o||new e,i.fix_self_closing!==!1&&(i.fix_self_closing=!0),r("comment cdata text start end pi doctype".split(" "),function(e){e&&(a[e]=i[e]||s)}),a.parse=function(e){function r(e){var t,n;for(t=f.length;t--&&f[t].name!==e;);if(t>=0){for(n=f.length-1;n>=t;n--)e=f[n],e.valid&&s.end(e.name);f.length=t}}function a(e,t,n,r,o){var a,s,l=/[\s\u0000-\u001F]+/g;if(t=t.toLowerCase(),n=t in C?t:F(n||r||o||""),w&&!v&&0!==t.indexOf("data-")){if(a=S[t],!a&&T){for(s=T.length;s--&&(a=T[s],!a.pattern.test(t)););-1===s&&(a=null)}if(!a)return;if(a.validValues&&!(n in a.validValues))return}if(W[t]&&!i.allow_script_urls){var c=n.replace(l,"");try{if(c=decodeURIComponent(c),V.test(c))return}catch(u){if(c=unescape(c),V.test(c))return}}p.map[t]=n,p.push({name:t,value:n})}var s=this,l,c=0,u,d,f=[],p,h,m,g,v,y,b,C,x,w,_,N,E,k,S,T,R,A,B,L,D,H,M,P,O,I=0,F=t.decode,z,W=n.makeMap("src,href"),V=/(java|vb)script:/i;for(H=new RegExp("<(?:(?:!--([\\w\\W]*?)-->)|(?:!\\[CDATA\\[([\\w\\W]*?)\\]\\]>)|(?:!DOCTYPE([\\w\\W]*?)>)|(?:\\?([^\\s\\/<>]+) ?([\\w\\W]*?)[?/]>)|(?:\\/([^>]+)>)|(?:([A-Za-z0-9\\-\\:\\.]+)((?:\\s+[^\"'>]+(?:(?:\"[^\"]*\")|(?:'[^']*')|[^>]*))*|\\/|\\s+)>))","g"),M=/([\w:\-]+)(?:\s*=\s*(?:(?:\"((?:[^\"])*)\")|(?:\'((?:[^\'])*)\')|([^>\s]+)))?/g,b=o.getShortEndedElements(),D=i.self_closing_elements||o.getSelfClosingElements(),C=o.getBoolAttrs(),w=i.validate,y=i.remove_internals,z=i.fix_self_closing,P=o.getSpecialElements();l=H.exec(e);){if(c<l.index&&s.text(F(e.substr(c,l.index-c))),u=l[6])u=u.toLowerCase(),":"===u.charAt(0)&&(u=u.substr(1)),r(u);else if(u=l[7]){if(u=u.toLowerCase(),":"===u.charAt(0)&&(u=u.substr(1)),x=u in b,z&&D[u]&&f.length>0&&f[f.length-1].name===u&&r(u),!w||(_=o.getElementRule(u))){if(N=!0,w&&(S=_.attributes,T=_.attributePatterns),(k=l[8])?(v=-1!==k.indexOf("data-mce-type"),v&&y&&(N=!1),p=[],p.map={},k.replace(M,a)):(p=[],p.map={}),w&&!v){if(R=_.attributesRequired,A=_.attributesDefault,B=_.attributesForced,L=_.removeEmptyAttrs,L&&!p.length&&(N=!1),B)for(h=B.length;h--;)E=B[h],g=E.name,O=E.value,"{$uid}"===O&&(O="mce_"+I++),p.map[g]=O,p.push({name:g,value:O});if(A)for(h=A.length;h--;)E=A[h],g=E.name,g in p.map||(O=E.value,"{$uid}"===O&&(O="mce_"+I++),p.map[g]=O,p.push({name:g,value:O}));if(R){for(h=R.length;h--&&!(R[h]in p.map););-1===h&&(N=!1)}p.map["data-mce-bogus"]&&(N=!1)}N&&s.start(u,p,x)}else N=!1;if(d=P[u]){d.lastIndex=c=l.index+l[0].length,(l=d.exec(e))?(N&&(m=e.substr(c,l.index-c)),c=l.index+l[0].length):(m=e.substr(c),c=e.length),N&&(m.length>0&&s.text(m,!0),s.end(u)),H.lastIndex=c;continue}x||(k&&k.indexOf("/")==k.length-1?N&&s.end(u):f.push({name:u,valid:N}))}else(u=l[1])?(">"===u.charAt(0)&&(u=" "+u),i.allow_conditional_comments||"[if"!==u.substr(0,3)||(u=" "+u),s.comment(u)):(u=l[2])?s.cdata(u):(u=l[3])?s.doctype(u):(u=l[4])&&s.pi(u,l[5]);c=l.index+l[0].length}for(c<e.length&&s.text(F(e.substr(c))),h=f.length-1;h>=0;h--)u=f[h],u.valid&&s.end(u.name)}}}),r(_,[C,x,w,p],function(e,t,n,r){var i=r.makeMap,o=r.each,a=r.explode,s=r.extend;return function(r,l){function c(t){var n,r,o,a,s,c,d,f,p,h,m,g,v,y;for(m=i("tr,td,th,tbody,thead,tfoot,table"),h=l.getNonEmptyElements(),g=l.getTextBlockElements(),n=0;n<t.length;n++)if(r=t[n],r.parent&&!r.fixed)if(g[r.name]&&"li"==r.parent.name){for(v=r.next;v&&g[v.name];)v.name="li",v.fixed=!0,r.parent.insert(v,r.parent),v=v.next;r.unwrap(r)}else{for(a=[r],o=r.parent;o&&!l.isValidChild(o.name,r.name)&&!m[o.name];o=o.parent)a.push(o);if(o&&a.length>1){for(a.reverse(),s=c=u.filterNode(a[0].clone()),p=0;p<a.length-1;p++){for(l.isValidChild(c.name,a[p].name)?(d=u.filterNode(a[p].clone()),c.append(d)):d=c,f=a[p].firstChild;f&&f!=a[p+1];)y=f.next,d.append(f),f=y;c=d}s.isEmpty(h)?o.insert(r,a[0],!0):(o.insert(s,a[0],!0),o.insert(r,s)),o=a[0],(o.isEmpty(h)||o.firstChild===o.lastChild&&"br"===o.firstChild.name)&&o.empty().remove()}else if(r.parent){if("li"===r.name){if(v=r.prev,v&&("ul"===v.name||"ul"===v.name)){v.append(r);continue}if(v=r.next,v&&("ul"===v.name||"ul"===v.name)){v.insert(r,v.firstChild,!0);continue}r.wrap(u.filterNode(new e("ul",1)));continue}l.isValidChild(r.parent.name,"div")&&l.isValidChild("div",r.name)?r.wrap(u.filterNode(new e("div",1))):"style"===r.name||"script"===r.name?r.empty().remove():r.unwrap()}}}var u=this,d={},f=[],p={},h={};r=r||{},r.validate="validate"in r?r.validate:!0,r.root_name=r.root_name||"body",u.schema=l=l||new t,u.filterNode=function(e){var t,n,r;n in d&&(r=p[n],r?r.push(e):p[n]=[e]),t=f.length;for(;t--;)n=f[t].name,n in e.attributes.map&&(r=h[n],r?r.push(e):h[n]=[e]);return e},u.addNodeFilter=function(e,t){o(a(e),function(e){var n=d[e];n||(d[e]=n=[]),n.push(t)})},u.addAttributeFilter=function(e,t){o(a(e),function(e){var n;for(n=0;n<f.length;n++)if(f[n].name===e)return f[n].callbacks.push(t),void 0;f.push({name:e,callbacks:[t]})})},u.parse=function(t,o){function a(){function e(e){e&&(t=e.firstChild,t&&3==t.type&&(t.value=t.value.replace(R,"")),t=e.lastChild,t&&3==t.type&&(t.value=t.value.replace(L,"")))}var t=y.firstChild,n,i;if(l.isValidChild(y.name,I.toLowerCase())){for(;t;)n=t.next,3==t.type||1==t.type&&"p"!==t.name&&!T[t.name]&&!t.attr("data-mce-type")?i?i.append(t):(i=u(I,1),i.attr(r.forced_root_block_attrs),y.insert(i,t),i.append(t)):(e(i),i=null),t=n;e(i)}}function u(t,n){var r=new e(t,n),i;return t in d&&(i=p[t],i?i.push(r):p[t]=[r]),r}function m(e){var t,n,r;for(t=e.prev;t&&3===t.type;)n=t.value.replace(L,""),n.length>0?(t.value=n,t=t.prev):(r=t.prev,t.remove(),t=r)}function g(e){var t,n={};for(t in e)"li"!==t&&"p"!=t&&(n[t]=e[t]);return n}var v,y,b,C,x,w,_,N,E,k,S,T,R,A=[],B,L,D,H,M,P,O,I;if(o=o||{},p={},h={},T=s(i("script,style,head,html,body,title,meta,param"),l.getBlockElements()),O=l.getNonEmptyElements(),P=l.children,S=r.validate,I="forced_root_block"in o?o.forced_root_block:r.forced_root_block,M=l.getWhiteSpaceElements(),R=/^[ \t\r\n]+/,L=/[ \t\r\n]+$/,D=/[ \t\r\n]+/g,H=/^[ \t\r\n]+$/,v=new n({validate:S,allow_script_urls:r.allow_script_urls,allow_conditional_comments:r.allow_conditional_comments,self_closing_elements:g(l.getSelfClosingElements()),cdata:function(e){b.append(u("#cdata",4)).value=e},text:function(e,t){var n;B||(e=e.replace(D," "),b.lastChild&&T[b.lastChild.name]&&(e=e.replace(R,""))),0!==e.length&&(n=u("#text",3),n.raw=!!t,b.append(n).value=e)},comment:function(e){b.append(u("#comment",8)).value=e},pi:function(e,t){b.append(u(e,7)).value=t,m(b)},doctype:function(e){var t;t=b.append(u("#doctype",10)),t.value=e,m(b)},start:function(e,t,n){var r,i,o,a,s;if(o=S?l.getElementRule(e):{}){for(r=u(o.outputName||e,1),r.attributes=t,r.shortEnded=n,b.append(r),s=P[b.name],s&&P[r.name]&&!s[r.name]&&A.push(r),i=f.length;i--;)a=f[i].name,a in t.map&&(E=h[a],E?E.push(r):h[a]=[r]);T[e]&&m(r),n||(b=r),!B&&M[e]&&(B=!0)}},end:function(t){var n,r,i,o,a;if(r=S?l.getElementRule(t):{}){if(T[t]&&!B){if(n=b.firstChild,n&&3===n.type)if(i=n.value.replace(R,""),i.length>0)n.value=i,n=n.next;else for(o=n.next,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.next,(0===i.length||H.test(i))&&(n.remove(),n=o),n=o;if(n=b.lastChild,n&&3===n.type)if(i=n.value.replace(L,""),i.length>0)n.value=i,n=n.prev;else for(o=n.prev,n.remove(),n=o;n&&3===n.type;)i=n.value,o=n.prev,(0===i.length||H.test(i))&&(n.remove(),n=o),n=o}if(B&&M[t]&&(B=!1),(r.removeEmpty||r.paddEmpty)&&b.isEmpty(O))if(r.paddEmpty)b.empty().append(new e("#text","3")).value="\xa0";else if(!b.attributes.map.name&&!b.attributes.map.id)return a=b.parent,b.empty().remove(),b=a,void 0;b=b.parent}}},l),y=b=new e(o.context||r.root_name,11),v.parse(t),S&&A.length&&(o.context?o.invalid=!0:c(A)),I&&("body"==y.name||o.isRootContent)&&a(),!o.invalid){for(k in p){for(E=d[k],C=p[k],_=C.length;_--;)C[_].parent||C.splice(_,1);for(x=0,w=E.length;w>x;x++)E[x](C,k,o)}for(x=0,w=f.length;w>x;x++)if(E=f[x],E.name in h){for(C=h[E.name],_=C.length;_--;)C[_].parent||C.splice(_,1);for(_=0,N=E.callbacks.length;N>_;_++)E.callbacks[_](C,E.name,o)}}return y},r.remove_trailing_brs&&u.addNodeFilter("br",function(t){var n,r=t.length,i,o=s({},l.getBlockElements()),a=l.getNonEmptyElements(),c,u,d,f,p,h;for(o.body=1,n=0;r>n;n++)if(i=t[n],c=i.parent,o[i.parent.name]&&i===c.lastChild){for(d=i.prev;d;){if(f=d.name,"span"!==f||"bookmark"!==d.attr("data-mce-type")){if("br"!==f)break;if("br"===f){i=null;break}}d=d.prev}i&&(i.remove(),c.isEmpty(a)&&(p=l.getElementRule(c.name),p&&(p.removeEmpty?c.remove():p.paddEmpty&&(c.empty().append(new e("#text",3)).value="\xa0"))))}else{for(u=i;c&&c.firstChild===u&&c.lastChild===u&&(u=c,!o[c.name]);)c=c.parent;u===c&&(h=new e("#text",3),h.value="\xa0",i.replace(h))}}),r.allow_html_in_named_anchor||u.addAttributeFilter("id,name",function(e){for(var t=e.length,n,r,i,o;t--;)if(o=e[t],"a"===o.name&&o.firstChild&&!o.attr("href")){i=o.parent,n=o.lastChild;do r=n.prev,i.insert(n,o),n=r;while(n)}})}}),r(N,[m,p],function(e,t){var n=t.makeMap;return function(t){var r=[],i,o,a,s,l;return t=t||{},i=t.indent,o=n(t.indent_before||""),a=n(t.indent_after||""),s=e.getEncodeFunc(t.entity_encoding||"raw",t.entities),l="html"==t.element_format,{start:function(e,t,n){var c,u,d,f;if(i&&o[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n")),r.push("<",e),t)for(c=0,u=t.length;u>c;c++)d=t[c],r.push(" ",d.name,'="',s(d.value,!0),'"');r[r.length]=!n||l?">":" />",n&&i&&a[e]&&r.length>0&&(f=r[r.length-1],f.length>0&&"\n"!==f&&r.push("\n"))},end:function(e){var t;r.push("</",e,">"),i&&a[e]&&r.length>0&&(t=r[r.length-1],t.length>0&&"\n"!==t&&r.push("\n"))},text:function(e,t){e.length>0&&(r[r.length]=t?e:s(e))},cdata:function(e){r.push("<![CDATA[",e,"]]>")},comment:function(e){r.push("<!--",e,"-->")},pi:function(e,t){t?r.push("<?",e," ",t,"?>"):r.push("<?",e,"?>"),i&&r.push("\n")},doctype:function(e){r.push("<!DOCTYPE",e,">",i?"\n":"")},reset:function(){r.length=0},getContent:function(){return r.join("").replace(/\n$/,"")}}}}),r(E,[N,x],function(e,t){return function(n,r){var i=this,o=new e(n);n=n||{},n.validate="validate"in n?n.validate:!0,i.schema=r=r||new t,i.writer=o,i.serialize=function(e){function t(e){var n=i[e.type],s,l,c,u,d,f,p,h,m;if(n)n(e);else{if(s=e.name,l=e.shortEnded,c=e.attributes,a&&c&&c.length>1){for(f=[],f.map={},m=r.getElementRule(e.name),p=0,h=m.attributesOrder.length;h>p;p++)u=m.attributesOrder[p],u in c.map&&(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));for(p=0,h=c.length;h>p;p++)u=c[p].name,u in f.map||(d=c.map[u],f.map[u]=d,f.push({name:u,value:d}));c=f}if(o.start(e.name,c,l),!l){if(e=e.firstChild)do t(e);while(e=e.next);o.end(s)}}}var i,a;return a=n.validate,i={3:function(e){o.text(e.value,e.raw)},8:function(e){o.comment(e.value)},7:function(e){o.pi(e.name,e.value)},10:function(e){o.doctype(e.value)},4:function(e){o.cdata(e.value)},11:function(e){if(e=e.firstChild)do t(e);while(e=e.next)}},o.reset(),1!=e.type||n.inner?i[11](e):t(e),o.getContent()}}}),r(k,[v,_,m,E,C,x,g,p],function(e,t,n,r,i,o,a,s){var l=s.each,c=s.trim,u=e.DOM;return function(e,i){var s,d,f;return i&&(s=i.dom,d=i.schema),s=s||u,d=d||new o(e),e.entity_encoding=e.entity_encoding||"named",e.remove_trailing_brs="remove_trailing_brs"in e?e.remove_trailing_brs:!0,f=new t(e,d),f.addAttributeFilter("src,href,style",function(t,n){for(var r=t.length,i,o,a="data-mce-"+n,l=e.url_converter,c=e.url_converter_scope,u;r--;)i=t[r],o=i.attributes.map[a],o!==u?(i.attr(n,o.length>0?o:null),i.attr(a,null)):(o=i.attributes.map[n],"style"===n?o=s.serializeStyle(s.parseStyle(o),i.name):l&&(o=l.call(c,o,n,i.name)),i.attr(n,o.length>0?o:null))}),f.addAttributeFilter("class",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.attr("class").replace(/(?:^|\s)mce-item-\w+(?!\S)/g,""),n.attr("class",r.length>0?r:null)}),f.addAttributeFilter("data-mce-type",function(e,t,n){for(var r=e.length,i;r--;)i=e[r],"bookmark"!==i.attributes.map["data-mce-type"]||n.cleanup||i.remove()}),f.addAttributeFilter("data-mce-expando",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),f.addNodeFilter("noscript",function(e){for(var t=e.length,r;t--;)r=e[t].firstChild,r&&(r.value=n.decode(r.value))}),f.addNodeFilter("script,style",function(e,t){function n(e){return e.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n").replace(/^[\r\n]*|[\r\n]*$/g,"").replace(/^\s*((<!--)?(\s*\/\/)?\s*<!\[CDATA\[|(<!--\s*)?\/\*\s*<!\[CDATA\[\s*\*\/|(\/\/)?\s*<!--|\/\*\s*<!--\s*\*\/)\s*[\r\n]*/gi,"").replace(/\s*(\/\*\s*\]\]>\s*\*\/(-->)?|\s*\/\/\s*\]\]>(-->)?|\/\/\s*(-->)?|\]\]>|\/\*\s*-->\s*\*\/|\s*-->\s*)\s*$/g,"")}for(var r=e.length,i,o;r--;)if(i=e[r],o=i.firstChild?i.firstChild.value:"","script"===t){var a=(i.attr("type")||"text/javascript").replace(/^mce\-/,"");i.attr("type","text/javascript"===a?null:a),o.length>0&&(i.firstChild.value="// <![CDATA[\n"+n(o)+"\n// ]]>")}else o.length>0&&(i.firstChild.value="<!--\n"+n(o)+"\n-->")}),f.addNodeFilter("#comment",function(e){for(var t=e.length,n;t--;)n=e[t],0===n.value.indexOf("[CDATA[")?(n.name="#cdata",n.type=4,n.value=n.value.replace(/^\[CDATA\[|\]\]$/g,"")):0===n.value.indexOf("mce:protected ")&&(n.name="#text",n.type=3,n.raw=!0,n.value=unescape(n.value).substr(14))}),f.addNodeFilter("xml:namespace,input",function(e,t){for(var n=e.length,r;n--;)r=e[n],7===r.type?r.remove():1===r.type&&("input"!==t||"type"in r.attributes.map||r.attr("type","text"))}),e.fix_list_elements&&f.addNodeFilter("ul,ol",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.parent,("ul"===r.name||"ol"===r.name)&&n.prev&&"li"===n.prev.name&&n.prev.append(n)}),f.addAttributeFilter("data-mce-src,data-mce-href,data-mce-style,data-mce-selected",function(e,t){for(var n=e.length;n--;)e[n].attr(t,null)}),{schema:d,addNodeFilter:f.addNodeFilter,addAttributeFilter:f.addAttributeFilter,serialize:function(t,n){var i=this,o,u,p,h,m;return a.ie&&s.select("script,style,select,map").length>0?(m=t.innerHTML,t=t.cloneNode(!1),s.setHTML(t,m)):t=t.cloneNode(!0),o=t.ownerDocument.implementation,o.createHTMLDocument&&(u=o.createHTMLDocument(""),l("BODY"==t.nodeName?t.childNodes:[t],function(e){u.body.appendChild(u.importNode(e,!0))}),t="BODY"!=t.nodeName?u.body.firstChild:u.body,p=s.doc,s.doc=u),n=n||{},n.format=n.format||"html",n.selection&&(n.forced_root_block=""),n.no_events||(n.node=t,i.onPreProcess(n)),h=new r(e,d),n.content=h.serialize(f.parse(c(n.getInner?t.innerHTML:s.getOuterHTML(t)),n)),n.cleanup||(n.content=n.content.replace(/\uFEFF/g,"")),n.no_events||i.onPostProcess(n),p&&(s.doc=p),n.node=null,n.content},addRules:function(e){d.addValidElements(e)},setRules:function(e){d.setValidElements(e)},onPreProcess:function(e){i&&i.fire("PreProcess",e)},onPostProcess:function(e){i&&i.fire("PostProcess",e)}}}}),r(S,[],function(){function e(e){function t(t,n){var r,i=0,o,a,s,l,c,u,d=-1,f;if(r=t.duplicate(),r.collapse(n),f=r.parentElement(),f.ownerDocument===e.dom.doc){for(;"false"===f.contentEditable;)f=f.parentNode;if(!f.hasChildNodes())return{node:f,inside:1};for(s=f.children,o=s.length-1;o>=i;)if(u=Math.floor((i+o)/2),l=s[u],r.moveToElementText(l),d=r.compareEndPoints(n?"StartToStart":"EndToEnd",t),d>0)o=u-1;else{if(!(0>d))return{node:l};i=u+1}if(0>d)for(l?r.collapse(!1):(r.moveToElementText(f),r.collapse(!0),l=f,a=!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",1)&&f==r.parentElement();)c++;else for(r.collapse(!0),c=0;0!==r.compareEndPoints(n?"StartToStart":"StartToEnd",t)&&0!==r.move("character",-1)&&f==r.parentElement();)c++;return{node:l,position:d,offset:c,inside:a}}}function n(){function n(e){var n=t(o,e),r,i,s=0,l,c,u;if(r=n.node,i=n.offset,n.inside&&!r.hasChildNodes())return a[e?"setStart":"setEnd"](r,0),void 0;if(i===c)return a[e?"setStartBefore":"setEndAfter"](r),void 0;if(n.position<0){if(l=n.inside?r.firstChild:r.nextSibling,!l)return a[e?"setStartAfter":"setEndAfter"](r),void 0;if(!i)return 3==l.nodeType?a[e?"setStart":"setEnd"](l,0):a[e?"setStartBefore":"setEndBefore"](l),void 0;for(;l;){if(u=l.nodeValue,s+=u.length,s>=i){r=l,s-=i,s=u.length-s;break}l=l.nextSibling}}else{if(l=r.previousSibling,!l)return a[e?"setStartBefore":"setEndBefore"](r);if(!i)return 3==r.nodeType?a[e?"setStart":"setEnd"](l,r.nodeValue.length):a[e?"setStartAfter":"setEndAfter"](l),void 0;for(;l;){if(s+=l.nodeValue.length,s>=i){r=l,s-=i;break}l=l.previousSibling}}a[e?"setStart":"setEnd"](r,s)}var o=e.getRng(),a=i.createRng(),s,l,c,u,d;if(s=o.item?o.item(0):o.parentElement(),s.ownerDocument!=i.doc)return a;if(l=e.isCollapsed(),o.item)return a.setStart(s.parentNode,i.nodeIndex(s)),a.setEnd(a.startContainer,a.startOffset+1),a;try{n(!0),l||n()}catch(f){if(-2147024809!=f.number)throw f;d=r.getBookmark(2),c=o.duplicate(),c.collapse(!0),s=c.parentElement(),l||(c=o.duplicate(),c.collapse(!1),u=c.parentElement(),u.innerHTML=u.innerHTML),s.innerHTML=s.innerHTML,r.moveToBookmark(d),o=e.getRng(),n(!0),l||n()
+}return a}var r=this,i=e.dom,o=!1;this.getBookmark=function(n){function r(e){var t,n,r,o,a=[];for(t=e.parentNode,n=i.getRoot().parentNode;t!=n&&9!==t.nodeType;){for(r=t.children,o=r.length;o--;)if(e===r[o]){a.push(o);break}e=t,t=t.parentNode}return a}function o(e){var n;return n=t(a,e),n?{position:n.position,offset:n.offset,indexes:r(n.node),inside:n.inside}:void 0}var a=e.getRng(),s={};return 2===n&&(a.item?s.start={ctrl:!0,indexes:r(a.item(0))}:(s.start=o(!0),e.isCollapsed()||(s.end=o()))),s},this.moveToBookmark=function(e){function t(e){var t,n,r,o;for(t=i.getRoot(),n=e.length-1;n>=0;n--)o=t.children,r=e[n],r<=o.length-1&&(t=o[r]);return t}function n(n){var i=e[n?"start":"end"],a,s,l,c;i&&(a=i.position>0,s=o.createTextRange(),s.moveToElementText(t(i.indexes)),c=i.offset,c!==l?(s.collapse(i.inside||a),s.moveStart("character",a?-c:c)):s.collapse(n),r.setEndPoint(n?"StartToStart":"EndToStart",s),n&&r.collapse(!0))}var r,o=i.doc.body;e.start&&(e.start.ctrl?(r=o.createControlRange(),r.addElement(t(e.start.indexes)),r.select()):(r=o.createTextRange(),n(!0),n(),r.select()))},this.addRange=function(t){function n(e){var t,n,a,d,h;a=i.create("a"),t=e?s:c,n=e?l:u,d=r.duplicate(),(t==f||t==f.documentElement)&&(t=p,n=0),3==t.nodeType?(t.parentNode.insertBefore(a,t),d.moveToElementText(a),d.moveStart("character",n),i.remove(a),r.setEndPoint(e?"StartToStart":"EndToEnd",d)):(h=t.childNodes,h.length?(n>=h.length?i.insertAfter(a,h[h.length-1]):t.insertBefore(a,h[n]),d.moveToElementText(a)):t.canHaveHTML&&(t.innerHTML="<span>&#xFEFF;</span>",a=t.firstChild,d.moveToElementText(a),d.collapse(o)),r.setEndPoint(e?"StartToStart":"EndToEnd",d),i.remove(a))}var r,a,s,l,c,u,d,f=e.dom.doc,p=f.body,h,m;if(s=t.startContainer,l=t.startOffset,c=t.endContainer,u=t.endOffset,r=p.createTextRange(),s==c&&1==s.nodeType){if(l==u&&!s.hasChildNodes()){if(s.canHaveHTML)return d=s.previousSibling,d&&!d.hasChildNodes()&&i.isBlock(d)?d.innerHTML="&#xFEFF;":d=null,s.innerHTML="<span>&#xFEFF;</span><span>&#xFEFF;</span>",r.moveToElementText(s.lastChild),r.select(),i.doc.selection.clear(),s.innerHTML="",d&&(d.innerHTML=""),void 0;l=i.nodeIndex(s),s=s.parentNode}if(l==u-1)try{if(m=s.childNodes[l],a=p.createControlRange(),a.addElement(m),a.select(),h=e.getRng(),h.item&&m===h.item(0))return}catch(g){}}n(!0),n(),r.select()},this.getRangeAt=n}return e}),r(T,[g],function(e){return{BACKSPACE:8,DELETE:46,DOWN:40,ENTER:13,LEFT:37,RIGHT:39,SPACEBAR:32,TAB:9,UP:38,modifierPressed:function(e){return e.shiftKey||e.ctrlKey||e.altKey},metaKeyPressed:function(t){return(e.mac?t.metaKey:t.ctrlKey)&&!t.altKey}}}),r(R,[T,p,g],function(e,t,n){return function(r,i){function o(e){return i.settings.object_resizing===!1?!1:/TABLE|IMG|DIV/.test(e.nodeName)?"false"===e.getAttribute("data-mce-resize")?!1:!0:!1}function a(t){var n,r;n=t.screenX-k,r=t.screenY-S,H=n*N[2]+A,M=r*N[3]+B,H=5>H?5:H,M=5>M?5:M,(e.modifierPressed(t)||"IMG"==x.nodeName&&N[2]*N[3]!==0)&&(H=Math.round(M/L),M=Math.round(H*L)),b.setStyles(w,{width:H,height:M}),N[2]<0&&w.clientWidth<=H&&b.setStyle(w,"left",T+(A-H)),N[3]<0&&w.clientHeight<=M&&b.setStyle(w,"top",R+(B-M)),D||(i.fire("ObjectResizeStart",{target:x,width:A,height:B}),D=!0)}function s(){function e(e,t){t&&(x.style[e]||!i.schema.isValid(x.nodeName.toLowerCase(),e)?b.setStyle(x,e,t):b.setAttrib(x,e,t))}D=!1,e("width",H),e("height",M),b.unbind(P,"mousemove",a),b.unbind(P,"mouseup",s),O!=P&&(b.unbind(O,"mousemove",a),b.unbind(O,"mouseup",s)),b.remove(w),I&&"TABLE"!=x.nodeName||l(x),i.fire("ObjectResized",{target:x,width:H,height:M}),i.nodeChanged()}function l(e,t,n){var r,l,u,d,f,p=i.getBody();r=b.getPos(e,p),T=r.x,R=r.y,f=e.getBoundingClientRect(),l=f.width||f.right-f.left,u=f.height||f.bottom-f.top,x!=e&&(m(),x=e,H=M=0),d=i.fire("ObjectSelected",{target:e}),o(e)&&!d.isDefaultPrevented()?C(_,function(e,r){function o(t){D=!0,k=t.screenX,S=t.screenY,A=x.clientWidth,B=x.clientHeight,L=B/A,N=e,w=x.cloneNode(!0),b.addClass(w,"mce-clonedresizable"),w.contentEditable=!1,w.unSelectabe=!0,b.setStyles(w,{left:T,top:R,margin:0}),w.removeAttribute("data-mce-selected"),i.getBody().appendChild(w),b.bind(P,"mousemove",a),b.bind(P,"mouseup",s),O!=P&&(b.bind(O,"mousemove",a),b.bind(O,"mouseup",s))}var c,d;return t?(r==t&&o(n),void 0):(c=b.get("mceResizeHandle"+r),c?b.show(c):(d=i.getBody(),c=b.add(d,"div",{id:"mceResizeHandle"+r,"data-mce-bogus":!0,"class":"mce-resizehandle",contentEditable:!1,unSelectabe:!0,style:"cursor:"+r+"-resize; margin:0; padding:0"}),b.bind(c,"mousedown",function(e){e.preventDefault(),o(e)})),b.setStyles(c,{left:l*e[0]+T-c.offsetWidth/2,top:u*e[1]+R-c.offsetHeight/2}),void 0)}):c(),x.setAttribute("data-mce-selected","1")}function c(){var e,t;x&&x.removeAttribute("data-mce-selected");for(e in _)t=b.get("mceResizeHandle"+e),t&&(b.unbind(t),b.remove(t))}function u(e){function t(e,t){do if(e===t)return!0;while(e=e.parentNode)}var n;return C(b.select("img[data-mce-selected],hr[data-mce-selected]"),function(e){e.removeAttribute("data-mce-selected")}),n="mousedown"==e.type?e.target:r.getNode(),n=b.getParent(n,I?"table":"table,img,hr"),n&&(g(),t(r.getStart(),n)&&t(r.getEnd(),n)&&(!I||n!=r.getStart()&&"IMG"!==r.getStart().nodeName))?(l(n),void 0):(c(),void 0)}function d(e,t,n){e&&e.attachEvent&&e.attachEvent("on"+t,n)}function f(e,t,n){e&&e.detachEvent&&e.detachEvent("on"+t,n)}function p(e){var t=e.srcElement,n,r,o,a,s,c,u;n=t.getBoundingClientRect(),c=E.clientX-n.left,u=E.clientY-n.top;for(r in _)if(o=_[r],a=t.offsetWidth*o[0],s=t.offsetHeight*o[1],Math.abs(a-c)<8&&Math.abs(s-u)<8){N=o;break}D=!0,i.getDoc().selection.empty(),l(t,r,E)}function h(e){var t=e.srcElement;if(t!=x){if(m(),0===t.id.indexOf("mceResizeHandle"))return e.returnValue=!1,void 0;("IMG"==t.nodeName||"TABLE"==t.nodeName)&&(c(),x=t,d(t,"resizestart",p))}}function m(){f(x,"resizestart",p)}function g(){try{i.getDoc().execCommand("enableObjectResizing",!1,!1)}catch(e){}}function v(e){var t;if(I){t=P.body.createControlRange();try{return t.addElement(e),t.select(),!0}catch(n){}}}function y(){x=w=null,I&&(m(),f(i.getBody(),"controlselect",h))}var b=i.dom,C=t.each,x,w,_,N,E,k,S,T,R,A,B,L,D,H,M,P=i.getDoc(),O=document,I=n.ie&&n.ie<11;_={n:[.5,0,0,-1],e:[1,.5,1,0],s:[.5,1,0,1],w:[0,.5,-1,0],nw:[0,0,-1,-1],ne:[1,0,1,-1],se:[1,1,1,1],sw:[0,1,-1,1]};var F=".mce-content-body";return i.contentStyles.push(F+" div.mce-resizehandle {position: absolute;border: 1px solid black;background: #FFF;width: 5px;height: 5px;z-index: 10000}"+F+" .mce-resizehandle:hover {background: #000}"+F+" img[data-mce-selected], hr[data-mce-selected] {outline: 1px solid black;resize: none}"+F+" .mce-clonedresizable {position: absolute;"+(n.gecko?"":"outline: 1px dashed black;")+"opacity: .5;filter: alpha(opacity=50);z-index: 10000}"),i.on("init",function(){I?(i.on("ObjectResized",function(e){"TABLE"!=e.target.nodeName&&(c(),v(e.target))}),d(i.getBody(),"controlselect",h),i.on("mousedown",function(e){E=e})):(g(),n.ie>=11&&(i.on("mouseup",function(e){var t=e.target.nodeName;/^(TABLE|IMG|HR)$/.test(t)&&(i.selection.select(e.target,"TABLE"==t),i.nodeChanged())}),i.dom.bind(i.getBody(),"mscontrolselect",function(e){/^(TABLE|IMG|HR)$/.test(e.target.nodeName)&&e.preventDefault()}))),i.on("nodechange mousedown mouseup ResizeEditor",u),i.on("keydown keyup",function(e){x&&"TABLE"==x.nodeName&&u(e)})}),{controlSelect:v,destroy:y}}}),r(A,[f,S,R,g,p],function(e,n,r,i,o){function a(e,t,i,o){var a=this;a.dom=e,a.win=t,a.serializer=i,a.editor=o,a.controlSelection=new r(a,o),a.win.getSelection||(a.tridentSel=new n(a))}var s=o.each,l=o.grep,c=o.trim,u=i.ie,d=i.opera;return a.prototype={setCursorLocation:function(e,t){var n=this,r=n.dom.createRng();e?(r.setStart(e,t),r.setEnd(e,t),n.setRng(r),n.collapse(!1)):(n._moveEndPoint(r,n.editor.getBody(),!0),n.setRng(r))},getContent:function(e){var n=this,r=n.getRng(),i=n.dom.create("body"),o=n.getSel(),a,s,l;return e=e||{},a=s="",e.get=!0,e.format=e.format||"html",e.selection=!0,n.editor.fire("BeforeGetContent",e),"text"==e.format?n.isCollapsed()?"":r.text||(o.toString?o.toString():""):(r.cloneContents?(l=r.cloneContents(),l&&i.appendChild(l)):r.item!==t||r.htmlText!==t?(i.innerHTML="<br>"+(r.item?r.item(0).outerHTML:r.htmlText),i.removeChild(i.firstChild)):i.innerHTML=r.toString(),/^\s/.test(i.innerHTML)&&(a=" "),/\s+$/.test(i.innerHTML)&&(s=" "),e.getInner=!0,e.content=n.isCollapsed()?"":a+n.serializer.serialize(i,e)+s,n.editor.fire("GetContent",e),e.content)},setContent:function(e,t){var n=this,r=n.getRng(),i,o=n.win.document,a,s;if(t=t||{format:"html"},t.set=!0,t.selection=!0,e=t.content=e,t.no_events||n.editor.fire("BeforeSetContent",t),e=t.content,r.insertNode){e+='<span id="__caret">_</span>',r.startContainer==o&&r.endContainer==o?o.body.innerHTML=e:(r.deleteContents(),0===o.body.childNodes.length?o.body.innerHTML=e:r.createContextualFragment?r.insertNode(r.createContextualFragment(e)):(a=o.createDocumentFragment(),s=o.createElement("div"),a.appendChild(s),s.outerHTML=e,r.insertNode(a))),i=n.dom.get("__caret"),r=o.createRange(),r.setStartBefore(i),r.setEndBefore(i),n.setRng(r),n.dom.remove("__caret");try{n.setRng(r)}catch(l){}}else r.item&&(o.execCommand("Delete",!1,null),r=n.getRng()),/^\s+/.test(e)?(r.pasteHTML('<span id="__mce_tmp">_</span>'+e),n.dom.remove("__mce_tmp")):r.pasteHTML(e);t.no_events||n.editor.fire("SetContent",t)},getStart:function(){var e=this,t=e.getRng(),n,r,i,o;if(t.duplicate||t.item){if(t.item)return t.item(0);for(i=t.duplicate(),i.collapse(1),n=i.parentElement(),n.ownerDocument!==e.dom.doc&&(n=e.dom.getRoot()),r=o=t.parentElement();o=o.parentNode;)if(o==n){n=r;break}return n}return n=t.startContainer,1==n.nodeType&&n.hasChildNodes()&&(n=n.childNodes[Math.min(n.childNodes.length-1,t.startOffset)]),n&&3==n.nodeType?n.parentNode:n},getEnd:function(){var e=this,t=e.getRng(),n,r;return t.duplicate||t.item?t.item?t.item(0):(t=t.duplicate(),t.collapse(0),n=t.parentElement(),n.ownerDocument!==e.dom.doc&&(n=e.dom.getRoot()),n&&"BODY"==n.nodeName?n.lastChild||n:n):(n=t.endContainer,r=t.endOffset,1==n.nodeType&&n.hasChildNodes()&&(n=n.childNodes[r>0?r-1:r]),n&&3==n.nodeType?n.parentNode:n)},getBookmark:function(e,t){function n(e,t){var n=0;return s(a.select(e),function(e,r){e==t&&(n=r)}),n}function r(e){function t(t){var n,r,i,o=t?"start":"end";n=e[o+"Container"],r=e[o+"Offset"],1==n.nodeType&&"TR"==n.nodeName&&(i=n.childNodes,n=i[Math.min(t?r:r-1,i.length-1)],n&&(r=t?0:n.childNodes.length,e["set"+(t?"Start":"End")](n,r)))}return t(!0),t(),e}function i(){function e(e,n){var i=e[n?"startContainer":"endContainer"],a=e[n?"startOffset":"endOffset"],s=[],l,c,u=0;if(3==i.nodeType){if(t)for(l=i.previousSibling;l&&3==l.nodeType;l=l.previousSibling)a+=l.nodeValue.length;s.push(a)}else c=i.childNodes,a>=c.length&&c.length&&(u=1,a=Math.max(0,c.length-1)),s.push(o.dom.nodeIndex(c[a],t)+u);for(;i&&i!=r;i=i.parentNode)s.push(o.dom.nodeIndex(i,t));return s}var n=o.getRng(!0),r=a.getRoot(),i={};return i.start=e(n,!0),o.isCollapsed()||(i.end=e(n)),i}var o=this,a=o.dom,l,c,u,d,f,p,h="&#xFEFF;",m;if(2==e)return p=o.getNode(),f=p.nodeName,"IMG"==f?{name:f,index:n(f,p)}:o.tridentSel?o.tridentSel.getBookmark(e):i();if(e)return{rng:o.getRng()};if(l=o.getRng(),u=a.uniqueId(),d=o.isCollapsed(),m="overflow:hidden;line-height:0px",l.duplicate||l.item){if(l.item)return p=l.item(0),f=p.nodeName,{name:f,index:n(f,p)};c=l.duplicate();try{l.collapse(),l.pasteHTML('<span data-mce-type="bookmark" id="'+u+'_start" style="'+m+'">'+h+"</span>"),d||(c.collapse(!1),l.moveToElementText(c.parentElement()),0===l.compareEndPoints("StartToEnd",c)&&c.move("character",-1),c.pasteHTML('<span data-mce-type="bookmark" id="'+u+'_end" style="'+m+'">'+h+"</span>"))}catch(g){return null}}else{if(p=o.getNode(),f=p.nodeName,"IMG"==f)return{name:f,index:n(f,p)};c=r(l.cloneRange()),d||(c.collapse(!1),c.insertNode(a.create("span",{"data-mce-type":"bookmark",id:u+"_end",style:m},h))),l=r(l),l.collapse(!0),l.insertNode(a.create("span",{"data-mce-type":"bookmark",id:u+"_start",style:m},h))}return o.moveToBookmark({id:u,keep:1}),{id:u}},moveToBookmark:function(e){function t(t){var n=e[t?"start":"end"],r,i,o,s;if(n){for(o=n[0],i=c,r=n.length-1;r>=1;r--){if(s=i.childNodes,n[r]>s.length-1)return;i=s[n[r]]}3===i.nodeType&&(o=Math.min(n[0],i.nodeValue.length)),1===i.nodeType&&(o=Math.min(n[0],i.childNodes.length)),t?a.setStart(i,o):a.setEnd(i,o)}return!0}function n(t){var n=o.get(e.id+"_"+t),r,i,a,c,u=e.keep;if(n&&(r=n.parentNode,"start"==t?(u?(r=n.firstChild,i=1):i=o.nodeIndex(n),f=p=r,h=m=i):(u?(r=n.firstChild,i=1):i=o.nodeIndex(n),p=r,m=i),!u)){for(c=n.previousSibling,a=n.nextSibling,s(l(n.childNodes),function(e){3==e.nodeType&&(e.nodeValue=e.nodeValue.replace(/\uFEFF/g,""))});n=o.get(e.id+"_"+t);)o.remove(n,1);c&&a&&c.nodeType==a.nodeType&&3==c.nodeType&&!d&&(i=c.nodeValue.length,c.appendData(a.nodeValue),o.remove(a),"start"==t?(f=p=c,h=m=i):(p=c,m=i))}}function r(e){return!o.isBlock(e)||e.innerHTML||u||(e.innerHTML='<br data-mce-bogus="1" />'),e}var i=this,o=i.dom,a,c,f,p,h,m;if(e)if(e.start){if(a=o.createRng(),c=o.getRoot(),i.tridentSel)return i.tridentSel.moveToBookmark(e);t(!0)&&t()&&i.setRng(a)}else e.id?(n("start"),n("end"),f&&(a=o.createRng(),a.setStart(r(f),h),a.setEnd(r(p),m),i.setRng(a))):e.name?i.select(o.select(e.name)[e.index]):e.rng&&i.setRng(e.rng)},select:function(e,t){var n=this,r=n.dom,i=r.createRng(),o;if(n.lastFocusBookmark=null,e){if(!t&&n.controlSelection.controlSelect(e))return;o=r.nodeIndex(e),i.setStart(e.parentNode,o),i.setEnd(e.parentNode,o+1),t&&(n._moveEndPoint(i,e,!0),n._moveEndPoint(i,e)),n.setRng(i)}return e},isCollapsed:function(){var e=this,t=e.getRng(),n=e.getSel();return!t||t.item?!1:t.compareEndPoints?0===t.compareEndPoints("StartToEnd",t):!n||t.collapsed},collapse:function(e){var t=this,n=t.getRng(),r;n.item&&(r=n.item(0),n=t.win.document.body.createTextRange(),n.moveToElementText(r)),n.collapse(!!e),t.setRng(n)},getSel:function(){var e=this.win;return e.getSelection?e.getSelection():e.document.selection},getRng:function(e){var t=this,n,r,i,o=t.win.document,a;if(!e&&t.lastFocusBookmark){var s=t.lastFocusBookmark;return s.startContainer?(r=o.createRange(),r.setStart(s.startContainer,s.startOffset),r.setEnd(s.endContainer,s.endOffset)):r=s,r}if(e&&t.tridentSel)return t.tridentSel.getRangeAt(0);try{(n=t.getSel())&&(r=n.rangeCount>0?n.getRangeAt(0):n.createRange?n.createRange():o.createRange())}catch(l){}if(u&&r&&r.setStart){try{a=o.selection.createRange()}catch(l){}a&&a.item&&(i=a.item(0),r=o.createRange(),r.setStartBefore(i),r.setEndAfter(i))}return r||(r=o.createRange?o.createRange():o.body.createTextRange()),r.setStart&&9===r.startContainer.nodeType&&r.collapsed&&(i=t.dom.getRoot(),r.setStart(i,0),r.setEnd(i,0)),t.selectedRange&&t.explicitRange&&(0===r.compareBoundaryPoints(r.START_TO_START,t.selectedRange)&&0===r.compareBoundaryPoints(r.END_TO_END,t.selectedRange)?r=t.explicitRange:(t.selectedRange=null,t.explicitRange=null)),r},setRng:function(e,t){var n=this,r;if(e.select)try{e.select()}catch(i){}else if(n.tridentSel){if(e.cloneRange)try{return n.tridentSel.addRange(e),void 0}catch(i){}}else if(r=n.getSel()){n.explicitRange=e;try{r.removeAllRanges(),r.addRange(e)}catch(i){}t===!1&&r.extend&&(r.collapse(e.endContainer,e.endOffset),r.extend(e.startContainer,e.startOffset)),n.selectedRange=r.rangeCount>0?r.getRangeAt(0):null}},setNode:function(e){var t=this;return t.setContent(t.dom.getOuterHTML(e)),e},getNode:function(){function e(e,t){for(var n=e;e&&3===e.nodeType&&0===e.length;)e=t?e.nextSibling:e.previousSibling;return e||n}var t=this,n=t.getRng(),r,i=n.startContainer,o=n.endContainer,a=n.startOffset,s=n.endOffset,l=t.dom.getRoot();return n?n.setStart?(r=n.commonAncestorContainer,!n.collapsed&&(i==o&&2>s-a&&i.hasChildNodes()&&(r=i.childNodes[a]),3===i.nodeType&&3===o.nodeType&&(i=i.length===a?e(i.nextSibling,!0):i.parentNode,o=0===s?e(o.previousSibling,!1):o.parentNode,i&&i===o))?i:r&&3==r.nodeType?r.parentNode:r):(r=n.item?n.item(0):n.parentElement(),r.ownerDocument!==t.win.document&&(r=l),r):l},getSelectedBlocks:function(t,n){var r=this,i=r.dom,o,a,s=[];if(a=i.getRoot(),t=i.getParent(t||r.getStart(),i.isBlock),n=i.getParent(n||r.getEnd(),i.isBlock),t&&t!=a&&s.push(t),t&&n&&t!=n){o=t;for(var l=new e(t,a);(o=l.next())&&o!=n;)i.isBlock(o)&&s.push(o)}return n&&t!=n&&n!=a&&s.push(n),s},isForward:function(){var e=this.dom,t=this.getSel(),n,r;return t&&t.anchorNode&&t.focusNode?(n=e.createRng(),n.setStart(t.anchorNode,t.anchorOffset),n.collapse(!0),r=e.createRng(),r.setStart(t.focusNode,t.focusOffset),r.collapse(!0),n.compareBoundaryPoints(n.START_TO_START,r)<=0):!0},normalize:function(){function t(t){function a(t,n){for(var r=new e(t,f.getParent(t.parentNode,f.isBlock)||p);t=r[n?"prev":"next"]();)if("BR"===t.nodeName)return!0}function s(e,t){return e.previousSibling&&e.previousSibling.nodeName==t}function l(t,n){var r,a;for(n=n||c,r=new e(n,f.getParent(n.parentNode,f.isBlock)||p);h=r[t?"prev":"next"]();){if(3===h.nodeType&&h.nodeValue.length>0)return c=h,u=t?h.nodeValue.length:0,i=!0,void 0;if(f.isBlock(h)||m[h.nodeName.toLowerCase()])return;a=h}o&&a&&(c=a,i=!0,u=0)}var c,u,d,f=n.dom,p=f.getRoot(),h,m,g,v;if(c=r[(t?"start":"end")+"Container"],u=r[(t?"start":"end")+"Offset"],m=f.schema.getNonEmptyElements(),v=t,1==c.nodeType&&u>c.childNodes.length-1&&(v=!1),9===c.nodeType&&(c=f.getRoot(),u=0),c===p){if(v&&(h=c.childNodes[u>0?u-1:0],h&&(g=h.nodeName.toLowerCase(),m[h.nodeName]||"TABLE"==h.nodeName)))return;if(c.hasChildNodes()&&(u=Math.min(!v&&u>0?u-1:u,c.childNodes.length-1),c=c.childNodes[u],u=0,c.hasChildNodes()&&!/TABLE/.test(c.nodeName))){h=c,d=new e(c,p);do{if(3===h.nodeType&&h.nodeValue.length>0){u=v?0:h.nodeValue.length,c=h,i=!0;break}if(m[h.nodeName.toLowerCase()]){u=f.nodeIndex(h),c=h.parentNode,"IMG"!=h.nodeName||v||u++,i=!0;break}}while(h=v?d.next():d.prev())}}o&&(3===c.nodeType&&0===u&&l(!0),1===c.nodeType&&(h=c.childNodes[u],!h||"BR"!==h.nodeName||s(h,"A")||a(h)||a(h,!0)||l(!0,c.childNodes[u]))),v&&!o&&3===c.nodeType&&u===c.nodeValue.length&&l(!1),i&&r["set"+(t?"Start":"End")](c,u)}var n=this,r,i,o;u||(r=n.getRng(),o=r.collapsed,t(!0),o||t(),i&&(o&&r.collapse(!0),n.setRng(r,n.isForward())))},selectorChanged:function(e,t){var n=this,r;return n.selectorChangedData||(n.selectorChangedData={},r={},n.editor.on("NodeChange",function(e){var t=e.element,i=n.dom,o=i.getParents(t,null,i.getRoot()),a={};s(n.selectorChangedData,function(e,t){s(o,function(n){return i.is(n,t)?(r[t]||(s(e,function(e){e(!0,{node:n,selector:t,parents:o})}),r[t]=e),a[t]=e,!1):void 0})}),s(r,function(e,n){a[n]||(delete r[n],s(e,function(e){e(!1,{node:t,selector:n,parents:o})}))})})),n.selectorChangedData[e]||(n.selectorChangedData[e]=[]),n.selectorChangedData[e].push(t),n},getScrollContainer:function(){for(var e,t=this.dom.getRoot();t&&"BODY"!=t.nodeName;){if(t.scrollHeight>t.clientHeight){e=t;break}t=t.parentNode}return e},scrollIntoView:function(e){function t(e){for(var t=0,n=0,r=e;r&&r.nodeType;)t+=r.offsetLeft||0,n+=r.offsetTop||0,r=r.offsetParent;return{x:t,y:n}}var n,r,i=this,o=i.dom,a=o.getRoot(),s,l;if("BODY"!=a.nodeName){var c=i.getScrollContainer();if(c)return n=t(e).y-t(c).y,l=c.clientHeight,s=c.scrollTop,(s>n||n+25>s+l)&&(c.scrollTop=s>n?n:n-l+25),void 0}r=o.getViewPort(i.editor.getWin()),n=o.getPos(e).y,s=r.y,l=r.h,(n<r.y||n+25>s+l)&&i.editor.getWin().scrollTo(0,s>n?n:n-l+25)},_moveEndPoint:function(t,n,r){var o=n,a=new e(n,o),s=this.dom.schema.getNonEmptyElements();do{if(3==n.nodeType&&0!==c(n.nodeValue).length)return r?t.setStart(n,0):t.setEnd(n,n.nodeValue.length),void 0;if(s[n.nodeName])return r?t.setStartBefore(n):"BR"==n.nodeName?t.setEndBefore(n):t.setEndAfter(n),void 0;if(i.ie&&i.ie<11&&this.dom.isBlock(n)&&this.dom.isEmpty(n))return r?t.setStart(n,0):t.setEnd(n,0),void 0}while(n=r?a.next():a.prev());"BODY"==o.nodeName&&(r?t.setStart(o,0):t.setEnd(o,o.childNodes.length))},destroy:function(){this.win=null,this.controlSelection.destroy()}},a}),r(B,[p],function(e){function t(e){this.walk=function(t,r){function i(e){var t;return t=e[0],3===t.nodeType&&t===l&&c>=t.nodeValue.length&&e.splice(0,1),t=e[e.length-1],0===d&&e.length>0&&t===u&&3===t.nodeType&&e.splice(e.length-1,1),e}function o(e,t,n){for(var r=[];e&&e!=n;e=e[t])r.push(e);return r}function a(e,t){do{if(e.parentNode==t)return e;e=e.parentNode}while(e)}function s(e,t,n){var a=n?"nextSibling":"previousSibling";for(m=e,g=m.parentNode;m&&m!=t;m=g)g=m.parentNode,v=o(m==e?m:m[a],a),v.length&&(n||v.reverse(),r(i(v)))}var l=t.startContainer,c=t.startOffset,u=t.endContainer,d=t.endOffset,f,p,h,m,g,v,y;if(y=e.select("td.mce-item-selected,th.mce-item-selected"),y.length>0)return n(y,function(e){r([e])}),void 0;if(1==l.nodeType&&l.hasChildNodes()&&(l=l.childNodes[c]),1==u.nodeType&&u.hasChildNodes()&&(u=u.childNodes[Math.min(d-1,u.childNodes.length-1)]),l==u)return r(i([l]));for(f=e.findCommonAncestor(l,u),m=l;m;m=m.parentNode){if(m===u)return s(l,f,!0);if(m===f)break}for(m=u;m;m=m.parentNode){if(m===l)return s(u,f);if(m===f)break}p=a(l,f)||l,h=a(u,f)||u,s(l,p,!0),v=o(p==l?p:p.nextSibling,"nextSibling",h==u?h.nextSibling:h),v.length&&r(i(v)),s(u,h)},this.split=function(e){function t(e,t){return e.splitText(t)}var n=e.startContainer,r=e.startOffset,i=e.endContainer,o=e.endOffset;return n==i&&3==n.nodeType?r>0&&r<n.nodeValue.length&&(i=t(n,r),n=i.previousSibling,o>r?(o-=r,n=i=t(i,o).previousSibling,o=i.nodeValue.length,r=0):o=0):(3==n.nodeType&&r>0&&r<n.nodeValue.length&&(n=t(n,r),r=0),3==i.nodeType&&o>0&&o<i.nodeValue.length&&(i=t(i,o).previousSibling,o=i.nodeValue.length)),{startContainer:n,startOffset:r,endContainer:i,endOffset:o}}}var n=e.each;return t.compareRanges=function(e,t){if(e&&t){if(!e.item&&!e.duplicate)return e.startContainer==t.startContainer&&e.startOffset==t.startOffset;if(e.item&&t.item&&e.item(0)===t.item(0))return!0;if(e.isEqual&&t.isEqual&&t.isEqual(e))return!0}return!1},t}),r(L,[f,B,p],function(e,t,n){return function(r){function i(e){return e.nodeType&&(e=e.nodeName),!!r.schema.getTextBlockElements()[e.toLowerCase()]}function o(e,t){return I.getParents(e,t,I.getRoot())}function a(e){return 1===e.nodeType&&"_mce_caret"===e.id}function s(){u({alignleft:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"left"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"left"}}],aligncenter:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"center"},defaultBlock:"div"},{selector:"img",collapsed:!1,styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",collapsed:!1,styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"right"},defaultBlock:"div"},{selector:"img,table",collapsed:!1,styles:{"float":"right"}}],alignjustify:[{selector:"figure,p,h1,h2,h3,h4,h5,h6,td,th,tr,div,ul,ol,li",styles:{textAlign:"justify"},defaultBlock:"div"}],bold:[{inline:"strong",remove:"all"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b",remove:"all"}],italic:[{inline:"em",remove:"all"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i",remove:"all"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:!0},{inline:"u",remove:"all"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:!0},{inline:"strike",remove:"all"}],forecolor:{inline:"span",styles:{color:"%value"},wrap_links:!1},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"},wrap_links:!1},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},subscript:{inline:"sub"},superscript:{inline:"sup"},code:{inline:"code"},link:{inline:"a",selector:"a",remove:"all",split:!0,deep:!0,onmatch:function(){return!0},onformat:function(e,t,n){et(n,function(t,n){I.setAttrib(e,n,t)})}},removeformat:[{selector:"b,strong,em,i,font,u,strike,sub,sup",remove:"all",split:!0,expand:!1,block_expand:!0,deep:!0},{selector:"span",attributes:["style","class"],remove:"empty",split:!0,expand:!1,deep:!0},{selector:"*",attributes:["style","class"],split:!1,expand:!1,deep:!0}]}),et("p h1 h2 h3 h4 h5 h6 div address pre div dt dd samp".split(/\s/),function(e){u(e,{block:e,remove:"all"})}),u(r.settings.formats)}function l(){r.addShortcut("ctrl+b","bold_desc","Bold"),r.addShortcut("ctrl+i","italic_desc","Italic"),r.addShortcut("ctrl+u","underline_desc","Underline");for(var e=1;6>=e;e++)r.addShortcut("ctrl+"+e,"",["FormatBlock",!1,"h"+e]);r.addShortcut("ctrl+7","",["FormatBlock",!1,"p"]),r.addShortcut("ctrl+8","",["FormatBlock",!1,"div"]),r.addShortcut("ctrl+9","",["FormatBlock",!1,"address"])}function c(e){return e?O[e]:O}function u(e,t){e&&("string"!=typeof e?et(e,function(e,t){u(t,e)}):(t=t.length?t:[t],et(t,function(e){e.deep===X&&(e.deep=!e.selector),e.split===X&&(e.split=!e.selector||e.inline),e.remove===X&&e.selector&&!e.inline&&(e.remove="none"),e.selector&&e.inline&&(e.mixed=!0,e.block_expand=!0),"string"==typeof e.classes&&(e.classes=e.classes.split(/\s+/))}),O[e]=t))}function d(e){var t;return r.dom.getParent(e,function(e){return t=r.dom.getStyle(e,"text-decoration"),t&&"none"!==t}),t}function f(e){var t;1===e.nodeType&&e.parentNode&&1===e.parentNode.nodeType&&(t=d(e.parentNode),r.dom.getStyle(e,"color")&&t?r.dom.setStyle(e,"text-decoration",t):r.dom.getStyle(e,"textdecoration")===t&&r.dom.setStyle(e,"text-decoration",null))}function p(t,n,o){function s(e,t){t=t||m,e&&(t.onformat&&t.onformat(e,t,n,o),et(t.styles,function(t,r){I.setStyle(e,r,E(t,n))}),et(t.attributes,function(t,r){I.setAttrib(e,r,E(t,n))}),et(t.classes,function(t){t=E(t,n),I.hasClass(e,t)||I.addClass(e,t)}))}function l(){function t(t,n){var r=new e(n);for(o=r.current();o;o=r.prev())if(o.childNodes.length>1||o==t||"BR"==o.tagName)return o}var n=r.selection.getRng(),i=n.startContainer,a=n.endContainer;if(i!=a&&0===n.endOffset){var s=t(i,a),l=3==s.nodeType?s.length:s.childNodes.length;n.setEnd(s,l)}return n}function u(e,t,n,r,i){var o=[],a=-1,s,l=-1,c=-1,u;return et(e.childNodes,function(e,t){return"UL"===e.nodeName||"OL"===e.nodeName?(a=t,s=e,!1):void 0}),et(e.childNodes,function(e,n){"SPAN"===e.nodeName&&"bookmark"==I.getAttrib(e,"data-mce-type")&&(e.id==t.id+"_start"?l=n:e.id==t.id+"_end"&&(c=n))}),0>=a||a>l&&c>a?(et(tt(e.childNodes),i),0):(u=I.clone(n,K),et(tt(e.childNodes),function(e,t){(a>l&&a>t||l>a&&t>a)&&(o.push(e),e.parentNode.removeChild(e))}),a>l?e.insertBefore(u,s):l>a&&e.insertBefore(u,s.nextSibling),r.push(u),et(o,function(e){u.appendChild(e)}),u)}function d(e,r,o){var l=[],c,d,f=!0;c=m.inline||m.block,d=I.create(c),s(d),z.walk(e,function(e){function p(e){var y,C,x,_,N;return N=f,y=e.nodeName.toLowerCase(),C=e.parentNode.nodeName.toLowerCase(),1===e.nodeType&&J(e)&&(N=f,f="true"===J(e),_=!0),w(y,"br")?(v=0,m.block&&I.remove(e),void 0):m.wrapper&&g(e,t,n)?(v=0,void 0):f&&!_&&m.block&&!m.wrapper&&i(y)&&W(C,c)?(e=I.rename(e,c),s(e),l.push(e),v=0,void 0):m.selector&&(et(h,function(t){"collapsed"in t&&t.collapsed!==b||I.is(e,t.selector)&&!a(e)&&(s(e,t),x=!0)}),!m.inline||x)?(v=0,void 0):(!f||_||!W(c,y)||!W(C,c)||!o&&3===e.nodeType&&1===e.nodeValue.length&&65279===e.nodeValue.charCodeAt(0)||a(e)||m.inline&&V(e)?"li"==y&&r?v=u(e,r,d,l,p):(v=0,et(tt(e.childNodes),p),_&&(f=N),v=0):(v||(v=I.clone(d,K),e.parentNode.insertBefore(v,e),l.push(v)),v.appendChild(e)),void 0)}var v;et(e,p)}),m.wrap_links===!1&&et(l,function(e){function t(e){var n,r,i;if("A"===e.nodeName){for(r=I.clone(d,K),l.push(r),i=tt(e.childNodes),n=0;n<i.length;n++)r.appendChild(i[n]);e.appendChild(r)}et(tt(e.childNodes),t)}t(e)}),et(l,function(e){function r(e){var t=0;return et(e.childNodes,function(e){k(e)||L(e)||t++}),t}function i(e){var t,n;return et(e.childNodes,function(e){return 1!=e.nodeType||L(e)||a(e)?void 0:(t=e,K)}),t&&x(t,m)&&(n=I.clone(t,K),s(n),I.replace(n,e,Y),I.remove(t,1)),n||e}var o;if(o=r(e),(l.length>1||!V(e))&&0===o)return I.remove(e,1),void 0;if(m.inline||m.wrapper){if(m.exact||1!==o||(e=i(e)),et(h,function(t){et(I.select(t.inline,e),function(e){var r;if(t.wrap_links===!1){r=e.parentNode;do if("A"===r.nodeName)return;while(r=r.parentNode)}R(t,n,e,t.exact?e:null)})}),g(e.parentNode,t,n))return I.remove(e,1),e=0,Y;m.merge_with_parents&&I.getParent(e.parentNode,function(r){return g(r,t,n)?(I.remove(e,1),e=0,Y):void 0}),e&&m.merge_siblings!==!1&&(e=D(B(e),e),e=D(e,B(e,Y)))}})}var h=c(t),m=h[0],v,y,b=!o&&F.isCollapsed();if(m)if(o)o.nodeType?(y=I.createRng(),y.setStartBefore(o),y.setEndAfter(o),d(T(y,h),null,!0)):d(o,null,!0);else if(b&&m.inline&&!I.select("td.mce-item-selected,th.mce-item-selected").length)M("apply",t,n);else{var C=r.selection.getNode();U||!h[0].defaultBlock||I.getParent(C,I.isBlock)||p(h[0].defaultBlock),r.selection.setRng(l()),v=F.getBookmark(),d(T(F.getRng(Y),h),v),m.styles&&(m.styles.color||m.styles.textDecoration)&&(nt(C,f,"childNodes"),f(C)),F.moveToBookmark(v),P(F.getRng(Y)),r.nodeChanged()}}function h(e,t,n){function i(e){var n,r,o,a,s;if(1===e.nodeType&&J(e)&&(a=b,b="true"===J(e),s=!0),n=tt(e.childNodes),b&&!s)for(r=0,o=p.length;o>r&&!R(p[r],t,e,e);r++);if(h.deep&&n.length){for(r=0,o=n.length;o>r;r++)i(n[r]);s&&(b=a)}}function a(n){var r;return et(o(n.parentNode).reverse(),function(n){var i;r||"_start"==n.id||"_end"==n.id||(i=g(n,e,t),i&&i.split!==!1&&(r=n))}),r}function s(e,n,r,i){var o,a,s,l,c,u;if(e){for(u=e.parentNode,o=n.parentNode;o&&o!=u;o=o.parentNode){for(a=I.clone(o,K),c=0;c<p.length;c++)if(R(p[c],t,a,a)){a=0;break}a&&(s&&a.appendChild(s),l||(l=a),s=a)}!i||h.mixed&&V(e)||(n=I.split(e,n)),s&&(r.parentNode.insertBefore(s,r),l.appendChild(r))}return n}function l(e){return s(a(e),e,e,!0)}function u(e){var t=I.get(e?"_start":"_end"),n=t[e?"firstChild":"lastChild"];return L(n)&&(n=n[e?"firstChild":"lastChild"]),I.remove(t,!0),n}function f(e){var t,n,o=e.commonAncestorContainer;e=T(e,p,Y),h.split&&(t=H(e,Y),n=H(e),t!=n?(/^(TR|TH|TD)$/.test(t.nodeName)&&t.firstChild&&(t="TR"==t.nodeName?t.firstChild.firstChild||t:t.firstChild||t),o&&/^T(HEAD|BODY|FOOT|R)$/.test(o.nodeName)&&/^(TH|TD)$/.test(n.nodeName)&&n.firstChild&&(n=n.firstChild||n),t=S(t,"span",{id:"_start","data-mce-type":"bookmark"}),n=S(n,"span",{id:"_end","data-mce-type":"bookmark"}),l(t),l(n),t=u(Y),n=u()):t=n=l(t),e.startContainer=t.parentNode,e.startOffset=q(t),e.endContainer=n.parentNode,e.endOffset=q(n)+1),z.walk(e,function(e){et(e,function(e){i(e),1===e.nodeType&&"underline"===r.dom.getStyle(e,"text-decoration")&&e.parentNode&&"underline"===d(e.parentNode)&&R({deep:!1,exact:!0,inline:"span",styles:{textDecoration:"underline"}},null,e)})})}var p=c(e),h=p[0],m,y,b=!0;return n?(n.nodeType?(y=I.createRng(),y.setStartBefore(n),y.setEndAfter(n),f(y)):f(n),void 0):(F.isCollapsed()&&h.inline&&!I.select("td.mce-item-selected,th.mce-item-selected").length?M("remove",e,t):(m=F.getBookmark(),f(F.getRng(Y)),F.moveToBookmark(m),h.inline&&v(e,t,F.getStart())&&P(F.getRng(!0)),r.nodeChanged()),void 0)}function m(e,t,n){var r=c(e);!v(e,t,n)||"toggle"in r[0]&&!r[0].toggle?p(e,t,n):h(e,t,n)}function g(e,t,n,r){function i(e,t,i){var o,a,s=t[i],l;if(t.onmatch)return t.onmatch(e,t,i);if(s)if(s.length===X){for(o in s)if(s.hasOwnProperty(o)){if(a="attributes"===i?I.getAttrib(e,o):_(e,o),r&&!a&&!t.exact)return;if((!r||t.exact)&&!w(a,N(E(s[o],n),o)))return}}else for(l=0;l<s.length;l++)if("attributes"===i?I.getAttrib(e,s[l]):_(e,s[l]))return t;return t}var o=c(t),a,s,l;if(o&&e)for(s=0;s<o.length;s++)if(a=o[s],x(e,a)&&i(e,a,"attributes")&&i(e,a,"styles")){if(l=a.classes)for(s=0;s<l.length;s++)if(!I.hasClass(e,l[s]))return;return a}}function v(e,t,n){function r(n){var r=I.getRoot();return n===r?!1:(n=I.getParent(n,function(n){return n.parentNode===r||!!g(n,e,t,!0)}),g(n,e,t))}var i;return n?r(n):(n=F.getNode(),r(n)?Y:(i=F.getStart(),i!=n&&r(i)?Y:K))}function y(e,t){var n,r=[],i={};return n=F.getStart(),I.getParent(n,function(n){var o,a;for(o=0;o<e.length;o++)a=e[o],!i[a]&&g(n,a,t)&&(i[a]=!0,r.push(a))},I.getRoot()),r
+}function b(e){var t=c(e),n,r,i,a,s;if(t)for(n=F.getStart(),r=o(n),a=t.length-1;a>=0;a--){if(s=t[a].selector,!s||t[a].defaultBlock)return Y;for(i=r.length-1;i>=0;i--)if(I.is(r[i],s))return Y}return K}function C(e,t,n){var i;return G||(G={},i={},r.on("NodeChange",function(e){var t=o(e.element),n={};et(G,function(e,r){et(t,function(o){return g(o,r,{},e.similar)?(i[r]||(et(e,function(e){e(!0,{node:o,format:r,parents:t})}),i[r]=e),n[r]=e,!1):void 0})}),et(i,function(r,o){n[o]||(delete i[o],et(r,function(n){n(!1,{node:e.element,format:o,parents:t})}))})})),et(e.split(","),function(e){G[e]||(G[e]=[],G[e].similar=n),G[e].push(t)}),this}function x(e,t){return w(e,t.inline)?Y:w(e,t.block)?Y:t.selector?1==e.nodeType&&I.is(e,t.selector):void 0}function w(e,t){return e=e||"",t=t||"",e=""+(e.nodeName||e),t=""+(t.nodeName||t),e.toLowerCase()==t.toLowerCase()}function _(e,t){return N(I.getStyle(e,t),t)}function N(e,t){return("color"==t||"backgroundColor"==t)&&(e=I.toHex(e)),"fontWeight"==t&&700==e&&(e="bold"),"fontFamily"==t&&(e=e.replace(/[\'\"]/g,"").replace(/,\s+/g,",")),""+e}function E(e,t){return"string"!=typeof e?e=e(t):t&&(e=e.replace(/%(\w+)/g,function(e,n){return t[n]||e})),e}function k(e){return e&&3===e.nodeType&&/^([\t \r\n]+|)$/.test(e.nodeValue)}function S(e,t,n){var r=I.create(t,n);return e.parentNode.insertBefore(r,e),r.appendChild(e),r}function T(t,n,a){function s(e){function t(e){return"BR"==e.nodeName&&e.getAttribute("data-mce-bogus")&&!e.nextSibling}var r,i,o,a,s;if(r=i=e?g:y,a=e?"previousSibling":"nextSibling",s=I.getRoot(),3==r.nodeType&&!k(r)&&(e?v>0:b<r.nodeValue.length))return r;for(;;){if(!n[0].block_expand&&V(i))return i;for(o=i[a];o;o=o[a])if(!L(o)&&!k(o)&&!t(o))return i;if(i.parentNode==s){r=i;break}i=i.parentNode}return r}function l(e,t){for(t===X&&(t=3===e.nodeType?e.length:e.childNodes.length);e&&e.hasChildNodes();)e=e.childNodes[t],e&&(t=3===e.nodeType?e.length:e.childNodes.length);return{node:e,offset:t}}function c(e){for(var t=e;t;){if(1===t.nodeType&&J(t))return"false"===J(t)?t:e;t=t.parentNode}return e}function u(t,n,i){function o(e,t){var n,r,o=e.nodeValue;return"undefined"==typeof t&&(t=i?o.length:0),i?(n=o.lastIndexOf(" ",t),r=o.lastIndexOf("\xa0",t),n=n>r?n:r,-1===n||a||n++):(n=o.indexOf(" ",t),r=o.indexOf("\xa0",t),n=-1!==n&&(-1===r||r>n)?n:r),n}var s,l,c,u;if(3===t.nodeType){if(c=o(t,n),-1!==c)return{container:t,offset:c};u=t}for(s=new e(t,I.getParent(t,V)||r.getBody());l=s[i?"prev":"next"]();)if(3===l.nodeType){if(u=l,c=o(l),-1!==c)return{container:l,offset:c}}else if(V(l))break;return u?(n=i?0:u.length,{container:u,offset:n}):void 0}function d(e,r){var i,a,s,l;for(3==e.nodeType&&0===e.nodeValue.length&&e[r]&&(e=e[r]),i=o(e),a=0;a<i.length;a++)for(s=0;s<n.length;s++)if(l=n[s],!("collapsed"in l&&l.collapsed!==t.collapsed)&&I.is(i[a],l.selector))return i[a];return e}function f(e,t){var r,a=I.getRoot();if(n[0].wrapper||(r=I.getParent(e,n[0].block,a)),r||(r=I.getParent(3==e.nodeType?e.parentNode:e,function(e){return e!=a&&i(e)})),r&&n[0].wrapper&&(r=o(r,"ul,ol").reverse()[0]||r),!r)for(r=e;r[t]&&!V(r[t])&&(r=r[t],!w(r,"br")););return r||e}var p,h,m,g=t.startContainer,v=t.startOffset,y=t.endContainer,b=t.endOffset;if(1==g.nodeType&&g.hasChildNodes()&&(p=g.childNodes.length-1,g=g.childNodes[v>p?p:v],3==g.nodeType&&(v=0)),1==y.nodeType&&y.hasChildNodes()&&(p=y.childNodes.length-1,y=y.childNodes[b>p?p:b-1],3==y.nodeType&&(b=y.nodeValue.length)),g=c(g),y=c(y),(L(g.parentNode)||L(g))&&(g=L(g)?g:g.parentNode,g=g.nextSibling||g,3==g.nodeType&&(v=0)),(L(y.parentNode)||L(y))&&(y=L(y)?y:y.parentNode,y=y.previousSibling||y,3==y.nodeType&&(b=y.length)),n[0].inline&&(t.collapsed&&(m=u(g,v,!0),m&&(g=m.container,v=m.offset),m=u(y,b),m&&(y=m.container,b=m.offset)),h=l(y,b),h.node)){for(;h.node&&0===h.offset&&h.node.previousSibling;)h=l(h.node.previousSibling);h.node&&h.offset>0&&3===h.node.nodeType&&" "===h.node.nodeValue.charAt(h.offset-1)&&h.offset>1&&(y=h.node,y.splitText(h.offset-1))}return(n[0].inline||n[0].block_expand)&&(n[0].inline&&3==g.nodeType&&0!==v||(g=s(!0)),n[0].inline&&3==y.nodeType&&b!==y.nodeValue.length||(y=s())),n[0].selector&&n[0].expand!==K&&!n[0].inline&&(g=d(g,"previousSibling"),y=d(y,"nextSibling")),(n[0].block||n[0].selector)&&(g=f(g,"previousSibling"),y=f(y,"nextSibling"),n[0].block&&(V(g)||(g=s(!0)),V(y)||(y=s()))),1==g.nodeType&&(v=q(g),g=g.parentNode),1==y.nodeType&&(b=q(y)+1,y=y.parentNode),{startContainer:g,startOffset:v,endContainer:y,endOffset:b}}function R(e,t,n,r){var i,o,a;if(!x(n,e))return K;if("all"!=e.remove)for(et(e.styles,function(e,i){e=N(E(e,t),i),"number"==typeof i&&(i=e,r=0),(!r||w(_(r,i),e))&&I.setStyle(n,i,""),a=1}),a&&""===I.getAttrib(n,"style")&&(n.removeAttribute("style"),n.removeAttribute("data-mce-style")),et(e.attributes,function(e,i){var o;if(e=E(e,t),"number"==typeof i&&(i=e,r=0),!r||w(I.getAttrib(r,i),e)){if("class"==i&&(e=I.getAttrib(n,i),e&&(o="",et(e.split(/\s+/),function(e){/mce\w+/.test(e)&&(o+=(o?" ":"")+e)}),o)))return I.setAttrib(n,i,o),void 0;"class"==i&&n.removeAttribute("className"),j.test(i)&&n.removeAttribute("data-mce-"+i),n.removeAttribute(i)}}),et(e.classes,function(e){e=E(e,t),(!r||I.hasClass(r,e))&&I.removeClass(n,e)}),o=I.getAttribs(n),i=0;i<o.length;i++)if(0!==o[i].nodeName.indexOf("_"))return K;return"none"!=e.remove?(A(n,e),Y):void 0}function A(e,t){function n(e,t,n){return e=B(e,t,n),!e||"BR"==e.nodeName||V(e)}var i=e.parentNode,o;t.block&&(U?i==I.getRoot()&&(t.list_block&&w(e,t.list_block)||et(tt(e.childNodes),function(e){W(U,e.nodeName.toLowerCase())?o?o.appendChild(e):(o=S(e,U),I.setAttribs(o,r.settings.forced_root_block_attrs)):o=0})):V(e)&&!V(i)&&(n(e,K)||n(e.firstChild,Y,1)||e.insertBefore(I.create("br"),e.firstChild),n(e,Y)||n(e.lastChild,K,1)||e.appendChild(I.create("br")))),t.selector&&t.inline&&!w(t.inline,e)||I.remove(e,1)}function B(e,t,n){if(e)for(t=t?"nextSibling":"previousSibling",e=n?e:e[t];e;e=e[t])if(1==e.nodeType||!k(e))return e}function L(e){return e&&1==e.nodeType&&"bookmark"==e.getAttribute("data-mce-type")}function D(e,t){function n(e,t){function n(e){var t={};return et(I.getAttribs(e),function(n){var r=n.nodeName.toLowerCase();0!==r.indexOf("_")&&"style"!==r&&(t[r]=I.getAttrib(e,r))}),t}function r(e,t){var n,r;for(r in e)if(e.hasOwnProperty(r)){if(n=t[r],n===X)return K;if(e[r]!=n)return K;delete t[r]}for(r in t)if(t.hasOwnProperty(r))return K;return Y}return e.nodeName!=t.nodeName?K:r(n(e),n(t))?r(I.parseStyle(I.getAttrib(e,"style")),I.parseStyle(I.getAttrib(t,"style")))?Y:K:K}function r(e,t){for(i=e;i;i=i[t]){if(3==i.nodeType&&0!==i.nodeValue.length)return e;if(1==i.nodeType&&!L(i))return i}return e}var i,o;if(e&&t&&(e=r(e,"previousSibling"),t=r(t,"nextSibling"),n(e,t))){for(i=e.nextSibling;i&&i!=t;)o=i,i=i.nextSibling,e.appendChild(o);return I.remove(t),et(tt(t.childNodes),function(t){e.appendChild(t)}),e}return t}function H(t,n){var i,o,a;return i=t[n?"startContainer":"endContainer"],o=t[n?"startOffset":"endOffset"],1==i.nodeType&&(a=i.childNodes.length-1,!n&&o&&o--,i=i.childNodes[o>a?a:o]),3===i.nodeType&&n&&o>=i.nodeValue.length&&(i=new e(i,r.getBody()).next()||i),3!==i.nodeType||n||0!==o||(i=new e(i,r.getBody()).prev()||i),i}function M(t,n,o){function a(e){var t=I.create("span",{id:y,"data-mce-bogus":!0,style:b?"color:red":""});return e&&t.appendChild(r.getDoc().createTextNode($)),t}function s(e,t){for(;e;){if(3===e.nodeType&&e.nodeValue!==$||e.childNodes.length>1)return!1;t&&1===e.nodeType&&t.push(e),e=e.firstChild}return!0}function l(e){for(;e;){if(e.id===y)return e;e=e.parentNode}}function u(t){var n;if(t)for(n=new e(t,t),t=n.current();t;t=n.next())if(3===t.nodeType)return t}function d(e,t){var n,r;if(e)r=F.getRng(!0),s(e)?(t!==!1&&(r.setStartBefore(e),r.setEndBefore(e)),I.remove(e)):(n=u(e),n.nodeValue.charAt(0)===$&&(n=n.deleteData(0,1)),I.remove(e,1)),F.setRng(r);else if(e=l(F.getStart()),!e)for(;e=I.get(y);)d(e,!1)}function f(){var e,t,r,i,s,d,f;e=F.getRng(!0),i=e.startOffset,d=e.startContainer,f=d.nodeValue,t=l(F.getStart()),t&&(r=u(t)),f&&i>0&&i<f.length&&/\w/.test(f.charAt(i))&&/\w/.test(f.charAt(i-1))?(s=F.getBookmark(),e.collapse(!0),e=T(e,c(n)),e=z.split(e),p(n,o,e),F.moveToBookmark(s)):(t&&r.nodeValue===$?p(n,o,t):(t=a(!0),r=t.firstChild,e.insertNode(t),i=1,p(n,o,t)),F.setCursorLocation(r,i))}function m(){var e=F.getRng(!0),t,r,s,l,u,d,f=[],p,m;for(t=e.startContainer,r=e.startOffset,u=t,3==t.nodeType&&((r!=t.nodeValue.length||t.nodeValue===$)&&(l=!0),u=u.parentNode);u;){if(g(u,n,o)){d=u;break}u.nextSibling&&(l=!0),f.push(u),u=u.parentNode}if(d)if(l)s=F.getBookmark(),e.collapse(!0),e=T(e,c(n),!0),e=z.split(e),h(n,o,e),F.moveToBookmark(s);else{for(m=a(),u=m,p=f.length-1;p>=0;p--)u.appendChild(I.clone(f[p],!1)),u=u.firstChild;u.appendChild(I.doc.createTextNode($)),u=u.firstChild;var v=I.getParent(d,i);v&&I.isEmpty(v)?d.parentNode.replaceChild(m,d):I.insertAfter(m,d),F.setCursorLocation(u,1),I.isEmpty(d)&&I.remove(d)}}function v(){var e;e=l(F.getStart()),e&&!I.isEmpty(e)&&nt(e,function(e){1!=e.nodeType||e.id===y||I.isEmpty(e)||I.setAttrib(e,"data-mce-bogus",null)},"childNodes")}var y="_mce_caret",b=r.settings.caret_debug;r._hasCaretEvents||(Z=function(){var e=[],t;if(s(l(F.getStart()),e))for(t=e.length;t--;)I.setAttrib(e[t],"data-mce-bogus","1")},Q=function(e){var t=e.keyCode;d(),(8==t||37==t||39==t)&&d(l(F.getStart())),v()},r.on("SetContent",function(e){e.selection&&v()}),r._hasCaretEvents=!0),"apply"==t?f():m()}function P(t){var n=t.startContainer,r=t.startOffset,i,o,a,s,l;if(3==n.nodeType&&r>=n.nodeValue.length&&(r=q(n),n=n.parentNode,i=!0),1==n.nodeType)for(s=n.childNodes,n=s[Math.min(r,s.length-1)],o=new e(n,I.getParent(n,I.isBlock)),(r>s.length-1||i)&&o.next(),a=o.current();a;a=o.next())if(3==a.nodeType&&!k(a))return l=I.create("a",null,$),a.parentNode.insertBefore(l,a),t.setStart(a,0),F.setRng(t),I.remove(l),void 0}var O={},I=r.dom,F=r.selection,z=new t(I),W=r.schema.isValidChild,V=I.isBlock,U=r.settings.forced_root_block,q=I.nodeIndex,$="\ufeff",j=/^(src|href|style)$/,K=!1,Y=!0,G,X,J=I.getContentEditable,Q,Z,et=n.each,tt=n.grep,nt=n.walk,rt=n.extend;rt(this,{get:c,register:u,apply:p,remove:h,toggle:m,match:v,matchAll:y,matchNode:g,canApply:b,formatChanged:C}),s(),l(),r.on("BeforeGetContent",function(){Z&&Z()}),r.on("mouseup keydown",function(e){Q&&Q(e)})}}),r(D,[g,p],function(e,t){var n=t.trim,r;return r=new RegExp(["<span[^>]+data-mce-bogus[^>]+>[\u200b\ufeff]+<\\/span>","<div[^>]+data-mce-bogus[^>]+><\\/div>",'\\s?data-mce-selected="[^"]+"'].join("|"),"gi"),function(t){function i(){return n(t.getContent({format:"raw",no_events:1}).replace(r,""))}function o(){a.typing=!1,a.add()}var a,s=0,l=[],c,u,d;return t.on("init",function(){a.add()}),t.on("BeforeExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&a.beforeChange()}),t.on("ExecCommand",function(e){var t=e.command;"Undo"!=t&&"Redo"!=t&&"mceRepaint"!=t&&a.add()}),t.on("ObjectResizeStart",function(){a.beforeChange()}),t.on("SaveContent ObjectResized",o),t.dom.bind(t.dom.getRoot(),"dragend",o),t.dom.bind(t.getBody(),"focusout",function(){!t.removed&&a.typing&&o()}),t.on("KeyUp",function(n){var r=n.keyCode;(r>=33&&36>=r||r>=37&&40>=r||45==r||13==r||n.ctrlKey)&&(o(),t.nodeChanged()),(46==r||8==r||e.mac&&(91==r||93==r))&&t.nodeChanged(),u&&a.typing&&(t.isDirty()||(t.isNotDirty=!l[0]||i()==l[0].content,t.isNotDirty||t.fire("change",{level:l[0],lastLevel:null})),t.fire("TypingUndo"),u=!1,t.nodeChanged())}),t.on("KeyDown",function(e){var t=e.keyCode;return t>=33&&36>=t||t>=37&&40>=t||45==t?(a.typing&&o(),void 0):((16>t||t>20)&&224!=t&&91!=t&&!a.typing&&(a.beforeChange(),a.typing=!0,a.add(),u=!0),void 0)}),t.on("MouseDown",function(){a.typing&&o()}),t.addShortcut("ctrl+z","","Undo"),t.addShortcut("ctrl+y,ctrl+shift+z","","Redo"),t.on("AddUndo Undo Redo ClearUndos MouseUp",function(e){e.isDefaultPrevented()||t.nodeChanged()}),a={data:l,typing:!1,beforeChange:function(){d||(c=t.selection.getBookmark(2,!0))},add:function(e){var n,r=t.settings,o;if(e=e||{},e.content=i(),d||t.fire("BeforeAddUndo",{level:e}).isDefaultPrevented())return null;if(o=l[s],o&&o.content==e.content)return null;if(l[s]&&(l[s].beforeBookmark=c),r.custom_undo_redo_levels&&l.length>r.custom_undo_redo_levels){for(n=0;n<l.length-1;n++)l[n]=l[n+1];l.length--,s=l.length}e.bookmark=t.selection.getBookmark(2,!0),s<l.length-1&&(l.length=s+1),l.push(e),s=l.length-1;var a={level:e,lastLevel:o};return t.fire("AddUndo",a),s>0&&(t.fire("change",a),t.isNotDirty=!1),e},undo:function(){var e;return a.typing&&(a.add(),a.typing=!1),s>0&&(e=l[--s],0===s&&(t.isNotDirty=!0),t.setContent(e.content,{format:"raw"}),t.selection.moveToBookmark(e.beforeBookmark),t.fire("undo",{level:e})),e},redo:function(){var e;return s<l.length-1&&(e=l[++s],t.setContent(e.content,{format:"raw"}),t.selection.moveToBookmark(e.bookmark),t.fire("redo",{level:e})),e},clear:function(){l=[],s=0,a.typing=!1,t.fire("ClearUndos")},hasUndo:function(){return s>0||a.typing&&l[0]&&i()!=l[0].content},hasRedo:function(){return s<l.length-1&&!this.typing},transact:function(e){a.beforeChange(),d=!0,e(),d=!1,a.add()}}}}),r(H,[f,g],function(e,t){var n=t.ie&&t.ie<11;return function(r){function i(i){function d(e){return e&&o.isBlock(e)&&!/^(TD|TH|CAPTION|FORM)$/.test(e.nodeName)&&!/^(fixed|absolute)/i.test(e.style.position)&&"true"!==o.getContentEditable(e)}function f(e){var t;o.isBlock(e)&&(t=a.getRng(),e.appendChild(o.create("span",null,"\xa0")),a.select(e),e.lastChild.outerHTML="",a.setRng(t))}function p(e){for(var t=e,n=[],r;t=t.firstChild;){if(o.isBlock(t))return;1!=t.nodeType||u[t.nodeName.toLowerCase()]||n.push(t)}for(r=n.length;r--;)t=n[r],!t.hasChildNodes()||t.firstChild==t.lastChild&&""===t.firstChild.nodeValue?o.remove(t):"A"==t.nodeName&&" "===(t.innerText||t.textContent)&&o.remove(t)}function h(n){function r(e){for(;e;){if(1==e.nodeType||3==e.nodeType&&e.data&&/[\r\n\s]/.test(e.data))return e;e=e.nextSibling}}var i,s,l,c=n,d;if(t.ie&&t.ie<9&&A&&A.firstChild&&A.firstChild==A.lastChild&&"BR"==A.firstChild.tagName&&o.remove(A.firstChild),"LI"==n.nodeName){var f=r(n.firstChild);f&&/^(UL|OL)$/.test(f.nodeName)&&n.insertBefore(o.doc.createTextNode("\xa0"),n.firstChild)}if(l=o.createRng(),n.hasChildNodes()){for(i=new e(n,n);s=i.current();){if(3==s.nodeType){l.setStart(s,0),l.setEnd(s,0);break}if(u[s.nodeName.toLowerCase()]){l.setStartBefore(s),l.setEndBefore(s);break}c=s,s=i.next()}s||(l.setStart(c,0),l.setEnd(c,0))}else"BR"==n.nodeName?n.nextSibling&&o.isBlock(n.nextSibling)?((!B||9>B)&&(d=o.create("br"),n.parentNode.insertBefore(d,n)),l.setStartBefore(n),l.setEndBefore(n)):(l.setStartAfter(n),l.setEndAfter(n)):(l.setStart(n,0),l.setEnd(n,0));a.setRng(l),o.remove(d),a.scrollIntoView(n)}function m(e){var t=s.forced_root_block;t&&t.toLowerCase()===e.tagName.toLowerCase()&&o.setAttribs(e,s.forced_root_block_attrs)}function g(e){var t=T,r,i,a;if(e||"TABLE"==P?(r=o.create(e||I),m(r)):r=A.cloneNode(!1),a=r,s.keep_styles!==!1)do if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(t.nodeName)){if("_mce_caret"==t.id)continue;i=t.cloneNode(!1),o.setAttrib(i,"id",""),r.hasChildNodes()?(i.appendChild(r.firstChild),r.appendChild(i)):(a=i,r.appendChild(i))}while(t=t.parentNode);return n||(a.innerHTML='<br data-mce-bogus="1">'),r}function v(t){var n,r,i;if(3==T.nodeType&&(t?R>0:R<T.nodeValue.length))return!1;if(T.parentNode==A&&F&&!t)return!0;if(t&&1==T.nodeType&&T==A.firstChild)return!0;if("TABLE"===T.nodeName||T.previousSibling&&"TABLE"==T.previousSibling.nodeName)return F&&!t||!F&&t;for(n=new e(T,A),3==T.nodeType&&(t&&0===R?n.prev():t||R!=T.nodeValue.length||n.next());r=n.current();){if(1===r.nodeType){if(!r.getAttribute("data-mce-bogus")&&(i=r.nodeName.toLowerCase(),u[i]&&"br"!==i))return!1}else if(3===r.nodeType&&!/^[ \t\r\n]*$/.test(r.nodeValue))return!1;t?n.prev():n.next()}return!0}function y(e,t){var n,i,a,s,l,u,f=I||"P";if(i=o.getParent(e,o.isBlock),u=r.getBody().nodeName.toLowerCase(),!i||!d(i)){if(i=i||S,!i.hasChildNodes())return n=o.create(f),m(n),i.appendChild(n),E.setStart(n,0),E.setEnd(n,0),n;for(s=e;s.parentNode!=i;)s=s.parentNode;for(;s&&!o.isBlock(s);)a=s,s=s.previousSibling;if(a&&c.isValidChild(u,f.toLowerCase())){for(n=o.create(f),m(n),a.parentNode.insertBefore(n,a),s=a;s&&!o.isBlock(s);)l=s.nextSibling,n.appendChild(s),s=l;E.setStart(e,t),E.setEnd(e,t)}}return e}function b(){function e(e){for(var t=M[e?"firstChild":"lastChild"];t&&1!=t.nodeType;)t=t[e?"nextSibling":"previousSibling"];return t===A}function t(){var e=M.parentNode;return"LI"==e.nodeName?e:M}var n=M.parentNode.nodeName;/^(OL|UL|LI)$/.test(n)&&(I="LI"),D=I?g(I):o.create("BR"),e(!0)&&e()?"LI"==n?o.insertAfter(D,t()):o.replace(D,M):e(!0)?"LI"==n?(o.insertAfter(D,t()),D.appendChild(o.doc.createTextNode(" ")),D.appendChild(M)):M.parentNode.insertBefore(D,M):e()?(o.insertAfter(D,t()),f(D)):(M=t(),k=E.cloneRange(),k.setStartAfter(A),k.setEndAfter(M),H=k.extractContents(),"LI"==I&&"LI"==H.firstChild.nodeName?(D=H.firstChild,o.insertAfter(H,M)):(o.insertAfter(H,M),o.insertAfter(D,M))),o.remove(A),h(D),l.add()}function C(){for(var t=new e(T,A),n;n=t.next();)if(u[n.nodeName.toLowerCase()]||n.length>0)return!0}function x(){var e,t,r;T&&3==T.nodeType&&R>=T.nodeValue.length&&(n||C()||(e=o.create("br"),E.insertNode(e),E.setStartAfter(e),E.setEndAfter(e),t=!0)),e=o.create("br"),E.insertNode(e),n&&"PRE"==P&&(!B||8>B)&&e.parentNode.insertBefore(o.doc.createTextNode("\r"),e),r=o.create("span",{},"&nbsp;"),e.parentNode.insertBefore(r,e),a.scrollIntoView(r),o.remove(r),t?(E.setStartBefore(e),E.setEndBefore(e)):(E.setStartAfter(e),E.setEndAfter(e)),a.setRng(E),l.add()}function w(e){do 3===e.nodeType&&(e.nodeValue=e.nodeValue.replace(/^[\r\n]+/,"")),e=e.firstChild;while(e)}function _(e){var t=o.getRoot(),n,r;for(n=e;n!==t&&"false"!==o.getContentEditable(n);)"true"===o.getContentEditable(n)&&(r=n),n=n.parentNode;return n!==t?r:t}function N(e){var t;n||(e.normalize(),t=e.lastChild,(!t||/^(left|right)$/gi.test(o.getStyle(t,"float",!0)))&&o.add(e,"br"))}var E=a.getRng(!0),k,S,T,R,A,B,L,D,H,M,P,O,I,F;if(!E.collapsed)return r.execCommand("Delete"),void 0;if(!i.isDefaultPrevented()&&(T=E.startContainer,R=E.startOffset,I=(s.force_p_newlines?"p":"")||s.forced_root_block,I=I?I.toUpperCase():"",B=o.doc.documentMode,L=i.shiftKey,1==T.nodeType&&T.hasChildNodes()&&(F=R>T.childNodes.length-1,T=T.childNodes[Math.min(R,T.childNodes.length-1)]||T,R=F&&3==T.nodeType?T.nodeValue.length:0),S=_(T))){if(l.beforeChange(),!o.isBlock(S)&&S!=o.getRoot())return(!I||L)&&x(),void 0;if((I&&!L||!I&&L)&&(T=y(T,R)),A=o.getParent(T,o.isBlock),M=A?o.getParent(A.parentNode,o.isBlock):null,P=A?A.nodeName.toUpperCase():"",O=M?M.nodeName.toUpperCase():"","LI"!=O||i.ctrlKey||(A=M,P=O),"LI"==P){if(!I&&L)return x(),void 0;if(o.isEmpty(A))return b(),void 0}if("PRE"==P&&s.br_in_pre!==!1){if(!L)return x(),void 0}else if(!I&&!L&&"LI"!=P||I&&L)return x(),void 0;I&&A===r.getBody()||(I=I||"P",v()?(D=/^(H[1-6]|PRE|FIGURE)$/.test(P)&&"HGROUP"!=O?g(I):g(),s.end_container_on_empty_block&&d(M)&&o.isEmpty(A)?D=o.split(M,A):o.insertAfter(D,A),h(D)):v(!0)?(D=A.parentNode.insertBefore(g(),A),f(D),h(A)):(k=E.cloneRange(),k.setEndAfter(A),H=k.extractContents(),w(H),D=H.firstChild,o.insertAfter(H,A),p(D),N(A),h(D)),o.setAttrib(D,"id",""),r.fire("NewBlock",{newBlock:D}),l.add())}}var o=r.dom,a=r.selection,s=r.settings,l=r.undoManager,c=r.schema,u=c.getNonEmptyElements();r.on("keydown",function(e){13==e.keyCode&&i(e)!==!1&&e.preventDefault()})}}),r(M,[],function(){return function(e){function t(){var t=i.getStart(),s=e.getBody(),l,c,u,d,f,p,h,m=-16777215,g,v,y,b,C;if(C=n.forced_root_block,t&&1===t.nodeType&&C){for(;t&&t!=s;){if(a[t.nodeName])return;t=t.parentNode}if(l=i.getRng(),l.setStart){c=l.startContainer,u=l.startOffset,d=l.endContainer,f=l.endOffset;try{v=e.getDoc().activeElement===s}catch(x){}}else l.item&&(t=l.item(0),l=e.getDoc().body.createTextRange(),l.moveToElementText(t)),v=l.parentElement().ownerDocument===e.getDoc(),y=l.duplicate(),y.collapse(!0),u=-1*y.move("character",m),y.collapsed||(y=l.duplicate(),y.collapse(!1),f=-1*y.move("character",m)-u);for(t=s.firstChild,b=s.nodeName.toLowerCase();t;)if((3===t.nodeType||1==t.nodeType&&!a[t.nodeName])&&o.isValidChild(b,C.toLowerCase())){if(3===t.nodeType&&0===t.nodeValue.length){h=t,t=t.nextSibling,r.remove(h);continue}p||(p=r.create(C,e.settings.forced_root_block_attrs),t.parentNode.insertBefore(p,t),g=!0),h=t,t=t.nextSibling,p.appendChild(h)}else p=null,t=t.nextSibling;if(g&&v){if(l.setStart)l.setStart(c,u),l.setEnd(d,f),i.setRng(l);else try{l=e.getDoc().body.createTextRange(),l.moveToElementText(s),l.collapse(!0),l.moveStart("character",u),f>0&&l.moveEnd("character",f),l.select()}catch(x){}e.nodeChanged()}}}var n=e.settings,r=e.dom,i=e.selection,o=e.schema,a=o.getBlockElements();n.forced_root_block&&e.on("NodeChange",t)}}),r(P,[E,g,p],function(e,n,r){var i=r.each,o=r.extend,a=r.map,s=r.inArray,l=r.explode,c=n.gecko,u=n.ie,d=!0,f=!1;return function(r){function p(e,t,n){var r;return e=e.toLowerCase(),(r=N.exec[e])?(r(e,t,n),d):f}function h(e){var t;return e=e.toLowerCase(),(t=N.state[e])?t(e):-1}function m(e){var t;return e=e.toLowerCase(),(t=N.value[e])?t(e):f}function g(e,t){t=t||"exec",i(e,function(e,n){i(n.toLowerCase().split(","),function(n){N[t][n]=e})})}function v(e,n,i){return n===t&&(n=f),i===t&&(i=null),r.getDoc().execCommand(e,n,i)}function y(e){return k.match(e)}function b(e,n){k.toggle(e,n?{value:n}:t),r.nodeChanged()}function C(e){S=_.getBookmark(e)}function x(){_.moveToBookmark(S)}var w=r.dom,_=r.selection,N={state:{},exec:{},value:{}},E=r.settings,k=r.formatter,S;o(this,{execCommand:p,queryCommandState:h,queryCommandValue:m,addCommands:g}),g({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){r.undoManager.add()},"Cut,Copy,Paste":function(e){var t=r.getDoc(),i;try{v(e)}catch(o){i=d}if(i||!t.queryCommandSupported(e)){var a=r.translate("Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.");n.mac&&(a=a.replace(/Ctrl\+/g,"\u2318+")),r.windowManager.alert(a)}},unlink:function(){if(_.isCollapsed()){var e=_.getNode();return"A"==e.tagName&&r.dom.remove(e,!0),void 0}k.remove("link")},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t=e.substring(7);"full"==t&&(t="justify"),i("left,center,right,justify".split(","),function(e){t!=e&&k.remove("align"+e)}),b("align"+t),p("mceRepaint")},"InsertUnorderedList,InsertOrderedList":function(e){var t,n;v(e),t=w.getParent(_.getNode(),"ol,ul"),t&&(n=t.parentNode,/^(H[1-6]|P|ADDRESS|PRE)$/.test(n.nodeName)&&(C(),w.split(n,t),x()))},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){b(e)},"ForeColor,HiliteColor,FontName":function(e,t,n){b(e,n)},FontSize:function(e,t,n){var r,i;n>=1&&7>=n&&(i=l(E.font_size_style_values),r=l(E.font_size_classes),n=r?r[n-1]||n:i[n-1]||n),b(e,n)},RemoveFormat:function(e){k.remove(e)},mceBlockQuote:function(){b("blockquote")},FormatBlock:function(e,t,n){return b(n||"p")},mceCleanup:function(){var e=_.getBookmark();r.setContent(r.getContent({cleanup:d}),{cleanup:d}),_.moveToBookmark(e)},mceRemoveNode:function(e,t,n){var i=n||_.getNode();i!=r.getBody()&&(C(),r.dom.remove(i,d),x())},mceSelectNodeDepth:function(e,t,n){var i=0;w.getParent(_.getNode(),function(e){return 1==e.nodeType&&i++==n?(_.select(e),f):void 0},r.getBody())},mceSelectNode:function(e,t,n){_.select(n)},mceInsertContent:function(t,n,i){function o(e){function t(e){return r[e]&&3==r[e].nodeType}var n,r,i;return n=_.getRng(!0),r=n.startContainer,i=n.startOffset,3==r.nodeType&&(i>0?e=e.replace(/^&nbsp;/," "):t("previousSibling")||(e=e.replace(/^ /,"&nbsp;")),i<r.length?e=e.replace(/&nbsp;(<br>|)$/," "):t("nextSibling")||(e=e.replace(/(&nbsp;| )(<br>|)$/,"&nbsp;"))),e}var a,s,l,c,d,f,p,h,m,g,v;/^ | $/.test(i)&&(i=o(i)),a=r.parser,s=new e({},r.schema),v='<span id="mce_marker" data-mce-type="bookmark">&#xFEFF;&#200B;</span>',f={content:i,format:"html",selection:!0},r.fire("BeforeSetContent",f),i=f.content,-1==i.indexOf("{$caret}")&&(i+="{$caret}"),i=i.replace(/\{\$caret\}/,v),h=_.getRng();var y=h.startContainer||(h.parentElement?h.parentElement():null),b=r.getBody();y===b&&_.isCollapsed()&&w.isBlock(b.firstChild)&&w.isEmpty(b.firstChild)&&(h=w.createRng(),h.setStart(b.firstChild,0),h.setEnd(b.firstChild,0),_.setRng(h)),_.isCollapsed()||r.getDoc().execCommand("Delete",!1,null),l=_.getNode();var C={context:l.nodeName.toLowerCase()};if(d=a.parse(i,C),m=d.lastChild,"mce_marker"==m.attr("id"))for(p=m,m=m.prev;m;m=m.walk(!0))if(3==m.type||!w.isBlock(m.name)){m.parent.insert(p,m,"br"===m.name);break}if(C.invalid){for(_.setContent(v),l=_.getNode(),c=r.getBody(),9==l.nodeType?l=m=c:m=l;m!==c;)l=m,m=m.parentNode;i=l==c?c.innerHTML:w.getOuterHTML(l),i=s.serialize(a.parse(i.replace(/<span (id="mce_marker"|id=mce_marker).+?<\/span>/i,function(){return s.serialize(d)}))),l==c?w.setHTML(c,i):w.setOuterHTML(l,i)}else i=s.serialize(d),m=l.firstChild,g=l.lastChild,!m||m===g&&"BR"===m.nodeName?w.setHTML(l,i):_.setContent(i);p=w.get("mce_marker"),_.scrollIntoView(p),h=w.createRng(),m=p.previousSibling,m&&3==m.nodeType?(h.setStart(m,m.nodeValue.length),u||(g=p.nextSibling,g&&3==g.nodeType&&(m.appendData(g.data),g.parentNode.removeChild(g)))):(h.setStartBefore(p),h.setEndBefore(p)),w.remove(p),_.setRng(h),r.fire("SetContent",f),r.addVisual()},mceInsertRawHTML:function(e,t,n){_.setContent("tiny_mce_marker"),r.setContent(r.getContent().replace(/tiny_mce_marker/g,function(){return n}))},mceToggleFormat:function(e,t,n){b(n)},mceSetContent:function(e,t,n){r.setContent(n)},"Indent,Outdent":function(e){var t,n,r;t=E.indentation,n=/[a-z%]+$/i.exec(t),t=parseInt(t,10),h("InsertUnorderedList")||h("InsertOrderedList")?v(e):(E.forced_root_block||w.getParent(_.getNode(),w.isBlock)||k.apply("div"),i(_.getSelectedBlocks(),function(i){var o;"LI"!=i.nodeName&&(o="rtl"==w.getStyle(i,"direction",!0)?"paddingRight":"paddingLeft","outdent"==e?(r=Math.max(0,parseInt(i.style[o]||0,10)-t),w.setStyle(i,o,r?r+n:"")):(r=parseInt(i.style[o]||0,10)+t+n,w.setStyle(i,o,r)))}))},mceRepaint:function(){if(c)try{C(d),_.getSel()&&_.getSel().selectAllChildren(r.getBody()),_.collapse(d),x()}catch(e){}},InsertHorizontalRule:function(){r.execCommand("mceInsertContent",!1,"<hr />")},mceToggleVisualAid:function(){r.hasVisual=!r.hasVisual,r.addVisual()},mceReplaceContent:function(e,t,n){r.execCommand("mceInsertContent",!1,n.replace(/\{\$selection\}/g,_.getContent({format:"text"})))},mceInsertLink:function(e,t,n){var r;"string"==typeof n&&(n={href:n}),r=w.getParent(_.getNode(),"a"),n.href=n.href.replace(" ","%20"),r&&n.href||k.remove("link"),n.href&&k.apply("link",n,r)},selectAll:function(){var e=w.getRoot(),t;_.getRng().setStart?(t=w.createRng(),t.setStart(e,0),t.setEnd(e,e.childNodes.length),_.setRng(t)):(t=_.getRng(),t.item||(t.moveToElementText(e),t.select()))},"delete":function(){v("Delete");var e=r.getBody();w.isEmpty(e)&&(r.setContent(""),e.firstChild&&w.isBlock(e.firstChild)?r.selection.setCursorLocation(e.firstChild,0):r.selection.setCursorLocation(e,0))},mceNewDocument:function(){r.setContent("")}}),g({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(e){var t="align"+e.substring(7),n=_.isCollapsed()?[w.getParent(_.getNode(),w.isBlock)]:_.getSelectedBlocks(),r=a(n,function(e){return!!k.matchNode(e,t)});return-1!==s(r,d)},"Bold,Italic,Underline,Strikethrough,Superscript,Subscript":function(e){return y(e)},mceBlockQuote:function(){return y("blockquote")},Outdent:function(){var e;if(E.inline_styles){if((e=w.getParent(_.getStart(),w.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return d;if((e=w.getParent(_.getEnd(),w.isBlock))&&parseInt(e.style.paddingLeft,10)>0)return d}return h("InsertUnorderedList")||h("InsertOrderedList")||!E.inline_styles&&!!w.getParent(_.getNode(),"BLOCKQUOTE")},"InsertUnorderedList,InsertOrderedList":function(e){var t=w.getParent(_.getNode(),"ul,ol");return t&&("insertunorderedlist"===e&&"UL"===t.tagName||"insertorderedlist"===e&&"OL"===t.tagName)}},"state"),g({"FontSize,FontName":function(e){var t=0,n;return(n=w.getParent(_.getNode(),"span"))&&(t="fontsize"==e?n.style.fontSize:n.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()),t}},"value"),g({Undo:function(){r.undoManager.undo()},Redo:function(){r.undoManager.redo()}})}}),r(O,[p],function(e){function t(e,i){var o=this,a,s;if(e=r(e),i=o.settings=i||{},/^([\w\-]+):([^\/]{2})/i.test(e)||/^\s*#/.test(e))return o.source=e,void 0;var l=0===e.indexOf("//");0!==e.indexOf("/")||l||(e=(i.base_uri?i.base_uri.protocol||"http":"http")+"://mce_host"+e),/^[\w\-]*:?\/\//.test(e)||(s=i.base_uri?i.base_uri.path:new t(location.href).directory,e=""===i.base_uri.protocol?"//mce_host"+o.toAbsPath(s,e):(i.base_uri&&i.base_uri.protocol||"http")+"://mce_host"+o.toAbsPath(s,e)),e=e.replace(/@@/g,"(mce_at)"),e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@\/]*):?([^:@\/]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e),n(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(t,n){var r=e[n];r&&(r=r.replace(/\(mce_at\)/g,"@@")),o[t]=r}),a=i.base_uri,a&&(o.protocol||(o.protocol=a.protocol),o.userInfo||(o.userInfo=a.userInfo),o.port||"mce_host"!==o.host||(o.port=a.port),o.host&&"mce_host"!==o.host||(o.host=a.host),o.source=""),l&&(o.protocol="")}var n=e.each,r=e.trim;return t.prototype={setPath:function(e){var t=this;e=/^(.*?)\/?(\w+)?$/.exec(e),t.path=e[0],t.directory=e[1],t.file=e[2],t.source="",t.getURI()},toRelative:function(e){var n=this,r;if("./"===e)return e;if(e=new t(e,{base_uri:n}),"mce_host"!=e.host&&n.host!=e.host&&e.host||n.port!=e.port||n.protocol!=e.protocol&&""!==e.protocol)return e.getURI();var i=n.getURI(),o=e.getURI();return i==o||"/"==i.charAt(i.length-1)&&i.substr(0,i.length-1)==o?i:(r=n.toRelPath(n.path,e.path),e.query&&(r+="?"+e.query),e.anchor&&(r+="#"+e.anchor),r)},toAbsolute:function(e,n){return e=new t(e,{base_uri:this}),e.getURI(this.host==e.host&&this.protocol==e.protocol?n:0)},toRelPath:function(e,t){var n,r=0,i="",o,a;if(e=e.substring(0,e.lastIndexOf("/")),e=e.split("/"),n=t.split("/"),e.length>=n.length)for(o=0,a=e.length;a>o;o++)if(o>=n.length||e[o]!=n[o]){r=o+1;break}if(e.length<n.length)for(o=0,a=n.length;a>o;o++)if(o>=e.length||e[o]!=n[o]){r=o+1;break}if(1===r)return t;for(o=0,a=e.length-(r-1);a>o;o++)i+="../";for(o=r-1,a=n.length;a>o;o++)i+=o!=r-1?"/"+n[o]:n[o];return i},toAbsPath:function(e,t){var r,i=0,o=[],a,s;for(a=/\/$/.test(t)?"/":"",e=e.split("/"),t=t.split("/"),n(e,function(e){e&&o.push(e)}),e=o,r=t.length-1,o=[];r>=0;r--)0!==t[r].length&&"."!==t[r]&&(".."!==t[r]?i>0?i--:o.push(t[r]):i++);return r=e.length-i,s=0>=r?o.reverse().join("/"):e.slice(0,r).join("/")+"/"+o.reverse().join("/"),0!==s.indexOf("/")&&(s="/"+s),a&&s.lastIndexOf("/")!==s.length-1&&(s+=a),s},getURI:function(e){var t,n=this;return(!n.source||e)&&(t="",e||(t+=n.protocol?n.protocol+"://":"//",n.userInfo&&(t+=n.userInfo+"@"),n.host&&(t+=n.host),n.port&&(t+=":"+n.port)),n.path&&(t+=n.path),n.query&&(t+="?"+n.query),n.anchor&&(t+="#"+n.anchor),n.source=t),n.source}},t}),r(I,[p],function(e){function t(){}var n=e.each,r=e.extend,i,o;return t.extend=i=function(e){function t(){var e,t,n,r;if(!o&&(r=this,r.init&&r.init.apply(r,arguments),t=r.Mixins))for(e=t.length;e--;)n=t[e],n.init&&n.init.apply(r,arguments)}function a(){return this}function s(e,t){return function(){var n=this,r=n._super,i;return n._super=c[e],i=t.apply(n,arguments),n._super=r,i}}var l=this,c=l.prototype,u,d,f;o=!0,u=new l,o=!1,e.Mixins&&(n(e.Mixins,function(t){t=t;for(var n in t)"init"!==n&&(e[n]=t[n])}),c.Mixins&&(e.Mixins=c.Mixins.concat(e.Mixins))),e.Methods&&n(e.Methods.split(","),function(t){e[t]=a}),e.Properties&&n(e.Properties.split(","),function(t){var n="_"+t;e[t]=function(e){var t=this,r;return e!==r?(t[n]=e,t):t[n]}}),e.Statics&&n(e.Statics,function(e,n){t[n]=e}),e.Defaults&&c.Defaults&&(e.Defaults=r({},c.Defaults,e.Defaults));
+for(d in e)f=e[d],u[d]="function"==typeof f&&c[d]?s(d,f):f;return t.prototype=u,t.constructor=t,t.extend=i,t},t}),r(F,[I],function(e){function t(e){for(var t=[],n=e.length,r;n--;)r=e[n],r.__checked||(t.push(r),r.__checked=1);for(n=t.length;n--;)delete t[n].__checked;return t}var n=/^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@?([\w\\]+)([\^\$\*!~]?=)([\w\\]+)\])?(?:\:(.+))?/i,r=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,i=/^\s*|\s*$/g,o,a=e.extend({init:function(e){function t(e){return e?(e=e.toLowerCase(),function(t){return"*"===e||t.type===e}):void 0}function o(e){return e?function(t){return t._name===e}:void 0}function a(e){return e?(e=e.split("."),function(t){for(var n=e.length;n--;)if(!t.hasClass(e[n]))return!1;return!0}):void 0}function s(e,t,n){return e?function(r){var i=r[e]?r[e]():"";return t?"="===t?i===n:"*="===t?i.indexOf(n)>=0:"~="===t?(" "+i+" ").indexOf(" "+n+" ")>=0:"!="===t?i!=n:"^="===t?0===i.indexOf(n):"$="===t?i.substr(i.length-n.length)===n:!1:!!n}:void 0}function l(e){var t;return e?(e=/(?:not\((.+)\))|(.+)/i.exec(e),e[1]?(t=u(e[1],[]),function(e){return!d(e,t)}):(e=e[2],function(t,n,r){return"first"===e?0===n:"last"===e?n===r-1:"even"===e?n%2===0:"odd"===e?n%2===1:t[e]?t[e]():!1})):void 0}function c(e,r,c){function u(e){e&&r.push(e)}var d;return d=n.exec(e.replace(i,"")),u(t(d[1])),u(o(d[2])),u(a(d[3])),u(s(d[4],d[5],d[6])),u(l(d[7])),r.psuedo=!!d[7],r.direct=c,r}function u(e,t){var n=[],i,o,a;do if(r.exec(""),o=r.exec(e),o&&(e=o[3],n.push(o[1]),o[2])){i=o[3];break}while(o);for(i&&u(i,t),e=[],a=0;a<n.length;a++)">"!=n[a]&&e.push(c(n[a],[],">"===n[a-1]));return t.push(e),t}var d=this.match;this._selectors=u(e,[])},match:function(e,t){var n,r,i,o,a,s,l,c,u,d,f,p,h;for(t=t||this._selectors,n=0,r=t.length;r>n;n++){for(a=t[n],o=a.length,h=e,p=0,i=o-1;i>=0;i--)for(c=a[i];h;){if(c.psuedo)for(f=h.parent().items(),u=d=f.length;u--&&f[u]!==h;);for(s=0,l=c.length;l>s;s++)if(!c[s](h,u,d)){s=l+1;break}if(s===l){p++;break}if(i===o-1)break;h=h.parent()}if(p===o)return!0}return!1},find:function(e){function n(e,t,i){var o,a,s,l,c,u=t[i];for(o=0,a=e.length;a>o;o++){for(c=e[o],s=0,l=u.length;l>s;s++)if(!u[s](c,o,a)){s=l+1;break}if(s===l)i==t.length-1?r.push(c):c.items&&n(c.items(),t,i+1);else if(u.direct)return;c.items&&n(c.items(),t,i)}}var r=[],i,s,l=this._selectors;if(e.items){for(i=0,s=l.length;s>i;i++)n(e.items(),l[i],0);s>1&&(r=t(r))}return o||(o=a.Collection),new o(r)}});return a}),r(z,[p,F,I],function(e,t,n){var r,i,o=Array.prototype.push,a=Array.prototype.slice;return i={length:0,init:function(e){e&&this.add(e)},add:function(t){var n=this;return e.isArray(t)?o.apply(n,t):t instanceof r?n.add(t.toArray()):o.call(n,t),n},set:function(e){var t=this,n=t.length,r;for(t.length=0,t.add(e),r=t.length;n>r;r++)delete t[r];return t},filter:function(e){var n=this,i,o,a=[],s,l;for("string"==typeof e?(e=new t(e),l=function(t){return e.match(t)}):l=e,i=0,o=n.length;o>i;i++)s=n[i],l(s)&&a.push(s);return new r(a)},slice:function(){return new r(a.apply(this,arguments))},eq:function(e){return-1===e?this.slice(e):this.slice(e,+e+1)},each:function(t){return e.each(this,t),this},toArray:function(){return e.toArray(this)},indexOf:function(e){for(var t=this,n=t.length;n--&&t[n]!==e;);return n},reverse:function(){return new r(e.toArray(this).reverse())},hasClass:function(e){return this[0]?this[0].hasClass(e):!1},prop:function(e,t){var n=this,r,i;return t!==r?(n.each(function(n){n[e]&&n[e](t)}),n):(i=n[0],i&&i[e]?i[e]():void 0)},exec:function(t){var n=this,r=e.toArray(arguments).slice(1);return n.each(function(e){e[t]&&e[t].apply(e,r)}),n},remove:function(){for(var e=this.length;e--;)this[e].remove();return this}},e.each("fire on off show hide addClass removeClass append prepend before after reflow".split(" "),function(t){i[t]=function(){var n=e.toArray(arguments);return this.each(function(e){t in e&&e[t].apply(e,n)}),this}}),e.each("text name disabled active selected checked visible parent value data".split(" "),function(e){i[e]=function(t){return this.prop(e,t)}}),r=n.extend(i),t.Collection=r,r}),r(W,[p,v],function(e,t){return{id:function(){return t.DOM.uniqueId()},createFragment:function(e){return t.DOM.createFragment(e)},getWindowSize:function(){return t.DOM.getViewPort()},getSize:function(e){var t,n;if(e.getBoundingClientRect){var r=e.getBoundingClientRect();t=Math.max(r.width||r.right-r.left,e.offsetWidth),n=Math.max(r.height||r.bottom-r.bottom,e.offsetHeight)}else t=e.offsetWidth,n=e.offsetHeight;return{width:t,height:n}},getPos:function(e,n){return t.DOM.getPos(e,n)},getViewPort:function(e){return t.DOM.getViewPort(e)},get:function(e){return document.getElementById(e)},addClass:function(e,n){return t.DOM.addClass(e,n)},removeClass:function(e,n){return t.DOM.removeClass(e,n)},hasClass:function(e,n){return t.DOM.hasClass(e,n)},toggleClass:function(e,n,r){return t.DOM.toggleClass(e,n,r)},css:function(e,n,r){return t.DOM.setStyle(e,n,r)},on:function(e,n,r,i){return t.DOM.bind(e,n,r,i)},off:function(e,n,r){return t.DOM.unbind(e,n,r)},fire:function(e,n,r){return t.DOM.fire(e,n,r)},innerHtml:function(e,n){t.DOM.setHTML(e,n)}}}),r(V,[I,p,z,W],function(e,t,n,r){var i=t.makeMap("focusin focusout scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave wheel keydown keypress keyup contextmenu"," "),o={},a="onmousewheel"in document,s=!1,l=e.extend({Statics:{controlIdLookup:{},elementIdCache:o},isRtl:function(){return l.rtl},classPrefix:"mce-",init:function(e){var n=this,i,o;if(n.settings=e=t.extend({},n.Defaults,e),n._id=r.id(),n._text=n._name="",n._width=n._height=0,n._aria={role:e.role},i=e.classes)for(i=i.split(" "),i.map={},o=i.length;o--;)i.map[i[o]]=!0;n._classes=i||[],n.visible(!0),t.each("title text width height name classes visible disabled active value".split(" "),function(t){var r=e[t],i;r!==i?n[t](r):n["_"+t]===i&&(n["_"+t]=!1)}),n.on("click",function(){return n.disabled()?!1:void 0}),e.classes&&t.each(e.classes.split(" "),function(e){n.addClass(e)}),n.settings=e,n._borderBox=n.parseBox(e.border),n._paddingBox=n.parseBox(e.padding),n._marginBox=n.parseBox(e.margin),e.hidden&&n.hide()},Properties:"parent,title,text,width,height,disabled,active,name,value",Methods:"renderHtml",getContainerElm:function(){return document.body},getParentCtrl:function(e){for(var t;e&&!(t=l.controlIdLookup[e.id]);)e=e.parentNode;return t},parseBox:function(e){var t,n=10;if(e)return"number"==typeof e?(e=e||0,{top:e,left:e,bottom:e,right:e}):(e=e.split(" "),t=e.length,1===t?e[1]=e[2]=e[3]=e[0]:2===t?(e[2]=e[0],e[3]=e[1]):3===t&&(e[3]=e[1]),{top:parseInt(e[0],n)||0,right:parseInt(e[1],n)||0,bottom:parseInt(e[2],n)||0,left:parseInt(e[3],n)||0})},borderBox:function(){return this._borderBox},paddingBox:function(){return this._paddingBox},marginBox:function(){return this._marginBox},measureBox:function(e,t){function n(t){var n=document.defaultView;return n?(t=t.replace(/[A-Z]/g,function(e){return"-"+e}),n.getComputedStyle(e,null).getPropertyValue(t)):e.currentStyle[t]}function r(e){var t=parseFloat(n(e),10);return isNaN(t)?0:t}return{top:r(t+"TopWidth"),right:r(t+"RightWidth"),bottom:r(t+"BottomWidth"),left:r(t+"LeftWidth")}},initLayoutRect:function(){var e=this,t=e.settings,n,i,o=e.getEl(),a,s,l,c,u,d,f,p;n=e._borderBox=e._borderBox||e.measureBox(o,"border"),e._paddingBox=e._paddingBox||e.measureBox(o,"padding"),e._marginBox=e._marginBox||e.measureBox(o,"margin"),p=r.getSize(o),d=t.minWidth,f=t.minHeight,l=d||p.width,c=f||p.height,a=t.width,s=t.height,u=t.autoResize,u="undefined"!=typeof u?u:!a&&!s,a=a||l,s=s||c;var h=n.left+n.right,m=n.top+n.bottom,g=t.maxWidth||65535,v=t.maxHeight||65535;return e._layoutRect=i={x:t.x||0,y:t.y||0,w:a,h:s,deltaW:h,deltaH:m,contentW:a-h,contentH:s-m,innerW:a-h,innerH:s-m,startMinWidth:d||0,startMinHeight:f||0,minW:Math.min(l,g),minH:Math.min(c,v),maxW:g,maxH:v,autoResize:u,scrollW:0},e._lastLayoutRect={},i},layoutRect:function(e){var t=this,n=t._layoutRect,r,i,o,a,s,c;return n||(n=t.initLayoutRect()),e?(o=n.deltaW,a=n.deltaH,e.x!==s&&(n.x=e.x),e.y!==s&&(n.y=e.y),e.minW!==s&&(n.minW=e.minW),e.minH!==s&&(n.minH=e.minH),i=e.w,i!==s&&(i=i<n.minW?n.minW:i,i=i>n.maxW?n.maxW:i,n.w=i,n.innerW=i-o),i=e.h,i!==s&&(i=i<n.minH?n.minH:i,i=i>n.maxH?n.maxH:i,n.h=i,n.innerH=i-a),i=e.innerW,i!==s&&(i=i<n.minW-o?n.minW-o:i,i=i>n.maxW-o?n.maxW-o:i,n.innerW=i,n.w=i+o),i=e.innerH,i!==s&&(i=i<n.minH-a?n.minH-a:i,i=i>n.maxH-a?n.maxH-a:i,n.innerH=i,n.h=i+a),e.contentW!==s&&(n.contentW=e.contentW),e.contentH!==s&&(n.contentH=e.contentH),r=t._lastLayoutRect,(r.x!==n.x||r.y!==n.y||r.w!==n.w||r.h!==n.h)&&(c=l.repaintControls,c&&c.map&&!c.map[t._id]&&(c.push(t),c.map[t._id]=!0),r.x=n.x,r.y=n.y,r.w=n.w,r.h=n.h),t):n},repaint:function(){var e=this,t,n,r,i,o=0,a=0,s,l;l=document.createRange?function(e){return e}:Math.round,t=e.getEl().style,r=e._layoutRect,s=e._lastRepaintRect||{},i=e._borderBox,o=i.left+i.right,a=i.top+i.bottom,r.x!==s.x&&(t.left=l(r.x)+"px",s.x=r.x),r.y!==s.y&&(t.top=l(r.y)+"px",s.y=r.y),r.w!==s.w&&(t.width=l(r.w-o)+"px",s.w=r.w),r.h!==s.h&&(t.height=l(r.h-a)+"px",s.h=r.h),e._hasBody&&r.innerW!==s.innerW&&(n=e.getEl("body").style,n.width=l(r.innerW)+"px",s.innerW=r.innerW),e._hasBody&&r.innerH!==s.innerH&&(n=n||e.getEl("body").style,n.height=l(r.innerH)+"px",s.innerH=r.innerH),e._lastRepaintRect=s,e.fire("repaint",{},!1)},on:function(e,t){function n(e){var t,n;return function(i){return t||r.parents().each(function(r){var i=r.settings.callbacks;return i&&(t=i[e])?(n=r,!1):void 0}),t.call(n,i)}}var r=this,o,a,s,l;if(t)for("string"==typeof t&&(t=n(t)),s=e.toLowerCase().split(" "),l=s.length;l--;)e=s[l],o=r._bindings,o||(o=r._bindings={}),a=o[e],a||(a=o[e]=[]),a.push(t),i[e]&&(r._nativeEvents?r._nativeEvents[e]=!0:r._nativeEvents={name:!0},r._rendered&&r.bindPendingEvents());return r},off:function(e,t){var n=this,r,i=n._bindings,o,a,s,l;if(i)if(e)for(s=e.toLowerCase().split(" "),r=s.length;r--;){if(e=s[r],o=i[e],!e){for(a in i)i[a].length=0;return n}if(o)if(t)for(l=o.length;l--;)o[l]===t&&o.splice(l,1);else o.length=0}else n._bindings=[];return n},fire:function(e,t,n){function r(){return!1}function i(){return!0}var o=this,a,s,l,c;if(e=e.toLowerCase(),t=t||{},t.type||(t.type=e),t.control||(t.control=o),t.preventDefault||(t.preventDefault=function(){t.isDefaultPrevented=i},t.stopPropagation=function(){t.isPropagationStopped=i},t.stopImmediatePropagation=function(){t.isImmediatePropagationStopped=i},t.isDefaultPrevented=r,t.isPropagationStopped=r,t.isImmediatePropagationStopped=r),o._bindings&&(l=o._bindings[e]))for(a=0,s=l.length;s>a&&(t.isImmediatePropagationStopped()||l[a].call(o,t)!==!1);a++);if(n!==!1)for(c=o.parent();c&&!t.isPropagationStopped();)c.fire(e,t,!1),c=c.parent();return t},hasEventListeners:function(e){return e in this._bindings},parents:function(e){var t=this,r=new n;for(t=t.parent();t;t=t.parent())r.add(t);return e&&(r=r.filter(e)),r},next:function(){var e=this.parent().items();return e[e.indexOf(this)+1]},prev:function(){var e=this.parent().items();return e[e.indexOf(this)-1]},findCommonAncestor:function(e,t){for(var n;e;){for(n=t;n&&e!=n;)n=n.parent();if(e==n)break;e=e.parent()}return e},hasClass:function(e,t){var n=this._classes[t||"control"];return e=this.classPrefix+e,n&&!!n.map[e]},addClass:function(e,t){var n=this,r,i;return e=this.classPrefix+e,r=n._classes[t||"control"],r||(r=[],r.map={},n._classes[t||"control"]=r),r.map[e]||(r.map[e]=e,r.push(e),n._rendered&&(i=n.getEl(t),i&&(i.className=r.join(" ")))),n},removeClass:function(e,t){var n=this,r,i,o;if(e=this.classPrefix+e,r=n._classes[t||"control"],r&&r.map[e])for(delete r.map[e],i=r.length;i--;)r[i]===e&&r.splice(i,1);return n._rendered&&(o=n.getEl(t),o&&(o.className=r.join(" "))),n},toggleClass:function(e,t,n){var r=this;return t?r.addClass(e,n):r.removeClass(e,n),r},classes:function(e){var t=this._classes[e||"control"];return t?t.join(" "):""},innerHtml:function(e){return r.innerHtml(this.getEl(),e),this},getEl:function(e,t){var n,i=e?this._id+"-"+e:this._id;return n=o[i]=(t===!0?null:o[i])||r.get(i)},visible:function(e){var t=this,n;return"undefined"!=typeof e?(t._visible!==e&&(t._rendered&&(t.getEl().style.display=e?"":"none"),t._visible=e,n=t.parent(),n&&(n._lastRect=null),t.fire(e?"show":"hide")),t):t._visible},show:function(){return this.visible(!0)},hide:function(){return this.visible(!1)},focus:function(){try{this.getEl().focus()}catch(e){}return this},blur:function(){return this.getEl().blur(),this},aria:function(e,t){var n=this,r=n.getEl();return"undefined"==typeof t?n._aria[e]:(n._aria[e]=t,n._rendered&&("label"==e&&r.setAttribute("aria-labeledby",n._id),r.setAttribute("role"==e?e:"aria-"+e,t)),n)},encode:function(e,t){return t!==!1&&l.translate&&(e=l.translate(e)),(e||"").replace(/[&<>"]/g,function(e){return"&#"+e.charCodeAt(0)+";"})},before:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t),!0),t},after:function(e){var t=this,n=t.parent();return n&&n.insert(e,n.items().indexOf(t)),t},remove:function(){var e=this,t=e.getEl(),n=e.parent(),i,a;if(e.items){var s=e.items().toArray();for(a=s.length;a--;)s[a].remove()}if(n&&n.items&&(i=[],n.items().each(function(t){t!==e&&i.push(t)}),n.items().set(i),n._lastRect=null),e._eventsRoot&&e._eventsRoot==e&&r.off(t),delete l.controlIdLookup[e._id],delete o[e._id],t&&t.parentNode){var c=t.getElementsByTagName("*");for(a=c.length;a--;)delete o[c[a].id];t.parentNode.removeChild(t)}return e},renderBefore:function(e){var t=this;return e.parentNode.insertBefore(r.createFragment(t.renderHtml()),e),t.postRender(),t},renderTo:function(e){var t=this;return e=e||t.getContainerElm(),e.appendChild(r.createFragment(t.renderHtml())),t.postRender(),t},postRender:function(){var e=this,t=e.settings,n,i,o,a,s;for(a in t)0===a.indexOf("on")&&e.on(a.substr(2),t[a]);if(e._eventsRoot){for(o=e.parent();!s&&o;o=o.parent())s=o._eventsRoot;if(s)for(a in s._nativeEvents)e._nativeEvents[a]=!0}e.bindPendingEvents(),t.style&&(n=e.getEl(),n&&(n.setAttribute("style",t.style),n.style.cssText=t.style)),e._visible||r.css(e.getEl(),"display","none"),e.settings.border&&(i=e.borderBox(),r.css(e.getEl(),{"border-top-width":i.top,"border-right-width":i.right,"border-bottom-width":i.bottom,"border-left-width":i.left})),l.controlIdLookup[e._id]=e;for(var c in e._aria)e.aria(c,e._aria[c]);e.fire("postrender",{},!1)},scrollIntoView:function(e){function t(e,t){var n,r,i=e;for(n=r=0;i&&i!=t&&i.nodeType;)n+=i.offsetLeft||0,r+=i.offsetTop||0,i=i.offsetParent;return{x:n,y:r}}var n=this.getEl(),r=n.parentNode,i,o,a,s,l,c,u=t(n,r);return i=u.x,o=u.y,a=n.offsetWidth,s=n.offsetHeight,l=r.clientWidth,c=r.clientHeight,"end"==e?(i-=l-a,o-=c-s):"center"==e&&(i-=l/2-a/2,o-=c/2-s/2),r.scrollLeft=i,r.scrollTop=o,this},bindPendingEvents:function(){function e(e){var t=o.getParentCtrl(e.target);t&&t.fire(e.type,e)}function t(){var e=d._lastHoverCtrl;e&&(e.fire("mouseleave",{target:e.getEl()}),e.parents().each(function(e){e.fire("mouseleave",{target:e.getEl()})}),d._lastHoverCtrl=null)}function n(e){var t=o.getParentCtrl(e.target),n=d._lastHoverCtrl,r=0,i,a,s;if(t!==n){if(d._lastHoverCtrl=t,a=t.parents().toArray().reverse(),a.push(t),n){for(s=n.parents().toArray().reverse(),s.push(n),r=0;r<s.length&&a[r]===s[r];r++);for(i=s.length-1;i>=r;i--)n=s[i],n.fire("mouseleave",{target:n.getEl()})}for(i=r;i<a.length;i++)t=a[i],t.fire("mouseenter",{target:t.getEl()})}}function i(e){e.preventDefault(),"mousewheel"==e.type?(e.deltaY=-1/40*e.wheelDelta,e.wheelDeltaX&&(e.deltaX=-1/40*e.wheelDeltaX)):(e.deltaX=0,e.deltaY=e.detail),e=o.fire("wheel",e)}var o=this,l,c,u,d,f,p;if(o._rendered=!0,f=o._nativeEvents){for(u=o.parents().toArray(),u.unshift(o),l=0,c=u.length;!d&&c>l;l++)d=u[l]._eventsRoot;for(d||(d=u[u.length-1]||o),o._eventsRoot=d,c=l,l=0;c>l;l++)u[l]._eventsRoot=d;for(p in f){if(!f)return!1;"wheel"!==p||s?("mouseenter"===p||"mouseleave"===p?d._hasMouseEnter||(r.on(d.getEl(),"mouseleave",t),r.on(d.getEl(),"mouseover",n),d._hasMouseEnter=1):d[p]||(r.on(d.getEl(),p,e),d[p]=!0),f[p]=!1):a?r.on(o.getEl(),"mousewheel",i):r.on(o.getEl(),"DOMMouseScroll",i)}}},reflow:function(){return this.repaint(),this}});return l}),r(U,[],function(){var e={},t;return{add:function(t,n){e[t.toLowerCase()]=n},has:function(t){return!!e[t.toLowerCase()]},create:function(n,r){var i,o,a;if(!t){a=tinymce.ui;for(o in a)e[o.toLowerCase()]=a[o];t=!0}if("string"==typeof n?(r=r||{},r.type=n):(r=n,n=r.type),n=n.toLowerCase(),i=e[n],!i)throw new Error("Could not find control by type: "+n);return i=new i(r),i.type=n,i}}}),r(q,[V,z,F,U,p,W],function(e,t,n,r,i,o){var a={};return e.extend({layout:"",innerClass:"container-inner",init:function(e){var n=this;n._super(e),e=n.settings,n._fixed=e.fixed,n._items=new t,n.isRtl()&&n.addClass("rtl"),n.addClass("container"),n.addClass("container-body","body"),e.containerCls&&n.addClass(e.containerCls),n._layout=r.create((e.layout||n.layout)+"layout"),n.settings.items&&n.add(n.settings.items),n._hasBody=!0},items:function(){return this._items},find:function(e){return e=a[e]=a[e]||new n(e),e.find(this)},add:function(e){var t=this;return t.items().add(t.create(e)).parent(t),t},focus:function(){var e=this;return e.keyNav?e.keyNav.focusFirst():e._super(),e},replace:function(e,t){for(var n,r=this.items(),i=r.length;i--;)if(r[i]===e){r[i]=t;break}i>=0&&(n=t.getEl(),n&&n.parentNode.removeChild(n),n=e.getEl(),n&&n.parentNode.removeChild(n)),t.parent(this)},create:function(t){var n=this,o,a=[];return i.isArray(t)||(t=[t]),i.each(t,function(t){t&&(t instanceof e||("string"==typeof t&&(t={type:t}),o=i.extend({},n.settings.defaults,t),t.type=o.type=o.type||t.type||n.settings.defaultType||(o.defaults?o.defaults.type:null),t=r.create(o)),a.push(t))}),a},renderNew:function(){var e=this;return e.items().each(function(t,n){var r,i;t.parent(e),t._rendered||(r=e.getEl("body"),i=o.createFragment(t.renderHtml()),r.hasChildNodes()&&n<=r.childNodes.length-1?r.insertBefore(i,r.childNodes[n]):r.appendChild(i),t.postRender())}),e._layout.applyClasses(e),e._lastRect=null,e},append:function(e){return this.add(e).renderNew()},prepend:function(e){var t=this;return t.items().set(t.create(e).concat(t.items().toArray())),t.renderNew()},insert:function(e,t,n){var r=this,i,o,a;return e=r.create(e),i=r.items(),!n&&t<i.length-1&&(t+=1),t>=0&&t<i.length&&(o=i.slice(0,t).toArray(),a=i.slice(t).toArray(),i.set(o.concat(e,a))),r.renderNew()},fromJSON:function(e){var t=this;for(var n in e)t.find("#"+n).value(e[n]);return t},toJSON:function(){var e=this,t={};return e.find("*").each(function(e){var n=e.name(),r=e.value();n&&"undefined"!=typeof r&&(t[n]=r)}),t},preRender:function(){},renderHtml:function(){var e=this,t=e._layout;return e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'" role="'+this.settings.role+'"><div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"},postRender:function(){var e=this,t;return e.items().exec("postRender"),e._super(),e._layout.postRender(e),e._rendered=!0,e.settings.style&&o.css(e.getEl(),e.settings.style),e.settings.border&&(t=e.borderBox(),o.css(e.getEl(),{"border-top-width":t.top,"border-right-width":t.right,"border-bottom-width":t.bottom,"border-left-width":t.left})),e},initLayoutRect:function(){var e=this,t=e._super();return e._layout.recalc(e),t},recalc:function(){var e=this,t=e._layoutRect,n=e._lastRect;return n&&n.w==t.w&&n.h==t.h?void 0:(e._layout.recalc(e),t=e.layoutRect(),e._lastRect={x:t.x,y:t.y,w:t.w,h:t.h},!0)},reflow:function(){var t,n;if(this.visible()){for(e.repaintControls=[],e.repaintControls.map={},n=this.recalc(),t=e.repaintControls.length;t--;)e.repaintControls[t].repaint();"flow"!==this.settings.layout&&"stack"!==this.settings.layout&&this.repaint(),e.repaintControls=[]}return this}})}),r($,[W],function(e){function t(){var e=document,t,n,r,i,o,a,s,l,c=Math.max;return t=e.documentElement,n=e.body,r=c(t.scrollWidth,n.scrollWidth),i=c(t.clientWidth,n.clientWidth),o=c(t.offsetWidth,n.offsetWidth),a=c(t.scrollHeight,n.scrollHeight),s=c(t.clientHeight,n.clientHeight),l=c(t.offsetHeight,n.offsetHeight),{width:o>r?i:r,height:l>a?s:a}}return function(n,r){function i(){return a.getElementById(r.handle||n)}var o,a=document,s,l,c,u,d,f;r=r||{},l=function(n){var l=t(),p,h;n.preventDefault(),s=n.button,p=i(),d=n.screenX,f=n.screenY,h=window.getComputedStyle?window.getComputedStyle(p,null).getPropertyValue("cursor"):p.runtimeStyle.cursor,o=a.createElement("div"),e.css(o,{position:"absolute",top:0,left:0,width:l.width,height:l.height,zIndex:2147483647,opacity:1e-4,background:"red",cursor:h}),a.body.appendChild(o),e.on(a,"mousemove",u),e.on(a,"mouseup",c),r.start(n)},u=function(e){return e.button!==s?c(e):(e.deltaX=e.screenX-d,e.deltaY=e.screenY-f,e.preventDefault(),r.drag(e),void 0)},c=function(t){e.off(a,"mousemove",u),e.off(a,"mouseup",c),o.parentNode.removeChild(o),r.stop&&r.stop(t)},this.destroy=function(){e.off(i())},e.on(i(),"mousedown",l)}}),r(j,[W,$],function(e,t){return{init:function(){var e=this;e.on("repaint",e.renderScroll)},renderScroll:function(){function n(){function t(t,a,s,l,c,u){var d,f,p,h,m,g,v,y,b;if(f=i.getEl("scroll"+t)){if(y=a.toLowerCase(),b=s.toLowerCase(),i.getEl("absend")&&e.css(i.getEl("absend"),y,i.layoutRect()[l]-1),!c)return e.css(f,"display","none"),void 0;e.css(f,"display","block"),d=i.getEl("body"),p=i.getEl("scroll"+t+"t"),h=d["client"+s]-2*o,h-=n&&r?f["client"+u]:0,m=d["scroll"+s],g=h/m,v={},v[y]=d["offset"+a]+o,v[b]=h,e.css(f,v),v={},v[y]=d["scroll"+a]*g,v[b]=h*g,e.css(p,v)}}var n,r,a;a=i.getEl("body"),n=a.scrollWidth>a.clientWidth,r=a.scrollHeight>a.clientHeight,t("h","Left","Width","contentW",n,"Height"),t("v","Top","Height","contentH",r,"Width")}function r(){function n(n,r,a,s,l){var c,u=i._id+"-scroll"+n,d=i.classPrefix;i.getEl().appendChild(e.createFragment('<div id="'+u+'" class="'+d+"scrollbar "+d+"scrollbar-"+n+'"><div id="'+u+'t" class="'+d+'scrollbar-thumb"></div></div>')),i.draghelper=new t(u+"t",{start:function(){c=i.getEl("body")["scroll"+r],e.addClass(e.get(u),d+"active")},drag:function(e){var t,u,d,f,p=i.layoutRect();u=p.contentW>p.innerW,d=p.contentH>p.innerH,f=i.getEl("body")["client"+a]-2*o,f-=u&&d?i.getEl("scroll"+n)["client"+l]:0,t=f/i.getEl("body")["scroll"+a],i.getEl("body")["scroll"+r]=c+e["delta"+s]/t},stop:function(){e.removeClass(e.get(u),d+"active")}})}i.addClass("scroll"),n("v","Top","Height","Y","Width"),n("h","Left","Width","X","Height")}var i=this,o=2;i.settings.autoScroll&&(i._hasScroll||(i._hasScroll=!0,r(),i.on("wheel",function(e){var t=i.getEl("body");t.scrollLeft+=10*(e.deltaX||0),t.scrollTop+=10*e.deltaY,n()}),e.on(i.getEl("body"),"scroll",n)),n())}}}),r(K,[q,j],function(e,t){return e.extend({Defaults:{layout:"fit",containerCls:"panel"},Mixins:[t],renderHtml:function(){var e=this,t=e._layout,n=e.settings.html;return e.preRender(),t.preRender(e),"undefined"==typeof n?n='<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+t.renderHtml(e)+"</div>":("function"==typeof n&&(n=n.call(e)),e._hasBody=!1),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e._preBodyHtml||"")+n+"</div>"}})}),r(Y,[W],function(e){function t(t,n,r){var i,o,a,s,l,c,u,d,f,p;return f=e.getViewPort(),o=e.getPos(n),a=o.x,s=o.y,t._fixed&&(a-=f.x,s-=f.y),i=t.getEl(),p=e.getSize(i),l=p.width,c=p.height,p=e.getSize(n),u=p.width,d=p.height,r=(r||"").split(""),"b"===r[0]&&(s+=d),"r"===r[1]&&(a+=u),"c"===r[0]&&(s+=Math.round(d/2)),"c"===r[1]&&(a+=Math.round(u/2)),"b"===r[3]&&(s-=c),"r"===r[4]&&(a-=l),"c"===r[3]&&(s-=Math.round(c/2)),"c"===r[4]&&(a-=Math.round(l/2)),{x:a,y:s,w:l,h:c}}return{testMoveRel:function(n,r){for(var i=e.getViewPort(),o=0;o<r.length;o++){var a=t(this,n,r[o]);if(this._fixed){if(a.x>0&&a.x+a.w<i.w&&a.y>0&&a.y+a.h<i.h)return r[o]}else if(a.x>i.x&&a.x+a.w<i.w+i.x&&a.y>i.y&&a.y+a.h<i.h+i.y)return r[o]}return r[0]},moveRel:function(e,n){"string"!=typeof n&&(n=this.testMoveRel(e,n));var r=t(this,e,n);return this.moveTo(r.x,r.y)},moveBy:function(e,t){var n=this,r=n.layoutRect();return n.moveTo(r.x+e,r.y+t),n},moveTo:function(t,n){function r(e,t,n){return 0>e?0:e+n>t?(e=t-n,0>e?0:e):e}var i=this;if(i.settings.constrainToViewport){var o=e.getViewPort(window),a=i.layoutRect();t=r(t,o.w+o.x,a.w),n=r(n,o.h+o.y,a.h)}return i._rendered?i.layoutRect({x:t,y:n}).repaint():(i.settings.x=t,i.settings.y=n),i.fire("move",{x:t,y:n}),i}}}),r(G,[W],function(e){return{resizeToContent:function(){this._layoutRect.autoResize=!0,this._lastRect=null,this.reflow()},resizeTo:function(t,n){if(1>=t||1>=n){var r=e.getWindowSize();t=1>=t?t*r.w:t,n=1>=n?n*r.h:n}return this._layoutRect.autoResize=!1,this.layoutRect({minW:t,minH:n,w:t,h:n}).reflow()},resizeBy:function(e,t){var n=this,r=n.layoutRect();return n.resizeTo(r.w+e,r.h+t)}}}),r(X,[K,Y,G,W],function(e,t,n,r){function i(e){var t;for(t=s.length;t--;)s[t]===e&&s.splice(t,1);for(t=l.length;t--;)l[t]===e&&l.splice(t,1)}var o,a,s=[],l=[],c,u=e.extend({Mixins:[t,n],init:function(e){function t(){var e,t=u.zIndex||65535,n;if(l.length)for(e=0;e<l.length;e++)l[e].modal&&(t++,n=l[e]),l[e].getEl().style.zIndex=t,l[e].zIndex=t,t++;var i=document.getElementById(d.classPrefix+"modal-block");n?r.css(i,"z-index",n.zIndex-1):i&&(i.parentNode.removeChild(i),c=!1),u.currentZIndex=t}function n(e,t){for(;e;){if(e==t)return!0;e=e.parent()}}function i(e){function t(t,n){for(var r,i=0;i<s.length;i++)if(s[i]!=e)for(r=s[i].parent();r&&(r=r.parent());)r==e&&s[i].fixed(t).moveBy(0,n).repaint()}var n=r.getViewPort().y;e.settings.autofix&&(e._fixed?e._autoFixY>n&&(e.fixed(!1).layoutRect({y:e._autoFixY}).repaint(),t(!1,e._autoFixY-n)):(e._autoFixY=e.layoutRect().y,e._autoFixY<n&&(e.fixed(!0).layoutRect({y:0}).repaint(),t(!0,n-e._autoFixY))))}var d=this;d._super(e),d._eventsRoot=d,d.addClass("floatpanel"),e.autohide&&(o||(o=function(e){var t,r=d.getParentCtrl(e.target);for(t=s.length;t--;){var i=s[t];if(i.settings.autohide){if(r&&(n(r,i)||i.parent()===r))continue;e=i.fire("autohide",{target:e.target}),e.isDefaultPrevented()||i.hide()}}},r.on(document,"click",o)),s.push(d)),e.autofix&&(a||(a=function(){var e;for(e=s.length;e--;)i(s[e])},r.on(window,"scroll",a)),d.on("move",function(){i(this)})),d.on("postrender show",function(e){if(e.control==d){var n,i=d.classPrefix;d.modal&&!c&&(n=r.createFragment('<div id="'+i+'modal-block" class="'+i+"reset "+i+'fade"></div>'),n=n.firstChild,d.getContainerElm().appendChild(n),setTimeout(function(){r.addClass(n,i+"in"),r.addClass(d.getEl(),i+"in")},0),c=!0),l.push(d),t()}}),d.on("close hide",function(e){if(e.control==d){for(var n=l.length;n--;)l[n]===d&&l.splice(n,1);t()}}),d.on("show",function(){d.parents().each(function(e){return e._fixed?(d.fixed(!0),!1):void 0})}),e.popover&&(d._preBodyHtml='<div class="'+d.classPrefix+'arrow"></div>',d.addClass("popover").addClass("bottom").addClass(d.isRtl()?"end":"start"))},fixed:function(e){var t=this;if(t._fixed!=e){if(t._rendered){var n=r.getViewPort();e?t.layoutRect().y-=n.y:t.layoutRect().y+=n.y}t.toggleClass("fixed",e),t._fixed=e}return t},show:function(){var e=this,t,n=e._super();for(t=s.length;t--&&s[t]!==e;);return-1===t&&s.push(e),n},hide:function(){return i(this),this._super()},hideAll:function(){u.hideAll()},close:function(){var e=this;return e.fire("close"),e.remove()},remove:function(){i(this),this._super()}});return u.hideAll=function(){for(var e=s.length;e--;){var t=s[e];t.settings.autohide&&(t.fire("cancel",{},!1),t.hide(),s.splice(e,1))}},u}),r(J,[W],function(e){return function(t){function n(){if(!h)if(h=[],d.find)d.find("*").each(function(e){e.canFocus&&h.push(e.getEl())});else for(var e=d.getEl().getElementsByTagName("*"),t=0;t<e.length;t++)e[t].id&&e[t]&&h.push(e[t])}function r(){return document.getElementById(m)}function i(e){return e=e||r(),e&&e.getAttribute("role")}function o(e){for(var t,n=e||r();n=n.parentNode;)if(t=i(n))return t}function a(e){var t=document.getElementById(m);return t?t.getAttribute("aria-"+e):void 0}function s(){var n=r();if(!n||"TEXTAREA"!=n.nodeName&&"text"!=n.type)return t.onAction?t.onAction(m):e.fire(r(),"click",{keyboard:!0}),!0}function l(){var e;t.onCancel?((e=r())&&e.blur(),t.onCancel()):t.root.fire("cancel")}function c(e){function r(e){for(var t=d?d.getEl():document.body;e&&e!=t;){if("none"==e.style.display)return!1;e=e.parentNode}return!0}var i=-1,o,a,l=[];for(n(),a=l.length,a=0;a<h.length;a++)r(h[a])&&l.push(h[a]);for(a=l.length;a--;)if(l[a].id===m){i=a;break}i+=e,0>i?i=l.length-1:i>=l.length&&(i=0),o=l[i],o.focus(),m=o.id,t.actOnFocus&&s()}function u(){var e,r;for(r=i(t.root.getEl()),n(),e=h.length;e--;)if("toolbar"==r&&h[e].id===m)return h[e].focus(),void 0;h[0].focus()}var d=t.root,f=t.enableUpDown!==!1,p=t.enableLeftRight!==!1,h=t.items,m;return d.on("keydown",function(e){var n=37,r=39,u=38,d=40,h=27,m=14,g=13,v=32,y=9,b;switch(e.keyCode){case n:p&&(t.leftAction?t.leftAction():c(-1),b=!0);break;case r:p&&("menuitem"==i()&&"menu"==o()?a("haspopup")&&s():c(1),b=!0);break;case u:f&&(c(-1),b=!0);break;case d:f&&("menuitem"==i()&&"menubar"==o()?s():"button"==i()&&a("haspopup")?s():c(1),b=!0);break;case y:b=!0,e.shiftKey?c(-1):c(1);break;case h:b=!0,l();break;case m:case g:case v:b=s()}b&&(e.stopPropagation(),e.preventDefault())}),d.on("focusin",function(e){n(),m=e.target.id}),{moveFocus:c,focusFirst:u,cancel:l}}}),r(Q,[X,K,W,J,$],function(e,t,n,r,i){var o=e.extend({modal:!0,Defaults:{border:1,layout:"flex",containerCls:"panel",role:"dialog",callbacks:{submit:function(){this.fire("submit",{data:this.toJSON()})},close:function(){this.close()}}},init:function(e){var n=this;n._super(e),n.isRtl()&&n.addClass("rtl"),n.addClass("window"),n._fixed=!0,e.buttons&&(n.statusbar=new t({layout:"flex",border:"1 0 0 0",spacing:3,padding:10,align:"center",pack:n.isRtl()?"start":"end",defaults:{type:"button"},items:e.buttons}),n.statusbar.addClass("foot"),n.statusbar.parent(n)),n.on("click",function(e){-1!=e.target.className.indexOf(n.classPrefix+"close")&&n.close()}),n.aria("label",e.title),n._fullscreen=!1},recalc:function(){var e=this,t=e.statusbar,r,i,o,a;e._fullscreen&&(e.layoutRect(n.getWindowSize()),e.layoutRect().contentH=e.layoutRect().innerH),e._super(),r=e.layoutRect(),e.settings.title&&!e._fullscreen&&(i=r.headerW,i>r.w&&(o=r.x-Math.max(0,i/2),e.layoutRect({w:i,x:o}),a=!0)),t&&(t.layoutRect({w:e.layoutRect().innerW}).recalc(),i=t.layoutRect().minW+r.deltaW,i>r.w&&(o=r.x-Math.max(0,i-r.w),e.layoutRect({w:i,x:o}),a=!0)),a&&e.recalc()},initLayoutRect:function(){var e=this,t=e._super(),r=0,i;if(e.settings.title&&!e._fullscreen){i=e.getEl("head");var o=n.getSize(i);t.headerW=o.width,t.headerH=o.height,r+=t.headerH}e.statusbar&&(r+=e.statusbar.layoutRect().h),t.deltaH+=r,t.minH+=r,t.h+=r;var a=n.getWindowSize();return t.x=Math.max(0,a.w/2-t.w/2),t.y=Math.max(0,a.h/2-t.h/2),t},renderHtml:function(){var e=this,t=e._layout,n=e._id,r=e.classPrefix,i=e.settings,o="",a="",s=i.html;return e.preRender(),t.preRender(e),i.title&&(o='<div id="'+n+'-head" class="'+r+'window-head"><div class="'+r+'title">'+e.encode(i.title)+'</div><button type="button" class="'+r+'close" aria-hidden="true">&times;</button><div id="'+n+'-dragh" class="'+r+'dragh"></div></div>'),i.url&&(s='<iframe src="'+i.url+'" tabindex="-1"></iframe>'),"undefined"==typeof s&&(s=t.renderHtml(e)),e.statusbar&&(a=e.statusbar.renderHtml()),'<div id="'+n+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+o+'<div id="'+n+'-body" class="'+e.classes("body")+'">'+s+"</div>"+a+"</div>"},fullscreen:function(e){var t=this,r=document.documentElement,i,o=t.classPrefix,a;if(e!=t._fullscreen)if(n.on(window,"resize",function(){var e;if(t._fullscreen)if(i)t._timer||(t._timer=setTimeout(function(){var e=n.getWindowSize();t.moveTo(0,0).resizeTo(e.w,e.h),t._timer=0},50));else{e=(new Date).getTime();var r=n.getWindowSize();t.moveTo(0,0).resizeTo(r.w,r.h),(new Date).getTime()-e>50&&(i=!0)}}),a=t.layoutRect(),t._fullscreen=e,e){t._initial={x:a.x,y:a.y,w:a.w,h:a.h},t._borderBox=t.parseBox("0"),t.getEl("head").style.display="none",a.deltaH-=a.headerH+2,n.addClass(r,o+"fullscreen"),n.addClass(document.body,o+"fullscreen"),t.addClass("fullscreen");
+var s=n.getWindowSize();t.moveTo(0,0).resizeTo(s.w,s.h)}else t._borderBox=t.parseBox(t.settings.border),t.getEl("head").style.display="",a.deltaH+=a.headerH,n.removeClass(r,o+"fullscreen"),n.removeClass(document.body,o+"fullscreen"),t.removeClass("fullscreen"),t.moveTo(t._initial.x,t._initial.y).resizeTo(t._initial.w,t._initial.h);return t.reflow()},postRender:function(){var e=this,t=[],n,o,a;setTimeout(function(){e.addClass("in")},0),e.keyboardNavigation=new r({root:e,enableLeftRight:!1,enableUpDown:!1,items:t,onCancel:function(){e.close()}}),e.find("*").each(function(e){e.canFocus&&(o=o||e.settings.autofocus,n=n||e,"filepicker"==e.type?(t.push(e.getEl("inp")),e.getEl("open")&&t.push(e.getEl("open"))):t.push(e.getEl()))}),e.statusbar&&e.statusbar.find("*").each(function(e){e.canFocus&&(o=o||e.settings.autofocus,n=n||e,t.push(e.getEl()))}),e._super(),e.statusbar&&e.statusbar.postRender(),!o&&n&&n.focus(),this.dragHelper=new i(e._id+"-dragh",{start:function(){a={x:e.layoutRect().x,y:e.layoutRect().y}},drag:function(t){e.moveTo(a.x+t.deltaX,a.y+t.deltaY)}}),e.on("submit",function(t){t.isDefaultPrevented()||e.close()})},submit:function(){return this.fire("submit",{data:this.toJSON()})},remove:function(){var e=this,t=e.classPrefix;e.dragHelper.destroy(),e._super(),e.statusbar&&this.statusbar.remove(),e._fullscreen&&(n.removeClass(document.documentElement,t+"fullscreen"),n.removeClass(document.body,t+"fullscreen"))}});return o}),r(Z,[Q],function(e){var t=e.extend({init:function(e){e={border:1,padding:20,layout:"flex",pack:"center",align:"center",containerCls:"panel",autoScroll:!0,buttons:{type:"button",text:"Ok",action:"ok"},items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200}},this._super(e)},Statics:{OK:1,OK_CANCEL:2,YES_NO:3,YES_NO_CANCEL:4,msgBox:function(n){var r,i=n.callback||function(){};switch(n.buttons){case t.OK_CANCEL:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}},{type:"button",text:"Cancel",onClick:function(e){e.control.parents()[1].close(),i(!1)}}];break;case t.YES_NO:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}}];break;case t.YES_NO_CANCEL:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close()}}];break;default:r=[{type:"button",text:"Ok",subtype:"primary",onClick:function(e){e.control.parents()[1].close(),i(!0)}}]}return new e({padding:20,x:n.x,y:n.y,minWidth:300,minHeight:100,layout:"flex",pack:"center",align:"center",buttons:r,title:n.title,items:{type:"label",multiline:!0,maxWidth:500,maxHeight:200,text:n.text},onClose:n.onClose}).renderTo(document.body).reflow()},alert:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,t.msgBox(e)},confirm:function(e,n){return"string"==typeof e&&(e={text:e}),e.callback=n,e.buttons=t.OK_CANCEL,t.msgBox(e)}}});return t}),r(et,[Q,Z],function(e,t){return function(n){function r(){return o.length?o[o.length-1]:void 0}var i=this,o=[];i.windows=o,i.open=function(t,r){var i;return n.editorManager.activeEditor=n,t.title=t.title||" ",t.url=t.url||t.file,t.url&&(t.width=parseInt(t.width||320,10),t.height=parseInt(t.height||240,10)),t.body&&(t.items={defaults:t.defaults,type:t.bodyType||"form",items:t.body}),t.url||t.buttons||(t.buttons=[{text:"Ok",subtype:"primary",onclick:function(){i.find("form")[0].submit(),i.close()}},{text:"Cancel",onclick:function(){i.close()}}]),i=new e(t),o.push(i),i.on("close",function(){for(var e=o.length;e--;)o[e]===i&&o.splice(e,1);n.focus()}),t.data&&i.on("postRender",function(){this.find("*").each(function(e){var n=e.name();n in t.data&&e.value(t.data[n])})}),i.features=t||{},i.params=r||{},n.nodeChanged(),i.renderTo(document.body).reflow()},i.alert=function(e,n,r){t.alert(e,function(){n&&n.call(r||this)})},i.confirm=function(e,n,r){t.confirm(e,function(e){n.call(r||this,e)})},i.close=function(){r()&&r().close()},i.getParams=function(){return r()?r().params:null},i.setParams=function(e){r()&&(r().params=e)}}}),r(tt,[T,B,C,m,g,p],function(e,t,n,r,i,o){return function(a){function s(e,t){try{a.getDoc().execCommand(e,!1,t)}catch(n){}}function l(){var e=a.getDoc().documentMode;return e?e:6}function c(e){return e.isDefaultPrevented()}function u(){function t(e){var t=new MutationObserver(function(){});o.each(a.getBody().getElementsByTagName("*"),function(e){"SPAN"==e.tagName&&e.setAttribute("mce-data-marked",1),!e.hasAttribute("data-mce-style")&&e.hasAttribute("style")&&a.dom.setAttrib(e,"style",e.getAttribute("style"))}),t.observe(a.getDoc(),{childList:!0,attributes:!0,subtree:!0,attributeFilter:["style"]}),a.getDoc().execCommand(e?"ForwardDelete":"Delete",!1,null);var n=a.selection.getRng(),r=n.startContainer.parentNode;o.each(t.takeRecords(),function(e){if("style"==e.attributeName){var t=e.target.getAttribute("data-mce-style");t?e.target.setAttribute("style",t):e.target.removeAttribute("style")}o.each(e.addedNodes,function(e){if("SPAN"==e.nodeName&&!e.getAttribute("mce-data-marked")){var t,i;e==r&&(t=n.startOffset,i=e.firstChild),z.remove(e,!0),i&&(n.setStart(i,t),n.setEnd(i,t),a.selection.setRng(n))}})}),t.disconnect(),o.each(a.dom.select("span[mce-data-marked]"),function(e){e.removeAttribute("mce-data-marked")})}var n=a.getDoc();window.MutationObserver&&(a.on("keydown",function(n){var r=n.keyCode==F,i=e.metaKeyPressed(n);if(!c(n)&&(r||n.keyCode==I)){var o=a.selection.getRng(),s=o.startContainer,l=o.startOffset;if(!i&&o.collapsed&&3==s.nodeType&&(r?l<s.data.length:l>0))return;n.preventDefault(),i&&a.selection.getSel().modify("extend",r?"forward":"backward","word"),t(r)}}),a.on("keypress",function(e){c(e)||W.isCollapsed()||!e.charCode||(e.preventDefault(),t(!0),a.selection.setContent(String.fromCharCode(e.charCode)))}),a.addCommand("Delete",function(){t()}),a.addCommand("ForwardDelete",function(){t(!0)}),a.on("dragstart",function(e){e.dataTransfer.setData("mce-internal",a.selection.getContent())}),a.on("drop",function(e){if(!c(e)){var r=e.dataTransfer.getData("mce-internal");r&&n.caretRangeFromPoint&&(e.preventDefault(),t(),a.selection.setRng(n.caretRangeFromPoint(e.x,e.y)),a.insertContent(r))}}),a.on("cut",function(e){!c(e)&&e.clipboardData&&(e.preventDefault(),e.clipboardData.clearData(),e.clipboardData.setData("text/html",a.selection.getContent()),e.clipboardData.setData("text/plain",a.selection.getContent({format:"text"})),t(!0))}))}function d(){function e(e){var t=z.create("body"),n=e.cloneContents();return t.appendChild(n),W.serializer.serialize(t,{format:"html"})}function n(n){if(!n.setStart){if(n.item)return!1;var r=n.duplicate();return r.moveToElementText(a.getBody()),t.compareRanges(n,r)}var i=e(n),o=z.createRng();o.selectNode(a.getBody());var s=e(o);return i===s}a.on("keydown",function(e){var t=e.keyCode,r,i;if(!c(e)&&(t==F||t==I)){if(r=a.selection.isCollapsed(),i=a.getBody(),r&&!z.isEmpty(i))return;if(!r&&!n(a.selection.getRng()))return;e.preventDefault(),a.setContent(""),i.firstChild&&z.isBlock(i.firstChild)?a.selection.setCursorLocation(i.firstChild,0):a.selection.setCursorLocation(i,0),a.nodeChanged()}})}function f(){a.on("keydown",function(t){!c(t)&&65==t.keyCode&&e.metaKeyPressed(t)&&(t.preventDefault(),a.execCommand("SelectAll"))})}function p(){a.settings.content_editable||(z.bind(a.getDoc(),"focusin",function(){W.setRng(W.getRng())}),z.bind(a.getDoc(),"mousedown",function(e){e.target==a.getDoc().documentElement&&(a.getWin().focus(),W.setRng(W.getRng()))}))}function h(){a.on("keydown",function(e){if(!c(e)&&e.keyCode===I&&W.isCollapsed()&&0===W.getRng(!0).startOffset){var t=W.getNode(),n=t.previousSibling;if("HR"==t.nodeName)return z.remove(t),e.preventDefault(),void 0;n&&n.nodeName&&"hr"===n.nodeName.toLowerCase()&&(z.remove(n),e.preventDefault())}})}function m(){window.Range.prototype.getClientRects||a.on("mousedown",function(e){if(!c(e)&&"HTML"===e.target.nodeName){var t=a.getBody();t.blur(),setTimeout(function(){t.focus()},0)}})}function g(){a.on("click",function(e){e=e.target,/^(IMG|HR)$/.test(e.nodeName)&&W.getSel().setBaseAndExtent(e,0,e,1),"A"==e.nodeName&&z.hasClass(e,"mce-item-anchor")&&W.select(e),a.nodeChanged()})}function v(){function e(){var e=z.getAttribs(W.getStart().cloneNode(!1));return function(){var t=W.getStart();t!==a.getBody()&&(z.setAttrib(t,"style",null),O(e,function(e){t.setAttributeNode(e.cloneNode(!0))}))}}function t(){return!W.isCollapsed()&&z.getParent(W.getStart(),z.isBlock)!=z.getParent(W.getEnd(),z.isBlock)}a.on("keypress",function(n){var r;return c(n)||8!=n.keyCode&&46!=n.keyCode||!t()?void 0:(r=e(),a.getDoc().execCommand("delete",!1,null),r(),n.preventDefault(),!1)}),z.bind(a.getDoc(),"cut",function(n){var r;!c(n)&&t()&&(r=e(),setTimeout(function(){r()},0))})}function y(){var e,n;a.on("selectionchange",function(){n&&(clearTimeout(n),n=0),n=window.setTimeout(function(){var n=W.getRng();e&&t.compareRanges(n,e)||(a.nodeChanged(),e=n)},50)})}function b(){document.body.setAttribute("role","application")}function C(){a.on("keydown",function(e){if(!c(e)&&e.keyCode===I&&W.isCollapsed()&&0===W.getRng(!0).startOffset){var t=W.getNode().previousSibling;if(t&&t.nodeName&&"table"===t.nodeName.toLowerCase())return e.preventDefault(),!1}})}function x(){l()>7||(s("RespectVisibilityInDesign",!0),a.contentStyles.push(".mceHideBrInPre pre br {display: none}"),z.addClass(a.getBody(),"mceHideBrInPre"),U.addNodeFilter("pre",function(e){for(var t=e.length,r,i,o,a;t--;)for(r=e[t].getAll("br"),i=r.length;i--;)o=r[i],a=o.prev,a&&3===a.type&&"\n"!=a.value.charAt(a.value-1)?a.value+="\n":o.parent.insert(new n("#text",3),o,!0).value="\n"}),q.addNodeFilter("pre",function(e){for(var t=e.length,n,r,i,o;t--;)for(n=e[t].getAll("br"),r=n.length;r--;)i=n[r],o=i.prev,o&&3==o.type&&(o.value=o.value.replace(/\r?\n$/,""))}))}function w(){z.bind(a.getBody(),"mouseup",function(){var e,t=W.getNode();"IMG"==t.nodeName&&((e=z.getStyle(t,"width"))&&(z.setAttrib(t,"width",e.replace(/[^0-9%]+/g,"")),z.setStyle(t,"width","")),(e=z.getStyle(t,"height"))&&(z.setAttrib(t,"height",e.replace(/[^0-9%]+/g,"")),z.setStyle(t,"height","")))})}function _(){a.on("keydown",function(t){var n,r,i,o,s;if(!c(t)&&t.keyCode==e.BACKSPACE&&(n=W.getRng(),r=n.startContainer,i=n.startOffset,o=z.getRoot(),s=r,n.collapsed&&0===i)){for(;s&&s.parentNode&&s.parentNode.firstChild==s&&s.parentNode!=o;)s=s.parentNode;"BLOCKQUOTE"===s.tagName&&(a.formatter.toggle("blockquote",null,s),n=z.createRng(),n.setStart(r,0),n.setEnd(r,0),W.setRng(n))}})}function N(){function e(){a._refreshContentEditable(),s("StyleWithCSS",!1),s("enableInlineTableEditing",!1),V.object_resizing||s("enableObjectResizing",!1)}V.readonly||a.on("BeforeExecCommand MouseDown",e)}function E(){function e(){O(z.select("a"),function(e){var t=e.parentNode,n=z.getRoot();if(t.lastChild===e){for(;t&&!z.isBlock(t);){if(t.parentNode.lastChild!==t||t===n)return;t=t.parentNode}z.add(t,"br",{"data-mce-bogus":1})}})}a.on("SetContent ExecCommand",function(t){("setcontent"==t.type||"mceInsertLink"===t.command)&&e()})}function k(){V.forced_root_block&&a.on("init",function(){s("DefaultParagraphSeparator",V.forced_root_block)})}function S(){a.on("Undo Redo SetContent",function(e){e.initial||a.execCommand("mceRepaint")})}function T(){a.on("keydown",function(e){var t;c(e)||e.keyCode!=I||(t=a.getDoc().selection.createRange(),t&&t.item&&(e.preventDefault(),a.undoManager.beforeChange(),z.remove(t.item(0)),a.undoManager.add()))})}function R(){var e;l()>=10&&(e="",O("p div h1 h2 h3 h4 h5 h6".split(" "),function(t,n){e+=(n>0?",":"")+t+":empty"}),a.contentStyles.push(e+"{padding-right: 1px !important}"))}function A(){l()<9&&(U.addNodeFilter("noscript",function(e){for(var t=e.length,n,r;t--;)n=e[t],r=n.firstChild,r&&n.attr("data-mce-innertext",r.value)}),q.addNodeFilter("noscript",function(e){for(var t=e.length,i,o,a;t--;)i=e[t],o=e[t].firstChild,o?o.value=r.decode(o.value):(a=i.attributes.map["data-mce-innertext"],a&&(i.attr("data-mce-innertext",null),o=new n("#text",3),o.value=a,o.raw=!0,i.append(o)))}))}function B(){function e(e,t){var n=i.createTextRange();try{n.moveToPoint(e,t)}catch(r){n=null}return n}function t(t){var r;t.button?(r=e(t.x,t.y),r&&(r.compareEndPoints("StartToStart",a)>0?r.setEndPoint("StartToStart",a):r.setEndPoint("EndToEnd",a),r.select())):n()}function n(){var e=r.selection.createRange();a&&!e.item&&0===e.compareEndPoints("StartToEnd",e)&&a.select(),z.unbind(r,"mouseup",n),z.unbind(r,"mousemove",t),a=o=0}var r=z.doc,i=r.body,o,a,s;r.documentElement.unselectable=!0,z.bind(r,"mousedown contextmenu",function(i){if("HTML"===i.target.nodeName){if(o&&n(),s=r.documentElement,s.scrollHeight>s.clientHeight)return;o=1,a=e(i.x,i.y),a&&(z.bind(r,"mouseup",n),z.bind(r,"mousemove",t),z.win.focus(),a.select())}})}function L(){a.on("keyup focusin",function(t){65==t.keyCode&&e.metaKeyPressed(t)||W.normalize()})}function D(){a.contentStyles.push("img:-moz-broken {-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}")}function H(){a.inline||a.on("keydown",function(){document.activeElement==document.body&&a.getWin().focus()})}function M(){a.inline||(a.contentStyles.push("body {min-height: 150px}"),a.on("click",function(e){"HTML"==e.target.nodeName&&(a.execCommand("SelectAll"),a.selection.collapse(!0),a.nodeChanged())}))}function P(){i.mac&&a.on("keydown",function(t){!e.metaKeyPressed(t)||37!=t.keyCode&&39!=t.keyCode||(t.preventDefault(),a.selection.getSel().modify("move",37==t.keyCode?"backward":"forward","word"))})}var O=o.each,I=e.BACKSPACE,F=e.DELETE,z=a.dom,W=a.selection,V=a.settings,U=a.parser,q=a.serializer,$=i.gecko,j=i.ie,K=i.webkit;C(),_(),d(),L(),K&&(u(),p(),g(),k(),i.iOS?(y(),H(),M()):f()),j&&i.ie<11&&(h(),b(),x(),w(),T(),R(),A(),B()),i.ie>=11&&M(),i.ie&&f(),$&&(h(),m(),v(),N(),E(),S(),D(),P())}}),r(nt,[p],function(e){function t(){return!1}function n(){return!0}var r="__bindings",i=e.makeMap("focusin focusout click dblclick mousedown mouseup mousemove mouseover beforepaste paste cut copy selectionchange mouseout mouseenter mouseleave keydown keypress keyup contextmenu dragstart dragend dragover draggesture dragdrop drop drag"," ");return{fire:function(e,i,o){var a=this,s,l,c,u,d;if(e=e.toLowerCase(),i=i||{},i.type=e,i.target||(i.target=a),i.preventDefault||(i.preventDefault=function(){i.isDefaultPrevented=n},i.stopPropagation=function(){i.isPropagationStopped=n},i.stopImmediatePropagation=function(){i.isImmediatePropagationStopped=n},i.isDefaultPrevented=t,i.isPropagationStopped=t,i.isImmediatePropagationStopped=t),a[r]&&(s=a[r][e]))for(l=0,c=s.length;c>l&&(s[l]=u=s[l],!i.isImmediatePropagationStopped());l++)if(u.call(a,i)===!1)return i.preventDefault(),i;if(o!==!1&&a.parent)for(d=a.parent();d&&!i.isPropagationStopped();)d.fire(e,i,!1),d=d.parent();return i},on:function(e,t){var n=this,o,a,s,l;if(t===!1&&(t=function(){return!1}),t)for(s=e.toLowerCase().split(" "),l=s.length;l--;)e=s[l],o=n[r],o||(o=n[r]={}),a=o[e],a||(a=o[e]=[],n.bindNative&&i[e]&&n.bindNative(e)),a.push(t);return n},off:function(e,t){var n=this,o,a=n[r],s,l,c,u;if(a)if(e)for(c=e.toLowerCase().split(" "),o=c.length;o--;){if(e=c[o],s=a[e],!e){for(l in a)a[e].length=0;return n}if(s){if(t)for(u=s.length;u--;)s[u]===t&&s.splice(u,1);else s.length=0;!s.length&&n.unbindNative&&i[e]&&(n.unbindNative(e),delete a[e])}}else{if(n.unbindNative)for(e in a)n.unbindNative(e);n[r]=[]}return n},hasEventListeners:function(e){var t=this[r];return e=e.toLowerCase(),!(!t||!t[e]||0===t[e].length)}}}),r(rt,[p,g],function(e,t){var n=e.each,r=e.explode,i={f9:120,f10:121,f11:122};return function(o){var a=this,s={};o.on("keyup keypress keydown",function(e){(e.altKey||e.ctrlKey||e.metaKey)&&n(s,function(n){var r=t.mac?e.metaKey:e.ctrlKey;if(n.ctrl==r&&n.alt==e.altKey&&n.shift==e.shiftKey)return e.keyCode==n.keyCode||e.charCode&&e.charCode==n.charCode?(e.preventDefault(),"keydown"==e.type&&n.func.call(n.scope),!0):void 0})}),a.add=function(t,a,l,c){var u;return u=l,"string"==typeof l?l=function(){o.execCommand(u,!1,null)}:e.isArray(u)&&(l=function(){o.execCommand(u[0],u[1],u[2])}),n(r(t.toLowerCase()),function(e){var t={func:l,scope:c||o,desc:o.translate(a),alt:!1,ctrl:!1,shift:!1};n(r(e,"+"),function(e){switch(e){case"alt":case"ctrl":case"shift":t[e]=!0;break;default:t.charCode=e.charCodeAt(0),t.keyCode=i[e]||e.toUpperCase().charCodeAt(0)}}),s[(t.ctrl?"ctrl":"")+","+(t.alt?"alt":"")+","+(t.shift?"shift":"")+","+t.keyCode]=t}),!0}}}),r(it,[v,b,C,k,E,A,L,D,H,M,P,O,y,l,et,x,_,tt,g,p,nt,rt],function(e,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v,y,b,C,x,w){function _(e,t){return"selectionchange"==t||"drop"==t?e.getDoc():!e.inline&&/^mouse|click|contextmenu/.test(t)?e.getDoc():e.getBody()}function N(e,t,r){var i=this,o,a;o=i.documentBaseUrl=r.documentBaseURL,a=r.baseURI,i.settings=t=T({id:e,theme:"modern",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:o,add_form_submit_trigger:!0,submit_patch:!0,add_unload_trigger:!0,convert_urls:!0,relative_urls:!0,remove_script_host:!0,object_resizing:!0,doctype:"<!DOCTYPE html>",visual:!0,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",font_size_legacy_values:"xx-small,small,medium,large,x-large,xx-large,300%",forced_root_block:"p",hidden_input:!0,padd_empty_editor:!0,render_ui:!0,indentation:"30px",inline_styles:!0,convert_fonts_to_spans:!0,indent:"simple",indent_before:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",indent_after:"p,h1,h2,h3,h4,h5,h6,blockquote,div,title,style,pre,script,td,ul,li,area,table,thead,tfoot,tbody,tr,section,article,hgroup,aside,figure,option,optgroup,datalist",validate:!0,entity_encoding:"named",url_converter:i.convertURL,url_converter_scope:i,ie7_compat:!0},t),n.language=t.language||"en",n.languageLoad=t.language_load,n.baseURL=r.baseURL,i.id=t.id=e,i.isNotDirty=!0,i.plugins={},i.documentBaseURI=new f(t.document_base_url||o,{base_uri:a}),i.baseURI=a,i.contentCSS=[],i.contentStyles=[],i.shortcuts=new w(i),i.execCommands={},i.queryStateCommands={},i.queryValueCommands={},i.loadedCSS={},i.suffix=r.suffix,i.editorManager=r,i.inline=t.inline,i.execCallback("setup",i),r.fire("SetupEditor",i)}var E=e.DOM,k=n.ThemeManager,S=n.PluginManager,T=C.extend,R=C.each,A=C.explode,B=C.inArray,L=C.trim,D=C.resolve,H=h.Event,M=b.gecko,P=b.ie;return N.prototype={render:function(){function e(){E.unbind(window,"ready",e),n.render()}function t(){var e=p.ScriptLoader;if(r.language&&"en"!=r.language&&(r.language_url=n.editorManager.baseURL+"/langs/"+r.language+".js"),r.language_url&&e.add(r.language_url),r.theme&&"function"!=typeof r.theme&&"-"!=r.theme.charAt(0)&&!k.urls[r.theme]){var t=r.theme_url;t=t?n.documentBaseURI.toAbsolute(t):"themes/"+r.theme+"/theme"+o+".js",k.load(r.theme,t)}C.isArray(r.plugins)&&(r.plugins=r.plugins.join(" ")),R(r.external_plugins,function(e,t){S.load(t,e),r.plugins+=" "+t}),R(r.plugins.split(/[ ,]/),function(e){if(e=L(e),e&&!S.urls[e])if("-"==e.charAt(0)){e=e.substr(1,e.length);var t=S.dependencies(e);R(t,function(e){var t={prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"};e=S.createUrl(t,e),S.load(e.resource,e)})}else S.load(e,{prefix:"plugins/",resource:e,suffix:"/plugin"+o+".js"})}),e.loadQueue(function(){n.removed||n.init()})}var n=this,r=n.settings,i=n.id,o=n.suffix;if(!H.domLoaded)return E.bind(window,"ready",e),void 0;if(n.getElement()&&b.contentEditable){r.inline?n.inline=!0:(n.orgVisibility=n.getElement().style.visibility,n.getElement().style.visibility="hidden");var a=n.getElement().form||E.getParent(i,"form");a&&(n.formElement=a,r.hidden_input&&!/TEXTAREA|INPUT/i.test(n.getElement().nodeName)&&(E.insertAfter(E.create("input",{type:"hidden",name:i}),i),n.hasHiddenInput=!0),n.formEventDelegate=function(e){n.fire(e.type,e)},E.bind(a,"submit reset",n.formEventDelegate),n.on("reset",function(){n.setContent(n.startContent,{format:"raw"})}),!r.submit_patch||a.submit.nodeType||a.submit.length||a._mceOldSubmit||(a._mceOldSubmit=a.submit,a.submit=function(){return n.editorManager.triggerSave(),n.isNotDirty=!0,a._mceOldSubmit(a)})),n.windowManager=new m(n),"xml"==r.encoding&&n.on("GetContent",function(e){e.save&&(e.content=E.encode(e.content))}),r.add_form_submit_trigger&&n.on("submit",function(){n.initialized&&n.save()}),r.add_unload_trigger&&(n._beforeUnload=function(){!n.initialized||n.destroyed||n.isHidden()||n.save({format:"raw",no_events:!0,set_dirty:!1})},n.editorManager.on("BeforeUnload",n._beforeUnload)),t()}},init:function(){function e(n){var r=S.get(n),i,o;i=S.urls[n]||t.documentBaseUrl.replace(/\/$/,""),n=L(n),r&&-1===B(h,n)&&(R(S.dependencies(n),function(t){e(t)}),o=new r(t,i),t.plugins[n]=o,o.init&&(o.init(t,i),h.push(n)))}var t=this,n=t.settings,r=t.getElement(),i,o,a,s,l,c,u,d,f,p,h=[];if(t.rtl=this.editorManager.i18n.rtl,t.editorManager.add(t),n.aria_label=n.aria_label||E.getAttrib(r,"aria-label",t.getLang("aria.rich_text_area")),n.theme&&("function"!=typeof n.theme?(n.theme=n.theme.replace(/-/,""),l=k.get(n.theme),t.theme=new l(t,k.urls[n.theme]),t.theme.init&&t.theme.init(t,k.urls[n.theme]||t.documentBaseUrl.replace(/\/$/,""))):t.theme=n.theme),R(n.plugins.replace(/\-/g,"").split(/[ ,]/),e),n.render_ui&&t.theme&&(t.orgDisplay=r.style.display,"function"!=typeof n.theme?(i=n.width||r.style.width||r.offsetWidth,o=n.height||r.style.height||r.offsetHeight,a=n.min_height||100,f=/^[0-9\.]+(|px)$/i,f.test(""+i)&&(i=Math.max(parseInt(i,10)+(l.deltaWidth||0),100)),f.test(""+o)&&(o=Math.max(parseInt(o,10)+(l.deltaHeight||0),a)),l=t.theme.renderUI({targetNode:r,width:i,height:o,deltaWidth:n.delta_width,deltaHeight:n.delta_height}),n.content_editable||(E.setStyles(l.sizeContainer||l.editorContainer,{wi2dth:i,h2eight:o}),o=(l.iframeHeight||o)+("number"==typeof o?l.deltaHeight||0:""),a>o&&(o=a))):(l=n.theme(t,r),l.editorContainer.nodeType&&(l.editorContainer=l.editorContainer.id=l.editorContainer.id||t.id+"_parent"),l.iframeContainer.nodeType&&(l.iframeContainer=l.iframeContainer.id=l.iframeContainer.id||t.id+"_iframecontainer"),o=l.iframeHeight||r.offsetHeight),t.editorContainer=l.editorContainer),n.content_css&&R(A(n.content_css),function(e){t.contentCSS.push(t.documentBaseURI.toAbsolute(e))}),n.content_style&&t.contentStyles.push(n.content_style),n.content_editable)return r=s=l=null,t.initContentBody();for(t.iframeHTML=n.doctype+"<html><head>",n.document_base_url!=t.documentBaseUrl&&(t.iframeHTML+='<base href="'+t.documentBaseURI.getURI()+'" />'),!b.caretAfter&&n.ie7_compat&&(t.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" />'),t.iframeHTML+='<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />',p=0;p<t.contentCSS.length;p++){var m=t.contentCSS[p];t.iframeHTML+='<link type="text/css" rel="stylesheet" href="'+m+'" />',t.loadedCSS[m]=!0}u=n.body_id||"tinymce",-1!=u.indexOf("=")&&(u=t.getParam("body_id","","hash"),u=u[t.id]||u),d=n.body_class||"",-1!=d.indexOf("=")&&(d=t.getParam("body_class","","hash"),d=d[t.id]||""),t.iframeHTML+='</head><body id="'+u+'" class="mce-content-body '+d+'" onload="window.parent.tinymce.get(\''+t.id+"').fire('load');\"><br></body></html>";var g='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinymce.get("'+t.id+'");document.write(ed.iframeHTML);document.close();ed.initContentBody(true);})()';if(document.domain!=location.hostname&&(c=g),s=E.add(l.iframeContainer,"iframe",{id:t.id+"_ifr",src:c||'javascript:""',frameBorder:"0",allowTransparency:"true",title:t.editorManager.translate("Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help"),style:{width:"100%",height:o,display:"block"}}),P)try{t.getDoc()}catch(v){s.src=c=g}t.contentAreaContainer=l.iframeContainer,l.editorContainer&&(E.get(l.editorContainer).style.display=t.orgDisplay),E.get(t.id).style.display="none",E.setAttrib(t.id,"aria-hidden",!0),c||t.initContentBody(),r=s=l=null},initContentBody:function(t){var n=this,o=n.settings,f=E.get(n.id),p=n.getDoc(),h,m;o.inline||(n.getElement().style.visibility=n.orgVisibility),t||o.content_editable||(p.open(),p.write(n.iframeHTML),p.close()),o.content_editable&&(n.on("remove",function(){var e=this.getBody();E.removeClass(e,"mce-content-body"),E.removeClass(e,"mce-edit-focus"),E.setAttrib(e,"tabIndex",null),E.setAttrib(e,"contentEditable",null)}),E.addClass(f,"mce-content-body"),f.tabIndex=-1,n.contentDocument=p=o.content_document||document,n.contentWindow=o.content_window||window,n.bodyElement=f,o.content_document=o.content_window=null,o.root_name=f.nodeName.toLowerCase()),h=n.getBody(),h.disabled=!0,o.readonly||(n.inline&&"static"==E.getStyle(h,"position",!0)&&(h.style.position="relative"),h.contentEditable=n.getParam("content_editable_state",!0)),h.disabled=!1,n.schema=new g(o),n.dom=new e(p,{keep_values:!0,url_converter:n.convertURL,url_converter_scope:n,hex_colors:o.force_hex_style_colors,class_filter:o.class_filter,update_styles:!0,root_element:o.content_editable?n.id:null,collect:o.content_editable,schema:n.schema,onSetAttrib:function(e){n.fire("SetAttrib",e)}}),n.parser=new v(o,n.schema),n.parser.addAttributeFilter("src,href,style",function(e,t){for(var r=e.length,i,o=n.dom,a,s;r--;)i=e[r],a=i.attr(t),s="data-mce-"+t,i.attributes.map[s]||("style"===t?i.attr(s,o.serializeStyle(o.parseStyle(a),i.name)):i.attr(s,n.convertURL(a,t,i.name)))}),n.parser.addNodeFilter("script",function(e){for(var t=e.length,n;t--;)n=e[t],n.attr("type","mce-"+(n.attr("type")||"text/javascript"))}),n.parser.addNodeFilter("#cdata",function(e){for(var t=e.length,n;t--;)n=e[t],n.type=8,n.name="#comment",n.value="[CDATA["+n.value+"]]"}),n.parser.addNodeFilter("p,h1,h2,h3,h4,h5,h6,div",function(e){for(var t=e.length,i,o=n.schema.getNonEmptyElements();t--;)i=e[t],i.isEmpty(o)&&(i.empty().append(new r("br",1)).shortEnded=!0)}),n.serializer=new i(o,n),n.selection=new a(n.dom,n.getWin(),n.serializer,n),n.formatter=new s(n),n.undoManager=new l(n),n.forceBlocks=new u(n),n.enterKey=new c(n),n.editorCommands=new d(n),n.fire("PreInit"),o.browser_spellcheck||o.gecko_spellcheck||(p.body.spellcheck=!1,E.setAttrib(h,"spellcheck","false")),n.fire("PostRender"),n.quirks=y(n),o.directionality&&(h.dir=o.directionality),o.nowrap&&(h.style.whiteSpace="nowrap"),o.protect&&n.on("BeforeSetContent",function(e){R(o.protect,function(t){e.content=e.content.replace(t,function(e){return"<!--mce:protected "+escape(e)+"-->"})})}),n.on("SetContent",function(){n.addVisual(n.getBody())}),o.padd_empty_editor&&n.on("PostProcess",function(e){e.content=e.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")}),n.load({initial:!0,format:"html"}),n.startContent=n.getContent({format:"raw"}),n.initialized=!0,R(n._pendingNativeEvents,function(e){n.dom.bind(_(n,e),e,function(e){n.fire(e.type,e)})}),n.fire("init"),n.focus(!0),n.nodeChanged({initial:!0}),n.execCallback("init_instance_callback",n),n.contentStyles.length>0&&(m="",R(n.contentStyles,function(e){m+=e+"\r\n"}),n.dom.addStyle(m)),R(n.contentCSS,function(e){n.loadedCSS[e]||(n.dom.loadCSS(e),n.loadedCSS[e]=!0)}),o.auto_focus&&setTimeout(function(){var e=n.editorManager.get(o.auto_focus);e.selection.select(e.getBody(),1),e.selection.collapse(1),e.getBody().focus(),e.getWin().focus()},100),f=p=h=null},focus:function(e){var t,n=this,r=n.selection,i=n.settings.content_editable,o,a,s=n.getDoc(),l;e||(o=r.getRng(),o.item&&(a=o.item(0)),n._refreshContentEditable(),i||(b.opera||n.getBody().focus(),n.getWin().focus()),(M||i)&&(l=n.getBody(),l.setActive&&b.ie<11?l.setActive():l.focus(),i&&r.normalize()),a&&a.ownerDocument==s&&(o=s.body.createControlRange(),o.addElement(a),o.select())),n.editorManager.activeEditor!=n&&((t=n.editorManager.activeEditor)&&t.fire("deactivate",{relatedTarget:n}),n.fire("activate",{relatedTarget:t})),n.editorManager.activeEditor=n},execCallback:function(e){var t=this,n=t.settings[e],r;if(n)return t.callbackLookup&&(r=t.callbackLookup[e])&&(n=r.func,r=r.scope),"string"==typeof n&&(r=n.replace(/\.\w+$/,""),r=r?D(r):0,n=D(n),t.callbackLookup=t.callbackLookup||{},t.callbackLookup[e]={func:n,scope:r}),n.apply(r||t,Array.prototype.slice.call(arguments,1))},translate:function(e){var t=this.settings.language||"en",n=this.editorManager.i18n;return e?n.data[t+"."+e]||e.replace(/\{\#([^\}]+)\}/g,function(e,r){return n.data[t+"."+r]||"{#"+r+"}"}):""},getLang:function(e,n){return this.editorManager.i18n.data[(this.settings.language||"en")+"."+e]||(n!==t?n:"{#"+e+"}")},getParam:function(e,t,n){var r=e in this.settings?this.settings[e]:t,i;return"hash"===n?(i={},"string"==typeof r?R(r.indexOf("=")>0?r.split(/[;,](?![^=;,]*(?:[;,]|$))/):r.split(","),function(e){e=e.split("="),i[L(e[0])]=e.length>1?L(e[1]):L(e)}):i=r,i):r},nodeChanged:function(){var e=this,t=e.selection,n,r,i;e.initialized&&!e.settings.disable_nodechange&&(i=e.getBody(),n=t.getStart()||i,n=P&&n.ownerDocument!=e.getDoc()?e.getBody():n,"IMG"==n.nodeName&&t.isCollapsed()&&(n=n.parentNode),r=[],e.dom.getParent(n,function(e){return e===i?!0:(r.push(e),void 0)}),e.fire("NodeChange",{element:n,parents:r}))},addButton:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),t.text||t.icon||(t.icon=e),n.buttons=n.buttons||{},t.tooltip=t.tooltip||t.title,n.buttons[e]=t},addMenuItem:function(e,t){var n=this;t.cmd&&(t.onclick=function(){n.execCommand(t.cmd)}),n.menuItems=n.menuItems||{},n.menuItems[e]=t},addCommand:function(e,t,n){this.execCommands[e]={func:t,scope:n||this}},addQueryStateHandler:function(e,t,n){this.queryStateCommands[e]={func:t,scope:n||this}},addQueryValueHandler:function(e,t,n){this.queryValueCommands[e]={func:t,scope:n||this}},addShortcut:function(e,t,n,r){this.shortcuts.add(e,t,n,r)},execCommand:function(e,t,n,r){var i=this,o=0,a;return/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint)$/.test(e)||r&&r.skip_focus||i.focus(),r=T({},r),r=i.fire("BeforeExecCommand",{command:e,ui:t,value:n}),r.isDefaultPrevented()?!1:(a=i.execCommands[e])&&a.func.call(a.scope,t,n)!==!0?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):(R(i.plugins,function(r){return r.execCommand&&r.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),o=!0,!1):void 0}),o?o:i.theme&&i.theme.execCommand&&i.theme.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):i.editorCommands.execCommand(e,t,n)?(i.fire("ExecCommand",{command:e,ui:t,value:n}),!0):(i.getDoc().execCommand(e,t,n),i.fire("ExecCommand",{command:e,ui:t,value:n}),void 0))},queryCommandState:function(e){var t=this,n,r;if(!t._isHidden()){if((n=t.queryStateCommands[e])&&(r=n.func.call(n.scope),r!==!0))return r;if(r=t.editorCommands.queryCommandState(e),-1!==r)return r;try{return t.getDoc().queryCommandState(e)}catch(i){}}},queryCommandValue:function(e){var n=this,r,i;if(!n._isHidden()){if((r=n.queryValueCommands[e])&&(i=r.func.call(r.scope),i!==!0))return i;if(i=n.editorCommands.queryCommandValue(e),i!==t)return i;try{return n.getDoc().queryCommandValue(e)}catch(o){}}},show:function(){var e=this;E.show(e.getContainer()),E.hide(e.id),e.load(),e.fire("show")},hide:function(){var e=this,t=e.getDoc();P&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),E.hide(e.getContainer()),E.setStyle(e.id,"display",e.orgDisplay),e.fire("hide")},isHidden:function(){return!E.isHidden(this.id)},setProgressState:function(e,t){this.fire("ProgressState",{state:e,time:t})},load:function(e){var n=this,r=n.getElement(),i;return r?(e=e||{},e.load=!0,i=n.setContent(r.value!==t?r.value:r.innerHTML,e),e.element=r,e.no_events||n.fire("LoadContent",e),e.element=r=null,i):void 0},save:function(e){var t=this,n=t.getElement(),r,i;if(n&&t.initialized)return e=e||{},e.save=!0,e.element=n,r=e.content=t.getContent(e),e.no_events||t.fire("SaveContent",e),r=e.content,/TEXTAREA|INPUT/i.test(n.nodeName)?n.value=r:(n.innerHTML=r,(i=E.getParent(t.id,"form"))&&R(i.elements,function(e){return e.name==t.id?(e.value=r,!1):void 0})),e.element=n=null,e.set_dirty!==!1&&(t.isNotDirty=!0),r},setContent:function(e,t){var n=this,r=n.getBody(),i;return t=t||{},t.format=t.format||"html",t.set=!0,t.content=e,t.no_events||n.fire("BeforeSetContent",t),e=t.content,0===e.length||/^\s+$/.test(e)?(i=n.settings.forced_root_block,i&&n.schema.isValidChild(r.nodeName.toLowerCase(),i.toLowerCase())?(e=P&&11>P?"":'<br data-mce-bogus="1">',e=n.dom.createHTML(i,n.settings.forced_root_block_attrs,e)):(!P||11>P)&&(e='<br data-mce-bogus="1">'),r.innerHTML=e,n.fire("SetContent",t)):("raw"!==t.format&&(e=new o({},n.schema).serialize(n.parser.parse(e,{isRootContent:!0}))),t.content=L(e),n.dom.setHTML(r,t.content),t.no_events||n.fire("SetContent",t)),t.content
+},getContent:function(e){var t=this,n,r=t.getBody();return e=e||{},e.format=e.format||"html",e.get=!0,e.getInner=!0,e.no_events||t.fire("BeforeGetContent",e),n="raw"==e.format?r.innerHTML:"text"==e.format?r.innerText||r.textContent:t.serializer.serialize(r,e),e.content="text"!=e.format?L(n):n,e.no_events||t.fire("GetContent",e),e.content},insertContent:function(e){this.execCommand("mceInsertContent",!1,e)},isDirty:function(){return!this.isNotDirty},getContainer:function(){var e=this;return e.container||(e.container=E.get(e.editorContainer||e.id+"_parent")),e.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return E.get(this.settings.content_element||this.id)},getWin:function(){var e=this,t;return e.contentWindow||(t=E.get(e.id+"_ifr"),t&&(e.contentWindow=t.contentWindow)),e.contentWindow},getDoc:function(){var e=this,t;return e.contentDocument||(t=e.getWin(),t&&(e.contentDocument=t.document)),e.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(e,t,n){var r=this,i=r.settings;return i.urlconverter_callback?r.execCallback("urlconverter_callback",e,n,!0,t):!i.convert_urls||n&&"LINK"==n.nodeName||0===e.indexOf("file:")||0===e.length?e:i.relative_urls?r.documentBaseURI.toRelative(e):e=r.documentBaseURI.toAbsolute(e,i.remove_script_host)},addVisual:function(e){var n=this,r=n.settings,i=n.dom,o;e=e||n.getBody(),n.hasVisual===t&&(n.hasVisual=r.visual),R(i.select("table,a",e),function(e){var t;switch(e.nodeName){case"TABLE":return o=r.visual_table_class||"mce-item-table",t=i.getAttrib(e,"border"),t&&"0"!=t||(n.hasVisual?i.addClass(e,o):i.removeClass(e,o)),void 0;case"A":return i.getAttrib(e,"href",!1)||(t=i.getAttrib(e,"name")||e.id,o="mce-item-anchor",t&&(n.hasVisual?i.addClass(e,o):i.removeClass(e,o))),void 0}}),n.fire("VisualAid",{element:e,hasVisual:n.hasVisual})},remove:function(){var e=this;if(!e.removed){e.removed=1,e.hasHiddenInput&&E.remove(e.getElement().nextSibling);var t=e.getDoc();P&&t&&!e.inline&&t.execCommand("SelectAll"),e.save(),E.setStyle(e.id,"display",e.orgDisplay),e.settings.content_editable||(H.unbind(e.getWin()),H.unbind(e.getDoc()));var n=e.getContainer();H.unbind(e.getBody()),H.unbind(n),e.fire("remove"),e.editorManager.remove(e),E.remove(n),e.destroy()}},bindNative:function(e){var t=this;t.settings.readonly||(t.initialized?t.dom.bind(_(t,e),e,function(n){t.fire(e,n)}):t._pendingNativeEvents?t._pendingNativeEvents.push(e):t._pendingNativeEvents=[e])},unbindNative:function(e){var t=this;t.initialized&&t.dom.unbind(e)},destroy:function(e){var t=this,n;if(!t.destroyed){if(!e&&!t.removed)return t.remove(),void 0;e&&M&&(H.unbind(t.getDoc()),H.unbind(t.getWin()),H.unbind(t.getBody())),e||(t.editorManager.off("beforeunload",t._beforeUnload),t.theme&&t.theme.destroy&&t.theme.destroy(),t.selection.destroy(),t.dom.destroy()),n=t.formElement,n&&(n._mceOldSubmit&&(n.submit=n._mceOldSubmit,n._mceOldSubmit=null),E.unbind(n,"submit reset",t.formEventDelegate)),t.contentAreaContainer=t.formElement=t.container=null,t.settings.content_element=t.bodyElement=t.contentDocument=t.contentWindow=null,t.selection&&(t.selection=t.selection.win=t.selection.dom=t.selection.dom.doc=null),t.destroyed=1}},_refreshContentEditable:function(){var e=this,t,n;e._isHidden()&&(t=e.getBody(),n=t.parentNode,n.removeChild(t),n.appendChild(t),t.focus())},_isHidden:function(){var e;return M?(e=this.selection.getSel(),!e||!e.rangeCount||0===e.rangeCount):0}},T(N.prototype,x),N}),r(ot,[],function(){var e={};return{rtl:!1,add:function(t,n){for(var r in n)e[r]=n[r];this.rtl=this.rtl||"rtl"===e._dir},translate:function(t){if("undefined"==typeof t)return t;if("string"!=typeof t&&t.raw)return t.raw;if(t.push){var n=t.slice(1);t=(e[t[0]]||t[0]).replace(/\{([^\}]+)\}/g,function(e,t){return n[t]})}return e[t]||t},data:e}}),r(at,[v,g],function(e,t){function n(r){function i(){try{return document.activeElement}catch(e){return document.body}}function o(e){return e&&e.startContainer?{startContainer:e.startContainer,startOffset:e.startOffset,endContainer:e.endContainer,endOffset:e.endOffset}:e}function a(e,t){var n;return t.startContainer?(n=e.getDoc().createRange(),n.setStart(t.startContainer,t.startOffset),n.setEnd(t.endContainer,t.endOffset)):n=t,n}function s(t){return!!e.DOM.getParent(t,n.isEditorUIElement)}function l(e,t){for(var n=t.getBody();e;){if(e==n)return!0;e=e.parentNode}}function c(n){var c=n.editor,u;c.on("init",function(){"onbeforedeactivate"in document&&t.ie<11?c.dom.bind(c.getBody(),"beforedeactivate",function(){try{c.lastRng=c.selection.getRng()}catch(e){}c.selection.lastFocusBookmark=o(c.lastRng)}):(c.inline||t.ie>10)&&(c.on("nodechange keyup",function(){var e=document.activeElement;e&&e.id==c.id+"_ifr"&&(e=c.getBody()),l(e,c)&&(c.lastRng=c.selection.getRng())}),t.webkit&&(u=function(){var e=c.selection.getRng();e.collapsed||(c.lastRng=e)},e.DOM.bind(document,"selectionchange",u),c.on("remove",function(){e.DOM.unbind(document,"selectionchange",u)})))}),c.on("setcontent",function(){c.lastRng=null}),c.on("mousedown",function(){c.selection.lastFocusBookmark=null}),c.on("focusin",function(){var e=r.focusedEditor;c.selection.lastFocusBookmark&&(c.selection.setRng(a(c,c.selection.lastFocusBookmark)),c.selection.lastFocusBookmark=null),e!=c&&(e&&e.fire("blur",{focusedEditor:c}),r.activeEditor=c,r.focusedEditor=c,c.fire("focus",{blurredEditor:e}),c.focus(!1)),c.lastRng=null}),c.on("focusout",function(){window.setTimeout(function(){var e=r.focusedEditor;s(i())||e!=c||(c.fire("blur",{focusedEditor:null}),r.focusedEditor=null,c.selection.lastFocusBookmark=null)},0)})}e.DOM.bind(document,"focusin",function(e){var t=r.activeEditor;t&&e.target.ownerDocument==document&&(t.selection.lastFocusBookmark=o(t.lastRng),s(e.target)||r.focusedEditor!=t||(t.fire("blur",{focusedEditor:null}),r.focusedEditor=null))}),r.on("AddEditor",c)}return n.isEditorUIElement=function(e){return-1!==e.className.indexOf("mce-")},n}),r(st,[it,v,O,g,p,nt,ot,at],function(e,n,r,i,o,a,s,l){var c=n.DOM,u=o.explode,d=o.each,f=o.extend,p=0,h,m={majorVersion:"4",minorVersion:"0.12",releaseDate:"2013-12-18",editors:[],i18n:s,activeEditor:null,setup:function(){var e=this,t,n,i="",o;if(n=document.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,""),/[\/\\]$/.test(n)||(n+="/"),o=window.tinymce||window.tinyMCEPreInit)t=o.base||o.baseURL,i=o.suffix;else for(var a=document.getElementsByTagName("script"),s=0;s<a.length;s++){var c=a[s].src;if(/tinymce(\.full|\.jquery|)(\.min|\.dev|)\.js/.test(c)){-1!=c.indexOf(".min")&&(i=".min"),t=c.substring(0,c.lastIndexOf("/"));break}}e.baseURL=new r(n).toAbsolute(t),e.documentBaseURL=n,e.baseURI=new r(e.baseURL),e.suffix=i,e.focusManager=new l(e)},init:function(t){function n(e){var t=e.id;return t||(t=e.name,t=t&&!c.get(t)?e.name:c.uniqueId(),e.setAttribute("id",t)),t}function r(e,t,n){var r=e[t];if(r)return r.apply(n||this,Array.prototype.slice.call(arguments,2))}function i(e,t){return t.constructor===RegExp?t.test(e.className):c.hasClass(e,t)}function o(){var h,m;if(c.unbind(window,"ready",o),r(t,"onpageload"),t.types)return d(t.types,function(r){d(c.select(r.selector),function(i){var o=new e(n(i),f({},t,r),a);s.push(o),o.render(1)})}),void 0;if(t.selector)return d(c.select(t.selector),function(r){var i=new e(n(r),t,a);s.push(i),i.render(1)}),void 0;switch(t.mode){case"exact":h=t.elements||"",h.length>0&&d(u(h),function(n){c.get(n)?(l=new e(n,t,a),s.push(l),l.render(!0)):d(document.forms,function(r){d(r.elements,function(r){r.name===n&&(n="mce_editor_"+p++,c.setAttrib(r,"id",n),l=new e(n,t,a),s.push(l),l.render(1))})})});break;case"textareas":case"specific_textareas":d(c.select("textarea"),function(r){t.editor_deselector&&i(r,t.editor_deselector)||(!t.editor_selector||i(r,t.editor_selector))&&(l=new e(n(r),t,a),s.push(l),l.render(!0))})}t.oninit&&(h=m=0,d(s,function(e){m++,e.initialized?h++:e.on("init",function(){h++,h==m&&r(t,"oninit")}),h==m&&r(t,"oninit")}))}var a=this,s=[],l;a.settings=t,c.bind(window,"ready",o)},get:function(e){return e===t?this.editors:this.editors[e]},add:function(e){var t=this,n=t.editors;return n[e.id]=e,n.push(e),t.activeEditor=e,t.fire("AddEditor",{editor:e}),h||(h=function(){t.fire("BeforeUnload")},c.bind(window,"beforeunload",h)),e},createEditor:function(t,n){return this.add(new e(t,n,this))},remove:function(e){var t=this,n,r=t.editors,i,o;{if(e){if("string"==typeof e)return e=e.selector||e,d(c.select(e),function(e){t.remove(r[e.id])}),void 0;if(i=e,!r[i.id])return null;for(delete r[i.id],n=0;n<r.length;n++)if(r[n]==i){r.splice(n,1),o=!0;break}return t.activeEditor==i&&(t.activeEditor=r[0]),o&&t.fire("RemoveEditor",{editor:i}),r.length||c.unbind(window,"beforeunload",h),i.remove(),i}for(n=r.length-1;n>=0;n--)t.remove(r[n])}},execCommand:function(t,n,r){var i=this,o=i.get(r);switch(t){case"mceAddEditor":return i.get(r)||new e(r,i.settings,i).render(),!0;case"mceRemoveEditor":return o&&o.remove(),!0;case"mceToggleEditor":return o?(o.isHidden()?o.show():o.hide(),!0):(i.execCommand("mceAddEditor",0,r),!0)}return i.activeEditor?i.activeEditor.execCommand(t,n,r):!1},triggerSave:function(){d(this.editors,function(e){e.save()})},addI18n:function(e,t){s.add(e,t)},translate:function(e){return s.translate(e)}};return f(m,a),m.setup(),window.tinymce=window.tinyMCE=m,m}),r(lt,[st,p],function(e,t){var n=t.each,r=t.explode;e.on("AddEditor",function(e){var t=e.editor;t.on("preInit",function(){function e(e,t){n(t,function(t,n){t&&s.setStyle(e,n,t)}),s.rename(e,"span")}function i(e){s=t.dom,l.convert_fonts_to_spans&&n(s.select("font,u,strike",e.node),function(e){o[e.nodeName.toLowerCase()](s,e)})}var o,a,s,l=t.settings;l.inline_styles&&(a=r(l.font_size_legacy_values),o={font:function(t,n){e(n,{backgroundColor:n.style.backgroundColor,color:n.color,fontFamily:n.face,fontSize:a[parseInt(n.size,10)-1]})},u:function(t,n){e(n,{textDecoration:"underline"})},strike:function(t,n){e(n,{textDecoration:"line-through"})}},t.on("PreProcess SetContent",i))})})}),r(ct,[],function(){return{send:function(e){function t(){!e.async||4==n.readyState||r++>1e4?(e.success&&1e4>r&&200==n.status?e.success.call(e.success_scope,""+n.responseText,n,e):e.error&&e.error.call(e.error_scope,r>1e4?"TIMED_OUT":"GENERAL",n,e),n=null):setTimeout(t,10)}var n,r=0;if(e.scope=e.scope||this,e.success_scope=e.success_scope||e.scope,e.error_scope=e.error_scope||e.scope,e.async=e.async===!1?!1:!0,e.data=e.data||"",n=new XMLHttpRequest){if(n.overrideMimeType&&n.overrideMimeType(e.content_type),n.open(e.type||(e.data?"POST":"GET"),e.url,e.async),e.content_type&&n.setRequestHeader("Content-Type",e.content_type),n.setRequestHeader("X-Requested-With","XMLHttpRequest"),n.send(e.data),!e.async)return t();setTimeout(t,10)}}}}),r(ut,[],function(){function e(t,n){var r,i,o,a;if(n=n||'"',null===t)return"null";if(o=typeof t,"string"==o)return i="\bb	t\nn\ff\rr\"\"''\\\\",n+t.replace(/([\u0080-\uFFFF\x00-\x1f\"\'\\])/g,function(e,t){return'"'===n&&"'"===e?e:(r=i.indexOf(t),r+1?"\\"+i.charAt(r+1):(e=t.charCodeAt().toString(16),"\\u"+"0000".substring(e.length)+e))})+n;if("object"==o){if(t.hasOwnProperty&&"[object Array]"===Object.prototype.toString.call(t)){for(r=0,i="[";r<t.length;r++)i+=(r>0?",":"")+e(t[r],n);return i+"]"}i="{";for(a in t)t.hasOwnProperty(a)&&(i+="function"!=typeof t[a]?(i.length>1?","+n:n)+a+n+":"+e(t[a],n):"");return i+"}"}return""+t}return{serialize:e,parse:function(e){try{return window[String.fromCharCode(101)+"val"]("("+e+")")}catch(t){}}}}),r(dt,[ut,ct,p],function(e,t,n){function r(e){this.settings=i({},e),this.count=0}var i=n.extend;return r.sendRPC=function(e){return(new r).send(e)},r.prototype={send:function(n){var r=n.error,o=n.success;n=i(this.settings,n),n.success=function(t,i){t=e.parse(t),"undefined"==typeof t&&(t={error:"JSON Parse error."}),t.error?r.call(n.error_scope||n.scope,t.error,i):o.call(n.success_scope||n.scope,t.result)},n.error=function(e,t){r&&r.call(n.error_scope||n.scope,e,t)},n.data=e.serialize({id:n.id||"c"+this.count++,method:n.method,params:n.params}),n.content_type="application/json",t.send(n)}},r}),r(ft,[v],function(e){return{callbacks:{},count:0,send:function(n){var r=this,i=e.DOM,o=n.count!==t?n.count:r.count,a="tinymce_jsonp_"+o;r.callbacks[o]=function(e){i.remove(a),delete r.callbacks[o],n.callback(e)},i.add(i.doc.body,"script",{id:a,src:n.url,type:"text/javascript"}),r.count++}}}),r(pt,[],function(){function e(){s=[];for(var e in a)s.push(e);i.length=s.length}function n(){function n(e){var n,r;return r=e!==t?u+e:i.indexOf(",",u),-1===r||r>i.length?null:(n=i.substring(u,r),u=r+1,n)}var r,i,s,u=0;if(a={},c){o.load(l),i=o.getAttribute(l)||"";do{var d=n();if(null===d)break;if(r=n(parseInt(d,32)||0),null!==r){if(d=n(),null===d)break;s=n(parseInt(d,32)||0),r&&(a[r]=s)}}while(null!==r);e()}}function r(){var t,n="";if(c){for(var r in a)t=a[r],n+=(n?",":"")+r.length.toString(32)+","+r+","+t.length.toString(32)+","+t;o.setAttribute(l,n);try{o.save(l)}catch(i){}e()}}var i,o,a,s,l,c;try{if(window.localStorage)return localStorage}catch(u){}return l="tinymce",o=document.documentElement,c=!!o.addBehavior,c&&o.addBehavior("#default#userData"),i={key:function(e){return s[e]},getItem:function(e){return e in a?a[e]:null},setItem:function(e,t){a[e]=""+t,r()},removeItem:function(e){delete a[e],r()},clear:function(){a={},r()}},n(),i}),r(ht,[v,l,y,b,p,g],function(e,t,n,r,i,o){var a=window.tinymce;return a.DOM=e.DOM,a.ScriptLoader=n.ScriptLoader,a.PluginManager=r.PluginManager,a.ThemeManager=r.ThemeManager,a.dom=a.dom||{},a.dom.Event=t.Event,i.each(i,function(e,t){a[t]=e}),i.each("isOpera isWebKit isIE isGecko isMac".split(" "),function(e){a[e]=o[e.substr(2).toLowerCase()]}),{}}),r(mt,[I,p],function(e,t){return e.extend({Defaults:{firstControlClass:"first",lastControlClass:"last"},init:function(e){this.settings=t.extend({},this.Defaults,e)},preRender:function(e){e.addClass(this.settings.containerClass,"body")},applyClasses:function(e){var t=this,n=t.settings,r,i,o;r=e.items().filter(":visible"),i=n.firstControlClass,o=n.lastControlClass,r.each(function(e){e.removeClass(i).removeClass(o),n.controlClass&&e.addClass(n.controlClass)}),r.eq(0).addClass(i),r.eq(-1).addClass(o)},renderHtml:function(e){var t=this,n=t.settings,r,i="";return r=e.items(),r.eq(0).addClass(n.firstControlClass),r.eq(-1).addClass(n.lastControlClass),r.each(function(e){n.controlClass&&e.addClass(n.controlClass),i+=e.renderHtml()}),i},recalc:function(){},postRender:function(){}})}),r(gt,[mt],function(e){return e.extend({Defaults:{containerClass:"abs-layout",controlClass:"abs-layout-item"},recalc:function(e){e.items().filter(":visible").each(function(e){var t=e.settings;e.layoutRect({x:t.x,y:t.y,w:t.w,h:t.h}),e.recalc&&e.recalc()})},renderHtml:function(e){return'<div id="'+e._id+'-absend" class="'+e.classPrefix+'abs-end"></div>'+this._super(e)}})}),r(vt,[V,Y],function(e,t){return e.extend({Mixins:[t],Defaults:{classes:"widget tooltip tooltip-n"},text:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t._rendered&&(t.getEl().lastChild.innerHTML=t.encode(e)),t):t._value},renderHtml:function(){var e=this,t=e.classPrefix;return'<div id="'+e._id+'" class="'+e.classes()+'" role="presentation"><div class="'+t+'tooltip-arrow"></div><div class="'+t+'tooltip-inner">'+e.encode(e._text)+"</div></div>"},repaint:function(){var e=this,t,n;t=e.getEl().style,n=e._layoutRect,t.left=n.x+"px",t.top=n.y+"px",t.zIndex=131070}})}),r(yt,[V,vt],function(e,t){var n,r=e.extend({init:function(e){var t=this;t._super(e),t.canFocus=!0,e.tooltip&&r.tooltips!==!1&&(t.on("mouseenter",function(n){var r=t.tooltip().moveTo(-65535);if(n.control==t){var i=r.text(e.tooltip).show().testMoveRel(t.getEl(),["bc-tc","bc-tl","bc-tr"]);r.toggleClass("tooltip-n","bc-tc"==i),r.toggleClass("tooltip-nw","bc-tl"==i),r.toggleClass("tooltip-ne","bc-tr"==i),r.moveRel(t.getEl(),i)}else r.hide()}),t.on("mouseleave mousedown click",function(){t.tooltip().hide()})),t.aria("label",e.tooltip)},tooltip:function(){var e=this;return n||(n=new t({type:"tooltip"}),n.renderTo(e.getContainerElm())),n},active:function(e){var t=this,n;return e!==n&&(t.aria("pressed",e),t.toggleClass("active",e)),t._super(e)},disabled:function(e){var t=this,n;return e!==n&&(t.aria("disabled",e),t.toggleClass("disabled",e)),t._super(e)},postRender:function(){var e=this,t=e.settings;e._rendered=!0,e._super(),e.parent()||!t.width&&!t.height||(e.initLayoutRect(),e.repaint()),t.autofocus&&setTimeout(function(){e.focus()},0)},remove:function(){this._super(),n&&(n.remove(),n=null)}});return r}),r(bt,[yt],function(e){return e.extend({Defaults:{classes:"widget btn",role:"button"},init:function(e){var t=this,n;t.on("click mousedown",function(e){e.preventDefault()}),t._super(e),n=e.size,e.subtype&&t.addClass(e.subtype),n&&t.addClass("btn-"+n)},icon:function(e){var t=this,n=t.classPrefix;if("undefined"==typeof e)return t.settings.icon;if(t.settings.icon=e,e=e?n+"ico "+n+"i-"+t.settings.icon:"",t._rendered){var r=t.getEl().firstChild,i=r.getElementsByTagName("i")[0];e?(i&&i==r.firstChild||(i=document.createElement("i"),r.insertBefore(i,r.firstChild)),i.className=e):i&&r.removeChild(i),t.text(t._text)}return t},repaint:function(){var e=this.getEl().firstChild.style;e.width=e.height="100%",this._super()},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon,i="";return e.settings.image&&(r="none",i=" style=\"background-image: url('"+e.settings.image+"')\""),r=e.settings.icon?n+"ico "+n+"i-"+r:"",'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1"><button role="presentation" type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+i+"></i>":"")+(e._text?(r?"\xa0":"")+e.encode(e._text):"")+"</button></div>"}})}),r(Ct,[q],function(e){return e.extend({Defaults:{defaultType:"button",role:"toolbar"},renderHtml:function(){var e=this,t=e._layout;return e.addClass("btn-group"),e.preRender(),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'"><div id="'+e._id+'-body">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}})}),r(xt,[yt],function(e){return e.extend({Defaults:{classes:"checkbox",role:"checkbox",checked:!1},init:function(e){var t=this;t._super(e),t.on("click mousedown",function(e){e.preventDefault()}),t.on("click",function(e){e.preventDefault(),t.disabled()||t.checked(!t.checked())}),t.checked(t.settings.checked)},checked:function(e){var t=this;return"undefined"!=typeof e?(e?t.addClass("checked"):t.removeClass("checked"),t._checked=e,t.aria("checked",e),t):t._checked},value:function(e){return this.checked(e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix;return'<div id="'+t+'" class="'+e.classes()+'" unselectable="on" aria-labeledby="'+t+'-al" tabindex="-1"><i class="'+n+"ico "+n+'i-checkbox"></i><span id="'+t+'-al" class="'+n+'label">'+e.encode(e._text)+"</span></div>"}})}),r(wt,[bt,X],function(e,t){return e.extend({showPanel:function(){var e=this,n=e.settings;if(e.active(!0),e.panel)e.panel.show();else{var r=n.panel;r.type&&(r={layout:"grid",items:r}),r.popover=!0,r.autohide=!0,e.panel=new t(r).on("hide",function(){e.active(!1)}).parent(e).renderTo(e.getContainerElm()),e.panel.fire("show"),e.panel.reflow()}e.panel.moveRel(e.getEl(),n.popoverAlign||(e.isRtl()?["bc-tr","bc-tc"]:["bc-tl","bc-tc"]))},hidePanel:function(){var e=this;e.panel&&e.panel.hide()},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&(e.panel&&e.panel.visible()?e.hidePanel():e.showPanel())}),e._super()}})}),r(_t,[wt,v],function(e,t){var n=t.DOM;return e.extend({init:function(e){this._super(e),this.addClass("colorbutton")},color:function(e){return e?(this._color=e,this.getEl("preview").style.backgroundColor=e,this):this._color},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"",i=e.settings.image?" style=\"background-image: url('"+e.settings.image+"')\"":"";return'<div id="'+t+'" class="'+e.classes()+'"><button role="presentation" hidefocus type="button" tabindex="-1">'+(r?'<i class="'+r+'"'+i+"></i>":"")+'<span id="'+t+'-preview" class="'+n+'preview"></span>'+(e._text?(r?" ":"")+e._text:"")+'</button><button type="button" class="'+n+'open" hidefocus tabindex="-1"> <i class="'+n+'caret"></i></button></div>'},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(r){r.control!=e||n.getParent(r.target,"."+e.classPrefix+"open")||(r.stopImmediatePropagation(),t.call(e,r))}),delete e.settings.onclick,e._super()}})}),r(Nt,[yt,W],function(e,t){return e.extend({init:function(e){var n=this;n._super(e),n.addClass("combobox"),n.on("click",function(e){for(var t=e.target;t;)t.id&&-1!=t.id.indexOf("-open")&&n.fire("action"),t=t.parentNode}),n.on("keydown",function(e){"INPUT"==e.target.nodeName&&13==e.keyCode&&n.parents().reverse().each(function(t){return e.preventDefault(),n.fire("change"),t.hasEventListeners("submit")&&t.toJSON?(t.fire("submit",{data:t.toJSON()}),!1):void 0})}),e.placeholder&&(n.addClass("placeholder"),n.on("focusin",function(){n._hasOnChange||(t.on(n.getEl("inp"),"change",function(){n.fire("change")}),n._hasOnChange=!0),n.hasClass("placeholder")&&(n.getEl("inp").value="",n.removeClass("placeholder"))}),n.on("focusout",function(){0===n.value().length&&(n.getEl("inp").value=e.placeholder,n.addClass("placeholder"))}))},value:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t.removeClass("placeholder"),t._rendered&&(t.getEl("inp").value=e),t):t._rendered?(e=t.getEl("inp").value,e!=t.settings.placeholder?e:""):t._value},disabled:function(e){var t=this;return t._rendered&&"undefined"!=typeof e&&(t.getEl("inp").disabled=e),t._super(e)},focus:function(){this.getEl("inp").focus()},repaint:function(){var e=this,n=e.getEl(),r=e.getEl("open"),i=e.layoutRect(),o,a;o=r?i.w-t.getSize(r).width-10:i.w-10;var s=document;return s.all&&(!s.documentMode||s.documentMode<=8)&&(a=e.layoutRect().h-2+"px"),t.css(n.firstChild,{width:o,lineHeight:a}),e._super(),e},postRender:function(){var e=this;return t.on(this.getEl("inp"),"change",function(){e.fire("change")}),e._super()},remove:function(){t.off(this.getEl("inp")),this._super()},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.classPrefix,i=n.value||n.placeholder||"",o,a,s="";return o=n.icon?r+"ico "+r+"i-"+n.icon:"",a=e._text,(o||a)&&(s='<div id="'+t+'-open" class="'+r+"btn "+r+'open" tabIndex="-1"><button id="'+t+'-action" type="button" hidefocus tabindex="-1">'+(o?'<i class="'+o+'"></i>':'<i class="'+r+'caret"></i>')+(a?(o?" ":"")+a:"")+"</button></div>",e.addClass("has-open")),'<div id="'+t+'" class="'+e.classes()+'"><input id="'+t+'-inp" class="'+r+"textbox "+r+'placeholder" value="'+i+'" hidefocus="true"'+(e.disabled()?' disabled="disabled"':"")+">"+s+"</div>"}})}),r(Et,[yt,J],function(e,t){return e.extend({init:function(e){var t=this;e.delimiter||(e.delimiter="\xbb"),t._super(e),t.addClass("path"),t.canFocus=!0,t.on("click",function(e){var n,r=e.target;(n=r.getAttribute("data-index"))&&t.fire("select",{value:t.data()[n],index:n})})},focus:function(){var e=this;return e.keyNav=new t({root:e,enableLeftRight:!0}),e.keyNav.focusFirst(),e},data:function(e){var t=this;return"undefined"!=typeof e?(t._data=e,t.update(),t):t._data},update:function(){this.innerHtml(this._getPathHtml())},postRender:function(){var e=this;e._super(),e.data(e.settings.data)},renderHtml:function(){var e=this;return'<div id="'+e._id+'" class="'+e.classes()+'">'+e._getPathHtml()+"</div>"},_getPathHtml:function(){var e=this,t=e._data||[],n,r,i="",o=e.classPrefix;for(n=0,r=t.length;r>n;n++)i+=(n>0?'<div class="'+o+'divider" aria-hidden="true"> '+e.settings.delimiter+" </div>":"")+'<div role="button" class="'+o+"path-item"+(n==r-1?" "+o+"last":"")+'" data-index="'+n+'" tabindex="-1" id="'+e._id+"-"+n+'">'+t[n].name+"</div>";return i||(i='<div class="'+o+'path-item">&nbsp;</div>'),i}})}),r(kt,[Et,st],function(e,t){return e.extend({postRender:function(){function e(e){if(1===e.nodeType){if("BR"==e.nodeName||e.getAttribute("data-mce-bogus"))return!0;if("bookmark"===e.getAttribute("data-mce-type"))return!0}return!1}var n=this,r=t.activeEditor;return n.on("select",function(t){var n=[],i,o=r.getBody();for(r.focus(),i=r.selection.getStart();i&&i!=o;)e(i)||n.push(i),i=i.parentNode;r.selection.select(n[n.length-1-t.index]),r.nodeChanged()}),r.on("nodeChange",function(t){for(var i=[],o=t.parents,a=o.length;a--;)if(1==o[a].nodeType&&!e(o[a])){var s=r.fire("ResolveName",{name:o[a].nodeName.toLowerCase(),target:o[a]});i.push({name:s.name})}n.data(i)}),n._super()}})}),r(St,[q],function(e){return e.extend({Defaults:{layout:"flex",align:"center",defaults:{flex:1}},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.addClass("formitem"),t.preRender(e),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e.settings.title?'<div id="'+e._id+'-title" class="'+n+'title">'+e.settings.title+"</div>":"")+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></div>"}})}),r(Tt,[q,St],function(e,t){return e.extend({Defaults:{containerCls:"form",layout:"flex",direction:"column",align:"stretch",flex:1,padding:20,labelGap:30,spacing:10,callbacks:{submit:function(){this.submit()}}},preRender:function(){var e=this,n=e.items();n.each(function(n){var r,i=n.settings.label;i&&(r=new t({layout:"flex",autoResize:"overflow",defaults:{flex:1},items:[{type:"label",text:i,flex:0,forId:n._id}]}),r.type="formitem","undefined"==typeof n.settings.flex&&(n.settings.flex=1),e.replace(n,r),r.add(n))})},recalcLabels:function(){var e=this,t=0,n=[],r,i;if(e.settings.labelGapCalc!==!1)for(e.items().filter("formitem").each(function(e){var r=e.items()[0],i=r.getEl().clientWidth;t=i>t?i:t,n.push(r)}),i=e.settings.labelGap||0,r=n.length;r--;)n[r].settings.minWidth=t+i},visible:function(e){var t=this._super(e);return e===!0&&this._rendered&&this.recalcLabels(),t},submit:function(){return this.fire("submit",{data:this.toJSON()})},postRender:function(){var e=this;e._super(),e.recalcLabels(),e.fromJSON(e.settings.data)}})}),r(Rt,[Tt],function(e){return e.extend({Defaults:{containerCls:"fieldset",layout:"flex",direction:"column",align:"stretch",flex:1,padding:"25 15 5 15",labelGap:30,spacing:10,border:1},renderHtml:function(){var e=this,t=e._layout,n=e.classPrefix;return e.preRender(),t.preRender(e),'<fieldset id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1">'+(e.settings.title?'<legend id="'+e._id+'-title" class="'+n+'fieldset-title">'+e.settings.title+"</legend>":"")+'<div id="'+e._id+'-body" class="'+e.classes("body")+'">'+(e.settings.html||"")+t.renderHtml(e)+"</div></fieldset>"}})}),r(At,[Nt],function(e){return e.extend({init:function(e){var t=this,n=tinymce.activeEditor,r;e.spellcheck=!1,r=n.settings.file_browser_callback,r&&(e.icon="browse",e.onaction=function(){r(t.getEl("inp").id,t.getEl("inp").value,e.filetype,window)}),t._super(e)}})}),r(Bt,[gt],function(e){return e.extend({recalc:function(e){var t=e.layoutRect(),n=e.paddingBox();e.items().filter(":visible").each(function(e){e.layoutRect({x:n.left,y:n.top,w:t.innerW-n.right-n.left,h:t.innerH-n.top-n.bottom}),e.recalc&&e.recalc()})}})}),r(Lt,[gt],function(e){return e.extend({recalc:function(e){var t,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v=[],y,b,C,x,w,_,N,E,k,S,T,R,A,B,L,D,H,M,P,O,I,F,z,W,V=Math.max,U=Math.min;for(r=e.items().filter(":visible"),i=e.layoutRect(),o=e._paddingBox,a=e.settings,f=e.isRtl()?a.direction||"row-reversed":a.direction,s=a.align,l=e.isRtl()?a.pack||"end":a.pack,c=a.spacing||0,("row-reversed"==f||"column-reverse"==f)&&(r=r.set(r.toArray().reverse()),f=f.split("-")[0]),"column"==f?(k="y",N="h",E="minH",S="maxH",R="innerH",T="top",A="bottom",B="deltaH",L="contentH",I="left",M="w",D="x",H="innerW",P="minW",O="maxW",F="right",z="deltaW",W="contentW"):(k="x",N="w",E="minW",S="maxW",R="innerW",T="left",A="right",B="deltaW",L="contentW",I="top",M="h",D="y",H="innerH",P="minH",O="maxH",F="bottom",z="deltaH",W="contentH"),d=i[R]-o[T]-o[T],_=u=0,t=0,n=r.length;n>t;t++)p=r[t],h=p.layoutRect(),m=p.settings,g=m.flex,d-=n-1>t?c:0,g>0&&(u+=g,h[S]&&v.push(p),h.flex=g),d-=h[E],y=o[I]+h[P]+o[F],y>_&&(_=y);if(x={},x[E]=0>d?i[E]-d+i[B]:i[R]-d+i[B],x[P]=_+i[z],x[L]=i[R]-d,x[W]=_,x.minW=U(x.minW,i.maxW),x.minH=U(x.minH,i.maxH),x.minW=V(x.minW,i.startMinWidth),x.minH=V(x.minH,i.startMinHeight),!i.autoResize||x.minW==i.minW&&x.minH==i.minH){for(C=d/u,t=0,n=v.length;n>t;t++)p=v[t],h=p.layoutRect(),b=h[S],y=h[E]+h.flex*C,y>b?(d-=h[S]-h[E],u-=h.flex,h.flex=0,h.maxFlexSize=b):h.maxFlexSize=0;for(C=d/u,w=o[T],x={},0===u&&("end"==l?w=d+o[T]:"center"==l?(w=Math.round(i[R]/2-(i[R]-d)/2)+o[T],0>w&&(w=o[T])):"justify"==l&&(w=o[T],c=Math.floor(d/(r.length-1)))),x[D]=o[I],t=0,n=r.length;n>t;t++)p=r[t],h=p.layoutRect(),y=h.maxFlexSize||h[E],"center"===s?x[D]=Math.round(i[H]/2-h[M]/2):"stretch"===s?(x[M]=V(h[P]||0,i[H]-o[I]-o[F]),x[D]=o[I]):"end"===s&&(x[D]=i[H]-h[M]-o.top),h.flex>0&&(y+=h.flex*C),x[N]=y,x[k]=w,p.layoutRect(x),p.recalc&&p.recalc(),w+=y+c}else if(x.w=x.minW,x.h=x.minH,e.layoutRect(x),this.recalc(e),null===e._lastRect){var q=e.parent();q&&(q._lastRect=null,q.recalc())}}})}),r(Dt,[mt],function(e){return e.extend({Defaults:{containerClass:"flow-layout",controlClass:"flow-layout-item",endClass:"break"},recalc:function(e){e.items().filter(":visible").each(function(e){e.recalc&&e.recalc()})}})}),r(Ht,[V,yt,X,p,st,g],function(e,t,n,r,i,o){function a(e){function t(t){function n(e){return e.replace(/%(\w+)/g,"")}var r,i,o=e.dom,a="",l,c;return c=e.settings.preview_styles,c===!1?"":(c||(c="font-family font-size font-weight font-style text-decoration text-transform color background-color border border-radius"),(t=e.formatter.get(t))?(t=t[0],r=t.block||t.inline||"span",i=o.create(r),s(t.styles,function(e,t){e=n(e),e&&o.setStyle(i,t,e)}),s(t.attributes,function(e,t){e=n(e),e&&o.setAttrib(i,t,e)}),s(t.classes,function(e){e=n(e),o.hasClass(i,e)||o.addClass(i,e)}),e.fire("PreviewFormats"),o.setStyles(i,{position:"absolute",left:-65535}),e.getBody().appendChild(i),l=o.getStyle(e.getBody(),"fontSize",!0),l=/px$/.test(l)?parseInt(l,10):0,s(c.split(" "),function(t){var n=o.getStyle(i,t,!0);if(!("background-color"==t&&/transparent|rgba\s*\([^)]+,\s*0\)/.test(n)&&(n=o.getStyle(e.getBody(),t,!0),"#ffffff"==o.toHex(n).toLowerCase())||"color"==t&&"#000000"==o.toHex(n).toLowerCase())){if("font-size"==t&&/em|%$/.test(n)){if(0===l)return;n=parseFloat(n,10)/(/%$/.test(n)?100:1),n=n*l+"px"}"border"==t&&n&&(a+="padding:0 2px;"),a+=t+":"+n+";"}}),e.fire("AfterPreviewFormats"),o.remove(i),a):void 0)}function r(t,n){return function(){var r=this;e.on("nodeChange",function(i){var o=e.formatter,a=null;s(i.parents,function(e){return s(t,function(t){return n?o.matchNode(e,n,{value:t.value})&&(a=t.value):o.matchNode(e,t.value)&&(a=t.value),a?!1:void 0}),a?!1:void 0}),r.value(a)})}}function i(e){e=e.split(";");for(var t=e.length;t--;)e[t]=e[t].split("=");return e}function o(){function n(e){var t=[];if(e)return s(e,function(e){var o={text:e.title,icon:e.icon};if(e.items)o.menu=n(e.items);else{var a=e.format||"custom"+r++;e.format||(e.name=a,i.push(e)),o.format=a}t.push(o)}),t}var r=0,i=[],o=[{title:"Headers",items:[{title:"Header 1",format:"h1"},{title:"Header 2",format:"h2"},{title:"Header 3",format:"h3"},{title:"Header 4",format:"h4"},{title:"Header 5",format:"h5"},{title:"Header 6",format:"h6"}]},{title:"Inline",items:[{title:"Bold",icon:"bold",format:"bold"},{title:"Italic",icon:"italic",format:"italic"},{title:"Underline",icon:"underline",format:"underline"},{title:"Strikethrough",icon:"strikethrough",format:"strikethrough"},{title:"Superscript",icon:"superscript",format:"superscript"},{title:"Subscript",icon:"subscript",format:"subscript"},{title:"Code",icon:"code",format:"code"}]},{title:"Blocks",items:[{title:"Paragraph",format:"p"},{title:"Blockquote",format:"blockquote"},{title:"Div",format:"div"},{title:"Pre",format:"pre"}]},{title:"Alignment",items:[{title:"Left",icon:"alignleft",format:"alignleft"},{title:"Center",icon:"aligncenter",format:"aligncenter"},{title:"Right",icon:"alignright",format:"alignright"},{title:"Justify",icon:"alignjustify",format:"alignjustify"}]}];
+e.on("init",function(){s(i,function(t){e.formatter.register(t.name,t)})});var a=n(e.settings.style_formats||o);return a={type:"menu",items:a,onPostRender:function(t){e.fire("renderFormatsMenu",{control:t.control})},itemDefaults:{preview:!0,textStyle:function(){return this.settings.format?t(this.settings.format):void 0},onPostRender:function(){var t=this,n=this.settings.format;n&&t.parent().on("show",function(){t.disabled(!e.formatter.canApply(n)),t.active(e.formatter.match(n))})},onclick:function(){this.settings.format&&f(this.settings.format)}}}}function a(){return e.undoManager?e.undoManager.hasUndo():!1}function l(){return e.undoManager?e.undoManager.hasRedo():!1}function c(){var t=this;t.disabled(!a()),e.on("Undo Redo AddUndo TypingUndo",function(){t.disabled(!a())})}function u(){var t=this;t.disabled(!l()),e.on("Undo Redo AddUndo TypingUndo",function(){t.disabled(!l())})}function d(){var t=this;e.on("VisualAid",function(e){t.active(e.hasVisual)}),t.active(e.hasVisual)}function f(t){t.control&&(t=t.control.value()),t&&e.execCommand("mceToggleFormat",!1,t)}var p;p=o(),s({bold:"Bold",italic:"Italic",underline:"Underline",strikethrough:"Strikethrough",subscript:"Subscript",superscript:"Superscript"},function(t,n){e.addButton(n,{tooltip:t,onPostRender:function(){var t=this;e.formatter?e.formatter.formatChanged(n,function(e){t.active(e)}):e.on("init",function(){e.formatter.formatChanged(n,function(e){t.active(e)})})},onclick:function(){f(n)}})}),s({outdent:["Decrease indent","Outdent"],indent:["Increase indent","Indent"],cut:["Cut","Cut"],copy:["Copy","Copy"],paste:["Paste","Paste"],help:["Help","mceHelp"],selectall:["Select all","SelectAll"],hr:["Insert horizontal rule","InsertHorizontalRule"],removeformat:["Clear formatting","RemoveFormat"],visualaid:["Visual aids","mceToggleVisualAid"],newdocument:["New document","mceNewDocument"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1]})}),s({blockquote:["Toggle blockquote","mceBlockQuote"],numlist:["Numbered list","InsertOrderedList"],bullist:["Bullet list","InsertUnorderedList"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],alignleft:["Align left","JustifyLeft"],aligncenter:["Align center","JustifyCenter"],alignright:["Align right","JustifyRight"],alignjustify:["Justify","JustifyFull"]},function(t,n){e.addButton(n,{tooltip:t[0],cmd:t[1],onPostRender:function(){var t=this;e.formatter?e.formatter.formatChanged(n,function(e){t.active(e)}):e.on("init",function(){e.formatter.formatChanged(n,function(e){t.active(e)})})}})}),e.addButton("undo",{tooltip:"Undo",onPostRender:c,cmd:"undo"}),e.addButton("redo",{tooltip:"Redo",onPostRender:u,cmd:"redo"}),e.addMenuItem("newdocument",{text:"New document",shortcut:"Ctrl+N",icon:"newdocument",cmd:"mceNewDocument"}),e.addMenuItem("undo",{text:"Undo",icon:"undo",shortcut:"Ctrl+Z",onPostRender:c,cmd:"undo"}),e.addMenuItem("redo",{text:"Redo",icon:"redo",shortcut:"Ctrl+Y",onPostRender:u,cmd:"redo"}),e.addMenuItem("visualaid",{text:"Visual aids",selectable:!0,onPostRender:d,cmd:"mceToggleVisualAid"}),s({cut:["Cut","Cut","Ctrl+X"],copy:["Copy","Copy","Ctrl+C"],paste:["Paste","Paste","Ctrl+V"],selectall:["Select all","SelectAll","Ctrl+A"],bold:["Bold","Bold","Ctrl+B"],italic:["Italic","Italic","Ctrl+I"],underline:["Underline","Underline"],strikethrough:["Strikethrough","Strikethrough"],subscript:["Subscript","Subscript"],superscript:["Superscript","Superscript"],removeformat:["Clear formatting","RemoveFormat"]},function(t,n){e.addMenuItem(n,{text:t[0],icon:n,shortcut:t[2],cmd:t[1]})}),e.on("mousedown",function(){n.hideAll()}),e.addButton("styleselect",{type:"menubutton",text:"Formats",menu:p}),e.addButton("formatselect",function(){var n=[],o=i(e.settings.block_formats||"Paragraph=p;Address=address;Pre=pre;Header 1=h1;Header 2=h2;Header 3=h3;Header 4=h4;Header 5=h5;Header 6=h6");return s(o,function(e){n.push({text:e[0],value:e[1],textStyle:function(){return t(e[1])}})}),{type:"listbox",text:o[0][0],values:n,fixedWidth:!0,onselect:f,onPostRender:r(n)}}),e.addButton("fontselect",function(){var t="Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",n=[],o=i(e.settings.font_formats||t);return s(o,function(e){n.push({text:{raw:e[0]},value:e[1],textStyle:-1==e[1].indexOf("dings")?"font-family:"+e[1]:""})}),{type:"listbox",text:"Font Family",tooltip:"Font Family",values:n,fixedWidth:!0,onPostRender:r(n,"fontname"),onselect:function(t){t.control.settings.value&&e.execCommand("FontName",!1,t.control.settings.value)}}}),e.addButton("fontsizeselect",function(){var t=[],n="8pt 10pt 12pt 14pt 18pt 24pt 36pt",i=e.settings.fontsize_formats||n;return s(i.split(" "),function(e){t.push({text:e,value:e})}),{type:"listbox",text:"Font Sizes",tooltip:"Font Sizes",values:t,fixedWidth:!0,onPostRender:r(t,"fontsize"),onclick:function(t){t.control.settings.value&&e.execCommand("FontSize",!1,t.control.settings.value)}}}),e.addMenuItem("formats",{text:"Formats",menu:p})}var s=r.each;i.on("AddEditor",function(t){t.editor.rtl&&(e.rtl=!0),a(t.editor)}),e.translate=function(e){return i.translate(e)},t.tooltips=!o.iOS}),r(Mt,[gt],function(e){return e.extend({recalc:function(e){var t=e.settings,n,r,i,o,a,s,l,c,u,d,f,p,h,m,g,v,y,b,C,x,w,_,N=[],E=[],k,S,T,R,A,B;for(t=e.settings,i=e.items().filter(":visible"),o=e.layoutRect(),r=t.columns||Math.ceil(Math.sqrt(i.length)),n=Math.ceil(i.length/r),y=t.spacingH||t.spacing||0,b=t.spacingV||t.spacing||0,C=t.alignH||t.align,x=t.alignV||t.align,g=e._paddingBox,C&&"string"==typeof C&&(C=[C]),x&&"string"==typeof x&&(x=[x]),d=0;r>d;d++)N.push(0);for(f=0;n>f;f++)E.push(0);for(f=0;n>f;f++)for(d=0;r>d&&(u=i[f*r+d],u);d++)c=u.layoutRect(),k=c.minW,S=c.minH,N[d]=k>N[d]?k:N[d],E[f]=S>E[f]?S:E[f];for(A=o.innerW-g.left-g.right,w=0,d=0;r>d;d++)w+=N[d]+(d>0?y:0),A-=(d>0?y:0)+N[d];for(B=o.innerH-g.top-g.bottom,_=0,f=0;n>f;f++)_+=E[f]+(f>0?b:0),B-=(f>0?b:0)+E[f];if(w+=g.left+g.right,_+=g.top+g.bottom,l={},l.minW=w+(o.w-o.innerW),l.minH=_+(o.h-o.innerH),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH,l.minW=Math.min(l.minW,o.maxW),l.minH=Math.min(l.minH,o.maxH),l.minW=Math.max(l.minW,o.startMinWidth),l.minH=Math.max(l.minH,o.startMinHeight),!o.autoResize||l.minW==o.minW&&l.minH==o.minH){o.autoResize&&(l=e.layoutRect(l),l.contentW=l.minW-o.deltaW,l.contentH=l.minH-o.deltaH);var L;L="start"==t.packV?0:B>0?Math.floor(B/n):0;var D=0,H=t.flexWidths;if(H)for(d=0;d<H.length;d++)D+=H[d];else D=r;var M=A/D;for(d=0;r>d;d++)N[d]+=H?H[d]*M:M;for(h=g.top,f=0;n>f;f++){for(p=g.left,s=E[f]+L,d=0;r>d&&(u=i[f*r+d],u);d++)m=u.settings,c=u.layoutRect(),a=Math.max(N[d],c.startMinWidth),T=R=0,c.x=p,c.y=h,v=m.alignH||(C?C[d]||C[0]:null),"center"==v?c.x=p+a/2-c.w/2:"right"==v?c.x=p+a-c.w:"stretch"==v&&(c.w=a),v=m.alignV||(x?x[d]||x[0]:null),"center"==v?c.y=h+s/2-c.h/2:"bottom"==v?c.y=h+s-c.h:"stretch"==v&&(c.h=s),u.layoutRect(c),p+=a+y,u.recalc&&u.recalc();h+=s+b}}else if(l.w=l.minW,l.h=l.minH,e.layoutRect(l),this.recalc(e),null===e._lastRect){var P=e.parent();P&&(P._lastRect=null,P.recalc())}}})}),r(Pt,[yt],function(e){return e.extend({renderHtml:function(){var e=this;return e.addClass("iframe"),e.canFocus=!1,'<iframe id="'+e._id+'" class="'+e.classes()+'" tabindex="-1" src="'+(e.settings.url||"javascript:''")+'" frameborder="0"></iframe>'},src:function(e){this.getEl().src=e},html:function(e,t){var n=this,r=this.getEl().contentWindow.document.body;return r?(r.innerHTML=e,t&&t()):setTimeout(function(){n.html(e)},0),this}})}),r(Ot,[yt,W],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t.addClass("widget"),t.addClass("label"),t.canFocus=!1,e.multiline&&t.addClass("autoscroll"),e.strong&&t.addClass("strong")},initLayoutRect:function(){var e=this,n=e._super();if(e.settings.multiline){var r=t.getSize(e.getEl());r.width>n.maxW&&(n.minW=n.maxW,e.addClass("multiline")),e.getEl().style.width=n.minW+"px",n.startMinH=n.h=n.minH=Math.min(n.maxH,t.getSize(e.getEl()).height)}return n},repaint:function(){var e=this;return e.settings.multiline||(e.getEl().style.lineHeight=e.layoutRect().h+"px"),e._super()},text:function(e){var t=this;return t._rendered&&e&&this.innerHtml(t.encode(e)),t._super(e)},renderHtml:function(){var e=this,t=e.settings.forId;return'<label id="'+e._id+'" class="'+e.classes()+'"'+(t?' for="'+t:"")+'">'+e.encode(e._text)+"</label>"}})}),r(It,[q,J],function(e,t){return e.extend({Defaults:{role:"toolbar",layout:"flow"},init:function(e){var t=this;t._super(e),t.addClass("toolbar")},postRender:function(){var e=this;return e.items().addClass("toolbar-item"),e.keyNav=new t({root:e,enableLeftRight:!0}),e._super()}})}),r(Ft,[It],function(e){return e.extend({Defaults:{role:"menubar",containerCls:"menubar",defaults:{type:"menubutton"}}})}),r(zt,[bt,U,Ft],function(e,t,n){function r(e,t){for(;e;){if(t===e)return!0;e=e.parentNode}return!1}var i=e.extend({init:function(e){var t=this;t._renderOpen=!0,t._super(e),t.addClass("menubtn"),e.fixedWidth&&t.addClass("fixed-width"),t.aria("haspopup",!0),t.hasPopup=!0},showMenu:function(){var e=this,n=e.settings,r;return e.menu&&e.menu.visible()?e.hideMenu():(e.menu||(r=n.menu||[],r.length?r={type:"menu",items:r}:r.type=r.type||"menu",e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),e.fire("createmenu"),e.menu.reflow(),e.menu.on("cancel",function(t){t.control===e.menu&&e.focus()}),e.menu.on("show hide",function(t){t.control==e.menu&&e.activeMenu("show"==t.type)}).fire("show"),e.aria("expanded",!0)),e.menu.show(),e.menu.layoutRect({w:e.layoutRect().w}),e.menu.moveRel(e.getEl(),e.isRtl()?["br-tr","tr-br"]:["bl-tl","tl-bl"]),void 0)},hideMenu:function(){var e=this;e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1))},activeMenu:function(e){this.toggleClass("active",e)},renderHtml:function(){var e=this,t=e._id,r=e.classPrefix,i=e.settings.icon?r+"ico "+r+"i-"+e.settings.icon:"";return e.aria("role",e.parent()instanceof n?"menuitem":"button"),'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1"><button id="'+t+'-open" role="presentation" type="button" tabindex="-1">'+(i?'<i class="'+i+'"></i>':"")+"<span>"+(e._text?(i?"\xa0":"")+e.encode(e._text):"")+'</span> <i class="'+r+'caret"></i></button></div>'},postRender:function(){var e=this;return e.on("click",function(t){t.control===e&&r(t.target,e.getEl())&&(e.showMenu(),t.keyboard&&e.menu.items()[0].focus())}),e.on("mouseenter",function(t){var n=t.control,r=e.parent(),o;n&&r&&n instanceof i&&n.parent()==r&&(r.items().filter("MenuButton").each(function(e){e.hideMenu&&e!=n&&(e.menu&&e.menu.visible()&&(o=!0),e.hideMenu())}),o&&(n.focus(),n.showMenu()))}),e._super()},text:function(e){var t=this,n,r;if(t._rendered)for(r=t.getEl("open").getElementsByTagName("span"),n=0;n<r.length;n++)r[n].innerHTML=(t.settings.icon&&e?"\xa0":"")+t.encode(e);return this._super(e)},remove:function(){this._super(),this.menu&&this.menu.remove()}});return i}),r(Wt,[zt],function(e){return e.extend({init:function(e){var t=this,n,r,i,o,a;if(t._values=n=e.values,n){for(r=0;r<n.length;r++)i=n[r].selected||e.value===n[r].value,i&&(o=o||n[r].text,t._value=n[r].value);e.menu=n}e.text=e.text||o||n[0].text,t._super(e),t.addClass("listbox"),t.on("select",function(n){var r=n.control;a&&(n.lastControl=a),e.multiple?r.active(!r.active()):t.value(n.control.settings.value),a=r})},value:function(e){function t(e,n){e.items().each(function(e){r=e.value()===n,r&&(i=i||e.text()),e.active(r),e.menu&&t(e.menu,n)})}var n=this,r,i,o,a;if("undefined"!=typeof e){if(n.menu)t(n.menu,e);else for(o=n.settings.menu,a=0;a<o.length;a++)r=o[a].value==e,r&&(i=i||o[a].text),o[a].active=r;n.text(i||this.settings.text)}return n._super(e)}})}),r(Vt,[yt,U,g],function(e,t,n){return e.extend({Defaults:{border:0,role:"menuitem"},init:function(e){var t=this;t.hasPopup=!0,t._super(e),e=t.settings,t.addClass("menu-item"),e.menu&&t.addClass("menu-item-expand"),e.preview&&t.addClass("menu-item-preview"),("-"===t._text||"|"===t._text)&&(t.addClass("menu-item-sep"),t.aria("role","separator"),t.canFocus=!1,t._text="-"),e.selectable&&(t.aria("role","menuitemcheckbox"),t.aria("checked",!0),t.addClass("menu-item-checkbox"),e.icon="selected"),e.preview||e.selectable||t.addClass("menu-item-normal"),t.on("mousedown",function(e){e.preventDefault()}),t.on("mouseenter click",function(n){n.control===t&&(e.menu||"click"!==n.type?(t.showMenu(),n.keyboard&&setTimeout(function(){t.menu.items()[0].focus()},0)):(t.parent().hideAll(),t.fire("cancel"),t.fire("select")))}),e.menu&&t.aria("haspopup",!0)},hasMenus:function(){return!!this.settings.menu},showMenu:function(){var e=this,n=e.settings,r,i=e.parent();if(i.items().each(function(t){t!==e&&t.hideMenu()}),n.menu){r=e.menu,r?r.show():(r=n.menu,r.length?r={type:"menu",items:r}:r.type=r.type||"menu",i.settings.itemDefaults&&(r.itemDefaults=i.settings.itemDefaults),r=e.menu=t.create(r).parent(e).renderTo(e.getContainerElm()),r.reflow(),r.fire("show"),r.on("cancel",function(){e.focus()}),r.on("hide",function(t){t.control===r&&e.removeClass("selected")})),r._parentMenu=i,r.addClass("menu-sub");var o=r.testMoveRel(e.getEl(),e.isRtl()?["tl-tr","bl-br","tr-tl","br-bl"]:["tr-tl","br-bl","tl-tr","bl-br"]);r.moveRel(e.getEl(),o),r.rel=o,o="menu-sub-"+o,r.removeClass(r._lastRel),r.addClass(o),r._lastRel=o,e.addClass("selected"),e.aria("expanded",!0)}},hideMenu:function(){var e=this;return e.menu&&(e.menu.items().each(function(e){e.hideMenu&&e.hideMenu()}),e.menu.hide(),e.aria("expanded",!1)),e},renderHtml:function(){var e=this,t=e._id,r=e.settings,i=e.classPrefix,o=e.encode(e._text),a=e.settings.icon,s="",l=r.shortcut;return a&&e.parent().addClass("menu-has-icons"),r.image&&(a="none",s=" style=\"background-image: url('"+r.image+"')\""),l&&n.mac&&(l=l.replace(/ctrl\+alt\+/i,"&#x2325;&#x2318;"),l=l.replace(/ctrl\+/i,"&#x2318;"),l=l.replace(/alt\+/i,"&#x2325;"),l=l.replace(/shift\+/i,"&#x21E7;")),a=i+"ico "+i+"i-"+(e.settings.icon||"none"),'<div id="'+t+'" class="'+e.classes()+'" tabindex="-1">'+("-"!==o?'<i class="'+a+'"'+s+"></i>&nbsp;":"")+("-"!==o?'<span id="'+t+'-text" class="'+i+'text">'+o+"</span>":"")+(l?'<div id="'+t+'-shortcut" class="'+i+'menu-shortcut">'+l+"</div>":"")+(r.menu?'<div class="'+i+'caret"></div>':"")+"</div>"},postRender:function(){var e=this,t=e.settings,n=t.textStyle;if("function"==typeof n&&(n=n.call(this)),n){var r=e.getEl("text");r&&r.setAttribute("style",n)}return e._super()},remove:function(){this._super(),this.menu&&this.menu.remove()}})}),r(Ut,[X,J,Vt,p],function(e,t,n,r){var i=e.extend({Defaults:{defaultType:"menuitem",border:1,layout:"stack",role:"menu"},init:function(e){var i=this;if(e.autohide=!0,e.constrainToViewport=!0,e.itemDefaults)for(var o=e.items,a=o.length;a--;)o[a]=r.extend({},e.itemDefaults,o[a]);i._super(e),i.addClass("menu"),i.keyNav=new t({root:i,enableUpDown:!0,enableLeftRight:!0,leftAction:function(){i.parent()instanceof n&&i.keyNav.cancel()},onCancel:function(){i.fire("cancel",{},!1),i.hide()}})},repaint:function(){return this.toggleClass("menu-align",!0),this._super(),this.getEl().style.height="",this.getEl("body").style.height="",this},cancel:function(){var e=this;e.hideAll(),e.fire("cancel"),e.fire("select")},hideAll:function(){var e=this;return this.find("menuitem").exec("hideMenu"),e._super()},preRender:function(){var e=this;return e.items().each(function(t){var n=t.settings;return n.icon||n.selectable?(e._hasIcons=!0,!1):void 0}),e._super()}});return i}),r(qt,[xt],function(e){return e.extend({Defaults:{classes:"radio",role:"radio"}})}),r($t,[yt,$],function(e,t){return e.extend({renderHtml:function(){var e=this,t=e.classPrefix;return e.addClass("resizehandle"),"both"==e.settings.direction&&e.addClass("resizehandle-both"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes()+'"><i class="'+t+"ico "+t+'i-resize"></i></div>'},postRender:function(){var e=this;e._super(),e.resizeDragHelper=new t(this._id,{start:function(){e.fire("ResizeStart")},drag:function(t){"both"!=e.settings.direction&&(t.deltaX=0),e.fire("Resize",t)},end:function(){e.fire("ResizeEnd")}})},remove:function(){return this.resizeDragHelper&&this.resizeDragHelper.destroy(),this._super()}})}),r(jt,[yt],function(e){return e.extend({renderHtml:function(){var e=this;return e.addClass("spacer"),e.canFocus=!1,'<div id="'+e._id+'" class="'+e.classes()+'"></div>'}})}),r(Kt,[zt,W],function(e,t){return e.extend({Defaults:{classes:"widget btn splitbtn",role:"splitbutton"},repaint:function(){var e=this,n=e.getEl(),r=e.layoutRect(),i,o;return e._super(),i=n.firstChild,o=n.lastChild,t.css(i,{width:r.w-t.getSize(o).width,height:r.h-2}),t.css(o,{height:r.h-2}),e},activeMenu:function(e){var n=this;t.toggleClass(n.getEl().lastChild,n.classPrefix+"active",e)},renderHtml:function(){var e=this,t=e._id,n=e.classPrefix,r=e.settings.icon?n+"ico "+n+"i-"+e.settings.icon:"";return'<div id="'+t+'" class="'+e.classes()+'"><button type="button" hidefocus tabindex="-1">'+(r?'<i class="'+r+'"></i>':"")+(e._text?(r?" ":"")+e._text:"")+'</button><button type="button" class="'+n+'open" hidefocus tabindex="-1">'+(e._menuBtnText?(r?"\xa0":"")+e._menuBtnText:"")+' <i class="'+n+'caret"></i></button></div>'},postRender:function(){var e=this,t=e.settings.onclick;return e.on("click",function(e){var n=e.target;if(e.control==this)for(;n;){if("BUTTON"==n.nodeName&&-1==n.className.indexOf("open"))return e.stopImmediatePropagation(),t.call(this,e),void 0;n=n.parentNode}}),delete e.settings.onclick,e._super()}})}),r(Yt,[Dt],function(e){return e.extend({Defaults:{containerClass:"stack-layout",controlClass:"stack-layout-item",endClass:"break"}})}),r(Gt,[K,W],function(e,t){return e.extend({lastIdx:0,Defaults:{layout:"absolute",defaults:{type:"panel"}},activateTab:function(e){this.activeTabId&&t.removeClass(this.getEl(this.activeTabId),this.classPrefix+"active"),this.activeTabId="t"+e,t.addClass(this.getEl("t"+e),this.classPrefix+"active"),e!=this.lastIdx&&(this.items()[this.lastIdx].hide(),this.lastIdx=e),this.items()[e].show().fire("showtab"),this.reflow()},renderHtml:function(){var e=this,t=e._layout,n="",r=e.classPrefix;return e.preRender(),t.preRender(e),e.items().each(function(t,i){n+='<div id="'+e._id+"-t"+i+'" class="'+r+'tab" unselectable="on">'+e.encode(t.settings.title)+"</div>"}),'<div id="'+e._id+'" class="'+e.classes()+'" hideFocus="1" tabIndex="-1"><div id="'+e._id+'-head" class="'+r+'tabs">'+n+'</div><div id="'+e._id+'-body" class="'+e.classes("body")+'">'+t.renderHtml(e)+"</div></div>"},postRender:function(){var e=this;e._super(),e.settings.activeTab=e.settings.activeTab||0,e.activateTab(e.settings.activeTab),this.on("click",function(t){var n=t.target.parentNode;if(t.target.parentNode.id==e._id+"-head")for(var r=n.childNodes.length;r--;)n.childNodes[r]==t.target&&e.activateTab(r)})},initLayoutRect:function(){var e=this,n,r,i;r=t.getSize(e.getEl("head")).width,r=0>r?0:r,i=0,e.items().each(function(t,n){r=Math.max(r,t.layoutRect().minW),i=Math.max(i,t.layoutRect().minH),e.settings.activeTab!=n&&t.hide()}),e.items().each(function(e){e.settings.x=0,e.settings.y=0,e.settings.w=r,e.settings.h=i,e.layoutRect({x:0,y:0,w:r,h:i})});var o=t.getSize(e.getEl("head")).height;return e.settings.minWidth=r,e.settings.minHeight=i+o,n=e._super(),n.deltaH+=o,n.innerH=n.h-n.deltaH,n}})}),r(Xt,[yt,W],function(e,t){return e.extend({init:function(e){var t=this;t._super(e),t._value=e.value||"",t.addClass("textbox"),e.multiline?t.addClass("multiline"):t.on("keydown",function(e){13==e.keyCode&&t.parents().reverse().each(function(t){return e.preventDefault(),t.hasEventListeners("submit")&&t.toJSON?(t.fire("submit",{data:t.toJSON()}),!1):void 0})})},disabled:function(e){var t=this;return t._rendered&&"undefined"!=typeof e&&(t.getEl().disabled=e),t._super(e)},value:function(e){var t=this;return"undefined"!=typeof e?(t._value=e,t._rendered&&(t.getEl().value=e),t):t._rendered?t.getEl().value:t._value},repaint:function(){var e=this,t,n,r,i=0,o=0,a;t=e.getEl().style,n=e._layoutRect,a=e._lastRepaintRect||{};var s=document;return!e.settings.multiline&&s.all&&(!s.documentMode||s.documentMode<=8)&&(t.lineHeight=n.h-o+"px"),r=e._borderBox,i=r.left+r.right+8,o=r.top+r.bottom+(e.settings.multiline?8:0),n.x!==a.x&&(t.left=n.x+"px",a.x=n.x),n.y!==a.y&&(t.top=n.y+"px",a.y=n.y),n.w!==a.w&&(t.width=n.w-i+"px",a.w=n.w),n.h!==a.h&&(t.height=n.h-o+"px",a.h=n.h),e._lastRepaintRect=a,e.fire("repaint",{},!1),e},renderHtml:function(){var e=this,t=e._id,n=e.settings,r=e.encode(e._value,!1),i="";return"spellcheck"in n&&(i+=' spellcheck="'+n.spellcheck+'"'),n.maxLength&&(i+=' maxlength="'+n.maxLength+'"'),n.size&&(i+=' size="'+n.size+'"'),n.subtype&&(i+=' type="'+n.subtype+'"'),e.disabled()&&(i+=' disabled="disabled"'),n.multiline?'<textarea id="'+t+'" class="'+e.classes()+'" '+(n.rows?' rows="'+n.rows+'"':"")+' hidefocus="true"'+i+">"+r+"</textarea>":'<input id="'+t+'" class="'+e.classes()+'" value="'+r+'" hidefocus="true"'+i+">"},postRender:function(){var e=this;return t.on(e.getEl(),"change",function(t){e.fire("change",t)}),e._super()},remove:function(){t.off(this.getEl()),this._super()}})}),r(Jt,[W],function(e){return function(t){var n=this,r;n.show=function(i){return n.hide(),r=!0,window.setTimeout(function(){r&&t.appendChild(e.createFragment('<div class="mce-throbber"></div>'))},i||0),n},n.hide=function(){var e=t.lastChild;return e&&-1!=e.className.indexOf("throbber")&&e.parentNode.removeChild(e),r=!1,n}}}),a([l,c,u,d,f,p,h,m,g,v,y,b,C,x,w,_,N,E,k,S,T,R,A,B,L,D,H,M,P,O,I,F,z,W,V,U,q,$,j,K,Y,G,X,J,Q,Z,et,tt,nt,rt,it,ot,at,st,lt,ct,ut,dt,ft,pt,ht,mt,gt,vt,yt,bt,Ct,xt,wt,_t,Nt,Et,kt,St,Tt,Rt,At,Bt,Lt,Dt,Ht,Mt,Pt,Ot,It,Ft,zt,Wt,Vt,Ut,qt,$t,jt,Kt,Yt,Gt,Xt,Jt])}(this);
\ No newline at end of file
diff --git a/media/jui/css/sortablelist.css b/media/jui/css/sortablelist.css
index 9f7ce3a..88259e2 100644
--- a/media/jui/css/sortablelist.css
+++ b/media/jui/css/sortablelist.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 .dnd-list-highlight {
diff --git a/media/jui/js/cms.js b/media/jui/js/cms.js
index 9389a75..bb07eba 100644
--- a/media/jui/js/cms.js
+++ b/media/jui/js/cms.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -27,9 +27,9 @@ if (jQuery) {
 				$('[rel=\"showon_'+target+'\"]').each(function(){
 					var i = jQuery(this);
 					if (i.hasClass('showon_' + v))
-						i.show();
+						i.slideDown();
 					else
-						i.hide();
+						i.slideUp();
 				});
 			};
 		$('[rel^=\"showon_\"]').each(function(){
diff --git a/media/jui/js/sortablelist.js b/media/jui/js/sortablelist.js
index 34fbacc..984c24e 100644
--- a/media/jui/js/sortablelist.js
+++ b/media/jui/js/sortablelist.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/jui/js/treeselectmenu.jquery.js b/media/jui/js/treeselectmenu.jquery.js
index 0c2aebd..ce19d6c 100644
--- a/media/jui/js/treeselectmenu.jquery.js
+++ b/media/jui/js/treeselectmenu.jquery.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 jQuery(function($)
diff --git a/media/jui/js/treeselectmenu.jquery.min.js b/media/jui/js/treeselectmenu.jquery.min.js
index fb44a4d..3f4ec87 100644
--- a/media/jui/js/treeselectmenu.jquery.min.js
+++ b/media/jui/js/treeselectmenu.jquery.min.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('K(7($){u q=$(\'h#q\').C();$(\'.2 8\').x(7(){$8=$(9);$h=$8.5(\'h.2-O:w\');$8.D(\'<i t="P-B 4-"></i>\');$h.y(\'<h t="E"></h>\');m($8.5(\'3.2-6\').v){$8.5(\'i\').b(\'2-e 4-d\');$h.5(\'F:w\').y(q);m(!$8.5(\'3.2-6 3.2-6\').v){$8.5(\'h.2-I-A\').N()}}});$(\'i.2-e\').c(7(){$i=$(9);m($i.0().5(\'3.2-6\').R(\':U\')){$i.f(\'4-d\').b(\'4-g\');$i.0().5(\'3.2-6\').l();$i.0().5(\'3.2-6 i.2-e\').f(\'4-d\').b(\'4-g\')}s{$i.f(\'4-g\').b(\'4-d\');$i.0().5(\'3.2-6\').o();$i.0().5(\'3.2-6 i.2-e\').f(\'4-g\').b(\'4-d\')}});$(\'#G\').H(7(){u p=$(9).J().r();$(\'.2 8\').x(7(){m($(9).p().r().L(p)==-1){$(9).l()}s{$(9).o()}})});$(\'#M\').c(7(){$(\'.2 n\').k(\'j\',\'j\')});$(\'#Q\').c(7(){$(\'.2 n\').k(\'j\',z)});$(\'#S\').c(7(){$(\'3.2 3.2-6\').o();$(\'3.2 i.2-e\').f(\'4-g\').b(\'4-d\')});$(\'#T\').c(7(){$(\'3.2 3.2-6\').l();$(\'3.2 i.2-e\').f(\'4-d\').b(\'4-g\')});$(\'a.V\').c(7(){$(9).0().0().0().0().0().0().5(\'3.2-6 n\').k(\'j\',\'j\')});$(\'a.W\').c(7(){$(9).0().0().0().0().0().0().5(\'3.2-6 n\').k(\'j\',z)});$(\'a.X\').c(7(){$0=$(9).0().0().0().0().0().0().0();$0.5(\'3.2-6\').o();$0.5(\'3.2-6 i.2-e\').f(\'4-g\').b(\'4-d\')});$(\'a.Y\').c(7(){$0=$(9).0().0().0().0().0().0().0();$0.5(\'8 3.2-6\').l();$0.5(\'8 i.2-e\').f(\'4-d\').b(\'4-g\')})});',61,61,'parent||treeselect|ul|icon|find|sub|function|li|this||addClass|click|minus|toggle|removeClass|plus|div||checked|attr|hide|if|input|show|text|treeselectmenu|toLowerCase|else|class|var|length|first|each|after|false|expand|left|html|prepend|clearfix|label|treeselectfilter|keyup|menu|val|jQuery|indexOf|treeCheckAll|remove|item|pull|treeUncheckAll|is|treeExpandAll|treeCollapseAll|visible|checkall|uncheckall|expandall|collapseall'.split('|'),0,{}))
\ No newline at end of file
diff --git a/media/jui/less/modals.joomla.less b/media/jui/less/modals.joomla.less
index 9d96fa4..a047bd1 100644
--- a/media/jui/less/modals.joomla.less
+++ b/media/jui/less/modals.joomla.less
@@ -11,7 +11,7 @@ div.modal {
   top: 10%;
   left: 50%;
   z-index: @zindexModal;
-  width: 560px;
+  width: 580px;
   margin-left: -280px;
   background-color: @white;
   border: 1px solid #999;
@@ -29,4 +29,8 @@ div.modal {
   }
   &.fade.in { top: 10%; }
 }
+//Modal for Batch views
+.modal-batch {
+  overflow-y: visible;
+}
 // < Joomla JUI
diff --git a/media/media/css/medialist-details.css b/media/media/css/medialist-details.css
index 0891d43..b71c669 100644
--- a/media/media/css/medialist-details.css
+++ b/media/media/css/medialist-details.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/medialist-details_rtl.css b/media/media/css/medialist-details_rtl.css
index 13366b4..b2ba9f3 100644
--- a/media/media/css/medialist-details_rtl.css
+++ b/media/media/css/medialist-details_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/medialist-thumbs.css b/media/media/css/medialist-thumbs.css
index d9ec852..f622e13 100644
--- a/media/media/css/medialist-thumbs.css
+++ b/media/media/css/medialist-thumbs.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/medialist-thumbs_rtl.css b/media/media/css/medialist-thumbs_rtl.css
index 628fae0..2b67495 100644
--- a/media/media/css/medialist-thumbs_rtl.css
+++ b/media/media/css/medialist-thumbs_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/mediamanager.css b/media/media/css/mediamanager.css
index fe85327..77bd26b 100644
--- a/media/media/css/mediamanager.css
+++ b/media/media/css/mediamanager.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/mediamanager_rtl.css b/media/media/css/mediamanager_rtl.css
index 2db80df..f1f92fb 100644
--- a/media/media/css/mediamanager_rtl.css
+++ b/media/media/css/mediamanager_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/popup-imagelist.css b/media/media/css/popup-imagelist.css
index 733f588..26ec547 100644
--- a/media/media/css/popup-imagelist.css
+++ b/media/media/css/popup-imagelist.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/popup-imagelist_rtl.css b/media/media/css/popup-imagelist_rtl.css
index b042927..dfed9b3 100644
--- a/media/media/css/popup-imagelist_rtl.css
+++ b/media/media/css/popup-imagelist_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/popup-imagemanager.css b/media/media/css/popup-imagemanager.css
index 5165efa..78c3798 100644
--- a/media/media/css/popup-imagemanager.css
+++ b/media/media/css/popup-imagemanager.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/css/popup-imagemanager_rtl.css b/media/media/css/popup-imagemanager_rtl.css
index cb118f6..e081a33 100644
--- a/media/media/css/popup-imagemanager_rtl.css
+++ b/media/media/css/popup-imagemanager_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/js/mediamanager.js b/media/media/js/mediamanager.js
index 5c0c57a..bdada6a 100644
--- a/media/media/js/mediamanager.js
+++ b/media/media/js/mediamanager.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/media/js/popup-imagemanager.js b/media/media/js/popup-imagemanager.js
index b5dda58..4a0f85a 100644
--- a/media/media/js/popup-imagemanager.js
+++ b/media/media/js/popup-imagemanager.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -27,6 +27,7 @@ var ImageManager = this.ImageManager = {
 		this.fields.align	= document.id("f_align");
 		this.fields.title	= document.id("f_title");
 		this.fields.caption	= document.id("f_caption");
+		this.fields.c_class	= document.id("f_caption_class");
 
 		// Setup image listing objects
 		this.folderlist = document.id('folderlist');
@@ -90,13 +91,16 @@ var ImageManager = this.ImageManager = {
 
 	onok: function()
 	{
-		extra = '';
+		var tag		= '';
+		var extra	= '';
+
 		// Get the image tag field information
 		var url		= this.fields.url.get('value');
 		var alt		= this.fields.alt.get('value');
 		var align	= this.fields.align.get('value');
 		var title	= this.fields.title.get('value');
 		var caption	= this.fields.caption.get('value');
+		var c_class	= this.fields.c_class.get('value');
 
 		if (url != '') {
 			// Set alt attribute
@@ -106,19 +110,28 @@ var ImageManager = this.ImageManager = {
 				extra = extra + 'alt="" ';
 			}
 			// Set align attribute
-			if (align != '') {
-				extra = extra + 'align="'+align+'" ';
+			if (align != '' && caption == '') {
+				extra = extra + 'class="pull-'+align+'" ';
 			}
-			// Set align attribute
+			// Set title attribute
 			if (title != '') {
 				extra = extra + 'title="'+title+'" ';
 			}
-			// Set align attribute
+
+			tag = '<img src="'+url+'" '+extra+'/>';
+
+			// Process caption
 			if (caption != '') {
-				extra = extra + 'class="caption" ';
+				var figclass = '';
+				var captionclass = '';
+				if (align != '') {
+					figclass = ' class="pull-'+align+'"';
+				}
+				if (c_class != '') {
+					captionclass = ' class="'+c_class+'"';
+				}
+				tag = '<figure'+figclass+'>'+tag+'<figcaption'+captionclass+'>'+caption+'</figcaption></figure>';
 			}
-
-			var tag = "<img src=\""+url+"\" "+extra+"/>";
 		}
 
 		window.parent.jInsertEditorText(tag, this.editor);
diff --git a/media/mod_languages/images/eu_es.gif b/media/mod_languages/images/eu_es.gif
new file mode 100644
index 0000000..ddaee9d
Binary files /dev/null and b/media/mod_languages/images/eu_es.gif differ
diff --git a/media/overrider/css/overrider.css b/media/overrider/css/overrider.css
index 3b81717..e02a2e0 100644
--- a/media/overrider/css/overrider.css
+++ b/media/overrider/css/overrider.css
@@ -1,7 +1,7 @@
 /**
  * @package		Joomla.Administrator
  * @subpackage	com_languages
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/overrider/js/overrider.js b/media/overrider/js/overrider.js
index 46f493f..740fb8d 100644
--- a/media/overrider/js/overrider.js
+++ b/media/overrider/js/overrider.js
@@ -1,5 +1,5 @@
 /**
- * @copyright  Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright  Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js b/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js
index be4c9ad..1c11663 100644
--- a/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js
+++ b/media/plg_quickicon_extensionupdate/js/extensionupdatecheck.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js b/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js
index 28aaf82..bf127b7 100644
--- a/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js
+++ b/media/plg_quickicon_joomlaupdate/js/jupdatecheck.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/css/adminlist.css b/media/system/css/adminlist.css
index 66711e1..17ebc98 100644
--- a/media/system/css/adminlist.css
+++ b/media/system/css/adminlist.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/css/calendar-jos.css b/media/system/css/calendar-jos.css
index df3c273..905d0a3 100644
--- a/media/system/css/calendar-jos.css
+++ b/media/system/css/calendar-jos.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/css/frontediting.css b/media/system/css/frontediting.css
index 938361f..52b81d1 100644
--- a/media/system/css/frontediting.css
+++ b/media/system/css/frontediting.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/css/mootree.css b/media/system/css/mootree.css
index 7febd27..48cb4ef 100644
--- a/media/system/css/mootree.css
+++ b/media/system/css/mootree.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/css/mootree_rtl.css b/media/system/css/mootree_rtl.css
index 11ce7e7..2abe118 100644
--- a/media/system/css/mootree_rtl.css
+++ b/media/system/css/mootree_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/css/system.css b/media/system/css/system.css
index c1af6d1..1caa24c 100644
--- a/media/system/css/system.css
+++ b/media/system/css/system.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/caption-uncompressed.js b/media/system/js/caption-uncompressed.js
index ae8c16c..bcb4659 100644
--- a/media/system/js/caption-uncompressed.js
+++ b/media/system/js/caption-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -39,7 +39,7 @@ var JCaption = function(_selector) {
                 "width" : width
             }
         });
-				$el.before($container);
+        $el.before($container);
         $container.append($el);
         if (caption !== "") {
             $container.append($p);
diff --git a/media/system/js/combobox-uncompressed.js b/media/system/js/combobox-uncompressed.js
index 7a9aa0d..17ae40f 100644
--- a/media/system/js/combobox-uncompressed.js
+++ b/media/system/js/combobox-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/core-uncompressed.js b/media/system/js/core-uncompressed.js
index c00b6c0..72bf11e 100644
--- a/media/system/js/core-uncompressed.js
+++ b/media/system/js/core-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/frontediting-uncompressed.js b/media/system/js/frontediting-uncompressed.js
index c26699f..47bb2a6 100644
--- a/media/system/js/frontediting-uncompressed.js
+++ b/media/system/js/frontediting-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/helpsite.js b/media/system/js/helpsite.js
index b52fa1f..f3af383 100644
--- a/media/system/js/helpsite.js
+++ b/media/system/js/helpsite.js
@@ -1,6 +1,6 @@
 /**
  * @package		Joomla.JavaScript
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/highlighter-uncompressed.js b/media/system/js/highlighter-uncompressed.js
index b233b1d..6145a2e 100644
--- a/media/system/js/highlighter-uncompressed.js
+++ b/media/system/js/highlighter-uncompressed.js
@@ -1,6 +1,6 @@
 /**
  * @package     Joomla.JavaScript
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/html5fallback-uncompressed.js b/media/system/js/html5fallback-uncompressed.js
index 2b30914..d6b1e92 100644
--- a/media/system/js/html5fallback-uncompressed.js
+++ b/media/system/js/html5fallback-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/multiselect-uncompressed.js b/media/system/js/multiselect-uncompressed.js
index 7967719..9386973 100644
--- a/media/system/js/multiselect-uncompressed.js
+++ b/media/system/js/multiselect-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/punycode-uncompressed.js b/media/system/js/punycode-uncompressed.js
new file mode 100644
index 0000000..8a95955
--- /dev/null
+++ b/media/system/js/punycode-uncompressed.js
@@ -0,0 +1,507 @@
+/*! http://mths.be/punycode v1.2.3 by @mathias */
+;(function(root) {
+
+	/** Detect free variables */
+	var freeExports = typeof exports == 'object' && exports;
+	var freeModule = typeof module == 'object' && module &&
+		module.exports == freeExports && module;
+	var freeGlobal = typeof global == 'object' && global;
+	if (freeGlobal.global === freeGlobal || freeGlobal.window === freeGlobal) {
+		root = freeGlobal;
+	}
+
+	/**
+	 * The `punycode` object.
+	 * @name punycode
+	 * @type Object
+	 */
+	var punycode,
+
+	/** Highest positive signed 32-bit float value */
+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+
+	/** Bootstring parameters */
+	base = 36,
+	tMin = 1,
+	tMax = 26,
+	skew = 38,
+	damp = 700,
+	initialBias = 72,
+	initialN = 128, // 0x80
+	delimiter = '-', // '\x2D'
+
+	/** Regular expressions */
+	regexPunycode = /^xn--/,
+	regexNonASCII = /[^ -~]/, // unprintable ASCII chars + non-ASCII chars
+	regexSeparators = /\x2E|\u3002|\uFF0E|\uFF61/g, // RFC 3490 separators
+
+	/** Error messages */
+	errors = {
+		'overflow': 'Overflow: input needs wider integers to process',
+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+		'invalid-input': 'Invalid input'
+	},
+
+	/** Convenience shortcuts */
+	baseMinusTMin = base - tMin,
+	floor = Math.floor,
+	stringFromCharCode = String.fromCharCode,
+
+	/** Temporary variable */
+	key;
+
+	/*--------------------------------------------------------------------------*/
+
+	/**
+	 * A generic error utility function.
+	 * @private
+	 * @param {String} type The error type.
+	 * @returns {Error} Throws a `RangeError` with the applicable error message.
+	 */
+	function error(type) {
+		throw RangeError(errors[type]);
+	}
+
+	/**
+	 * A generic `Array#map` utility function.
+	 * @private
+	 * @param {Array} array The array to iterate over.
+	 * @param {Function} callback The function that gets called for every array
+	 * item.
+	 * @returns {Array} A new array of values returned by the callback function.
+	 */
+	function map(array, fn) {
+		var length = array.length;
+		while (length--) {
+			array[length] = fn(array[length]);
+		}
+		return array;
+	}
+
+	/**
+	 * A simple `Array#map`-like wrapper to work with domain name strings.
+	 * @private
+	 * @param {String} domain The domain name.
+	 * @param {Function} callback The function that gets called for every
+	 * character.
+	 * @returns {Array} A new string of characters returned by the callback
+	 * function.
+	 */
+	function mapDomain(string, fn) {
+		return map(string.split(regexSeparators), fn).join('.');
+	}
+
+	/**
+	 * Creates an array containing the numeric code points of each Unicode
+	 * character in the string. While JavaScript uses UCS-2 internally,
+	 * this function will convert a pair of surrogate halves (each of which
+	 * UCS-2 exposes as separate characters) into a single code point,
+	 * matching UTF-16.
+	 * @see `punycode.ucs2.encode`
+	 * @see <http://mathiasbynens.be/notes/javascript-encoding>
+	 * @memberOf punycode.ucs2
+	 * @name decode
+	 * @param {String} string The Unicode input string (UCS-2).
+	 * @returns {Array} The new array of code points.
+	 */
+	function ucs2decode(string) {
+		var output = [],
+		    counter = 0,
+		    length = string.length,
+		    value,
+		    extra;
+		while (counter < length) {
+			value = string.charCodeAt(counter++);
+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+				// high surrogate, and there is a next character
+				extra = string.charCodeAt(counter++);
+				if ((extra & 0xFC00) == 0xDC00) { // low surrogate
+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+				} else {
+					// unmatched surrogate; only append this code unit, in case the next
+					// code unit is the high surrogate of a surrogate pair
+					output.push(value);
+					counter--;
+				}
+			} else {
+				output.push(value);
+			}
+		}
+		return output;
+	}
+
+	/**
+	 * Creates a string based on an array of numeric code points.
+	 * @see `punycode.ucs2.decode`
+	 * @memberOf punycode.ucs2
+	 * @name encode
+	 * @param {Array} codePoints The array of numeric code points.
+	 * @returns {String} The new Unicode string (UCS-2).
+	 */
+	function ucs2encode(array) {
+		return map(array, function(value) {
+			var output = '';
+			if (value > 0xFFFF) {
+				value -= 0x10000;
+				output += stringFromCharCode(value >>> 10 & 0x3FF | 0xD800);
+				value = 0xDC00 | value & 0x3FF;
+			}
+			output += stringFromCharCode(value);
+			return output;
+		}).join('');
+	}
+
+	/**
+	 * Converts a basic code point into a digit/integer.
+	 * @see `digitToBasic()`
+	 * @private
+	 * @param {Number} codePoint The basic numeric code point value.
+	 * @returns {Number} The numeric value of a basic code point (for use in
+	 * representing integers) in the range `0` to `base - 1`, or `base` if
+	 * the code point does not represent a value.
+	 */
+	function basicToDigit(codePoint) {
+		if (codePoint - 48 < 10) {
+			return codePoint - 22;
+		}
+		if (codePoint - 65 < 26) {
+			return codePoint - 65;
+		}
+		if (codePoint - 97 < 26) {
+			return codePoint - 97;
+		}
+		return base;
+	}
+
+	/**
+	 * Converts a digit/integer into a basic code point.
+	 * @see `basicToDigit()`
+	 * @private
+	 * @param {Number} digit The numeric value of a basic code point.
+	 * @returns {Number} The basic code point whose value (when used for
+	 * representing integers) is `digit`, which needs to be in the range
+	 * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+	 * used; else, the lowercase form is used. The behavior is undefined
+	 * if `flag` is non-zero and `digit` has no uppercase form.
+	 */
+	function digitToBasic(digit, flag) {
+		//  0..25 map to ASCII a..z or A..Z
+		// 26..35 map to ASCII 0..9
+		return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
+	}
+
+	/**
+	 * Bias adaptation function as per section 3.4 of RFC 3492.
+	 * http://tools.ietf.org/html/rfc3492#section-3.4
+	 * @private
+	 */
+	function adapt(delta, numPoints, firstTime) {
+		var k = 0;
+		delta = firstTime ? floor(delta / damp) : delta >> 1;
+		delta += floor(delta / numPoints);
+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+			delta = floor(delta / baseMinusTMin);
+		}
+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+	}
+
+	/**
+	 * Converts a Punycode string of ASCII-only symbols to a string of Unicode
+	 * symbols.
+	 * @memberOf punycode
+	 * @param {String} input The Punycode string of ASCII-only symbols.
+	 * @returns {String} The resulting string of Unicode symbols.
+	 */
+	function decode(input) {
+		// Don't use UCS-2
+		var output = [],
+		    inputLength = input.length,
+		    out,
+		    i = 0,
+		    n = initialN,
+		    bias = initialBias,
+		    basic,
+		    j,
+		    index,
+		    oldi,
+		    w,
+		    k,
+		    digit,
+		    t,
+		    /** Cached calculation results */
+		    baseMinusT;
+
+		// Handle the basic code points: let `basic` be the number of input code
+		// points before the last delimiter, or `0` if there is none, then copy
+		// the first basic code points to the output.
+
+		basic = input.lastIndexOf(delimiter);
+		if (basic < 0) {
+			basic = 0;
+		}
+
+		for (j = 0; j < basic; ++j) {
+			// if it's not a basic code point
+			if (input.charCodeAt(j) >= 0x80) {
+				error('not-basic');
+			}
+			output.push(input.charCodeAt(j));
+		}
+
+		// Main decoding loop: start just after the last delimiter if any basic code
+		// points were copied; start at the beginning otherwise.
+
+		for (index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
+			// `index` is the index of the next character to be consumed.
+			// Decode a generalized variable-length integer into `delta`,
+			// which gets added to `i`. The overflow checking is easier
+			// if we increase `i` as we go, then subtract off its starting
+			// value at the end to obtain `delta`.
+			for (oldi = i, w = 1, k = base; /* no condition */; k += base) {
+
+				if (index >= inputLength) {
+					error('invalid-input');
+				}
+
+				digit = basicToDigit(input.charCodeAt(index++));
+
+				if (digit >= base || digit > floor((maxInt - i) / w)) {
+					error('overflow');
+				}
+
+				i += digit * w;
+				t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+
+				if (digit < t) {
+					break;
+				}
+
+				baseMinusT = base - t;
+				if (w > floor(maxInt / baseMinusT)) {
+					error('overflow');
+				}
+
+				w *= baseMinusT;
+
+			}
+
+			out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi == 0);
+
+			// `i` was supposed to wrap around from `out` to `0`,
+			// incrementing `n` each time, so we'll fix that now:
+			if (floor(i / out) > maxInt - n) {
+				error('overflow');
+			}
+
+			n += floor(i / out);
+			i %= out;
+
+			// Insert `n` at position `i` of the output
+			output.splice(i++, 0, n);
+
+		}
+
+		return ucs2encode(output);
+	}
+
+	/**
+	 * Converts a string of Unicode symbols to a Punycode string of ASCII-only
+	 * symbols.
+	 * @memberOf punycode
+	 * @param {String} input The string of Unicode symbols.
+	 * @returns {String} The resulting Punycode string of ASCII-only symbols.
+	 */
+	function encode(input) {
+		var n,
+		    delta,
+		    handledCPCount,
+		    basicLength,
+		    bias,
+		    j,
+		    m,
+		    q,
+		    k,
+		    t,
+		    currentValue,
+		    output = [],
+		    /** `inputLength` will hold the number of code points in `input`. */
+		    inputLength,
+		    /** Cached calculation results */
+		    handledCPCountPlusOne,
+		    baseMinusT,
+		    qMinusT;
+
+		// Convert the input in UCS-2 to Unicode
+		input = ucs2decode(input);
+
+		// Cache the length
+		inputLength = input.length;
+
+		// Initialize the state
+		n = initialN;
+		delta = 0;
+		bias = initialBias;
+
+		// Handle the basic code points
+		for (j = 0; j < inputLength; ++j) {
+			currentValue = input[j];
+			if (currentValue < 0x80) {
+				output.push(stringFromCharCode(currentValue));
+			}
+		}
+
+		handledCPCount = basicLength = output.length;
+
+		// `handledCPCount` is the number of code points that have been handled;
+		// `basicLength` is the number of basic code points.
+
+		// Finish the basic string - if it is not empty - with a delimiter
+		if (basicLength) {
+			output.push(delimiter);
+		}
+
+		// Main encoding loop:
+		while (handledCPCount < inputLength) {
+
+			// All non-basic code points < n have been handled already. Find the next
+			// larger one:
+			for (m = maxInt, j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+				if (currentValue >= n && currentValue < m) {
+					m = currentValue;
+				}
+			}
+
+			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
+			// but guard against overflow
+			handledCPCountPlusOne = handledCPCount + 1;
+			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
+				error('overflow');
+			}
+
+			delta += (m - n) * handledCPCountPlusOne;
+			n = m;
+
+			for (j = 0; j < inputLength; ++j) {
+				currentValue = input[j];
+
+				if (currentValue < n && ++delta > maxInt) {
+					error('overflow');
+				}
+
+				if (currentValue == n) {
+					// Represent delta as a generalized variable-length integer
+					for (q = delta, k = base; /* no condition */; k += base) {
+						t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+						if (q < t) {
+							break;
+						}
+						qMinusT = q - t;
+						baseMinusT = base - t;
+						output.push(
+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+						);
+						q = floor(qMinusT / baseMinusT);
+					}
+
+					output.push(stringFromCharCode(digitToBasic(q, 0)));
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
+					delta = 0;
+					++handledCPCount;
+				}
+			}
+
+			++delta;
+			++n;
+
+		}
+		return output.join('');
+	}
+
+	/**
+	 * Converts a Punycode string representing a domain name to Unicode. Only the
+	 * Punycoded parts of the domain name will be converted, i.e. it doesn't
+	 * matter if you call it on a string that has already been converted to
+	 * Unicode.
+	 * @memberOf punycode
+	 * @param {String} domain The Punycode domain name to convert to Unicode.
+	 * @returns {String} The Unicode representation of the given Punycode
+	 * string.
+	 */
+	function toUnicode(domain) {
+		return mapDomain(domain, function(string) {
+			return regexPunycode.test(string)
+				? decode(string.slice(4).toLowerCase())
+				: string;
+		});
+	}
+
+	/**
+	 * Converts a Unicode string representing a domain name to Punycode. Only the
+	 * non-ASCII parts of the domain name will be converted, i.e. it doesn't
+	 * matter if you call it with a domain that's already in ASCII.
+	 * @memberOf punycode
+	 * @param {String} domain The domain name to convert, as a Unicode string.
+	 * @returns {String} The Punycode representation of the given domain name.
+	 */
+	function toASCII(domain) {
+		return mapDomain(domain, function(string) {
+			return regexNonASCII.test(string)
+				? 'xn--' + encode(string)
+				: string;
+		});
+	}
+
+	/*--------------------------------------------------------------------------*/
+
+	/** Define the public API */
+	punycode = {
+		/**
+		 * A string representing the current Punycode.js version number.
+		 * @memberOf punycode
+		 * @type String
+		 */
+		'version': '1.2.3',
+		/**
+		 * An object of methods to convert from JavaScript's internal character
+		 * representation (UCS-2) to Unicode code points, and back.
+		 * @see <http://mathiasbynens.be/notes/javascript-encoding>
+		 * @memberOf punycode
+		 * @type Object
+		 */
+		'ucs2': {
+			'decode': ucs2decode,
+			'encode': ucs2encode
+		},
+		'decode': decode,
+		'encode': encode,
+		'toASCII': toASCII,
+		'toUnicode': toUnicode
+	};
+
+	/** Expose `punycode` */
+	// Some AMD build optimizers, like r.js, check for specific condition patterns
+	// like the following:
+	if (
+		typeof define == 'function' &&
+		typeof define.amd == 'object' &&
+		define.amd
+	) {
+		define(function() {
+			return punycode;
+		});
+	}	else if (freeExports && !freeExports.nodeType) {
+		if (freeModule) { // in Node.js or RingoJS v0.8.0+
+			freeModule.exports = punycode;
+		} else { // in Narwhal or RingoJS v0.7.0-
+			for (key in punycode) {
+				punycode.hasOwnProperty(key) && (freeExports[key] = punycode[key]);
+			}
+		}
+	} else { // in Rhino or a web browser
+		root.punycode = punycode;
+	}
+
+}(this));
diff --git a/media/system/js/punycode.js b/media/system/js/punycode.js
new file mode 100644
index 0000000..ac5d914
--- /dev/null
+++ b/media/system/js/punycode.js
@@ -0,0 +1,2 @@
+/*! http://mths.be/punycode v1.2.3 by @mathias */
+(function(o){function e(o){throw RangeError(L[o])}function n(o,e){for(var n=o.length;n--;)o[n]=e(o[n]);return o}function t(o,e){return n(o.split(S),e).join(".")}function r(o){for(var e,n,t=[],r=0,u=o.length;u>r;)e=o.charCodeAt(r++),e>=55296&&56319>=e&&u>r?(n=o.charCodeAt(r++),56320==(64512&n)?t.push(((1023&e)<<10)+(1023&n)+65536):(t.push(e),r--)):t.push(e);return t}function u(o){return n(o,function(o){var e="";return o>65535&&(o-=65536,e+=R(55296|1023&o>>>10),o=56320|1023&o),e+=R(o)}).join("")}function i(o){return 10>o-48?o-22:26>o-65?o-65:26>o-97?o-97:x}function f(o,e){return o+22+75*(26>o)-((0!=e)<<5)}function c(o,e,n){var t=0;for(o=n?P(o/m):o>>1,o+=P(o/e);o>M*y>>1;t+=x)o=P(o/M);return P(t+(M+1)*o/(o+j))}function l(o){var n,t,r,f,l,d,s,a,p,h,v=[],g=o.length,w=0,j=I,m=A;for(t=o.lastIndexOf(F),0>t&&(t=0),r=0;t>r;++r)o.charCodeAt(r)>=128&&e("not-basic"),v.push(o.charCodeAt(r));for(f=t>0?t+1:0;g>f;){for(l=w,d=1,s=x;f>=g&&e("invalid-input"),a=i(o.charCodeAt(f++)),(a>=x||a>P((b-w)/d))&&e("overflow"),w+=a*d,p=m>=s?C:s>=m+y?y:s-m,!(p>a);s+=x)h=x-p,d>P(b/h)&&e("overflow"),d*=h;n=v.length+1,m=c(w-l,n,0==l),P(w/n)>b-j&&e("overflow"),j+=P(w/n),w%=n,v.splice(w++,0,j)}return u(v)}function d(o){var n,t,u,i,l,d,s,a,p,h,v,g,w,j,m,E=[];for(o=r(o),g=o.length,n=I,t=0,l=A,d=0;g>d;++d)v=o[d],128>v&&E.push(R(v));for(u=i=E.length,i&&E.push(F);g>u;){for(s=b,d=0;g>d;++d)v=o[d],v>=n&&s>v&&(s=v);for(w=u+1,s-n>P((b-t)/w)&&e("overflow"),t+=(s-n)*w,n=s,d=0;g>d;++d)if(v=o[d],n>v&&++t>b&&e("overflow"),v==n){for(a=t,p=x;h=l>=p?C:p>=l+y?y:p-l,!(h>a);p+=x)m=a-h,j=x-h,E.push(R(f(h+m%j,0))),a=P(m/j);E.push(R(f(a,0))),l=c(t,w,u==i),t=0,++u}++t,++n}return E.join("")}function s(o){return t(o,function(o){return E.test(o)?l(o.slice(4).toLowerCase()):o})}function a(o){return t(o,function(o){return O.test(o)?"xn--"+d(o):o})}var p="object"==typeof exports&&exports,h="object"==typeof module&&module&&module.exports==p&&module,v="object"==typeof global&&global;(v.global===v||v.window===v)&&(o=v);var g,w,b=2147483647,x=36,C=1,y=26,j=38,m=700,A=72,I=128,F="-",E=/^xn--/,O=/[^ -~]/,S=/\x2E|\u3002|\uFF0E|\uFF61/g,L={overflow:"Overflow: input needs wider integers to process","not-basic":"Illegal input >= 0x80 (not a basic code point)","invalid-input":"Invalid input"},M=x-C,P=Math.floor,R=String.fromCharCode;if(g={version:"1.2.3",ucs2:{decode:r,encode:u},decode:l,encode:d,toASCII:a,toUnicode:s},"function"==typeof define&&"object"==typeof define.amd&&define.amd)define(function(){return g});else if(p&&!p.nodeType)if(h)h.exports=g;else for(w in g)g.hasOwnProperty(w)&&(p[w]=g[w]);else o.punycode=g})(this);
\ No newline at end of file
diff --git a/media/system/js/repeatable-uncompressed.js b/media/system/js/repeatable-uncompressed.js
index c69d6dc..69e3a3f 100644
--- a/media/system/js/repeatable-uncompressed.js
+++ b/media/system/js/repeatable-uncompressed.js
@@ -1,6 +1,6 @@
 /**
  * @package		Joomla.JavaScript
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/switcher-uncompressed.js b/media/system/js/switcher-uncompressed.js
index 1c6f814..a2fa7de 100644
--- a/media/system/js/switcher-uncompressed.js
+++ b/media/system/js/switcher-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/tabs-state.js b/media/system/js/tabs-state.js
index 58e5c3a..bd3d97a 100644
--- a/media/system/js/tabs-state.js
+++ b/media/system/js/tabs-state.js
@@ -1,5 +1,5 @@
 /**
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/tabs.js b/media/system/js/tabs.js
index 63e0289..b4eb516 100644
--- a/media/system/js/tabs.js
+++ b/media/system/js/tabs.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/validate-jquery-uncompressed.js b/media/system/js/validate-jquery-uncompressed.js
index e7ce2f6..d916e13 100644
--- a/media/system/js/validate-jquery-uncompressed.js
+++ b/media/system/js/validate-jquery-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/media/system/js/validate-uncompressed.js b/media/system/js/validate-uncompressed.js
index b55615d..a999576 100644
--- a/media/system/js/validate-uncompressed.js
+++ b/media/system/js/validate-uncompressed.js
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -50,6 +50,7 @@ var JFormValidator = new Class({
 
 		this.setHandler('email',
 			function (value) {
+				value = punycode.encode(value);
 				regex=/^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
 				return regex.test(value);
 			}
diff --git a/media/system/js/validate.js b/media/system/js/validate.js
index e271776..921e3e1 100644
--- a/media/system/js/validate.js
+++ b/media/system/js/validate.js
@@ -1,4 +1,4 @@
 /*
 		GNU General Public License version 2 or later; see LICENSE.txt
 */
-Object.append(Browser.Features,{inputemail:function(){var e=document.createElement("input");e.setAttribute("type","email");return e.type!=="text"}()});var JFormValidator=new Class({initialize:function(){this.handlers=Object();this.custom=Object();this.setHandler("username",function(e){regex=new RegExp("[<|>|\"|'|%|;|(|)|&]","i");return!regex.test(e)});this.setHandler("password",function(e){regex=/^\S[\S ]{2,98}\S$/;return regex.test(e)});this.setHandler("numeric",function(e){regex=/^(\d|-)?(\d|,)*\.?\d*$/;return regex.test(e)});this.setHandler("email",function(e){regex=/^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;return regex.test(e)});var e=$$("form.form-validate");e.each(function(e){this.attachToForm(e)},this)},setHandler:function(e,t,n){n=n==""?true:n;this.handlers[e]={enabled:n,exec:t}},attachToForm:function(e){e.getElements("input,textarea,select,button").each(function(e){if(e.hasClass("required")){e.set("aria-required","true");e.set("required","required")}if((document.id(e).get("tag")=="input"||document.id(e).get("tag")=="button")&&document.id(e).get("type")=="submit"){if(e.hasClass("validate")){e.onclick=function(){return document.formvalidator.isValid(this.form)}}}else{e.addEvent("blur",function(){return document.formvalidator.validate(this)});if(e.hasClass("validate-email")&&Browser.Features.inputemail){e.type="email"}}})},validate:function(e){e=document.id(e);if(e.get("disabled")&&!e.hasClass('required')){this.handleResponse(true,e);return true}if(e.hasClass("required")){if(e.get("tag")=="fieldset"&&(e.hasClass("radio")||e.hasClass("checkboxes"))){for(var t=0;;t++){if(document.id(e.get("id")+t)){if(document.id(e.get("id")+t).checked){break}}else{this.handleResponse(false,e);return false}}}else if(!e.get("value")){this.handleResponse(false,e);return false}}var n=e.className&&e.className.search(/validate-([a-zA-Z0-9\_\-]+)/)!=-1?e.className.match(/validate-([a-zA-Z0-9\_\-]+)/)[1]:"";if(n==""){this.handleResponse(true,e);return true}if(n&&n!="none"&&this.handlers[n]&&e.get("value")){if(this.handlers[n].exec(e.get("value"))!=true){this.handleResponse(false,e);return false}}this.handleResponse(true,e);return true},isValid:function(e){var t=true;var n=e.getElements("fieldset").concat(Array.from(e.elements));for(var r=0;r<n.length;r++){if(this.validate(n[r])==false){t=false}}(new Hash(this.custom)).each(function(e){if(e.exec()!=true){t=false}});if(!t){var i=Joomla.JText._("JLIB_FORM_FIELD_INVALID");var s=jQuery("label.invalid");var o=new Object;o.error=new Array;for(var r=0;r<s.length;r++){var u=jQuery(s[r]).text();if(u!="undefined"){o.error[r]=i+u.replace("*","")}}Joomla.renderMessages(o)}return t},handleResponse:function(e,t){if(!t.labelref){var n=$$("label");n.each(function(e){if(e.get("for")==t.get("id")){t.labelref=e}})}if(e==false){t.addClass("invalid");t.set("aria-invalid","true");if(t.labelref){document.id(t.labelref).addClass("invalid");document.id(t.labelref).set("aria-invalid","true")}}else{t.removeClass("invalid");t.set("aria-invalid","false");if(t.labelref){document.id(t.labelref).removeClass("invalid");document.id(t.labelref).set("aria-invalid","false")}}}});document.formvalidator=null;window.addEvent("domready",function(){document.formvalidator=new JFormValidator})
+Object.append(Browser.Features,{inputemail:function(){var e=document.createElement("input");e.setAttribute("type","email");return e.type!=="text"}()});var JFormValidator=new Class({initialize:function(){this.handlers=Object();this.custom=Object();this.setHandler("username",function(e){regex=new RegExp("[<|>|\"|'|%|;|(|)|&]","i");return!regex.test(e)});this.setHandler("password",function(e){regex=/^\S[\S ]{2,98}\S$/;return regex.test(e)});this.setHandler("numeric",function(e){regex=/^(\d|-)?(\d|,)*\.?\d*$/;return regex.test(e)});this.setHandler("email",function(e){e=punycode.encode(e);regex=/^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;return regex.test(e)});var e=$$("form.form-validate");e.each(function(e){this.attachToForm(e)},this)},setHandler:function(e,t,n){n=n==""?true:n;this.handlers[e]={enabled:n,exec:t}},attachToForm:function(e){e.getElements("input,textarea,select,button").each(function(e){if(e.hasClass("required")){e.set("aria-required","true");e.set("required","required")}if((document.id(e).get("tag")=="input"||document.id(e).get("tag")=="button")&&document.id(e).get("type")=="submit"){if(e.hasClass("validate")){e.onclick=function(){return document.formvalidator.isValid(this.form)}}}else{e.addEvent("blur",function(){return document.formvalidator.validate(this)});if(e.hasClass("validate-email")&&Browser.Features.inputemail){e.type="email"}}})},validate:function(e){e=document.id(e);if(e.get("disabled")&&!e.hasClass('required')){this.handleResponse(true,e);return true}if(e.hasClass("required")){if(e.get("tag")=="fieldset"&&(e.hasClass("radio")||e.hasClass("checkboxes"))){for(var t=0;;t++){if(document.id(e.get("id")+t)){if(document.id(e.get("id")+t).checked){break}}else{this.handleResponse(false,e);return false}}}else if(!e.get("value")){this.handleResponse(false,e);return false}}var n=e.className&&e.className.search(/validate-([a-zA-Z0-9\_\-]+)/)!=-1?e.className.match(/validate-([a-zA-Z0-9\_\-]+)/)[1]:"";if(n==""){this.handleResponse(true,e);return true}if(n&&n!="none"&&this.handlers[n]&&e.get("value")){if(this.handlers[n].exec(e.get("value"))!=true){this.handleResponse(false,e);return false}}this.handleResponse(true,e);return true},isValid:function(e){var t=true;var n=e.getElements("fieldset").concat(Array.from(e.elements));for(var r=0;r<n.length;r++){if(this.validate(n[r])==false){t=false}}(new Hash(this.custom)).each(function(e){if(e.exec()!=true){t=false}});if(!t){var i=Joomla.JText._("JLIB_FORM_FIELD_INVALID");var s=jQuery("label.invalid");var o=new Object;o.error=new Array;for(var r=0;r<s.length;r++){var u=jQuery(s[r]).text();if(u!="undefined"){o.error[r]=i+u.replace("*","")}}Joomla.renderMessages(o)}return t},handleResponse:function(e,t){if(!t.labelref){var n=$$("label");n.each(function(e){if(e.get("for")==t.get("id")){t.labelref=e}})}if(e==false){t.addClass("invalid");t.set("aria-invalid","true");if(t.labelref){document.id(t.labelref).addClass("invalid");document.id(t.labelref).set("aria-invalid","true")}}else{t.removeClass("invalid");t.set("aria-invalid","false");if(t.labelref){document.id(t.labelref).removeClass("invalid");document.id(t.labelref).set("aria-invalid","false")}}}});document.formvalidator=null;window.addEvent("domready",function(){document.formvalidator=new JFormValidator})
diff --git a/modules/mod_articles_archive/helper.php b/modules/mod_articles_archive/helper.php
index 542d2f4..18d5a53 100644
--- a/modules/mod_articles_archive/helper.php
+++ b/modules/mod_articles_archive/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_archive/mod_articles_archive.php b/modules/mod_articles_archive/mod_articles_archive.php
index d602e55..5e19b97 100644
--- a/modules/mod_articles_archive/mod_articles_archive.php
+++ b/modules/mod_articles_archive/mod_articles_archive.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_archive/mod_articles_archive.xml b/modules/mod_articles_archive/mod_articles_archive.xml
index 9392abc..ef59b14 100644
--- a/modules/mod_articles_archive/mod_articles_archive.xml
+++ b/modules/mod_articles_archive/mod_articles_archive.xml
@@ -5,7 +5,7 @@
 	<name>mod_articles_archive</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters.
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters.
 		All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see
 		LICENSE.txt</license>
diff --git a/modules/mod_articles_archive/tmpl/default.php b/modules/mod_articles_archive/tmpl/default.php
index 964bd2d..70ed3ce 100644
--- a/modules/mod_articles_archive/tmpl/default.php
+++ b/modules/mod_articles_archive/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_archive
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_categories/helper.php b/modules/mod_articles_categories/helper.php
index a0520b4..9404677 100644
--- a/modules/mod_articles_categories/helper.php
+++ b/modules/mod_articles_categories/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_categories/mod_articles_categories.php b/modules/mod_articles_categories/mod_articles_categories.php
index 7297c12..374b85f 100644
--- a/modules/mod_articles_categories/mod_articles_categories.php
+++ b/modules/mod_articles_categories/mod_articles_categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_categories/mod_articles_categories.xml b/modules/mod_articles_categories/mod_articles_categories.xml
index 750cb9c..746a15e 100644
--- a/modules/mod_articles_categories/mod_articles_categories.xml
+++ b/modules/mod_articles_categories/mod_articles_categories.xml
@@ -4,7 +4,7 @@
 	<name>mod_articles_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_categories/tmpl/default.php b/modules/mod_articles_categories/tmpl/default.php
index d813666..ff94bfe 100644
--- a/modules/mod_articles_categories/tmpl/default.php
+++ b/modules/mod_articles_categories/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_categories/tmpl/default_items.php b/modules/mod_articles_categories/tmpl/default_items.php
index f3d6b7b..28e068d 100644
--- a/modules/mod_articles_categories/tmpl/default_items.php
+++ b/modules/mod_articles_categories/tmpl/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_category/helper.php b/modules/mod_articles_category/helper.php
index 33af82d..5b15197 100644
--- a/modules/mod_articles_category/helper.php
+++ b/modules/mod_articles_category/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_category
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_category/mod_articles_category.php b/modules/mod_articles_category/mod_articles_category.php
index 5aa39d4..14f8523 100644
--- a/modules/mod_articles_category/mod_articles_category.php
+++ b/modules/mod_articles_category/mod_articles_category.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_category
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_category/mod_articles_category.xml b/modules/mod_articles_category/mod_articles_category.xml
index 3332374..78199ce 100644
--- a/modules/mod_articles_category/mod_articles_category.xml
+++ b/modules/mod_articles_category/mod_articles_category.xml
@@ -3,7 +3,7 @@
 	<name>mod_articles_category</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_category/tmpl/default.php b/modules/mod_articles_category/tmpl/default.php
index fe1b05c..809a01d 100644
--- a/modules/mod_articles_category/tmpl/default.php
+++ b/modules/mod_articles_category/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_category
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_latest/helper.php b/modules/mod_articles_latest/helper.php
index f2ede51..6a24b56 100644
--- a/modules/mod_articles_latest/helper.php
+++ b/modules/mod_articles_latest/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_latest/mod_articles_latest.php b/modules/mod_articles_latest/mod_articles_latest.php
index bb79faa..959172a 100644
--- a/modules/mod_articles_latest/mod_articles_latest.php
+++ b/modules/mod_articles_latest/mod_articles_latest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_latest/mod_articles_latest.xml b/modules/mod_articles_latest/mod_articles_latest.xml
index c1d00c5..5b1da12 100644
--- a/modules/mod_articles_latest/mod_articles_latest.xml
+++ b/modules/mod_articles_latest/mod_articles_latest.xml
@@ -7,7 +7,7 @@
 	<name>mod_articles_latest</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_latest/tmpl/default.php b/modules/mod_articles_latest/tmpl/default.php
index 3d6c544..1693920 100644
--- a/modules/mod_articles_latest/tmpl/default.php
+++ b/modules/mod_articles_latest/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/helper.php b/modules/mod_articles_news/helper.php
index 1d3db3d..b8468d7 100644
--- a/modules/mod_articles_news/helper.php
+++ b/modules/mod_articles_news/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/mod_articles_news.php b/modules/mod_articles_news/mod_articles_news.php
index 18bb6b7..2a820c5 100644
--- a/modules/mod_articles_news/mod_articles_news.php
+++ b/modules/mod_articles_news/mod_articles_news.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
index 2052846..3fd6840 100644
--- a/modules/mod_articles_news/mod_articles_news.xml
+++ b/modules/mod_articles_news/mod_articles_news.xml
@@ -7,7 +7,7 @@
 	<name>mod_articles_news</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_news/tmpl/_item.php b/modules/mod_articles_news/tmpl/_item.php
index 64e1145..8f9732f 100644
--- a/modules/mod_articles_news/tmpl/_item.php
+++ b/modules/mod_articles_news/tmpl/_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/tmpl/default.php b/modules/mod_articles_news/tmpl/default.php
index d410af4..3f49520 100644
--- a/modules/mod_articles_news/tmpl/default.php
+++ b/modules/mod_articles_news/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/tmpl/horizontal.php b/modules/mod_articles_news/tmpl/horizontal.php
index 595e32a..ca5b867 100644
--- a/modules/mod_articles_news/tmpl/horizontal.php
+++ b/modules/mod_articles_news/tmpl/horizontal.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_news/tmpl/vertical.php b/modules/mod_articles_news/tmpl/vertical.php
index 43c55d2..19244f5 100644
--- a/modules/mod_articles_news/tmpl/vertical.php
+++ b/modules/mod_articles_news/tmpl/vertical.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_news
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_popular/helper.php b/modules/mod_articles_popular/helper.php
index 3207fa7..0d2cabd 100644
--- a/modules/mod_articles_popular/helper.php
+++ b/modules/mod_articles_popular/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_popular/mod_articles_popular.php b/modules/mod_articles_popular/mod_articles_popular.php
index 89bc5fd..cecf36d 100644
--- a/modules/mod_articles_popular/mod_articles_popular.php
+++ b/modules/mod_articles_popular/mod_articles_popular.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_articles_popular/mod_articles_popular.xml b/modules/mod_articles_popular/mod_articles_popular.xml
index 52753cf..bc7cea0 100644
--- a/modules/mod_articles_popular/mod_articles_popular.xml
+++ b/modules/mod_articles_popular/mod_articles_popular.xml
@@ -7,7 +7,7 @@
 	<name>mod_articles_popular</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_articles_popular/tmpl/default.php b/modules/mod_articles_popular/tmpl/default.php
index 994d31d..f835970 100644
--- a/modules/mod_articles_popular/tmpl/default.php
+++ b/modules/mod_articles_popular/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_articles_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_banners/helper.php b/modules/mod_banners/helper.php
index a6722e8..d9e4b10 100644
--- a/modules/mod_banners/helper.php
+++ b/modules/mod_banners/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_banners/mod_banners.php b/modules/mod_banners/mod_banners.php
index 599aeca..156348d 100644
--- a/modules/mod_banners/mod_banners.php
+++ b/modules/mod_banners/mod_banners.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_banners/mod_banners.xml b/modules/mod_banners/mod_banners.xml
index f1d8411..6f9dc91 100644
--- a/modules/mod_banners/mod_banners.xml
+++ b/modules/mod_banners/mod_banners.xml
@@ -7,7 +7,7 @@
 	<name>mod_banners</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_banners/tmpl/default.php b/modules/mod_banners/tmpl/default.php
index 4e763f5..7b22644 100644
--- a/modules/mod_banners/tmpl/default.php
+++ b/modules/mod_banners/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_banners
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_breadcrumbs/helper.php b/modules/mod_breadcrumbs/helper.php
index f1bb1d5..24c2c4e 100644
--- a/modules/mod_breadcrumbs/helper.php
+++ b/modules/mod_breadcrumbs/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_breadcrumbs
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.php b/modules/mod_breadcrumbs/mod_breadcrumbs.php
index 8110558..ec5b664 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.php
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_breadcrumbs
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_breadcrumbs/mod_breadcrumbs.xml b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
index 6a9ffa8..07c424d 100644
--- a/modules/mod_breadcrumbs/mod_breadcrumbs.xml
+++ b/modules/mod_breadcrumbs/mod_breadcrumbs.xml
@@ -7,7 +7,7 @@
 	<name>mod_breadcrumbs</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_breadcrumbs/tmpl/default.php b/modules/mod_breadcrumbs/tmpl/default.php
index b939016..a97cbb5 100644
--- a/modules/mod_breadcrumbs/tmpl/default.php
+++ b/modules/mod_breadcrumbs/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_breadcrumbs
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -17,7 +17,11 @@
 	<?php
 	if ($params->get('showHere', 1))
 	{
-		echo '<li class="active"><span class="divider icon-location hasTooltip" title="' . JText::_('MOD_BREADCRUMBS_HERE') . '"></span></li>';
+		echo '<li class="active">' . JText::_('MOD_BREADCRUMBS_HERE') . '&#160;</span></li>';
+	}
+	else
+	{
+		echo '<li class="active"><span class="divider icon-location"></span></li>';
 	}
 
 	// Get rid of duplicated entries on trail including home page when using multilanguage
diff --git a/modules/mod_custom/mod_custom.php b/modules/mod_custom/mod_custom.php
index 7e1976d..8775437 100644
--- a/modules/mod_custom/mod_custom.php
+++ b/modules/mod_custom/mod_custom.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
index 25ad888..ff6f37b 100644
--- a/modules/mod_custom/mod_custom.xml
+++ b/modules/mod_custom/mod_custom.xml
@@ -6,7 +6,7 @@
 	<name>mod_custom</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_custom/tmpl/default.php b/modules/mod_custom/tmpl/default.php
index 2baa13f..11e4f36 100644
--- a/modules/mod_custom/tmpl/default.php
+++ b/modules/mod_custom/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_custom
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_feed/helper.php b/modules/mod_feed/helper.php
index b9e353b..99528f2 100644
--- a/modules/mod_feed/helper.php
+++ b/modules/mod_feed/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_feed/mod_feed.php b/modules/mod_feed/mod_feed.php
index 8e4cf37..c0a7700 100644
--- a/modules/mod_feed/mod_feed.php
+++ b/modules/mod_feed/mod_feed.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_feed/mod_feed.xml b/modules/mod_feed/mod_feed.xml
index c818632..3c818e2 100644
--- a/modules/mod_feed/mod_feed.xml
+++ b/modules/mod_feed/mod_feed.xml
@@ -7,7 +7,7 @@
 	<name>mod_feed</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_feed/tmpl/default.php b/modules/mod_feed/tmpl/default.php
index 1e54481..b858985 100644
--- a/modules/mod_feed/tmpl/default.php
+++ b/modules/mod_feed/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_feed
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_finder/helper.php b/modules/mod_finder/helper.php
index 46af5ba..52ed5a3 100644
--- a/modules/mod_finder/helper.php
+++ b/modules/mod_finder/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_finder/mod_finder.php b/modules/mod_finder/mod_finder.php
index f0f89fa..1413df3 100644
--- a/modules/mod_finder/mod_finder.php
+++ b/modules/mod_finder/mod_finder.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_finder/mod_finder.xml b/modules/mod_finder/mod_finder.xml
index 6188910..1cede6a 100644
--- a/modules/mod_finder/mod_finder.xml
+++ b/modules/mod_finder/mod_finder.xml
@@ -3,7 +3,7 @@
 	<name>mod_finder</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -32,8 +32,9 @@
 					description="MOD_FINDER_FIELDSET_BASIC_SEARCHFILTER_DESCRIPTION" />
 				<field
 					name="show_autosuggest"
-					type="list"
+					type="radio"
 					default="1"
+					class="btn-group btn-group-yesno"
 					label="MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_LABEL"
 					description="MOD_FINDER_FIELDSET_BASIC_AUTOSUGGEST_DESCRIPTION">
 					<option
@@ -74,11 +75,6 @@
 					filter="integer"
 					label="MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_LABEL"
 					description="MOD_FINDER_FIELDSET_ADVANCED_FIELD_SIZE_DESCRIPTION" />
-				<field
-					name="alt_label"
-					type="text"
-					label="MOD_FINDER_FIELDSET_ADVANCED_ALT_LABEL"
-					description="MOD_FINDER_FIELDSET_ADVANCED_ALT_DESCRIPTION" />
 				<field
 					name="show_label"
 					type="radio"
@@ -94,7 +90,7 @@
 				<field
 					name="label_pos"
 					type="list"
-					default="top"
+					default="left"
 					label="MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_LABEL"
 					description="MOD_FINDER_FIELDSET_ADVANCED_LABEL_POS_DESCRIPTION">
 					<option
@@ -106,6 +102,11 @@
 					<option
 						value="bottom">MOD_FINDER_CONFIG_OPTION_BOTTOM</option>
 				</field>
+				<field
+					name="alt_label"
+					type="text"
+					label="MOD_FINDER_FIELDSET_ADVANCED_ALT_LABEL"
+					description="MOD_FINDER_FIELDSET_ADVANCED_ALT_DESCRIPTION" />
 				<field
 					name="show_button"
 					type="radio"
@@ -121,7 +122,7 @@
 				<field
 					name="button_pos"
 					type="list"
-					default="right"
+					default="left"
 					label="MOD_FINDER_FIELDSET_ADVANCED_BUTTON_POS_LABEL"
 					description="MOD_FINDER_FIELDSET_ADVANCED_BUTTON_POS_DESCRIPTION">
 					<option
@@ -150,9 +151,12 @@
 					description="MOD_FINDER_FIELD_OPENSEARCH_TEXT_DESCRIPTION" />
 				<field
 					name="set_itemid"
-					type="text"
+					type="menuitem"
+					default="0"
 					label="MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_LABEL"
-					description="MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_DESCRIPTION" />
+					description="MOD_FINDER_FIELDSET_ADVANCED_SETITEMID_DESCRIPTION">
+					<option value="0">MOD_FINDER_SELECT_MENU_ITEMID</option>
+				</field>
 			</fieldset>
 		</fields>
 	</config>
diff --git a/modules/mod_finder/tmpl/default.php b/modules/mod_finder/tmpl/default.php
index 50d9172..2eda343 100644
--- a/modules/mod_finder/tmpl/default.php
+++ b/modules/mod_finder/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,7 +11,6 @@
 
 JHtml::addIncludePath(JPATH_SITE . '/components/com_finder/helpers/html');
 
-JHtml::_('behavior.framework');
 JHtml::_('bootstrap.tooltip');
 
 // Load the smart search component language file.
@@ -20,59 +19,55 @@
 
 $suffix = $params->get('moduleclass_sfx');
 $output = '<input type="text" name="q" id="mod-finder-searchword" class="search-query input-medium" size="' . $params->get('field_size', 20) . '" value="' . htmlspecialchars(JFactory::getApplication()->input->get('q', '', 'string')) . '" />';
-$button = '';
-$label = '';
 
 if ($params->get('show_label', 1))
 {
 	$label = '<label for="mod-finder-searchword" class="finder' . $suffix . '">' . $params->get('alt_label', JText::_('JSEARCH_FILTER_SUBMIT')) . '</label>';
 
-	switch ($params->get('label_pos', 'left')):
+	switch ($params->get('label_pos', 'left'))
+	{
 		case 'top' :
-			$label = $label . '<br />';
-			$output = $label . $output;
+			$output = $label . '<br />' . $output;
 			break;
 
 		case 'bottom' :
-			$label = '<br />' . $label;
-			$output = $output . $label;
+			$output .= '<br />' . $label;
 			break;
 
 		case 'right' :
-			$output = $output . $label;
+			$output .= $label;
 			break;
 
 		case 'left' :
 		default :
 			$output = $label . $output;
 			break;
-	endswitch;
+	}
 }
 
-if ($params->get('show_button', 1))
+if ($params->get('show_button'))
 {
 	$button = '<button class="btn btn-primary hasTooltip ' . $suffix . ' finder' . $suffix . '" type="submit" title="' . JText::_('MOD_FINDER_SEARCH_BUTTON') . '"><i class="icon-search icon-white"></i></button>';
 
-	switch ($params->get('button_pos', 'right')):
+	switch ($params->get('button_pos', 'left'))
+	{
 		case 'top' :
-			$button = $button . '<br />';
-			$output = $button . $output;
+			$output = $button . '<br />' . $output;
 			break;
 
 		case 'bottom' :
-			$button = '<br />' . $button;
-			$output = $output . $button;
+			$output .= '<br />' . $button;
 			break;
 
 		case 'right' :
-			$output = $output . $button;
+			$output .= $button;
 			break;
 
 		case 'left' :
 		default :
 			$output = $button . $output;
 			break;
-	endswitch;
+	}
 }
 
 JHtml::stylesheet('com_finder/finder.css', false, true, false);
@@ -145,15 +140,14 @@
 		echo $output;
 		?>
 
-		<?php if ($params->get('show_advanced', 1)) : ?>
-			<?php if ($params->get('show_advanced', 1) == 2) : ?>
-				<br />
-				<a href="<?php echo JRoute::_($route); ?>"><?php echo JText::_('COM_FINDER_ADVANCED_SEARCH'); ?></a>
-			<?php elseif ($params->get('show_advanced', 1) == 1) : ?>
-				<div id="mod-finder-advanced">
-					<?php echo JHtml::_('filter.select', $query, $params); ?>
-				</div>
-			<?php endif; ?>
+		<?php $show_advanced = $params->get('show_advanced'); ?>
+		<?php if ($show_advanced == 2) : ?>
+			<br />
+			<a href="<?php echo JRoute::_($route); ?>"><?php echo JText::_('COM_FINDER_ADVANCED_SEARCH'); ?></a>
+		<?php elseif ($show_advanced == 1) : ?>
+			<div id="mod-finder-advanced">
+				<?php echo JHtml::_('filter.select', $query, $params); ?>
+			</div>
 		<?php endif; ?>
 		<?php echo modFinderHelper::getGetFields($route, (int) $params->get('set_itemid')); ?>
 	</div>
diff --git a/modules/mod_footer/mod_footer.php b/modules/mod_footer/mod_footer.php
index d28d34d..c83ca43 100644
--- a/modules/mod_footer/mod_footer.php
+++ b/modules/mod_footer/mod_footer.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_footer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_footer/mod_footer.xml b/modules/mod_footer/mod_footer.xml
index 730f431..734eb1d 100644
--- a/modules/mod_footer/mod_footer.xml
+++ b/modules/mod_footer/mod_footer.xml
@@ -7,7 +7,7 @@
 	<name>mod_footer</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_footer/tmpl/default.php b/modules/mod_footer/tmpl/default.php
index b9ab069..bc071dc 100644
--- a/modules/mod_footer/tmpl/default.php
+++ b/modules/mod_footer/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_footer
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_languages/helper.php b/modules/mod_languages/helper.php
index 8b4b733..ff3ca53 100644
--- a/modules/mod_languages/helper.php
+++ b/modules/mod_languages/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_languages/mod_languages.php b/modules/mod_languages/mod_languages.php
index d38d5cd..9490920 100644
--- a/modules/mod_languages/mod_languages.php
+++ b/modules/mod_languages/mod_languages.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_languages/mod_languages.xml b/modules/mod_languages/mod_languages.xml
index 4316cf2..caa1675 100644
--- a/modules/mod_languages/mod_languages.xml
+++ b/modules/mod_languages/mod_languages.xml
@@ -7,7 +7,7 @@
 	<name>mod_languages</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_languages/tmpl/default.php b/modules/mod_languages/tmpl/default.php
index b185bf3..f04be16 100644
--- a/modules/mod_languages/tmpl/default.php
+++ b/modules/mod_languages/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_languages
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_login/helper.php b/modules/mod_login/helper.php
index 170d409..68756e6 100644
--- a/modules/mod_login/helper.php
+++ b/modules/mod_login/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_login/mod_login.php b/modules/mod_login/mod_login.php
index 01b134b..6a543e0 100644
--- a/modules/mod_login/mod_login.php
+++ b/modules/mod_login/mod_login.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
index 83ac249..12c589e 100644
--- a/modules/mod_login/mod_login.xml
+++ b/modules/mod_login/mod_login.xml
@@ -7,7 +7,7 @@
 	<name>mod_login</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_login/tmpl/default.php b/modules/mod_login/tmpl/default.php
index dd44d2c..357d824 100644
--- a/modules/mod_login/tmpl/default.php
+++ b/modules/mod_login/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_login/tmpl/default_logout.php b/modules/mod_login/tmpl/default_logout.php
index 772993a..8e0eb2e 100644
--- a/modules/mod_login/tmpl/default_logout.php
+++ b/modules/mod_login/tmpl/default_logout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_login
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/helper.php b/modules/mod_menu/helper.php
index 5230df9..5c8e0e0 100644
--- a/modules/mod_menu/helper.php
+++ b/modules/mod_menu/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,7 +21,7 @@ class ModMenuHelper
 	/**
 	 * Get a list of the menu items.
 	 *
-	 * @param  JRegistry   $params  The module options.
+	 * @param   JRegistry  &$params  The module options.
 	 *
 	 * @return  array
 	 *
@@ -39,6 +39,7 @@ public static function getList(&$params)
 		asort($levels);
 		$key = 'menu_items' . $params . implode(',', $levels) . '.' . $base->id;
 		$cache = JFactory::getCache('mod_menu', '');
+
 		if (!($items = $cache->get($key)))
 		{
 			$path    = $base->tree;
@@ -102,6 +103,7 @@ public static function getList(&$params)
 
 						default:
 							$router = $app::getRouter();
+
 							if ($router->getMode() == JROUTER_MODE_SEF)
 							{
 								$item->flink = 'index.php?Itemid=' . $item->id;
@@ -140,13 +142,14 @@ public static function getList(&$params)
 
 			$cache->store($items, $key);
 		}
+
 		return $items;
 	}
 
 	/**
 	 * Get base menu item.
 	 *
-	 * @param   JRegistry  $params  The module options.
+	 * @param   JRegistry  &$params  The module options.
 	 *
 	 * @return   object
 	 *
@@ -154,7 +157,6 @@ public static function getList(&$params)
 	 */
 	public static function getBase(&$params)
 	{
-
 		// Get base menu item from parameters
 		if ($params->get('base'))
 		{
@@ -177,7 +179,7 @@ public static function getBase(&$params)
 	/**
 	 * Get active menu item.
 	 *
-	 * @param   JRegistry  $params  The module options.
+	 * @param   JRegistry  &$params  The module options.
 	 *
 	 * @return  object
 	 *
@@ -189,5 +191,4 @@ public static function getActive(&$params)
 
 		return $menu->getActive() ? $menu->getActive() : $menu->getDefault();
 	}
-
 }
diff --git a/modules/mod_menu/mod_menu.php b/modules/mod_menu/mod_menu.php
index 61928a6..1d6d8b8 100644
--- a/modules/mod_menu/mod_menu.php
+++ b/modules/mod_menu/mod_menu.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
index 9b62dd2..a321829 100644
--- a/modules/mod_menu/mod_menu.xml
+++ b/modules/mod_menu/mod_menu.xml
@@ -7,7 +7,7 @@
 	<name>mod_menu</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_menu/tmpl/default.php b/modules/mod_menu/tmpl/default.php
index 29beb4e..3086ddf 100644
--- a/modules/mod_menu/tmpl/default.php
+++ b/modules/mod_menu/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -14,15 +14,18 @@
 <?php // The menu class is deprecated. Use nav instead. ?>
 <ul class="nav menu<?php echo $class_sfx;?>"<?php
 	$tag = '';
+
 	if ($params->get('tag_id') != null)
 	{
-		$tag = $params->get('tag_id').'';
-		echo ' id="'.$tag.'"';
+		$tag = $params->get('tag_id') . '';
+		echo ' id="' . $tag . '"';
 	}
 ?>>
 <?php
-foreach ($list as $i => &$item) :
-	$class = 'item-'.$item->id;
+foreach ($list as $i => &$item)
+{
+	$class = 'item-' . $item->id;
+
 	if ($item->id == $active_id)
 	{
 		$class .= ' current';
@@ -35,6 +38,7 @@
 	elseif ($item->type == 'alias')
 	{
 		$aliasToId = $item->params->get('aliasoptions');
+
 		if (count($path) > 0 && $aliasToId == $path[count($path) - 1])
 		{
 			$class .= ' active';
@@ -62,10 +66,10 @@
 
 	if (!empty($class))
 	{
-		$class = ' class="'.trim($class) .'"';
+		$class = ' class="' . trim($class) . '"';
 	}
 
-	echo '<li'.$class.'>';
+	echo '<li' . $class . '>';
 
 	// Render the menu item.
 	switch ($item->type) :
@@ -73,7 +77,7 @@
 		case 'url':
 		case 'component':
 		case 'heading':
-			require JModuleHelper::getLayoutPath('mod_menu', 'default_'.$item->type);
+			require JModuleHelper::getLayoutPath('mod_menu', 'default_' . $item->type);
 			break;
 
 		default:
@@ -86,15 +90,16 @@
 	{
 		echo '<ul class="nav-child unstyled small">';
 	}
-	// The next item is shallower.
 	elseif ($item->shallower)
 	{
+		// The next item is shallower.
 		echo '</li>';
 		echo str_repeat('</ul></li>', $item->level_diff);
 	}
-	// The next item is on the same level.
-	else {
+	else
+	{
+		// The next item is on the same level.
 		echo '</li>';
 	}
-endforeach;
+}
 ?></ul>
diff --git a/modules/mod_menu/tmpl/default_component.php b/modules/mod_menu/tmpl/default_component.php
index 67a7a11..73b2698 100644
--- a/modules/mod_menu/tmpl/default_component.php
+++ b/modules/mod_menu/tmpl/default_component.php
@@ -3,25 +3,29 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 // Note. It is important to remove spaces between elements.
-$class = $item->anchor_css ? 'class="'.$item->anchor_css.'" ' : '';
-$title = $item->anchor_title ? 'title="'.$item->anchor_title.'" ' : '';
+$class = $item->anchor_css ? 'class="' . $item->anchor_css . '" ' : '';
+$title = $item->anchor_title ? 'title="' . $item->anchor_title . '" ' : '';
+
 if ($item->menu_image)
-	{
-		$item->params->get('menu_text', 1) ?
-		$linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" /><span class="image-title">'.$item->title.'</span> ' :
-		$linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" />';
+{
+	$item->params->get('menu_text', 1) ?
+	$linktype = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" /><span class="image-title">' . $item->title . '</span> ' :
+	$linktype = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" />';
 }
-else { $linktype = $item->title;
+else
+{
+	$linktype = $item->title;
 }
 
-switch ($item->browserNav) :
+switch ($item->browserNav)
+{
 	default:
 	case 0:
 ?><a <?php echo $class; ?>href="<?php echo $item->flink; ?>" <?php echo $title; ?>><?php echo $linktype; ?></a><?php
@@ -35,4 +39,4 @@
 ?><a <?php echo $class; ?>href="<?php echo $item->flink; ?>" onclick="window.open(this.href,'targetWindow','toolbar=no,location=no,status=no,menubar=no,scrollbars=yes,resizable=yes');return false;" <?php echo $title; ?>><?php echo $linktype; ?></a>
 <?php
 		break;
-endswitch;
+}
diff --git a/modules/mod_menu/tmpl/default_heading.php b/modules/mod_menu/tmpl/default_heading.php
index fcd8dee..6c77667 100644
--- a/modules/mod_menu/tmpl/default_heading.php
+++ b/modules/mod_menu/tmpl/default_heading.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_menu/tmpl/default_separator.php b/modules/mod_menu/tmpl/default_separator.php
index 4ff7c5b..0c0d75c 100644
--- a/modules/mod_menu/tmpl/default_separator.php
+++ b/modules/mod_menu/tmpl/default_separator.php
@@ -3,21 +3,26 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 // Note. It is important to remove spaces between elements.
-$title = $item->anchor_title ? ' title="'.$item->anchor_title.'" ' : '';
+$title = $item->anchor_title ? ' title="' . $item->anchor_title . '" ' : '';
 if ($item->menu_image)
 	{
 		$item->params->get('menu_text', 1) ?
-		$linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" /><span class="image-title">'.$item->title.'</span> ' :
-		$linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" />';
+		$linktype = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" /><span class="image-title">' . $item->title . '</span> ' :
+		$linktype = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" />';
 }
-else { $linktype = $item->title;
+else
+{
+	$linktype = $item->title;
 }
 
-?><span class="separator"<?php echo $title; ?>><?php echo $linktype; ?></span>
+?>
+<span class="separator"<?php echo $title; ?>>
+	<?php echo $linktype; ?>
+</span>
diff --git a/modules/mod_menu/tmpl/default_url.php b/modules/mod_menu/tmpl/default_url.php
index c255b80..36e118e 100644
--- a/modules/mod_menu/tmpl/default_url.php
+++ b/modules/mod_menu/tmpl/default_url.php
@@ -3,23 +3,27 @@
  * @package     Joomla.Site
  * @subpackage  mod_menu
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 // Note. It is important to remove spaces between elements.
-$class = $item->anchor_css ? 'class="'.$item->anchor_css.'" ' : '';
-$title = $item->anchor_title ? 'title="'.$item->anchor_title.'" ' : '';
+$class = $item->anchor_css ? 'class="' . $item->anchor_css . '" ' : '';
+$title = $item->anchor_title ? 'title="' . $item->anchor_title . '" ' : '';
+
 if ($item->menu_image)
 	{
 		$item->params->get('menu_text', 1) ?
-		$linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" /><span class="image-title">'.$item->title.'</span> ' :
-		$linktype = '<img src="'.$item->menu_image.'" alt="'.$item->title.'" />';
+		$linktype = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" /><span class="image-title">' . $item->title . '</span> ' :
+		$linktype = '<img src="' . $item->menu_image . '" alt="' . $item->title . '" />';
 }
-else { $linktype = $item->title;
+else
+{
+	$linktype = $item->title;
 }
+
 $flink = $item->flink;
 $flink = JFilterOutput::ampReplace(htmlspecialchars($flink));
 
diff --git a/modules/mod_random_image/helper.php b/modules/mod_random_image/helper.php
index 731318c..d5ed2cd 100644
--- a/modules/mod_random_image/helper.php
+++ b/modules/mod_random_image/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_random_image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_random_image/mod_random_image.php b/modules/mod_random_image/mod_random_image.php
index fcf64cd..65c6d12 100644
--- a/modules/mod_random_image/mod_random_image.php
+++ b/modules/mod_random_image/mod_random_image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_random_image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_random_image/mod_random_image.xml b/modules/mod_random_image/mod_random_image.xml
index 968b61f..da37e8a 100644
--- a/modules/mod_random_image/mod_random_image.xml
+++ b/modules/mod_random_image/mod_random_image.xml
@@ -7,7 +7,7 @@
 	<name>mod_random_image</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_random_image/tmpl/default.php b/modules/mod_random_image/tmpl/default.php
index 06ea092..fa49ea2 100644
--- a/modules/mod_random_image/tmpl/default.php
+++ b/modules/mod_random_image/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_random_image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_related_items/helper.php b/modules/mod_related_items/helper.php
index f0188cf..7084950 100644
--- a/modules/mod_related_items/helper.php
+++ b/modules/mod_related_items/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_related_items
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_related_items/mod_related_items.php b/modules/mod_related_items/mod_related_items.php
index cc53a35..f3d0dee 100644
--- a/modules/mod_related_items/mod_related_items.php
+++ b/modules/mod_related_items/mod_related_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_related_items
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_related_items/mod_related_items.xml b/modules/mod_related_items/mod_related_items.xml
index e510e54..3060069 100644
--- a/modules/mod_related_items/mod_related_items.xml
+++ b/modules/mod_related_items/mod_related_items.xml
@@ -7,7 +7,7 @@
 	<name>mod_related_items</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_related_items/tmpl/default.php b/modules/mod_related_items/tmpl/default.php
index 9e04419..5aad441 100644
--- a/modules/mod_related_items/tmpl/default.php
+++ b/modules/mod_related_items/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_related_items
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_search/helper.php b/modules/mod_search/helper.php
index 8209ee7..c82496a 100644
--- a/modules/mod_search/helper.php
+++ b/modules/mod_search/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_search/mod_search.php b/modules/mod_search/mod_search.php
index 7adc243..26fb44a 100644
--- a/modules/mod_search/mod_search.php
+++ b/modules/mod_search/mod_search.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_search/mod_search.xml b/modules/mod_search/mod_search.xml
index a9a299f..4b9226b 100644
--- a/modules/mod_search/mod_search.xml
+++ b/modules/mod_search/mod_search.xml
@@ -7,7 +7,7 @@
 	<name>mod_search</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_search/tmpl/default.php b/modules/mod_search/tmpl/default.php
index 5a5fe45..e7f0365 100644
--- a/modules/mod_search/tmpl/default.php
+++ b/modules/mod_search/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_search
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_stats/helper.php b/modules/mod_stats/helper.php
index f4b2371..e8ccdbe 100644
--- a/modules/mod_stats/helper.php
+++ b/modules/mod_stats/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_stats/mod_stats.php b/modules/mod_stats/mod_stats.php
index 06ba16d..031d400 100644
--- a/modules/mod_stats/mod_stats.php
+++ b/modules/mod_stats/mod_stats.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_stats/mod_stats.xml b/modules/mod_stats/mod_stats.xml
index 7e0801e..90c0154 100644
--- a/modules/mod_stats/mod_stats.xml
+++ b/modules/mod_stats/mod_stats.xml
@@ -7,7 +7,7 @@
 	<name>mod_stats</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_stats/tmpl/default.php b/modules/mod_stats/tmpl/default.php
index 29db6df..3fc63bf 100644
--- a/modules/mod_stats/tmpl/default.php
+++ b/modules/mod_stats/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_stats
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_syndicate/helper.php b/modules/mod_syndicate/helper.php
index e5c9c95..faec95c 100644
--- a/modules/mod_syndicate/helper.php
+++ b/modules/mod_syndicate/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_syndicate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_syndicate/mod_syndicate.php b/modules/mod_syndicate/mod_syndicate.php
index 683feff..a41f5cd 100644
--- a/modules/mod_syndicate/mod_syndicate.php
+++ b/modules/mod_syndicate/mod_syndicate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_syndicate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_syndicate/mod_syndicate.xml b/modules/mod_syndicate/mod_syndicate.xml
index 19617d3..a0cce08 100644
--- a/modules/mod_syndicate/mod_syndicate.xml
+++ b/modules/mod_syndicate/mod_syndicate.xml
@@ -7,7 +7,7 @@
 	<name>mod_syndicate</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_syndicate/tmpl/default.php b/modules/mod_syndicate/tmpl/default.php
index 473b4ec..697113b 100644
--- a/modules/mod_syndicate/tmpl/default.php
+++ b/modules/mod_syndicate/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_syndicate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_popular/helper.php b/modules/mod_tags_popular/helper.php
index 55c79f6..1693412 100644
--- a/modules/mod_tags_popular/helper.php
+++ b/modules/mod_tags_popular/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_popular/mod_tags_popular.php b/modules/mod_tags_popular/mod_tags_popular.php
index 7a9027b..07cdfd5 100644
--- a/modules/mod_tags_popular/mod_tags_popular.php
+++ b/modules/mod_tags_popular/mod_tags_popular.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_popular/mod_tags_popular.xml b/modules/mod_tags_popular/mod_tags_popular.xml
index b9d746f..a1f8a33 100644
--- a/modules/mod_tags_popular/mod_tags_popular.xml
+++ b/modules/mod_tags_popular/mod_tags_popular.xml
@@ -7,7 +7,7 @@
 	<name>mod_tags_popular</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_tags_popular/tmpl/cloud.php b/modules/mod_tags_popular/tmpl/cloud.php
index 62a997e..bcbe3ef 100644
--- a/modules/mod_tags_popular/tmpl/cloud.php
+++ b/modules/mod_tags_popular/tmpl/cloud.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_popular/tmpl/default.php b/modules/mod_tags_popular/tmpl/default.php
index 1666ebd..f70fe48 100644
--- a/modules/mod_tags_popular/tmpl/default.php
+++ b/modules/mod_tags_popular/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_similar/helper.php b/modules/mod_tags_similar/helper.php
index 1e13e3b..16750e8 100644
--- a/modules/mod_tags_similar/helper.php
+++ b/modules/mod_tags_similar/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_similar/mod_tags_similar.php b/modules/mod_tags_similar/mod_tags_similar.php
index 858e363..fc14e15 100644
--- a/modules/mod_tags_similar/mod_tags_similar.php
+++ b/modules/mod_tags_similar/mod_tags_similar.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_similar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_tags_similar/mod_tags_similar.xml b/modules/mod_tags_similar/mod_tags_similar.xml
index 772494d..804417e 100644
--- a/modules/mod_tags_similar/mod_tags_similar.xml
+++ b/modules/mod_tags_similar/mod_tags_similar.xml
@@ -7,7 +7,7 @@
 	<name>mod_tags_similar</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_tags_similar/tmpl/default.php b/modules/mod_tags_similar/tmpl/default.php
index 00a73fe..06cfdf6 100644
--- a/modules/mod_tags_similar/tmpl/default.php
+++ b/modules/mod_tags_similar/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_tags_popular
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_users_latest/helper.php b/modules/mod_users_latest/helper.php
index 871d79a..e9154df 100644
--- a/modules/mod_users_latest/helper.php
+++ b/modules/mod_users_latest/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_users_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_users_latest/mod_users_latest.php b/modules/mod_users_latest/mod_users_latest.php
index 228711f..883da86 100644
--- a/modules/mod_users_latest/mod_users_latest.php
+++ b/modules/mod_users_latest/mod_users_latest.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_users_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_users_latest/mod_users_latest.xml b/modules/mod_users_latest/mod_users_latest.xml
index 31d42de..a77b3d1 100644
--- a/modules/mod_users_latest/mod_users_latest.xml
+++ b/modules/mod_users_latest/mod_users_latest.xml
@@ -7,7 +7,7 @@
 	<name>mod_users_latest</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_users_latest/tmpl/default.php b/modules/mod_users_latest/tmpl/default.php
index 2351bb6..f3e7804 100644
--- a/modules/mod_users_latest/tmpl/default.php
+++ b/modules/mod_users_latest/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_users_latest
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_weblinks/helper.php b/modules/mod_weblinks/helper.php
index d57c9ae..6fa0bec 100644
--- a/modules/mod_weblinks/helper.php
+++ b/modules/mod_weblinks/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_weblinks/mod_weblinks.php b/modules/mod_weblinks/mod_weblinks.php
index 7bcdcf4..ed92344 100644
--- a/modules/mod_weblinks/mod_weblinks.php
+++ b/modules/mod_weblinks/mod_weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_weblinks/mod_weblinks.xml b/modules/mod_weblinks/mod_weblinks.xml
index 9319eb9..86a1b3b 100644
--- a/modules/mod_weblinks/mod_weblinks.xml
+++ b/modules/mod_weblinks/mod_weblinks.xml
@@ -7,7 +7,7 @@
 	<name>mod_weblinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_weblinks/tmpl/default.php b/modules/mod_weblinks/tmpl/default.php
index 478cfb3..d8ae0d2 100644
--- a/modules/mod_weblinks/tmpl/default.php
+++ b/modules/mod_weblinks/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_whosonline/helper.php b/modules/mod_whosonline/helper.php
index e1d89d8..91c793c 100644
--- a/modules/mod_whosonline/helper.php
+++ b/modules/mod_whosonline/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_whosonline
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_whosonline/mod_whosonline.php b/modules/mod_whosonline/mod_whosonline.php
index 0c7c889..819b938 100644
--- a/modules/mod_whosonline/mod_whosonline.php
+++ b/modules/mod_whosonline/mod_whosonline.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_whosonline
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_whosonline/mod_whosonline.xml b/modules/mod_whosonline/mod_whosonline.xml
index 22aab0c..c15bc09 100644
--- a/modules/mod_whosonline/mod_whosonline.xml
+++ b/modules/mod_whosonline/mod_whosonline.xml
@@ -7,7 +7,7 @@
 	<name>mod_whosonline</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_whosonline/tmpl/default.php b/modules/mod_whosonline/tmpl/default.php
index f4d12dc..fd7fe03 100644
--- a/modules/mod_whosonline/tmpl/default.php
+++ b/modules/mod_whosonline/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_whosonline
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_wrapper/helper.php b/modules/mod_wrapper/helper.php
index ed4d808..6f64311 100644
--- a/modules/mod_wrapper/helper.php
+++ b/modules/mod_wrapper/helper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_wrapper/mod_wrapper.php b/modules/mod_wrapper/mod_wrapper.php
index 6ebc152..29dd212 100644
--- a/modules/mod_wrapper/mod_wrapper.php
+++ b/modules/mod_wrapper/mod_wrapper.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/modules/mod_wrapper/mod_wrapper.xml b/modules/mod_wrapper/mod_wrapper.xml
index 36970ac..d521b77 100644
--- a/modules/mod_wrapper/mod_wrapper.xml
+++ b/modules/mod_wrapper/mod_wrapper.xml
@@ -7,7 +7,7 @@
 	<name>mod_wrapper</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/modules/mod_wrapper/tmpl/default.php b/modules/mod_wrapper/tmpl/default.php
index b2dfa4c..d9af225 100644
--- a/modules/mod_wrapper/tmpl/default.php
+++ b/modules/mod_wrapper/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  mod_wrapper
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/authentication/cookie/cookie.php b/plugins/authentication/cookie/cookie.php
index 3466cd7..5dcf9cf 100644
--- a/plugins/authentication/cookie/cookie.php
+++ b/plugins/authentication/cookie/cookie.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Authentication.cookie
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/authentication/cookie/cookie.xml b/plugins/authentication/cookie/cookie.xml
index a643f2e..e72b7f7 100644
--- a/plugins/authentication/cookie/cookie.xml
+++ b/plugins/authentication/cookie/cookie.xml
@@ -3,7 +3,7 @@
 	<name>plg_authentication_cookie</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/authentication/gmail/gmail.php b/plugins/authentication/gmail/gmail.php
index 373b04a..51ddbb2 100644
--- a/plugins/authentication/gmail/gmail.php
+++ b/plugins/authentication/gmail/gmail.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Authentication.gmail
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/authentication/gmail/gmail.xml b/plugins/authentication/gmail/gmail.xml
index 07a6c77..b72de3d 100644
--- a/plugins/authentication/gmail/gmail.xml
+++ b/plugins/authentication/gmail/gmail.xml
@@ -3,7 +3,7 @@
 	<name>plg_authentication_gmail</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/authentication/joomla/joomla.php b/plugins/authentication/joomla/joomla.php
index ced9a07..e0bd124 100644
--- a/plugins/authentication/joomla/joomla.php
+++ b/plugins/authentication/joomla/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Authentication.joomla
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/authentication/joomla/joomla.xml b/plugins/authentication/joomla/joomla.xml
index 24c73cd..8d2857f 100644
--- a/plugins/authentication/joomla/joomla.xml
+++ b/plugins/authentication/joomla/joomla.xml
@@ -3,7 +3,7 @@
 	<name>plg_authentication_joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/authentication/ldap/ldap.php b/plugins/authentication/ldap/ldap.php
index 51f26c6..aa8daff 100644
--- a/plugins/authentication/ldap/ldap.php
+++ b/plugins/authentication/ldap/ldap.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Authentication.ldap
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/authentication/ldap/ldap.xml b/plugins/authentication/ldap/ldap.xml
index 364b054..0e18af5 100644
--- a/plugins/authentication/ldap/ldap.xml
+++ b/plugins/authentication/ldap/ldap.xml
@@ -3,7 +3,7 @@
 	<name>plg_authentication_ldap</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/captcha/recaptcha/recaptcha.php b/plugins/captcha/recaptcha/recaptcha.php
index 7b1d5a3..2cd7f18 100644
--- a/plugins/captcha/recaptcha/recaptcha.php
+++ b/plugins/captcha/recaptcha/recaptcha.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Captcha
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -87,12 +87,14 @@ public function onDisplay($name, $id, $class)
 	}
 
 	/**
-	  * Calls an HTTP POST function to verify if the user's guess was correct
-	  *
-	  * @return  True if the answer is correct, false otherwise
-	  *
-	  * @since  2.5
-	  */
+	 * Calls an HTTP POST function to verify if the user's guess was correct
+	 *
+	 * @param   string  $code  Answer provided by user.
+	 *
+	 * @return  True if the answer is correct, false otherwise
+	 *
+	 * @since  2.5
+	 */
 	public function onCheckAnswer($code)
 	{
 		$input      = JFactory::getApplication()->input;
@@ -177,10 +179,10 @@ private function _recaptcha_qsencode($data)
 	/**
 	 * Submits an HTTP POST to a reCAPTCHA server.
 	 *
-	 * @param   string  $host
-	 * @param   string  $path
-	 * @param   array   $data
-	 * @param   int     $port
+	 * @param   string  $host  Host name to POST to.
+	 * @param   string  $path  Path on host to POST to.
+	 * @param   array   $data  Data to be POSTed.
+	 * @param   int     $port  Optional port number on host.
 	 *
 	 * @return  array   Response
 	 *
diff --git a/plugins/captcha/recaptcha/recaptcha.xml b/plugins/captcha/recaptcha/recaptcha.xml
index a7ef785..2cda724 100644
--- a/plugins/captcha/recaptcha/recaptcha.xml
+++ b/plugins/captcha/recaptcha/recaptcha.xml
@@ -6,7 +6,7 @@
 	<author>Joomla! Project</author>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<description>PLG_CAPTCHA_RECAPTCHA_XML_DESCRIPTION</description>
 	<files>
diff --git a/plugins/content/contact/contact.php b/plugins/content/contact/contact.php
new file mode 100644
index 0000000..2df31ab
--- /dev/null
+++ b/plugins/content/contact/contact.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @package     Joomla.Plugin
+ * @subpackage  Content.Contact
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+/**
+ * Contact Plugin
+ *
+ * @package     Joomla.Plugin
+ * @subpackage  Content.Contact
+ * @since       3.2
+ */
+class PlgContentContact extends JPlugin
+{
+	/**
+	 * Plugin that retrieves contact information for contact
+	 *
+	 * @param   string   $context  The context of the content being passed to the plugin.
+	 * @param   mixed    &$row     An object with a "text" property
+	 * @param   mixed    $params   Additional parameters. See {@see PlgContentContent()}.
+	 * @param   integer  $page     Optional page number. Unused. Defaults to zero.
+	 *
+	 * @return  boolean	True on success.
+	 */
+	public function onContentPrepare($context, &$row, $params, $page = 0)
+	{
+		$allowed_contexts = array('com_content.category', 'com_content.article', 'com_content.featured');
+		if (!in_array($context, $allowed_contexts))
+		{
+			return true;
+		}
+
+		// Return if we don't have valid params or don't link the author
+		if (!($params instanceof JRegistry) || !$params->get('link_author'))
+		{
+			return true;
+		}
+
+		// Return if we don't have a valid article id
+		if (!isset($row->id) || !(int) $row->id)
+		{
+			return true;
+		}
+
+		$row->contactid = $this->getContactID($row->created_by);
+
+		if ($row->contactid)
+		{
+			$needle = 'index.php?option=com_contact&view=contact&id=' . $row->contactid;
+			$menu = JFactory::getApplication()->getMenu();
+			$item = $menu->getItems('link', $needle, true);
+			$link = $item ? $needle . '&Itemid=' . $item->id : $needle;
+			$row->contact_link = JRoute::_($link);
+		}
+		else
+		{
+			$row->contact_link = '';
+		}
+
+		return true;
+	}
+
+	/**
+	 * Retrieve Contact
+	 *
+	 * @param   int    $created_by
+	 *
+	 * @return  mixed|null|integer
+	 */
+	protected function getContactID($created_by)
+	{
+		static $contacts = array();
+		if(isset($contacts[$created_by]))
+		{
+			return $contacts[$created_by];
+		}
+
+		$db = JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		$query->select('MAX(contact.id) AS contactid');
+		$query->from('#__contact_details AS contact');
+		$query->where('contact.published = 1');
+		$query->where('contact.user_id = ' . (int) $created_by);
+
+		if (JLanguageMultilang::isEnabled() == 1)
+		{
+			$query->where('(contact.language in '
+				. '(' . $db->quote(JFactory::getLanguage()->getTag()) . ',' . $db->quote('*') . ') '
+				. ' OR contact.language IS NULL)');
+		}
+
+		$db->setQuery($query);
+
+		$contacts[$created_by] = $db->loadResult();
+
+		return $contacts[$created_by];
+	}
+}
diff --git a/plugins/content/contact/contact.xml b/plugins/content/contact/contact.xml
new file mode 100644
index 0000000..4196bbf
--- /dev/null
+++ b/plugins/content/contact/contact.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<extension version="3.2" type="plugin" group="content">
+	<name>plg_content_contact</name>
+	<author>Joomla! Project</author>
+	<creationDate>January 2014</creationDate>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
+	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
+	<authorEmail>admin@joomla.org</authorEmail>
+	<authorUrl>www.joomla.org</authorUrl>
+	<version>3.2.2</version>
+	<description>PLG_CONTENT_CONTACT_XML_DESCRIPTION</description>
+	<files>
+		<filename plugin="contact">contact.php</filename>
+		<filename>index.html</filename>
+	</files>
+	<languages>
+		<language tag="en-GB">en-GB.plg_content_contact.ini</language>
+		<language tag="en-GB">en-GB.plg_content_contact.sys.ini</language>
+	</languages>
+	<config>
+		<fields name="params">
+		</fields>
+	</config>
+</extension>
diff --git a/plugins/content/contact/index.html b/plugins/content/contact/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/content/contact/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/content/emailcloak/emailcloak.php b/plugins/content/emailcloak/emailcloak.php
index 238a5cf..9a54401 100644
--- a/plugins/content/emailcloak/emailcloak.php
+++ b/plugins/content/emailcloak/emailcloak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.emailcloak
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/emailcloak/emailcloak.xml b/plugins/content/emailcloak/emailcloak.xml
index 6e7f379..eb662fc 100644
--- a/plugins/content/emailcloak/emailcloak.xml
+++ b/plugins/content/emailcloak/emailcloak.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_emailcloak</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/finder/finder.php b/plugins/content/finder/finder.php
index a48c740..cdfcbef 100644
--- a/plugins/content/finder/finder.php
+++ b/plugins/content/finder/finder.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.finder
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 /**
- * Finder Content Plugin
+ * Smart Search Content Plugin
  *
  * @package     Joomla.Plugin
  * @subpackage  Content.finder
@@ -19,14 +19,16 @@
 class PlgContentFinder extends JPlugin
 {
 	/**
-	 * Finder after save content method
-	 * Article is passed by reference, but after the save, so no changes will be saved.
-	 * Method is called right after the content is saved
+	 * Smart Search after save content method.
+	 * Content is passed by reference, but after the save, so no changes will be saved.
+	 * Method is called right after the content is saved.
 	 *
 	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6)
 	 * @param   object  $article  A JTableContent object
 	 * @param   bool    $isNew    If the content has just been created
 	 *
+	 * @return  void
+	 *
 	 * @since	2.5
 	 */
 	public function onContentAfterSave($context, $article, $isNew)
@@ -39,13 +41,14 @@ public function onContentAfterSave($context, $article, $isNew)
 	}
 
 	/**
-	 * Finder before save content method
-	 * Article is passed by reference, but after the save, so no changes will be saved.
-	 * Method is called right after the content is saved
+	 * Smart Search before save content method.
+	 * Content is passed by reference. Method is called before the content is saved.
 	 *
-	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6)
-	 * @param   object  $article  A JTableContent object
-	 * @param   bool    $isNew    If the content is just about to be created
+	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6).
+	 * @param   object  $article  A JTableContent object.
+	 * @param   bool    $isNew    If the content is just about to be created.
+	 *
+	 * @return  void
 	 *
 	 * @since   2.5
 	 */
@@ -59,12 +62,13 @@ public function onContentBeforeSave($context, $article, $isNew)
 	}
 
 	/**
-	 * Finder after delete content method
-	 * Article is passed by reference, but after the save, so no changes will be saved.
-	 * Method is called right after the content is saved
+	 * Smart Search after delete content method.
+	 * Content is passed by reference, but after the deletion.
 	 *
-	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6)
-	 * @param   object  $article  A JTableContent object
+	 * @param   string  $context  The context of the content passed to the plugin (added in 1.6).
+	 * @param   object  $article  A JTableContent object.
+	 *
+	 * @return  void
 	 *
 	 * @since   2.5
 	 */
@@ -78,7 +82,7 @@ public function onContentAfterDelete($context, $article)
 	}
 
 	/**
-	 * Finder change state content method
+	 * Smart Search content state change method.
 	 * Method to update the link information for items that have been changed
 	 * from outside the edit screen. This is fired when the item is published,
 	 * unpublished, archived, or unarchived from the list view.
@@ -87,6 +91,8 @@ public function onContentAfterDelete($context, $article)
 	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
 	 * @param   integer  $value    The value of the state that the content has been changed to.
 	 *
+	 * @return  void
+	 *
 	 * @since   2.5
 	 */
 	public function onContentChangeState($context, $pks, $value)
@@ -99,14 +105,16 @@ public function onContentChangeState($context, $pks, $value)
 	}
 
 	/**
-	 * Finder change category state content method
-	 * Article is passed by reference, but after the save, so no changes will be saved.
-	 * Method is called right after the content is saved
+	 * Smart Search change category state content method.
+	 * Method is called when the state of the category to which the
+	 * content item belongs is changed.
 	 *
 	 * @param   string   $extension  The extension whose category has been updated.
 	 * @param   array    $pks        A list of primary key ids of the content that has changed state.
 	 * @param   integer  $value      The value of the state that the content has been changed to.
 	 *
+	 * @return  void
+	 *
 	 * @since   2.5
 	 */
 	public function onCategoryChangeState($extension, $pks, $value)
diff --git a/plugins/content/finder/finder.xml b/plugins/content/finder/finder.xml
index a410606..2b558a6 100644
--- a/plugins/content/finder/finder.xml
+++ b/plugins/content/finder/finder.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_finder</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/joomla/joomla.php b/plugins/content/joomla/joomla.php
index e37870b..5fca460 100644
--- a/plugins/content/joomla/joomla.php
+++ b/plugins/content/joomla/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.joomla
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/joomla/joomla.xml b/plugins/content/joomla/joomla.xml
index ac54b45..f510a26 100644
--- a/plugins/content/joomla/joomla.xml
+++ b/plugins/content/joomla/joomla.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/loadmodule/loadmodule.php b/plugins/content/loadmodule/loadmodule.php
index 3a1fecb..7af70a0 100644
--- a/plugins/content/loadmodule/loadmodule.php
+++ b/plugins/content/loadmodule/loadmodule.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.loadmodule
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/loadmodule/loadmodule.xml b/plugins/content/loadmodule/loadmodule.xml
index 87b79a2..d58b243 100644
--- a/plugins/content/loadmodule/loadmodule.xml
+++ b/plugins/content/loadmodule/loadmodule.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_loadmodule</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/pagebreak/pagebreak.php b/plugins/content/pagebreak/pagebreak.php
index 1675f85..0a4d293 100644
--- a/plugins/content/pagebreak/pagebreak.php
+++ b/plugins/content/pagebreak/pagebreak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.pagebreak
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -259,7 +259,7 @@ protected function _createTOC(&$row, &$matches, &$page)
 		$showall = $input->getInt('showall', 0);
 
 		// TOC header.
-		$row->toc .= '<div class="pull-right article-index">';
+		$row->toc = '<div class="pull-right article-index">';
 
 		if ($this->params->get('article_index') == 1)
 		{
diff --git a/plugins/content/pagebreak/pagebreak.xml b/plugins/content/pagebreak/pagebreak.xml
index 6d95cc7..0625b05 100644
--- a/plugins/content/pagebreak/pagebreak.xml
+++ b/plugins/content/pagebreak/pagebreak.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_pagebreak</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/pagenavigation/pagenavigation.php b/plugins/content/pagenavigation/pagenavigation.php
index 7c16732..0a6e09d 100644
--- a/plugins/content/pagenavigation/pagenavigation.php
+++ b/plugins/content/pagenavigation/pagenavigation.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.pagenavigation
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/pagenavigation/pagenavigation.xml b/plugins/content/pagenavigation/pagenavigation.xml
index 911c966..f598d1b 100644
--- a/plugins/content/pagenavigation/pagenavigation.xml
+++ b/plugins/content/pagenavigation/pagenavigation.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_pagenavigation</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/content/pagenavigation/tmpl/default.php b/plugins/content/pagenavigation/tmpl/default.php
index dbe115a..87a1b2e 100644
--- a/plugins/content/pagenavigation/tmpl/default.php
+++ b/plugins/content/pagenavigation/tmpl/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.pagenavigation
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/vote/vote.php b/plugins/content/vote/vote.php
index ca6ba82..228eb44 100644
--- a/plugins/content/vote/vote.php
+++ b/plugins/content/vote/vote.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Content.vote
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/content/vote/vote.xml b/plugins/content/vote/vote.xml
index 363220c..74fa7de 100644
--- a/plugins/content/vote/vote.xml
+++ b/plugins/content/vote/vote.xml
@@ -3,7 +3,7 @@
 	<name>plg_content_vote</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/article/article.php b/plugins/editors-xtd/article/article.php
index ffdf94e..d9bc89f 100644
--- a/plugins/editors-xtd/article/article.php
+++ b/plugins/editors-xtd/article/article.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.article
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/article/article.xml b/plugins/editors-xtd/article/article.xml
index 7050af2..70697c7 100644
--- a/plugins/editors-xtd/article/article.xml
+++ b/plugins/editors-xtd/article/article.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_article</name>
 	<author>Joomla! Project</author>
 	<creationDate>October 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/image/image.php b/plugins/editors-xtd/image/image.php
index f438c37..69d9a07 100644
--- a/plugins/editors-xtd/image/image.php
+++ b/plugins/editors-xtd/image/image.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.image
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -27,13 +27,13 @@ class PlgButtonImage extends JPlugin
 	protected $autoloadLanguage = true;
 
 	/**
-	 * Display the button
+	 * Display the button.
 	 *
-	 * @param   string  $name  The name of the button to display
-	 * @param   string  $asset
-	 * @param   string  $author
+	 * @param   string   $name    The name of the button to display.
+	 * @param   string   $asset   The name of the asset being edited.
+	 * @param   integer  $author  The id of the author owning the asset being edited.
 	 *
-	 * @return array A two element array of (imageName, textToInsert)
+	 * @return  array    A two element array of (imageName, textToInsert) or false if not authorised.
 	 */
 	public function onDisplay($name, $asset, $author)
 	{
diff --git a/plugins/editors-xtd/image/image.xml b/plugins/editors-xtd/image/image.xml
index 6b4912c..51d6b3e 100644
--- a/plugins/editors-xtd/image/image.xml
+++ b/plugins/editors-xtd/image/image.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_image</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.php b/plugins/editors-xtd/pagebreak/pagebreak.php
index 3ffda15..9963a9f 100644
--- a/plugins/editors-xtd/pagebreak/pagebreak.php
+++ b/plugins/editors-xtd/pagebreak/pagebreak.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.pagebreak
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/pagebreak/pagebreak.xml b/plugins/editors-xtd/pagebreak/pagebreak.xml
index 7dc78ac..50480ea 100644
--- a/plugins/editors-xtd/pagebreak/pagebreak.xml
+++ b/plugins/editors-xtd/pagebreak/pagebreak.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_pagebreak</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2004</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors-xtd/readmore/readmore.php b/plugins/editors-xtd/readmore/readmore.php
index 4c00f2c..6535bb7 100644
--- a/plugins/editors-xtd/readmore/readmore.php
+++ b/plugins/editors-xtd/readmore/readmore.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors-xtd.readmore
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors-xtd/readmore/readmore.xml b/plugins/editors-xtd/readmore/readmore.xml
index 4eb62e8..07b273e 100644
--- a/plugins/editors-xtd/readmore/readmore.xml
+++ b/plugins/editors-xtd/readmore/readmore.xml
@@ -3,7 +3,7 @@
 	<name>plg_editors-xtd_readmore</name>
 	<author>Joomla! Project</author>
 	<creationDate>March 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/editors/codemirror/codemirror.php b/plugins/editors/codemirror/codemirror.php
index 9ef57bd..d851126 100644
--- a/plugins/editors/codemirror/codemirror.php
+++ b/plugins/editors/codemirror/codemirror.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.codemirror
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/none/none.php b/plugins/editors/none/none.php
index 5c22ad9..5f8fcda 100644
--- a/plugins/editors/none/none.php
+++ b/plugins/editors/none/none.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.none
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
index 62789a3..6cdfd68 100644
--- a/plugins/editors/tinymce/tinymce.php
+++ b/plugins/editors/tinymce/tinymce.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Editors.tinymce
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/editors/tinymce/tinymce.xml b/plugins/editors/tinymce/tinymce.xml
index 3b87ecd..ee4cd2f 100644
--- a/plugins/editors/tinymce/tinymce.xml
+++ b/plugins/editors/tinymce/tinymce.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<extension version="3.1" type="plugin" group="editors" method="upgrade">
+<extension version="3.2" type="plugin" group="editors" method="upgrade">
 	<name>plg_editors_tinymce</name>
-	<version>4.0.10</version>
+	<version>4.0.12</version>
 	<creationDate>2005-2013</creationDate>
 	<author>Moxiecode Systems AB</author>
 	<authorEmail>N/A</authorEmail>
diff --git a/plugins/extension/joomla/joomla.php b/plugins/extension/joomla/joomla.php
index e781ed6..fd6893c 100644
--- a/plugins/extension/joomla/joomla.php
+++ b/plugins/extension/joomla/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Extension.Joomla
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/extension/joomla/joomla.xml b/plugins/extension/joomla/joomla.xml
index a01b3be..13d8e11 100644
--- a/plugins/extension/joomla/joomla.xml
+++ b/plugins/extension/joomla/joomla.xml
@@ -3,7 +3,7 @@
 	<name>plg_extension_joomla</name>
 	<author>Joomla! Project</author>
 	<creationDate>May 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/categories/categories.php b/plugins/finder/categories/categories.php
index ee2a04f..2f639ba 100644
--- a/plugins/finder/categories/categories.php
+++ b/plugins/finder/categories/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -12,7 +12,7 @@
 require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php';
 
 /**
- * Finder adapter for Joomla Categories.
+ * Smart Search adapter for Joomla Categories.
  *
  * @package     Joomla.Plugin
  * @subpackage  Finder.Categories
@@ -101,16 +101,19 @@ public function onFinderDelete($context, $table)
 		{
 			return true;
 		}
-		// Remove the items.
+
+		// Remove item from the index.
 		return $this->remove($id);
 	}
 
 	/**
-	 * Method to determine if the access level of an item changed.
+	 * Smart Search after save content method.
+	 * Reindexes the link information for a category that has been saved.
+	 * It also makes adjustments if the access level of the category has changed.
 	 *
-	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row      A JTable object
-	 * @param   boolean  $isNew    If the content has just been created
+	 * @param   string   $context  The context of the category passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the category has just been created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -119,20 +122,20 @@ public function onFinderDelete($context, $table)
 	 */
 	public function onFinderAfterSave($context, $row, $isNew)
 	{
-		// We only want to handle categories here
+		// We only want to handle categories here.
 		if ($context == 'com_categories.category')
 		{
-			// Check if the access levels are different
+			// Check if the access levels are different.
 			if (!$isNew && $this->old_access != $row->access)
 			{
 				// Process the change.
 				$this->itemAccessChange($row);
 
-				// Reindex the item
+				// Reindex the category item.
 				$this->reindex($row->id);
 			}
 
-			// Check if the parent access level is different
+			// Check if the parent access level is different.
 			if (!$isNew && $this->old_cataccess != $row->access)
 			{
 				$this->categoryAccessChange($row);
@@ -143,13 +146,12 @@ public function onFinderAfterSave($context, $row, $isNew)
 	}
 
 	/**
-	 * Method to reindex the link information for an item that has been saved.
-	 * This event is fired before the data is actually saved so we are going
-	 * to queue the item to be indexed later.
+	 * Smart Search before content save method.
+	 * This event is fired before the data is actually saved.
 	 *
-	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row     A JTable object
-	 * @param   boolean  $isNew    If the content is just about to be created
+	 * @param   string   $context  The context of the category passed to the plugin.
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the category is just about to be created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -158,10 +160,10 @@ public function onFinderAfterSave($context, $row, $isNew)
 	 */
 	public function onFinderBeforeSave($context, $row, $isNew)
 	{
-		// We only want to handle categories here
+		// We only want to handle categories here.
 		if ($context == 'com_categories.category')
 		{
-			// Query the database for the old access level and the parent if the item isn't new
+			// Query the database for the old access level and the parent if the item isn't new.
 			if (!$isNew)
 			{
 				$this->checkItemAccess($row);
@@ -177,9 +179,9 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 * from outside the edit screen. This is fired when the item is published,
 	 * unpublished, archived, or unarchived from the list view.
 	 *
-	 * @param   string   $context  The context for the content passed to the plugin.
-	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
-	 * @param   integer  $value    The value of the state that the content has been changed to.
+	 * @param   string   $context  The context for the category passed to the plugin.
+	 * @param   array    $pks      An array of primary key ids of the category that has changed state.
+	 * @param   integer  $value    The value of the state that the category has been changed to.
 	 *
 	 * @return  void
 	 *
@@ -187,12 +189,14 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 */
 	public function onFinderChangeState($context, $pks, $value)
 	{
-		// We only want to handle categories here
+		// We only want to handle categories here.
 		if ($context == 'com_categories.category')
 		{
-			// The category published state is tied to the parent category
-			// published state so we need to look up all published states
-			// before we change anything.
+			/*
+			 * The category published state is tied to the parent category
+			 * published state so we need to look up all published states
+			 * before we change anything.
+			 */
 			foreach ($pks as $pk)
 			{
 				/* TODO: The $item variable does not seem to be used at all
@@ -217,12 +221,12 @@ public function onFinderChangeState($context, $pks, $value)
 				// Update the item.
 				$this->change($pk, 'state', $temp);
 
-				// Reindex the item
+				// Reindex the item.
 				$this->reindex($pk);
 			}
 		}
 
-		// Handle when the plugin is disabled
+		// Handle when the plugin is disabled.
 		if ($context == 'com_plugins.plugin' && $value === 0)
 		{
 			$this->pluginDisable($pks);
@@ -233,7 +237,7 @@ public function onFinderChangeState($context, $pks, $value)
 	 * Method to index an item. The item must be a FinderIndexerResult object.
 	 *
 	 * @param   FinderIndexerResult  $item    The item to index as an FinderIndexerResult object.
-	 * @param   string               $format  The item format
+	 * @param   string               $format  The item format.  Not used.
 	 *
 	 * @return  void
 	 *
@@ -242,7 +246,7 @@ public function onFinderChangeState($context, $pks, $value)
 	 */
 	protected function index(FinderIndexerResult $item, $format = 'html')
 	{
-		// Check if the extension is enabled
+		// Check if the extension is enabled.
 		if (JComponentHelper::isEnabled($this->extension) == false)
 		{
 			return;
@@ -250,7 +254,7 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 
 		$item->setLanguage();
 
-		// Need to import component route helpers dynamically, hence the reason it's handled here
+		// Need to import component route helpers dynamically, hence the reason it's handled here.
 		$path = JPATH_SITE . '/components/' . $item->extension . '/helpers/route.php';
 		if (is_file($path))
 		{
@@ -268,7 +272,8 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 		$registry->loadString($item->metadata);
 		$item->metadata = $registry;
 
-		/* Add the meta-data processing instructions based on the categories
+		/*
+		 * Add the meta-data processing instructions based on the category's
 		 * configuration parameters.
 		 */
 		// Add the meta-author.
@@ -280,7 +285,7 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metadesc');
 		$item->addInstruction(FinderIndexer::META_CONTEXT, 'metaauthor');
 		$item->addInstruction(FinderIndexer::META_CONTEXT, 'author');
-		//$item->addInstruction(FinderIndexer::META_CONTEXT, 'created_by_alias');
+		// $item->addInstruction(FinderIndexer::META_CONTEXT, 'created_by_alias');
 
 		// Trigger the onContentPrepare event.
 		$item->summary = FinderIndexerHelper::prepareContent($item->summary, $item->params);
@@ -351,6 +356,7 @@ protected function setup()
 	protected function getListQuery($query = null)
 	{
 		$db = JFactory::getDbo();
+
 		// Check if we can use the supplied SQL query.
 		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
 			->select('a.id, a.title, a.alias, a.description AS summary, a.extension')
@@ -358,7 +364,7 @@ protected function getListQuery($query = null)
 			->select('a.metakey, a.metadesc, a.metadata, a.language, a.lft, a.parent_id, a.level')
 			->select('a.created_time AS start_date, a.published AS state, a.access, a.params');
 
-		// Handle the alias CASE WHEN portion of the query
+		// Handle the alias CASE WHEN portion of the query.
 		$case_when_item_alias = ' CASE WHEN ';
 		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
 		$case_when_item_alias .= ' THEN ';
@@ -375,7 +381,7 @@ protected function getListQuery($query = null)
 
 	/**
 	 * Method to get a SQL query to load the published and access states for
-	 * an article and category.
+	 * a category and its parents.
 	 *
 	 * @return  JDatabaseQuery  A database object.
 	 *
diff --git a/plugins/finder/categories/categories.xml b/plugins/finder/categories/categories.xml
index 1393a5c..29a6cef 100644
--- a/plugins/finder/categories/categories.xml
+++ b/plugins/finder/categories/categories.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/contacts/contacts.php b/plugins/finder/contacts/contacts.php
index 4a9d7f4..21adb91 100644
--- a/plugins/finder/contacts/contacts.php
+++ b/plugins/finder/contacts/contacts.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Contacts
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/plugins/finder/contacts/contacts.xml b/plugins/finder/contacts/contacts.xml
index 284bf24..362febb 100644
--- a/plugins/finder/contacts/contacts.xml
+++ b/plugins/finder/contacts/contacts.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_contacts</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/content/content.php b/plugins/finder/content/content.php
index 63c6023..c0f68c0 100644
--- a/plugins/finder/content/content.php
+++ b/plugins/finder/content/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -12,7 +12,7 @@
 require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php';
 
 /**
- * Finder adapter for com_content.
+ * Smart Search adapter for com_content.
  *
  * @package     Joomla.Plugin
  * @subpackage  Finder.Content
@@ -83,7 +83,7 @@ class PlgFinderContent extends FinderIndexerAdapter
 	 */
 	public function onFinderCategoryChangeState($extension, $pks, $value)
 	{
-		// Make sure we're handling com_content categories
+		// Make sure we're handling com_content categories.
 		if ($extension == 'com_content')
 		{
 			$this->categoryStateChange($pks, $value);
@@ -115,16 +115,20 @@ public function onFinderAfterDelete($context, $table)
 		{
 			return true;
 		}
-		// Remove the items.
+
+		// Remove item from the index.
 		return $this->remove($id);
 	}
 
 	/**
-	 * Method to determine if the access level of an item changed.
+	 * Smart Search after save content method.
+	 * Reindexes the link information for an article that has been saved.
+	 * It also makes adjustments if the access level of an item or the
+	 * category to which it belongs has changed.
 	 *
 	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row      A JTable object
-	 * @param   boolean  $isNew    If the content has just been created
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content has just been created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -133,24 +137,24 @@ public function onFinderAfterDelete($context, $table)
 	 */
 	public function onFinderAfterSave($context, $row, $isNew)
 	{
-		// We only want to handle articles here
+		// We only want to handle articles here.
 		if ($context == 'com_content.article' || $context == 'com_content.form')
 		{
-			// Check if the access levels are different
+			// Check if the access levels are different.
 			if (!$isNew && $this->old_access != $row->access)
 			{
 				// Process the change.
 				$this->itemAccessChange($row);
 			}
 
-			// Reindex the item
+			// Reindex the item.
 			$this->reindex($row->id);
 		}
 
-		// Check for access changes in the category
+		// Check for access changes in the category.
 		if ($context == 'com_categories.category')
 		{
-			// Check if the access levels are different
+			// Check if the access levels are different.
 			if (!$isNew && $this->old_cataccess != $row->access)
 			{
 				$this->categoryAccessChange($row);
@@ -161,13 +165,12 @@ public function onFinderAfterSave($context, $row, $isNew)
 	}
 
 	/**
-	 * Method to reindex the link information for an item that has been saved.
-	 * This event is fired before the data is actually saved so we are going
-	 * to queue the item to be indexed later.
+	 * Smart Search before content save method.
+	 * This event is fired before the data is actually saved.
 	 *
 	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row     A JTable object
-	 * @param   boolean  $isNew    If the content is just about to be created
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    If the content is just about to be created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -176,20 +179,20 @@ public function onFinderAfterSave($context, $row, $isNew)
 	 */
 	public function onFinderBeforeSave($context, $row, $isNew)
 	{
-		// We only want to handle articles here
+		// We only want to handle articles here.
 		if ($context == 'com_content.article' || $context == 'com_content.form')
 		{
-			// Query the database for the old access level if the item isn't new
+			// Query the database for the old access level if the item isn't new.
 			if (!$isNew)
 			{
 				$this->checkItemAccess($row);
 			}
 		}
 
-		// Check for access levels from the category
+		// Check for access levels from the category.
 		if ($context == 'com_categories.category')
 		{
-			// Query the database for the old access level if the item isn't new
+			// Query the database for the old access level if the item isn't new.
 			if (!$isNew)
 			{
 				$this->checkCategoryAccess($row);
@@ -205,7 +208,7 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 * unpublished, archived, or unarchived from the list view.
 	 *
 	 * @param   string   $context  The context for the content passed to the plugin.
-	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
+	 * @param   array    $pks      An array of primary key ids of the content that has changed state.
 	 * @param   integer  $value    The value of the state that the content has been changed to.
 	 *
 	 * @return  void
@@ -214,12 +217,13 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 */
 	public function onFinderChangeState($context, $pks, $value)
 	{
-		// We only want to handle articles here
+		// We only want to handle articles here.
 		if ($context == 'com_content.article' || $context == 'com_content.form')
 		{
 			$this->itemStateChange($pks, $value);
 		}
-		// Handle when the plugin is disabled
+
+		// Handle when the plugin is disabled.
 		if ($context == 'com_plugins.plugin' && $value === 0)
 		{
 			$this->pluginDisable($pks);
@@ -230,7 +234,7 @@ public function onFinderChangeState($context, $pks, $value)
 	 * Method to index an item. The item must be a FinderIndexerResult object.
 	 *
 	 * @param   FinderIndexerResult  $item    The item to index as an FinderIndexerResult object.
-	 * @param   string               $format  The item format
+	 * @param   string               $format  The item format.  Not used.
 	 *
 	 * @return  void
 	 *
@@ -241,13 +245,13 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 	{
 		$item->setLanguage();
 
-		// Check if the extension is enabled
+		// Check if the extension is enabled.
 		if (JComponentHelper::isEnabled($this->extension) == false)
 		{
 			return;
 		}
 
-		// Initialize the item parameters.
+		// Initialise the item parameters.
 		$registry = new JRegistry;
 		$registry->loadString($item->params);
 		$item->params = JComponentHelper::getParams('com_content', true);
@@ -337,6 +341,7 @@ protected function setup()
 	protected function getListQuery($query = null)
 	{
 		$db = JFactory::getDbo();
+
 		// Check if we can use the supplied SQL query.
 		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
 			->select('a.id, a.title, a.alias, a.introtext AS summary, a.fulltext AS body')
diff --git a/plugins/finder/content/content.xml b/plugins/finder/content/content.xml
index 65c2be1..457dace 100644
--- a/plugins/finder/content/content.xml
+++ b/plugins/finder/content/content.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_content</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/newsfeeds/newsfeeds.php b/plugins/finder/newsfeeds/newsfeeds.php
index e0795b6..49bfa6a 100644
--- a/plugins/finder/newsfeeds/newsfeeds.php
+++ b/plugins/finder/newsfeeds/newsfeeds.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -12,7 +12,7 @@
 require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php';
 
 /**
- * Finder adapter for Joomla Newsfeeds.
+ * Smart Search adapter for Joomla Newsfeeds.
  *
  * @package     Joomla.Plugin
  * @subpackage  Finder.Newsfeeds
@@ -82,7 +82,7 @@ class PlgFinderNewsfeeds extends FinderIndexerAdapter
 	 * from the list view.
 	 *
 	 * @param   string   $extension  The extension whose category has been updated.
-	 * @param   array    $pks        A list of primary key ids of the content that has changed state.
+	 * @param   array    $pks        An array of primary key ids of the content that has changed state.
 	 * @param   integer  $value      The value of the state that the content has been changed to.
 	 *
 	 * @return  void
@@ -91,7 +91,7 @@ class PlgFinderNewsfeeds extends FinderIndexerAdapter
 	 */
 	public function onFinderCategoryChangeState($extension, $pks, $value)
 	{
-		// Make sure we're handling com_newsfeeds categories
+		// Make sure we're handling com_newsfeeds categories.
 		if ($extension == 'com_newsfeeds')
 		{
 			$this->categoryStateChange($pks, $value);
@@ -102,7 +102,7 @@ public function onFinderCategoryChangeState($extension, $pks, $value)
 	 * Method to remove the link information for items that have been deleted.
 	 *
 	 * @param   string  $context  The context of the action being performed.
-	 * @param   JTable  $table    A JTable object containing the record to be deleted
+	 * @param   JTable  $table    A JTable object containing the record to be deleted.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -123,16 +123,20 @@ public function onFinderAfterDelete($context, $table)
 		{
 			return true;
 		}
-		// Remove the items.
+
+		// Remove the item from the index.
 		return $this->remove($id);
 	}
 
 	/**
-	 * Method to determine if the access level of an item changed.
+	 * Smart Search after save content method.
+	 * Reindexes the link information for a newsfeed that has been saved.
+	 * It also makes adjustments if the access level of a newsfeed item or
+	 * the category to which it belongs has beend changed.
 	 *
 	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row      A JTable object
-	 * @param   boolean  $isNew    If the content has just been created
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content has just been created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -141,24 +145,24 @@ public function onFinderAfterDelete($context, $table)
 	 */
 	public function onFinderAfterSave($context, $row, $isNew)
 	{
-		// We only want to handle news feeds here
+		// We only want to handle newsfeeds here.
 		if ($context == 'com_newsfeeds.newsfeed')
 		{
-			// Check if the access levels are different
+			// Check if the access levels are different.
 			if (!$isNew && $this->old_access != $row->access)
 			{
 				// Process the change.
 				$this->itemAccessChange($row);
 			}
 
-			// Reindex the item
+			// Reindex the item.
 			$this->reindex($row->id);
 		}
 
-		// Check for access changes in the category
+		// Check for access changes in the category.
 		if ($context == 'com_categories.category')
 		{
-			// Check if the access levels are different
+			// Check if the access levels are different.
 			if (!$isNew && $this->old_cataccess != $row->access)
 			{
 				$this->categoryAccessChange($row);
@@ -169,13 +173,12 @@ public function onFinderAfterSave($context, $row, $isNew)
 	}
 
 	/**
-	 * Method to reindex the link information for an item that has been saved.
-	 * This event is fired before the data is actually saved so we are going
-	 * to queue the item to be indexed later.
+	 * Smart Search before content save method.
+	 * This event is fired before the data is actually saved.
 	 *
 	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row     A JTable object
-	 * @param   boolean  $isNew    If the content is just about to be created
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content is just about to be created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -184,20 +187,20 @@ public function onFinderAfterSave($context, $row, $isNew)
 	 */
 	public function onFinderBeforeSave($context, $row, $isNew)
 	{
-		// We only want to handle news feeds here
+		// We only want to handle newsfeeds here.
 		if ($context == 'com_newsfeeds.newsfeed')
 		{
-			// Query the database for the old access level if the item isn't new
+			// Query the database for the old access level if the item isn't new.
 			if (!$isNew)
 			{
 				$this->checkItemAccess($row);
 			}
 		}
 
-		// Check for access levels from the category
+		// Check for access levels from the category.
 		if ($context == 'com_categories.category')
 		{
-			// Query the database for the old access level if the item isn't new
+			// Query the database for the old access level if the item isn't new.
 			if (!$isNew)
 			{
 				$this->checkCategoryAccess($row);
@@ -213,7 +216,7 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 * unpublished, archived, or unarchived from the list view.
 	 *
 	 * @param   string   $context  The context for the content passed to the plugin.
-	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
+	 * @param   array    $pks      An array of primary key ids of the content that has changed state.
 	 * @param   integer  $value    The value of the state that the content has been changed to.
 	 *
 	 * @return  void
@@ -222,13 +225,13 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 */
 	public function onFinderChangeState($context, $pks, $value)
 	{
-		// We only want to handle news feeds here
+		// We only want to handle newsfeeds here.
 		if ($context == 'com_newsfeeds.newsfeed')
 		{
 			$this->itemStateChange($pks, $value);
 		}
 
-		// Handle when the plugin is disabled
+		// Handle when the plugin is disabled.
 		if ($context == 'com_plugins.plugin' && $value === 0)
 		{
 			$this->pluginDisable($pks);
@@ -239,7 +242,7 @@ public function onFinderChangeState($context, $pks, $value)
 	 * Method to index an item. The item must be a FinderIndexerResult object.
 	 *
 	 * @param   FinderIndexerResult  $item    The item to index as an FinderIndexerResult object.
-	 * @param   string               $format  The item format
+	 * @param   string               $format  The item format.  Not used.
 	 *
 	 * @return  void
 	 *
@@ -248,7 +251,7 @@ public function onFinderChangeState($context, $pks, $value)
 	 */
 	protected function index(FinderIndexerResult $item, $format = 'html')
 	{
-		// Check if the extension is enabled
+		// Check if the extension is enabled.
 		if (JComponentHelper::isEnabled($this->extension) == false)
 		{
 			return;
@@ -329,6 +332,7 @@ protected function setup()
 	protected function getListQuery($query = null)
 	{
 		$db = JFactory::getDbo();
+
 		// Check if we can use the supplied SQL query.
 		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
 			->select('a.id, a.catid, a.name AS title, a.alias, a.link AS link')
@@ -338,7 +342,7 @@ protected function getListQuery($query = null)
 			->select('a.created_by, a.created_by_alias, a.modified, a.modified_by')
 			->select('c.title AS category, c.published AS cat_state, c.access AS cat_access');
 
-		// Handle the alias CASE WHEN portion of the query
+		// Handle the alias CASE WHEN portion of the query.
 		$case_when_item_alias = ' CASE WHEN ';
 		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
 		$case_when_item_alias .= ' THEN ';
diff --git a/plugins/finder/newsfeeds/newsfeeds.xml b/plugins/finder/newsfeeds/newsfeeds.xml
index 56b8b74..413310d 100644
--- a/plugins/finder/newsfeeds/newsfeeds.xml
+++ b/plugins/finder/newsfeeds/newsfeeds.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/tags/tags.php b/plugins/finder/tags/tags.php
index 9439bd5..b9010a5 100644
--- a/plugins/finder/tags/tags.php
+++ b/plugins/finder/tags/tags.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Tags
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/plugins/finder/tags/tags.xml b/plugins/finder/tags/tags.xml
index 41afd1a..256c463 100644
--- a/plugins/finder/tags/tags.xml
+++ b/plugins/finder/tags/tags.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_tags</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2013</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/finder/weblinks/weblinks.php b/plugins/finder/weblinks/weblinks.php
index 70bc230..5384821 100644
--- a/plugins/finder/weblinks/weblinks.php
+++ b/plugins/finder/weblinks/weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Finder.Weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -13,7 +13,7 @@
 require_once JPATH_ADMINISTRATOR . '/components/com_finder/helpers/indexer/adapter.php';
 
 /**
- * Finder adapter for Joomla Web Links.
+ * Smart Search adapter for Joomla Web Links.
  *
  * @package     Joomla.Plugin
  * @subpackage  Finder.Weblinks
@@ -75,7 +75,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter
 	 * from the list view.
 	 *
 	 * @param   string   $extension  The extension whose category has been updated.
-	 * @param   array    $pks        A list of primary key ids of the content that has changed state.
+	 * @param   array    $pks        An array of primary key ids of the content that has changed state.
 	 * @param   integer  $value      The value of the state that the content has been changed to.
 	 *
 	 * @return  void
@@ -84,7 +84,7 @@ class PlgFinderWeblinks extends FinderIndexerAdapter
 	 */
 	public function onFinderCategoryChangeState($extension, $pks, $value)
 	{
-		// Make sure we're handling com_weblinks categories
+		// Make sure we're handling com_weblinks categories.
 		if ($extension == 'com_weblinks')
 		{
 			$this->categoryStateChange($pks, $value);
@@ -95,7 +95,7 @@ public function onFinderCategoryChangeState($extension, $pks, $value)
 	 * Method to remove the link information for items that have been deleted.
 	 *
 	 * @param   string  $context  The context of the action being performed.
-	 * @param   JTable  $table    A JTable object containing the record to be deleted
+	 * @param   JTable  $table    A JTable object containing the record to be deleted.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -116,16 +116,20 @@ public function onFinderAfterDelete($context, $table)
 		{
 			return true;
 		}
-		// Remove the items.
+
+		// Remove the item from the index.
 		return $this->remove($id);
 	}
 
 	/**
-	 * Method to determine if the access level of an item changed.
+	 * Smart Search after content save method.
+	 * Reindexes the link information for a weblink that has been saved.
+	 * It also makes adjustments if the access level of a weblink item or
+	 * the category to which it belongs has been changed.
 	 *
 	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row      A JTable object
-	 * @param   boolean  $isNew    If the content has just been created
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content has just been created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -137,21 +141,21 @@ public function onFinderAfterSave($context, $row, $isNew)
 		// We only want to handle web links here. We need to handle front end and back end editing.
 		if ($context == 'com_weblinks.weblink' || $context == 'com_weblinks.form' )
 		{
-			// Check if the access levels are different
+			// Check if the access levels are different.
 			if (!$isNew && $this->old_access != $row->access)
 			{
 				// Process the change.
 				$this->itemAccessChange($row);
 			}
 
-			// Reindex the item
+			// Reindex the item.
 			$this->reindex($row->id);
 		}
 
-		// Check for access changes in the category
+		// Check for access changes in the category.
 		if ($context == 'com_categories.category')
 		{
-			// Check if the access levels are different
+			// Check if the access levels are different.
 			if (!$isNew && $this->old_cataccess != $row->access)
 			{
 				$this->categoryAccessChange($row);
@@ -162,13 +166,12 @@ public function onFinderAfterSave($context, $row, $isNew)
 	}
 
 	/**
-	 * Method to reindex the link information for an item that has been saved.
-	 * This event is fired before the data is actually saved so we are going
-	 * to queue the item to be indexed later.
+	 * Smart Search before content save method.
+	 * This event is fired before the data is actually saved.
 	 *
 	 * @param   string   $context  The context of the content passed to the plugin.
-	 * @param   JTable   $row     A JTable object
-	 * @param   boolean  $isNew    If the content is just about to be created
+	 * @param   JTable   $row      A JTable object.
+	 * @param   boolean  $isNew    True if the content is just about to be created.
 	 *
 	 * @return  boolean  True on success.
 	 *
@@ -177,20 +180,20 @@ public function onFinderAfterSave($context, $row, $isNew)
 	 */
 	public function onFinderBeforeSave($context, $row, $isNew)
 	{
-		// We only want to handle web links here
+		// We only want to handle web links here.
 		if ($context == 'com_weblinks.weblink' || $context == 'com_weblinks.form')
 		{
-			// Query the database for the old access level if the item isn't new
+			// Query the database for the old access level if the item isn't new.
 			if (!$isNew)
 			{
 				$this->checkItemAccess($row);
 			}
 		}
 
-		// Check for access levels from the category
+		// Check for access levels from the category.
 		if ($context == 'com_categories.category')
 		{
-			// Query the database for the old access level if the item isn't new
+			// Query the database for the old access level if the item isn't new.
 			if (!$isNew)
 			{
 				$this->checkCategoryAccess($row);
@@ -206,7 +209,7 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 * unpublished, archived, or unarchived from the list view.
 	 *
 	 * @param   string   $context  The context for the content passed to the plugin.
-	 * @param   array    $pks      A list of primary key ids of the content that has changed state.
+	 * @param   array    $pks      An array of primary key ids of the content that has changed state.
 	 * @param   integer  $value    The value of the state that the content has been changed to.
 	 *
 	 * @return  void
@@ -215,12 +218,13 @@ public function onFinderBeforeSave($context, $row, $isNew)
 	 */
 	public function onFinderChangeState($context, $pks, $value)
 	{
-		// We only want to handle web links here
+		// We only want to handle web links here.
 		if ($context == 'com_weblinks.weblink' || $context == 'com_weblinks.form')
 		{
 			$this->itemStateChange($pks, $value);
 		}
-		// Handle when the plugin is disabled
+
+		// Handle when the plugin is disabled.
 		if ($context == 'com_plugins.plugin' && $value === 0)
 		{
 			$this->pluginDisable($pks);
@@ -231,7 +235,7 @@ public function onFinderChangeState($context, $pks, $value)
 	 * Method to index an item. The item must be a FinderIndexerResult object.
 	 *
 	 * @param   FinderIndexerResult  $item    The item to index as an FinderIndexerResult object.
-	 * @param   string               $format  The item format
+	 * @param   string               $format  The item format.  Not used.
 	 *
 	 * @return  void
 	 *
@@ -248,7 +252,7 @@ protected function index(FinderIndexerResult $item, $format = 'html')
 
 		$item->setLanguage();
 
-		// Initialize the item parameters.
+		// Initialise the item parameters.
 		$registry = new JRegistry;
 		$registry->loadString($item->params);
 		$item->params = $registry;
@@ -320,6 +324,7 @@ protected function setup()
 	protected function getListQuery($query = null)
 	{
 		$db = JFactory::getDbo();
+
 		// Check if we can use the supplied SQL query.
 		$query = $query instanceof JDatabaseQuery ? $query : $db->getQuery(true)
 			->select('a.id, a.catid, a.title, a.alias, a.url AS link, a.description AS summary')
@@ -329,7 +334,7 @@ protected function getListQuery($query = null)
 			->select('a.state AS state, a.created AS start_date, a.params')
 			->select('c.title AS category, c.published AS cat_state, c.access AS cat_access');
 
-		// Handle the alias CASE WHEN portion of the query
+		// Handle the alias CASE WHEN portion of the query.
 		$case_when_item_alias = ' CASE WHEN ';
 		$case_when_item_alias .= $query->charLength('a.alias', '!=', '0');
 		$case_when_item_alias .= ' THEN ';
diff --git a/plugins/finder/weblinks/weblinks.xml b/plugins/finder/weblinks/weblinks.xml
index 089cde6..37378c7 100644
--- a/plugins/finder/weblinks/weblinks.xml
+++ b/plugins/finder/weblinks/weblinks.xml
@@ -3,7 +3,7 @@
 	<name>plg_finder_weblinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/quickicon/extensionupdate/extensionupdate.php b/plugins/quickicon/extensionupdate/extensionupdate.php
index 5651511..a9418a2 100644
--- a/plugins/quickicon/extensionupdate/extensionupdate.php
+++ b/plugins/quickicon/extensionupdate/extensionupdate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Quickicon.Extensionupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -46,12 +46,12 @@ public function onGetIcons($context)
 
 		JHtml::_('jquery.framework');
 
-		$ajax_url = JUri::base().'index.php?option=com_installer&view=update&task=update.ajax';
+		$ajax_url = JUri::base() . 'index.php?option=com_installer&view=update&task=update.ajax';
 		$script = "var plg_quickicon_extensionupdate_ajax_url = '$ajax_url';\n";
-		$script .= 'var plg_quickicon_extensionupdate_text = {"UPTODATE" : "'.
-			JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE', true).'", "UPDATEFOUND": "'.
-			JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND', true).'", "ERROR": "'.
-			JText::_('PLG_QUICKICON_EXTENSIONUPDATE_ERROR', true)."\"};\n";
+		$script .= 'var plg_quickicon_extensionupdate_text = {"UPTODATE" : "'
+			. JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPTODATE', true) . '", "UPDATEFOUND": "'
+			. JText::_('PLG_QUICKICON_EXTENSIONUPDATE_UPDATEFOUND', true) . '", "ERROR": "'
+			. JText::_('PLG_QUICKICON_EXTENSIONUPDATE_ERROR', true) . "\"};\n";
 		$document = JFactory::getDocument();
 		$document->addScriptDeclaration($script);
 		JHtml::_('script', 'plg_quickicon_extensionupdate/extensionupdatecheck.js', false, true);
diff --git a/plugins/quickicon/extensionupdate/extensionupdate.xml b/plugins/quickicon/extensionupdate/extensionupdate.xml
index 53e99e9..8dfb336 100644
--- a/plugins/quickicon/extensionupdate/extensionupdate.xml
+++ b/plugins/quickicon/extensionupdate/extensionupdate.xml
@@ -3,7 +3,7 @@
 	<name>plg_quickicon_extensionupdate</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/quickicon/joomlaupdate/joomlaupdate.php b/plugins/quickicon/joomlaupdate/joomlaupdate.php
index 26391a3..71f89da 100644
--- a/plugins/quickicon/joomlaupdate/joomlaupdate.php
+++ b/plugins/quickicon/joomlaupdate/joomlaupdate.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Quickicon.Joomlaupdate
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -53,7 +53,7 @@ public function onGetIcons($context)
 		$script = array();
 		$script[] = 'var plg_quickicon_joomlaupdate_url = \'' . $url . '\';';
 		$script[] = 'var plg_quickicon_joomlaupdate_ajax_url = \'' . $ajax_url . '\';';
-		$script[] = 'var plg_quickicon_jupdatecheck_jversion = \''.JVERSION.'\'';
+		$script[] = 'var plg_quickicon_jupdatecheck_jversion = \'' . JVERSION . '\'';
 		$script[] = 'var plg_quickicon_joomlaupdate_text = {'
 			. '"UPTODATE" : "' . JText::_('PLG_QUICKICON_JOOMLAUPDATE_UPTODATE', true) . '",'
 			. '"UPDATEFOUND": "' . JText::_('PLG_QUICKICON_JOOMLAUPDATE_UPDATEFOUND', true) . '",'
diff --git a/plugins/quickicon/joomlaupdate/joomlaupdate.xml b/plugins/quickicon/joomlaupdate/joomlaupdate.xml
index b92d924..ccc4efa 100644
--- a/plugins/quickicon/joomlaupdate/joomlaupdate.xml
+++ b/plugins/quickicon/joomlaupdate/joomlaupdate.xml
@@ -3,7 +3,7 @@
 	<name>plg_quickicon_joomlaupdate</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/categories/categories.php b/plugins/search/categories/categories.php
index 1d2f859..3273e40 100644
--- a/plugins/search/categories/categories.php
+++ b/plugins/search/categories/categories.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.categories
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 require_once JPATH_SITE . '/components/com_content/helpers/route.php';
 
 /**
- * Categories Search plugin
+ * Categories search plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  Search.categories
@@ -29,7 +29,11 @@ class PlgSearchCategories extends JPlugin
 	protected $autoloadLanguage = true;
 
 	/**
-	 * @return array An array of search areas
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearchAreas()
 	{
@@ -40,16 +44,19 @@ public function onContentSearchAreas()
 	}
 
 	/**
-	 * Categories Search method
+	 * Search content (categories).
+	 *
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   mixed   $areas     An array if the search is to be restricted to areas or null to search all areas.
 	 *
-	 * The sql must return the following fields that are
-	 * used in a common display routine: href, title, section, created, text,
-	 * browsernav
+	 * @return  array  Search results.
 	 *
-	 * @param string Target search string
-	 * @param string mathcing option, exact|any|all
-	 * @param string ordering option, newest|oldest|popular|alpha|category
-	 * @param mixed  An array if restricted to areas, null if search all
+	 * @since   1.6
 	 */
 	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
 	{
@@ -137,7 +144,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$text = $db->quote('%' . $db->escape($text, true) . '%', false);
 		$query = $db->getQuery(true);
 
-		//sqlsrv changes
+		// SQLSRV changes.
 		$case_when = ' CASE WHEN ';
 		$case_when .= $query->charLength('a.alias', '!=', '0');
 		$case_when .= ' THEN ';
diff --git a/plugins/search/categories/categories.xml b/plugins/search/categories/categories.xml
index 697722e..f1c9073 100644
--- a/plugins/search/categories/categories.xml
+++ b/plugins/search/categories/categories.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_categories</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/contacts/contacts.php b/plugins/search/contacts/contacts.php
index 24a2b2d..3bc166d 100644
--- a/plugins/search/contacts/contacts.php
+++ b/plugins/search/contacts/contacts.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.contacts
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 /**
- * Contacts Search plugin
+ * Contacts search plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  Search.contacts
@@ -27,7 +27,11 @@ class PlgSearchContacts extends JPlugin
 	protected $autoloadLanguage = true;
 
 	/**
-	 * @return array An array of search areas
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearchAreas()
 	{
@@ -38,14 +42,19 @@ public function onContentSearchAreas()
 	}
 
 	/**
-	 * Contacts Search method
+	 * Search content (contacts).
+	 *
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
 	 *
-	 * The sql must return the following fields that are used in a common display
-	 * routine: href, title, section, created, text, browsernav
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   string  $areas     An array if the search is to be restricted to areas or null to search all areas.
 	 *
-	 * @param string Target search string
-	 * @param string matching option, exact|any|all
-	 * @param string ordering option, newest|oldest|popular|alpha|category
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
 	{
@@ -108,7 +117,8 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$text = $db->quote('%' . $db->escape($text, true) . '%', false);
 
 		$query = $db->getQuery(true);
-		//sqlsrv changes
+
+		// SQLSRV changes.
 		$case_when = ' CASE WHEN ';
 		$case_when .= $query->charLength('a.alias', '!=', '0');
 		$case_when .= ' THEN ';
@@ -144,7 +154,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 			->group('a.id, a.con_position, a.misc, c.alias, c.id')
 			->order($order);
 
-		// Filter by language
+		// Filter by language.
 		if ($app->isSite() && JLanguageMultilang::isEnabled())
 		{
 			$tag = JFactory::getLanguage()->getTag();
diff --git a/plugins/search/contacts/contacts.xml b/plugins/search/contacts/contacts.xml
index 606f821..4676c84 100644
--- a/plugins/search/contacts/contacts.xml
+++ b/plugins/search/contacts/contacts.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_contacts</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/content/content.php b/plugins/search/content/content.php
index 0625e9f..054cb23 100644
--- a/plugins/search/content/content.php
+++ b/plugins/search/content/content.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.content
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 require_once JPATH_SITE . '/components/com_content/router.php';
 
 /**
- * Content Search plugin
+ * Content search plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  Search.content
@@ -21,7 +21,11 @@
 class PlgSearchContent extends JPlugin
 {
 	/**
-	 * @return array An array of search areas
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearchAreas()
 	{
@@ -32,13 +36,18 @@ public function onContentSearchAreas()
 	}
 
 	/**
-	 * Content Search method
-	 * The sql must return the following fields that are used in a common display
-	 * routine: href, title, section, created, text, browsernav
-	 * @param string Target search string
-	 * @param string mathcing option, exact|any|all
-	 * @param string ordering option, newest|oldest|popular|alpha|category
-	 * @param mixed  An array if the search it to be restricted to areas, null if search all
+	 * Search content (articles).
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
+	 *
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   mixed   $areas     An array if the search it to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
 	{
@@ -134,11 +143,12 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$rows = array();
 		$query = $db->getQuery(true);
 
-		// search articles
+		// Search articles.
 		if ($sContent && $limit > 0)
 		{
 			$query->clear();
-			//sqlsrv changes
+
+			// SQLSRV changes.
 			$case_when = ' CASE WHEN ';
 			$case_when .= $query->charLength('a.alias', '!=', '0');
 			$case_when .= ' THEN ';
@@ -170,7 +180,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 				->group('a.id, a.title, a.metadesc, a.metakey, a.created, a.introtext, a.fulltext, c.title, a.alias, c.alias, c.id')
 				->order($order);
 
-			// Filter by language
+			// Filter by language.
 			if ($app->isSite() && JLanguageMultilang::isEnabled())
 			{
 				$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')')
@@ -191,11 +201,12 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 			$rows[] = $list;
 		}
 
-		// search archived content
+		// Search archived content.
 		if ($sArchived && $limit > 0)
 		{
 			$query->clear();
-			//sqlsrv changes
+
+			// SQLSRV changes.
 			$case_when = ' CASE WHEN ';
 			$case_when .= $query->charLength('a.alias', '!=', '0');
 			$case_when .= ' THEN ';
@@ -218,7 +229,8 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 					. $case_when . ',' . $case_when1 . ', '
 					. 'c.title AS section, \'2\' AS browsernav'
 			);
-			//.'CONCAT_WS("/", c.title) AS section, \'2\' AS browsernav' );
+
+			// .'CONCAT_WS("/", c.title) AS section, \'2\' AS browsernav' );
 			$query->from('#__content AS a')
 				->join('INNER', '#__categories AS c ON c.id=a.catid AND c.access IN (' . $groups . ')')
 				->where(
@@ -229,7 +241,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 				)
 				->order($order);
 
-			// Filter by language
+			// Filter by language.
 			if ($app->isSite() && JLanguageMultilang::isEnabled())
 			{
 				$query->where('a.language in (' . $db->quote($tag) . ',' . $db->quote('*') . ')')
@@ -239,7 +251,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 			$db->setQuery($query, 0, $limit);
 			$list3 = $db->loadObjectList();
 
-			// find an itemid for archived to use if there isn't another one
+			// Find an itemid for archived to use if there isn't another one.
 			$item = $app->getMenu()->getItems('link', 'index.php?option=com_content&view=archive', true);
 			$itemid = isset($item->id) ? '&Itemid=' . $item->id : '';
 
diff --git a/plugins/search/content/content.xml b/plugins/search/content/content.xml
index 63dd51a..5fd0733 100644
--- a/plugins/search/content/content.xml
+++ b/plugins/search/content/content.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_content</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/newsfeeds/newsfeeds.php b/plugins/search/newsfeeds/newsfeeds.php
index 7ba9586..4233027 100644
--- a/plugins/search/newsfeeds/newsfeeds.php
+++ b/plugins/search/newsfeeds/newsfeeds.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 /**
- * Newsfeeds Search plugin
+ * Newsfeeds search plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  Search.newsfeeds
@@ -27,7 +27,11 @@ class PlgSearchNewsfeeds extends JPlugin
 	protected $autoloadLanguage = true;
 
 	/**
-	 * @return array An array of search areas
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearchAreas()
 	{
@@ -38,15 +42,19 @@ public function onContentSearchAreas()
 	}
 
 	/**
-	 * Newsfeeds Search method
+	 * Search content (newsfeeds).
+	 *
+	 * The SQL must return the following fields that are used in a common display
+	 * routine: href, title, section, created, text, browsernav.
 	 *
-	 * The sql must return the following fields that are used in a common display
-	 * routine: href, title, section, created, text, browsernav
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   mixed   $areas     An array if the search it to be restricted to areas or null to search all areas.
 	 *
-	 * @param string Target search string
-	 * @param string mathcing option, exact|any|all
-	 * @param string ordering option, newest|oldest|popular|alpha|category
-	 * @param mixed  An array if the search it to be restricted to areas, null if search all
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
 	{
@@ -134,7 +142,8 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$searchNewsfeeds = JText::_('PLG_SEARCH_NEWSFEEDS_NEWSFEEDS');
 
 		$query = $db->getQuery(true);
-		//sqlsrv changes
+
+		// SQLSRV changes.
 		$case_when = ' CASE WHEN ';
 		$case_when .= $query->charLength('a.alias', '!=', '0');
 		$case_when .= ' THEN ';
@@ -159,7 +168,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 			->where('(' . $where . ') AND a.published IN (' . implode(',', $state) . ') AND c.published = 1 AND c.access IN (' . $groups . ')')
 			->order($order);
 
-		// Filter by language
+		// Filter by language.
 		if ($app->isSite() && JLanguageMultilang::isEnabled())
 		{
 			$tag = JFactory::getLanguage()->getTag();
diff --git a/plugins/search/newsfeeds/newsfeeds.xml b/plugins/search/newsfeeds/newsfeeds.xml
index af48f8f..4503616 100644
--- a/plugins/search/newsfeeds/newsfeeds.xml
+++ b/plugins/search/newsfeeds/newsfeeds.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_newsfeeds</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/search/weblinks/weblinks.php b/plugins/search/weblinks/weblinks.php
index f9d6f6f..945d35c 100644
--- a/plugins/search/weblinks/weblinks.php
+++ b/plugins/search/weblinks/weblinks.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Search.weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -12,7 +12,7 @@
 require_once JPATH_SITE . '/components/com_weblinks/helpers/route.php';
 
 /**
- * Weblinks Search plugin
+ * Weblinks search plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  Search.weblinks
@@ -29,7 +29,11 @@ class PlgSearchWeblinks extends JPlugin
 	protected $autoloadLanguage = true;
 
 	/**
-	 * @return array An array of search areas
+	 * Determine areas searchable by this plugin.
+	 *
+	 * @return  array  An array of search areas.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearchAreas()
 	{
@@ -40,15 +44,19 @@ public function onContentSearchAreas()
 	}
 
 	/**
-	 * Weblink Search method
+	 * Search content (weblinks).
 	 *
-	 * The sql must return the following fields that are used in a common display
+	 * The SQL must return the following fields that are used in a common display
 	 * routine: href, title, section, created, text, browsernav
 	 *
-	 * @param string Target search string
-	 * @param string mathcing option, exact|any|all
-	 * @param string ordering option, newest|oldest|popular|alpha|category
-	 * @param mixed  An array if the search it to be restricted to areas, null if search all
+	 * @param   string  $text      Target search string.
+	 * @param   string  $phrase    Matching option (possible values: exact|any|all).  Default is "any".
+	 * @param   string  $ordering  Ordering option (possible values: newest|oldest|popular|alpha|category).  Default is "newest".
+	 * @param   mixed   $areas     An array if the search it to be restricted to areas or null to search all areas.
+	 *
+	 * @return  array  Search results.
+	 *
+	 * @since   1.6
 	 */
 	public function onContentSearch($text, $phrase = '', $ordering = '', $areas = null)
 	{
@@ -145,7 +153,8 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		}
 
 		$query = $db->getQuery(true);
-		//sqlsrv changes
+
+		// SQLSRV changes.
 		$case_when = ' CASE WHEN ';
 		$case_when .= $query->charLength('a.alias', '!=', '0');
 		$case_when .= ' THEN ';
@@ -170,7 +179,7 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		->where('(' . $where . ') AND a.state IN (' . implode(',', $state) . ') AND c.published = 1 AND c.access IN (' . $groups . ')')
 		->order($order);
 
-		// Filter by language
+		// Filter by language.
 		if ($app->isSite() && JLanguageMultilang::isEnabled())
 		{
 			$tag = JFactory::getLanguage()->getTag();
diff --git a/plugins/search/weblinks/weblinks.xml b/plugins/search/weblinks/weblinks.xml
index 1e9212a..68ad391 100644
--- a/plugins/search/weblinks/weblinks.xml
+++ b/plugins/search/weblinks/weblinks.xml
@@ -3,7 +3,7 @@
 	<name>plg_search_weblinks</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2005</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/cache/cache.php b/plugins/system/cache/cache.php
index c243d0e..8b1082b 100644
--- a/plugins/system/cache/cache.php
+++ b/plugins/system/cache/cache.php
@@ -3,17 +3,18 @@
  * @package     Joomla.Plugin
  * @subpackage  System.cache
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 /**
- * Joomla! Page Cache Plugin
+ * Joomla! Page Cache Plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  System.cache
+ * @since       1.5
  */
 class PlgSystemCache extends JPlugin
 {
@@ -23,18 +24,18 @@ class PlgSystemCache extends JPlugin
 	var $_cache_key	= null;
 
 	/**
-	 * Constructor
+	 * Constructor.
 	 *
-	 * @access	protected
-	 * @param   object	$subject The object to observe
-	 * @param   array  $config  An array that holds the plugin configuration
-	 * @since   1.0
+	 * @param   object  &$subject  The object to observe.
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.5
 	 */
 	function __construct(& $subject, $config)
 	{
 		parent::__construct($subject, $config);
 
-		//Set the language in the class
+		// Set the language in the class.
 		$options = array(
 			'defaultgroup'	=> 'page',
 			'browsercache'	=> $this->params->get('browsercache', false),
@@ -46,9 +47,12 @@ function __construct(& $subject, $config)
 	}
 
 	/**
-	* Converting the site URL to fit to the HTTP request
-	*
-	*/
+	 * Converting the site URL to fit to the HTTP request.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
 	function onAfterInitialise()
 	{
 		global $_PROFILER;
@@ -75,7 +79,7 @@ function onAfterInitialise()
 
 		if ($data !== false)
 		{
-			// Set cached body
+			// Set cached body.
 			$app->setBody($data);
 
 			echo $app->toString($app->getCfg('gzip'));
@@ -89,6 +93,13 @@ function onAfterInitialise()
 		}
 	}
 
+	/**
+	 * After render.
+	 *
+	 * @return   void
+	 *
+	 * @since   1.5
+	 */
 	function onAfterRender()
 	{
 		$app = JFactory::getApplication();
@@ -106,7 +117,7 @@ function onAfterRender()
 		$user = JFactory::getUser();
 		if ($user->get('guest'))
 		{
-			// We need to check again here, because auto-login plugins have not been fired before the first aid check
+			// We need to check again here, because auto-login plugins have not been fired before the first aid check.
 			$this->_cache->store(null, $this->_cache_key);
 		}
 	}
diff --git a/plugins/system/cache/cache.xml b/plugins/system/cache/cache.xml
index 9040654..f91e766 100644
--- a/plugins/system/cache/cache.xml
+++ b/plugins/system/cache/cache.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_cache</name>
 	<author>Joomla! Project</author>
 	<creationDate>February 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index ef692b4..732854c 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Plugin
  * @subpackage  System.Debug
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
 defined('_JEXEC') or die;
 
 /**
- * Joomla! Debug plugin
+ * Joomla! Debug plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  System.Debug
@@ -18,6 +18,12 @@
  */
 class PlgSystemDebug extends JPlugin
 {
+	/**
+	 * xdebug.file_link_format from the php.ini.
+	 *
+	 * @var    string
+	 * @since  1.7
+	 */
 	protected $linkFormat = '';
 
 	/**
@@ -37,7 +43,7 @@ class PlgSystemDebug extends JPlugin
 	private $logEntries = array();
 
 	/**
-	 * Holds SHOW PROFILES of queries
+	 * Holds SHOW PROFILES of queries.
 	 *
 	 * @var    array
 	 * @since  3.1.2
@@ -45,7 +51,7 @@ class PlgSystemDebug extends JPlugin
 	private $sqlShowProfiles = array();
 
 	/**
-	 * Holds all SHOW PROFILE FOR QUERY n, indexed by n-1
+	 * Holds all SHOW PROFILE FOR QUERY n, indexed by n-1.
 	 *
 	 * @var    array
 	 * @since  3.1.2
@@ -53,7 +59,7 @@ class PlgSystemDebug extends JPlugin
 	private $sqlShowProfileEach = array();
 
 	/**
-	 * Holds all EXPLAIN EXTENDED for all queries
+	 * Holds all EXPLAIN EXTENDED for all queries.
 	 *
 	 * @var    array
 	 * @since  3.1.2
@@ -61,7 +67,7 @@ class PlgSystemDebug extends JPlugin
 	private $explains = array();
 
 	/**
-	 * Holds total amount of executed queries
+	 * Holds total amount of executed queries.
 	 *
 	 * @var    int
 	 * @since  3.2
@@ -71,8 +77,8 @@ class PlgSystemDebug extends JPlugin
 	/**
 	 * Constructor.
 	 *
-	 * @param   object  &$subject  The object to observe
-	 * @param   array   $config    An array that holds the plugin configuration
+	 * @param   object  &$subject  The object to observe.
+	 * @param   array   $config    An optional associative array of configuration settings.
 	 *
 	 * @since   1.5
 	 */
@@ -86,9 +92,16 @@ public function __construct(&$subject, $config)
 			JLog::addLogger(array('text_file' => 'deprecated.php'), JLog::ALL, array('deprecated'));
 		}
 
+		// Skip the plugin if debug is off
+		$app = JFactory::getApplication();
+		if ($app->getCfg('debug_lang') == '0' && $app->getCfg('debug') == '0')
+		{
+			return;
+		}
+
 		$this->debugLang = JFactory::getApplication()->getCfg('debug_lang');
 
-		// Only if debugging or language debug is enabled
+		// Only if debugging or language debug is enabled.
 		if (JDEBUG || $this->debugLang)
 		{
 			JFactory::getConfig()->set('gzip', 0);
@@ -121,14 +134,14 @@ public function __construct(&$subject, $config)
 			JLog::addLogger(array('logger' => 'callback', 'callback' => array($this, 'logger')), $priority, $categories, $mode);
 		}
 
-		// Prepare disconnect-handler for SQL profiling:
+		// Prepare disconnect handler for SQL profiling.
 		$db = JFactory::getDbo();
 		$db->addDisconnectHandler(array($this, 'mysqlDisconnectHandler'));
 	}
 
 	/**
-	 * Add the CSS for debug. We can't do this in the constructor because
-	 * stuff breaks.
+	 * Add the CSS for debug.
+	 * We can't do this in the constructor because stuff breaks.
 	 *
 	 * @return  void
 	 *
@@ -136,13 +149,13 @@ public function __construct(&$subject, $config)
 	 */
 	public function onAfterDispatch()
 	{
-		// Only if debugging or language debug is enabled
+		// Only if debugging or language debug is enabled.
 		if ((JDEBUG || $this->debugLang) && $this->isAuthorisedDisplayDebug())
 		{
 			JHtml::_('stylesheet', 'cms/debug.css', array(), true);
 		}
 
-		// Only if debugging is enabled for SQL queries popovers
+		// Only if debugging is enabled for SQL query popovers.
 		if (JDEBUG && $this->isAuthorisedDisplayDebug())
 		{
 			JHtml::_('bootstrap.tooltip');
@@ -151,31 +164,31 @@ public function onAfterDispatch()
 	}
 
 	/**
-	 * Show the debug info
+	 * Show the debug info.
 	 *
 	 * @since  1.6
 	 */
 	public function __destruct()
 	{
-		// Do not render if debugging or language debug is not enabled
+		// Do not render if debugging or language debug is not enabled.
 		if (!JDEBUG && !$this->debugLang)
 		{
 			return;
 		}
 
-		// User has to be authorised to see the debug information
+		// User has to be authorised to see the debug information.
 		if (!$this->isAuthorisedDisplayDebug())
 		{
 			return;
 		}
 
-		// Only render for HTML output
+		// Only render for HTML output.
 		if (JFactory::getDocument()->getType() !== 'html')
 		{
 			return;
 		}
 
-		// Capture output
+		// Capture output.
 		$contents = ob_get_contents();
 
 		if ($contents)
@@ -183,7 +196,7 @@ public function __destruct()
 			ob_end_clean();
 		}
 
-		// No debug for Safari and Chrome redirection
+		// No debug for Safari and Chrome redirection.
 		if (strstr(strtolower($_SERVER['HTTP_USER_AGENT']), 'webkit') !== false
 			&& substr($contents, 0, 50) == '<html><head><meta http-equiv="refresh" content="0;'
 		)
@@ -192,12 +205,12 @@ public function __destruct()
 			return;
 		}
 
-		// Load language
+		// Load language.
 		$this->loadLanguage();
 
 		$html = array();
 
-		// Some "mousewheel protecting" JS
+		// Some "mousewheel protecting" JS.
 		$html[] = "<script>function toggleContainer(name)
 		{
 			var e = document.getElementById(name);// MooTools might not be available ;)
@@ -265,7 +278,7 @@ public function __destruct()
 	/**
 	 * Method to check if the current user is allowed to see the debug information or not.
 	 *
-	 * @return  boolean  True is access is allowed
+	 * @return  boolean  True is access is allowed.
 	 *
 	 * @since   3.0
 	 */
@@ -278,7 +291,7 @@ private function isAuthorisedDisplayDebug()
 			return $result;
 		}
 
-		// If the user is not allowed to view the output then end here
+		// If the user is not allowed to view the output then end here.
 		$filterGroups = (array) $this->params->get('filter_groups', null);
 
 		if (!empty($filterGroups))
@@ -301,8 +314,8 @@ private function isAuthorisedDisplayDebug()
 	/**
 	 * General display method.
 	 *
-	 * @param   string  $item    The item to display
-	 * @param   array   $errors  Errors occured during execution
+	 * @param   string  $item    The item to display.
+	 * @param   array   $errors  Errors occured during execution.
 	 *
 	 * @return  string
 	 *
@@ -347,11 +360,11 @@ protected function display($item, array $errors = array())
 	/**
 	 * Display session information.
 	 *
-	 * Called recursive.
+	 * Called recursively.
 	 *
-	 * @param   string   $key      A session key
-	 * @param   mixed    $session  The session array, initially null
-	 * @param   integer  $id       The id is used for JS toggling the div
+	 * @param   string   $key      A session key.
+	 * @param   mixed    $session  The session array, initially null.
+	 * @param   integer  $id       Used to identify the DIV for the JavaScript toggling code.
 	 *
 	 * @return  string
 	 *
@@ -617,7 +630,7 @@ protected function displayProfileInformation()
 	}
 
 	/**
-	 * Display memory usage
+	 * Display memory usage.
 	 *
 	 * @return  string
 	 *
@@ -672,7 +685,7 @@ protected function displayQueries()
 				{
 					if (isset($timings[$id * 2 + 1]))
 					{
-						// Compute the query time: $timing[$k] = array( queryTime, timeBetweenQueries ):
+						// Compute the query time: $timing[$k] = array( queryTime, timeBetweenQueries ).
 						$timing[$id] = array(($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000, $id > 0 ? ($timings[$id * 2] - $timings[$id * 2 - 1]) * 1000 : 0);
 						$maxtime = max($maxtime, $timing[$id]['0']);
 					}
@@ -703,11 +716,11 @@ protected function displayQueries()
 
 			if ($timings && isset($timings[$id * 2 + 1]))
 			{
-				// Compute the query time:
+				// Compute the query time.
 				$queryTime = ($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000;
 				$totalQueryTime += $queryTime;
 
-				// Run an EXPLAIN EXTENDED query on the SQL query if possible:
+				// Run an EXPLAIN EXTENDED query on the SQL query if possible.
 				$hasWarnings = false;
 				$hasWarningsInProfile = false;
 
@@ -720,7 +733,7 @@ protected function displayQueries()
 					$explain = JText::sprintf('PLG_DEBUG_QUERY_EXPLAIN_NOT_POSSIBLE', htmlspecialchars($query));
 				}
 
-				// Run a SHOW PROFILE query:
+				// Run a SHOW PROFILE query.
 				$profile = '';
 
 				if (in_array($db->name, array('mysqli', 'mysql')))
@@ -732,10 +745,11 @@ protected function displayQueries()
 					}
 				}
 
-				$ratio = 0.5; // how heavy should the string length count: 0 - 1
+				// How heavy should the string length count: 0 - 1.
+				$ratio = 0.5;
 				$timeScore = $queryTime / (strlen($query) * $ratio) * 200;
 
-				// Determine color of bargraph depending on query speed and presence of warnings in EXPLAIN:
+				// Determine color of bargraph depending on query speed and presence of warnings in EXPLAIN.
 				if ($timeScore > 10)
 				{
 					$barClass = 'bar-danger';
@@ -752,7 +766,7 @@ protected function displayQueries()
 					$labelClass = 'label-success';
 				}
 
-				// Computes bargraph as follows: Position begin and end of the bar relatively to whole execution time:
+				// Computes bargraph as follows: Position begin and end of the bar relatively to whole execution time.
 				$prevBar = ($id && isset($bars[$id - 1])) ? $bars[$id - 1] : 0;
 
 				$barPre = round($timing[$id][1] / ($totalBargraphTime * 10), 4);
@@ -787,7 +801,7 @@ protected function displayQueries()
 			}
 		}
 
-		// Remove single queries from $duplicates
+		// Remove single queries from $duplicates.
 		$total_duplicates = 0;
 
 		foreach ($duplicates as $did => $dups)
@@ -802,7 +816,7 @@ protected function displayQueries()
 			}
 		}
 
-		// Fix first bar width
+		// Fix first bar width.
 		$minWidth = 0.3;
 
 		if ($bars[0]->width < $minWidth && isset($bars[1]))
@@ -823,7 +837,7 @@ protected function displayQueries()
 
 		foreach ($log as $id => $query)
 		{
-			// Start Query Type Ticker Additions
+			// Start query type ticker additions.
 			$fromStart = stripos($query, 'from');
 			$whereStart = stripos($query, 'where', $fromStart);
 
@@ -842,7 +856,7 @@ protected function displayQueries()
 			$fromString = str_replace("\n", " ", $fromString);
 			$fromString = trim($fromString);
 
-			// Initialize the select/other query type counts the first time:
+			// Initialise the select/other query type counts the first time.
 			if (!isset($selectQueryTypeTicker[$fromString]))
 			{
 				$selectQueryTypeTicker[$fromString] = 0;
@@ -853,7 +867,7 @@ protected function displayQueries()
 				$otherQueryTypeTicker[$fromString] = 0;
 			}
 
-			// Increment the count:
+			// Increment the count.
 			if (stripos($query, 'select') === 0)
 			{
 				$selectQueryTypeTicker[$fromString] = $selectQueryTypeTicker[$fromString] + 1;
@@ -869,11 +883,10 @@ protected function displayQueries()
 
 			if ($timings && isset($timings[$id * 2 + 1]))
 			{
-				// Compute the query time:
+				// Compute the query time.
 				$queryTime = ($timings[$id * 2 + 1] - $timings[$id * 2]) * 1000;
 
-				// Timing
-				// Formats the output for the query time with EXPLAIN query results as tooltip:
+				// Timing.  Formats the output for the query time with EXPLAIN query results as tooltip.
 				$htmlTiming = '<div style="margin: 0px 0 5px;"><span class="dbg-query-time">' . JText::sprintf('PLG_DEBUG_QUERY_TIME', sprintf('<span class="label ' . $info[$id]->class . '">%.2f&nbsp;ms</span>', $timing[$id]['0']));
 
 				if ($timing[$id]['1'])
@@ -888,7 +901,7 @@ protected function displayQueries()
 					$memoryUsed = $callStacks[$id][0]['memory'][1] - $callStacks[$id][0]['memory'][0];
 					$memoryBeforeQuery = $callStacks[$id][0]['memory'][0];
 
-					// Determine color of query memory usage:
+					// Determine colour of query memory usage.
 					if ($memoryUsed > 0.1 * $memoryUsageNow)
 					{
 						$labelClass = 'label-important';
@@ -910,7 +923,7 @@ protected function displayQueries()
 
 					if ($callStacks[$id][0]['memory'][2] !== null)
 					{
-						// Determine color of number or results:
+						// Determine colour of number or results.
 						$resultsReturned = $callStacks[$id][0]['memory'][2];
 
 						if ($resultsReturned > 3000)
@@ -937,10 +950,10 @@ protected function displayQueries()
 
 				$htmlTiming .= '</div>';
 
-				// Bar
+				// Bar.
 				$htmlBar = $this->renderBars($bars, 'query', $id);
 
-				// Profile Query
+				// Profile query.
 				$title = JText::_('PLG_DEBUG_PROFILE');
 
 				if (!$info[$id]->profile)
@@ -950,7 +963,7 @@ protected function displayQueries()
 
 				$htmlProfile = ($info[$id]->profile ? $info[$id]->profile : JText::_('PLG_DEBUG_NO_PROFILE'));
 
-				// Backtrace/Called
+				// Backtrace and call stack.
 				$htmlCallStack = '';
 
 				if (isset($callStacks[$id]))
@@ -1084,7 +1097,7 @@ protected function displayQueries()
 			return implode('', $html);
 		}
 
-		// Get the totals for the query types:
+		// Get the totals for the query types.
 		$totalSelectQueryTypes = count($selectQueryTypeTicker);
 		$totalOtherQueryTypes = count($otherQueryTypeTicker);
 		$totalQueryTypes = $totalSelectQueryTypes + $totalOtherQueryTypes;
@@ -1131,9 +1144,11 @@ protected function displayQueries()
 	}
 
 	/**
-	 * @param   array    &$bars  Array of bar data
-	 * @param   string   $class  Optional class for items
-	 * @param   integer  $id     Id if the bar to highlight
+	 * Render bars.
+	 *
+	 * @param   array    &$bars  Array of bar data.
+	 * @param   string   $class  Optional class for items.
+	 * @param   integer  $id     Id of the bar to highlight.
 	 *
 	 * @return  string
 	 *
@@ -1172,8 +1187,10 @@ protected function renderBars(&$bars, $class = '', $id = null)
 	}
 
 	/**
-	 * @param   array    $table
-	 * @param   boolean  $hasWarnings  Changes value to true if warnings are displayed, otherwise untouched
+	 * Render array as HTML table.
+	 *
+	 * @param   array    $table         Array to be rendered.
+	 * @param   boolean  &$hasWarnings  Changes value to true if warnings are displayed, otherwise untouched.
 	 *
 	 * @return  string
 	 *
@@ -1217,16 +1234,16 @@ protected function tableToHtml($table, &$hasWarnings)
 			{
 				if ($td === null)
 				{
-					// Display null's as 'NULL':
+					// Display null's as 'NULL'.
 					$td = 'NULL';
 				}
 
-				// Treat special columns:
+				// Treat special columns.
 				if ($k == 'Duration')
 				{
 					if ($td >= 0.001 && ($td == $durations[0] || (isset($durations[1]) && $td == $durations[1])))
 					{
-						// Duration column with duration value of more than 1 ms and within 2 top duration in SQL engine: Highlight warning:
+						// Duration column with duration value of more than 1 ms and within 2 top duration in SQL engine: Highlight warning.
 						$html[] = '<td class="dbg-warning">';
 						$hasWarnings = true;
 					}
@@ -1235,12 +1252,12 @@ protected function tableToHtml($table, &$hasWarnings)
 						$html[] = '<td>';
 					}
 
-					// Display duration in ms with the unit instead of seconds:
+					// Display duration in milliseconds with the unit instead of seconds.
 					$html[] = sprintf('%.1f&nbsp;ms', $td * 1000);
 				}
 				elseif ($k == 'Error')
 				{
-					// An error in the EXPLAIN query occured, display it instead of the result (means original query had syntax error most probably):
+					// An error in the EXPLAIN query occured, display it instead of the result (means original query had syntax error most probably).
 					$html[] = '<td class="dbg-warning">' . htmlspecialchars($td);
 					$hasWarnings = true;
 				}
@@ -1248,7 +1265,7 @@ protected function tableToHtml($table, &$hasWarnings)
 				{
 					if ($td === 'NULL')
 					{
-						// Displays query parts which don't use a key with warning:
+						// Displays query parts which don't use a key with warning.
 						$html[] = '<td><strong>' . '<span class="dbg-warning hasTooltip" title="' . JHtml::tooltipText('PLG_DEBUG_WARNING_NO_INDEX_DESC') . '">' . JText::_('PLG_DEBUG_WARNING_NO_INDEX') . '</span>' . '</strong>';
 						$hasWarnings = true;
 					}
@@ -1261,10 +1278,10 @@ protected function tableToHtml($table, &$hasWarnings)
 				{
 					$htmlTd = htmlspecialchars($td);
 
-					// Replace spaces with nbsp for less tall tables displayed:
+					// Replace spaces with &nbsp; (non-breaking spaces) for less tall tables displayed.
 					$htmlTd = preg_replace('/([^;]) /', '\1&nbsp;', $htmlTd);
 
-					// Displays warnings for "Using filesort":
+					// Displays warnings for "Using filesort".
 					$htmlTdWithWarnings = str_replace('Using&nbsp;filesort', '<span class="dbg-warning hasTooltip" title="' . JHtml::tooltipText('PLG_DEBUG_WARNING_USING_FILESORT_DESC') . '">' . JText::_('PLG_DEBUG_WARNING_USING_FILESORT') . '</span>', $htmlTd);
 
 					if ($htmlTdWithWarnings !== $htmlTd)
@@ -1291,9 +1308,9 @@ protected function tableToHtml($table, &$hasWarnings)
 	}
 
 	/**
-	 * Disconnect-handler for database to collect profiling and explain information
+	 * Disconnect handler for database to collect profiling and explain information.
 	 *
-	 * @param   JDatabaseDriver  &$db  Database object
+	 * @param   JDatabaseDriver  &$db  Database object.
 	 *
 	 * @return  void
 	 *
@@ -1311,13 +1328,13 @@ public function mysqlDisconnectHandler(&$db)
 		{
 			try
 			{
-				// Check if profiling is enabled:
+				// Check if profiling is enabled.
 				$db->setQuery("SHOW VARIABLES LIKE 'have_profiling'");
 				$hasProfiling = $db->loadResult();
 
 				if ($hasProfiling)
 				{
-					// Run a SHOW PROFILE query:
+					// Run a SHOW PROFILE query.
 					$db->setQuery('SHOW PROFILES');
 					$this->sqlShowProfiles = $db->loadAssocList();
 
@@ -1325,7 +1342,7 @@ public function mysqlDisconnectHandler(&$db)
 					{
 						foreach ($this->sqlShowProfiles as $qn)
 						{
-							// Run SHOW PROFILE FOR QUERY for each query where a profile is available (max 100):
+							// Run SHOW PROFILE FOR QUERY for each query where a profile is available (max 100).
 							$db->setQuery('SHOW PROFILE FOR QUERY ' . (int) ($qn['Query_ID']));
 							$this->sqlShowProfileEach[(int) ($qn['Query_ID'] - 1)] = $db->loadAssocList();
 						}
@@ -1464,7 +1481,7 @@ protected function displayUntranslatedStrings()
 					$guesses[$file] = array();
 				}
 
-				// Prepare the key
+				// Prepare the key.
 				if (($pos = strpos($info['string'], '=')) > 0)
 				{
 					$parts = explode('=', $info['string']);
@@ -1503,7 +1520,7 @@ protected function displayUntranslatedStrings()
 				$key = preg_replace('#\s+#', '_', $key);
 				$key = preg_replace('#\W#', '', $key);
 
-				// Prepare the text
+				// Prepare the text.
 				$guesses[$file][] = $key . '="' . $guess . '"';
 			}
 		}
@@ -1522,7 +1539,7 @@ protected function displayUntranslatedStrings()
 	/**
 	 * Simple highlight for SQL queries.
 	 *
-	 * @param   string  $query  The query to highlight
+	 * @param   string  $query  The query to highlight.
 	 *
 	 * @return  string
 	 *
@@ -1538,15 +1555,15 @@ protected function highlightQuery($query)
 
 		$regex = array(
 
-			// Tables are identified by the prefix
+			// Tables are identified by the prefix.
 			'/(=)/'
 			=> '<b class="dbg-operator">$1</b>',
 
-			// All uppercase words have a special meaning
+			// All uppercase words have a special meaning.
 			'/(?<!\w|>)([A-Z_]{2,})(?!\w)/x'
 			=> '<span class="dbg-command">$1</span>',
 
-			// Tables are identified by the prefix
+			// Tables are identified by the prefix.
 			'/(' . JFactory::getDbo()->getPrefix() . '[a-z_0-9]+)/'
 			=> '<span class="dbg-table">$1</span>'
 
@@ -1564,9 +1581,9 @@ protected function highlightQuery($query)
 	 *
 	 * Stolen from JError to prevent it's removal.
 	 *
-	 * @param   Exception  $error  The error
+	 * @param   Exception  $error  The Exception object to be rendered.
 	 *
-	 * @return  string     Contents of the backtrace
+	 * @return  string     Rendered backtrace.
 	 *
 	 * @since   2.5
 	 */
@@ -1664,6 +1681,8 @@ protected function formatLink($file, $line = '')
 	 *
 	 * @param   JLogEntry  $entry  A log entry.
 	 *
+	 * @return  void
+	 *
 	 * @since   3.1
 	 */
 	public function logger(JLogEntry $entry)
@@ -1672,7 +1691,7 @@ public function logger(JLogEntry $entry)
 	}
 
 	/**
-	 * Display log messages
+	 * Display log messages.
 	 *
 	 * @return  string
 	 *
diff --git a/plugins/system/debug/debug.xml b/plugins/system/debug/debug.xml
index 81b26df..dfbe7bb 100644
--- a/plugins/system/debug/debug.xml
+++ b/plugins/system/debug/debug.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_debug</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2006</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/highlight/highlight.php b/plugins/system/highlight/highlight.php
index c815ac8..94dedc0 100644
--- a/plugins/system/highlight/highlight.php
+++ b/plugins/system/highlight/highlight.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.Highlight
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
@@ -37,7 +37,7 @@ public function onAfterDispatch()
 			return true;
 		}
 
-		// Set the variables
+		// Set the variables.
 		$input = JFactory::getApplication()->input;
 		$extension = $input->get('option', '', 'cmd');
 
@@ -63,7 +63,7 @@ public function onAfterDispatch()
 			return true;
 		}
 
-		// Clean the terms array
+		// Clean the terms array.
 		$filter = JFilterInput::getInstance();
 
 		$cleanTerms = array();
diff --git a/plugins/system/highlight/highlight.xml b/plugins/system/highlight/highlight.xml
index 8483841..7e85684 100644
--- a/plugins/system/highlight/highlight.xml
+++ b/plugins/system/highlight/highlight.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_highlight</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2011</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see	LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
index e2ed0f9..0a57706 100644
--- a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
+++ b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
index 32c635c..99825cf 100644
--- a/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
+++ b/plugins/system/languagecode/language/en-GB/en-GB.plg_system_languagecode.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8
 
diff --git a/plugins/system/languagecode/languagecode.php b/plugins/system/languagecode/languagecode.php
index e80e14a..d92ac9f 100644
--- a/plugins/system/languagecode/languagecode.php
+++ b/plugins/system/languagecode/languagecode.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.languagecode
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,29 +19,32 @@
 class PlgSystemLanguagecode extends JPlugin
 {
 	/**
-	 * Plugin that change the language code used in the <html /> tag
+	 * Plugin that changes the language code used in the <html /> tag.
 	 *
-	 * @since  2.5
+	 * @return  void
+	 *
+	 * @since   2.5
 	 */
 	public function onAfterRender()
 	{
 		$app = JFactory::getApplication();
-		// Use this plugin only in site application
+
+		// Use this plugin only in site application.
 		if ($app->isSite())
 		{
-			// Get the response body
+			// Get the response body.
 			$body = $app->getBody();
 
-			// Get the current language code
+			// Get the current language code.
 			$code = JFactory::getDocument()->getLanguage();
 
-			// Get the new code
+			// Get the new code.
 			$new_code  = $this->params->get($code);
 
-			// Replace the old code by the new code in the <html /> tag
+			// Replace the old code by the new code in the <html /> tag.
 			if ($new_code)
 			{
-				// Replace the new code in the HTML document
+				// Replace the new code in the HTML document.
 				$patterns = array(
 					chr(1) . '(<html.*\s+xml:lang=")(' . $code . ')(".*>)' . chr(1) . 'i',
 					chr(1) . '(<html.*\s+lang=")(' . $code . ')(".*>)' . chr(1) . 'i',
@@ -57,7 +60,7 @@ public function onAfterRender()
 				$replace = array();
 			}
 
-			// Replace codes in <link hreflang="" /> attributes
+			// Replace codes in <link hreflang="" /> attributes.
 			preg_match_all(chr(1) . '(<link.*\s+hreflang=")([0-9a-z\-]*)(".*\s+rel="alternate".*/>)' . chr(1) . 'i', $body, $matches);
 			foreach ($matches[2] as $match)
 			{
@@ -83,41 +86,34 @@ public function onAfterRender()
 	}
 
 	/**
-	 * @param   JForm	$form	The form to be altered.
-	 * @param   array  $data	The associated data for the form.
+	 * Prepare form.
+	 *
+	 * @param   JForm  $form  The form to be altered.
+	 * @param   array  $data  The associated data for the form.
 	 *
 	 * @return  boolean
+	 *
 	 * @since	2.5
 	 */
 	public function onContentPrepareForm($form, $data)
 	{
-		// Ensure that data is an object
-		$data = (object) $data;
-
-		// Check we have a form
+		// Check we have a form.
 		if (!($form instanceof JForm))
 		{
 			$this->_subject->setError('JERROR_NOT_A_FORM');
 			return false;
 		}
 
-		// Check we are manipulating a valid form.
-		$app = JFactory::getApplication();
-		if ($form->getName() != 'com_plugins.plugin'
-			|| isset($data->name) && $data->name != 'plg_system_languagecode'
-			|| empty($data) && !$app->getUserState('plg_system_language_code.edit')
-		)
+		// Check we are manipulating the languagecode plugin.
+		if ($form->getName() != 'com_plugins.plugin' || !$form->getField('languagecodeplugin', 'params'))
 		{
 			return true;
 		}
 
-		// Mark the plugin as being edited
-		$app->setUserState('plg_system_language_code.edit', $data->name == 'plg_system_languagecode');
-
-		// Get site languages
+		// Get site languages.
 		if ($languages = JLanguage::getKnownLanguages(JPATH_SITE))
 		{
-			// Inject fields into the form
+			// Inject fields into the form.
 			foreach ($languages as $tag => $language)
 			{
 				$form->load('
diff --git a/plugins/system/languagecode/languagecode.xml b/plugins/system/languagecode/languagecode.xml
index f139fb8..eaf0161 100644
--- a/plugins/system/languagecode/languagecode.xml
+++ b/plugins/system/languagecode/languagecode.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_languagecode</name>
 	<author>Joomla! Project</author>
 	<creationDate>November 2011</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
@@ -18,5 +18,10 @@
 		<language tag="en-GB">language/en-GB/en-GB.plg_system_languagecode.ini</language>
 		<language tag="en-GB">language/en-GB/en-GB.plg_system_languagecode.sys.ini</language>
 	</languages>
-	<config />
+	<config>
+		<fields name="params">
+			<field name="languagecodeplugin" type="hidden" 
+				default="true" />
+		</fields>
+	</config>
 </extension>
diff --git a/plugins/system/languagefilter/languagefilter.php b/plugins/system/languagefilter/languagefilter.php
index 61545cb..a1e0114 100644
--- a/plugins/system/languagefilter/languagefilter.php
+++ b/plugins/system/languagefilter/languagefilter.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.languagefilter
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -11,10 +11,10 @@
 
 JLoader::register('MenusHelper', JPATH_ADMINISTRATOR . '/components/com_menus/helpers/menus.php');
 
-JLoader::register('MultilangstatusHelper', JPATH_ADMINISTRATOR.'/components/com_languages/helpers/multilangstatus.php');
+JLoader::register('MultilangstatusHelper', JPATH_ADMINISTRATOR . '/components/com_languages/helpers/multilangstatus.php');
 
 /**
- * Joomla! Language Filter Plugin
+ * Joomla! Language Filter Plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  System.languagefilter
@@ -40,11 +40,19 @@ class PlgSystemLanguageFilter extends JPlugin
 
 	private static $_user_lang_code;
 
+	/**
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An optional associative array of configuration settings.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct(&$subject, $config)
 	{
 		parent::__construct($subject, $config);
 
-		// Ensure that constructor is called one time
+		// Ensure that constructor is called one time.
 		self::$cookie = SID == '';
 		if (!self::$default_lang)
 		{
@@ -53,7 +61,7 @@ public function __construct(&$subject, $config)
 
 			if ($app->isSite())
 			{
-				// setup language data
+				// Setup language data.
 				self::$mode_sef 	= ($router->getMode() == JROUTER_MODE_SEF) ? true : false;
 				self::$sefs 		= JLanguageHelper::getLanguages('sef');
 				self::$lang_codes 	= JLanguageHelper::getLanguages('lang_code');
@@ -81,7 +89,7 @@ public function __construct(&$subject, $config)
 					// Get the route path from the request.
 					$path = JString::substr($uri->toString(), JString::strlen($uri->base()));
 
-					// Apache mod_rewrite is Off
+					// Apache mod_rewrite is Off.
 					$path = JFactory::getConfig()->get('sef_rewrite') ? $path : JString::substr($path, 10);
 
 					// Trim any spaces or slashes from the ends of the path and explode into segments.
@@ -104,18 +112,21 @@ public function __construct(&$subject, $config)
 				if (isset(self::$sefs[$sef]))
 				{
 					$lang_code = self::$sefs[$sef]->lang_code;
-					// Create a cookie
+
+					// Create a cookie.
 					$conf = JFactory::getConfig();
 					$cookie_domain 	= $conf->get('config.cookie_domain', '');
 					$cookie_path 	= $conf->get('config.cookie_path', '/');
 					setcookie(JApplication::getHash('language'), $lang_code, $this->getLangCookieTime(), $cookie_path, $cookie_domain);
 					$app->input->cookie->set(JApplication::getHash('language'), $lang_code);
-					// set the request var
+
+					// Set the request var.
 					$app->input->set('language', $lang_code);
 				}
 			}
 			parent::__construct($subject, $config);
-			// 	Detect browser feature
+
+			// Detect browser feature.
 			if ($app->isSite())
 			{
 				$app->setDetectBrowser($this->params->get('detect_browser', '1') == '1');
@@ -123,6 +134,13 @@ public function __construct(&$subject, $config)
 		}
 	}
 
+	/**
+	 * After initialise.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
 	public function onAfterInitialise()
 	{
 		$app = JFactory::getApplication();
@@ -133,13 +151,14 @@ public function onAfterInitialise()
 			self::$tag = JFactory::getLanguage()->getTag();
 
 			$router = $app->getRouter();
-			// attach build rules for language SEF
+
+			// Attach build rules for language SEF.
 			$router->attachBuildRule(array($this, 'buildRule'));
 
-			// attach parse rules for language SEF
+			// Attach parse rules for language SEF.
 			$router->attachParseRule(array($this, 'parseRule'));
 
-			// Adding custom site name
+			// Add custom site name.
 			$languages = JLanguageHelper::getLanguages('lang_code');
 			if (isset($languages[self::$tag]) && $languages[self::$tag]->sitename)
 			{
@@ -148,6 +167,16 @@ public function onAfterInitialise()
 		}
 	}
 
+	/**
+	 * Add build rule to router.
+	 *
+	 * @param   JRouter  &$router  JRouter object.
+	 * @param   JUri     &$uri     JUri object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
 	public function buildRule(&$router, &$uri)
 	{
 		$sef = $uri->getVar('lang');
@@ -176,7 +205,7 @@ public function buildRule(&$router, &$uri)
 					}
 					parse_str($parts['query'], $vars);
 
-					// test if the url contains same vars as in menu link
+					// Test if the url contains same vars as in menu link.
 					$test = true;
 
 					foreach ($uri->getQuery(true) as $key => $value)
@@ -214,7 +243,7 @@ public function buildRule(&$router, &$uri)
 				|| $this->params->get('detect_browser', 1) && JLanguageHelper::detectLanguage() != self::$tag && !self::$cookie
 			)
 			{
-				$uri->setPath($uri->getPath().'/'.$sef.'/');
+				$uri->setPath($uri->getPath() . '/' . $sef . '/');
 			}
 			else
 			{
@@ -227,12 +256,23 @@ public function buildRule(&$router, &$uri)
 		}
 	}
 
+	/**
+	 * Add parse rule to router.
+	 *
+	 * @param   JRouter  &$router  JRouter object.
+	 * @param   JUri     &$uri     JUri object.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
 	public function parseRule(&$router, &$uri)
 	{
 		$app = JFactory::getApplication();
 
 		$lang_code = $app->input->cookie->getString(JApplication::getHash('language'));
-		// No cookie - let's try to detect browser language or use site default
+
+		// No cookie - let's try to detect browser language or use site default.
 		if (!$lang_code)
 		{
 			if ($this->params->get('detect_browser', 1))
@@ -252,32 +292,32 @@ public function parseRule(&$router, &$uri)
 
 			$sef = $parts[0];
 
-			// Redirect only if not in post
+			// Redirect only if not in post.
 			if (!empty($lang_code) && ($app->input->getMethod() != "POST" || count($app->input->post) == 0))
 			{
 				if ($this->params->get('remove_default_prefix', 0) == 0)
 				{
-					// redirect if sef does not exists
+					// Redirect if sef does not exist.
 					if (!isset(self::$sefs[$sef]))
 					{
-						// Use the current language sef or the default one
+						// Use the current language sef or the default one.
 						$sef = isset(self::$lang_codes[$lang_code]) ? self::$lang_codes[$lang_code]->sef : self::$default_sef;
 						$uri->setPath($sef . '/' . $path);
 
 						if ($app->getCfg('sef_rewrite'))
 						{
-							$app->redirect($uri->base().$uri->toString(array('path', 'query', 'fragment')));
+							$app->redirect($uri->base() . $uri->toString(array('path', 'query', 'fragment')));
 						}
 						else
 						{
 							$path = $uri->toString(array('path', 'query', 'fragment'));
-							$app->redirect($uri->base().'index.php'.($path ? ('/' . $path) : ''));
+							$app->redirect($uri->base() . 'index.php'.($path ? ('/' . $path) : ''));
 						}
 					}
 				}
 				else
 				{
-					// redirect if sef does not exists and language is not the default one
+					// Redirect if sef does not exist and language is not the default one.
 					if (!isset(self::$sefs[$sef]) && $lang_code != self::$default_lang)
 					{
 						$sef = isset(self::$lang_codes[$lang_code]) && empty($path) ? self::$lang_codes[$lang_code]->sef : self::$default_sef;
@@ -290,10 +330,10 @@ public function parseRule(&$router, &$uri)
 						else
 						{
 							$path = $uri->toString(array('path', 'query', 'fragment'));
-							$app->redirect($uri->base().'index.php'.($path ? ('/' . $path) : ''));
+							$app->redirect($uri->base() . 'index.php'.($path ? ('/' . $path) : ''));
 						}
 					}
-					// redirect if sef is the default one
+					// Redirect if sef is the default one.
 					elseif (isset(self::$sefs[$sef]) &&
 						self::$default_lang == self::$sefs[$sef]->lang_code &&
 						(!$this->params->get('detect_browser', 1) || JLanguageHelper::detectLanguage() == self::$tag || self::$cookie)
@@ -309,7 +349,7 @@ public function parseRule(&$router, &$uri)
 						else
 						{
 							$path = $uri->toString(array('path', 'query', 'fragment'));
-							$app->redirect($uri->base().'index.php'.($path ? ('/' . $path) : ''));
+							$app->redirect($uri->base() . 'index.php' . ($path ? ('/' . $path) : ''));
 						}
 					}
 				}
@@ -339,16 +379,18 @@ public function parseRule(&$router, &$uri)
 		$array = array('lang' => $sef);
 		return $array;
 	}
+
 	/**
-	 * before store user method
+	 * Before store user method.
 	 *
-	 * Method is called before user data is stored in the database
+	 * Method is called before user data is stored in the database.
 	 *
-	 * @param   array  $user	Holds the old user data.
-	 * @param   boolean		$isnew	True if a new user is stored.
-	 * @param   array  $new	Holds the new user data.
+	 * @param   array    $user   Holds the old user data.
+	 * @param   boolean  $isnew  True if a new user is stored.
+	 * @param   array    $new    Holds the new user data.
 	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public function onUserBeforeSave($user, $isnew, $new)
@@ -367,16 +409,17 @@ public function onUserBeforeSave($user, $isnew, $new)
 	}
 
 	/**
-	 * after store user method
+	 * After store user method.
 	 *
-	 * Method is called after user data is stored in the database
+	 * Method is called after user data is stored in the database.
 	 *
-	 * @param   array  $user		Holds the new user data.
-	 * @param   boolean		$isnew		True if a new user is stored.
-	 * @param   boolean		$success	True if user was succesfully stored in the database.
-	 * @param   string  $msg		Message.
+	 * @param   array    $user     Holds the new user data.
+	 * @param   boolean  $isnew    True if a new user is stored.
+	 * @param   boolean  $success  True if user was succesfully stored in the database.
+	 * @param   string   $msg      Message.
 	 *
 	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public function onUserAfterSave($user, $isnew, $success, $msg)
@@ -404,9 +447,10 @@ public function onUserAfterSave($user, $isnew, $success, $msg)
 			{
 				if ($app->isSite())
 				{
-					$app->setUserState('com_users.edit.profile.redirect', 'index.php?Itemid='.$app->getMenu()->getDefault($lang_code)->id.'&lang='.self::$lang_codes[$lang_code]->sef);
+					$app->setUserState('com_users.edit.profile.redirect', 'index.php?Itemid=' . $app->getMenu()->getDefault($lang_code)->id . '&lang=' . self::$lang_codes[$lang_code]->sef);
 					self::$tag = $lang_code;
-					// Create a cookie
+
+					// Create a cookie.
 					$conf = JFactory::getConfig();
 					$cookie_domain 	= $conf->get('config.cookie_domain', '');
 					$cookie_path 	= $conf->get('config.cookie_path', '/');
@@ -417,12 +461,13 @@ public function onUserAfterSave($user, $isnew, $success, $msg)
 	}
 
 	/**
-	 * This method should handle any login logic and report back to the subject
+	 * Method to handle any login logic and report back to the subject.
 	 *
-	 * @param   array  $user		Holds the user data
-	 * @param   array  $options	Array holding options (remember, autoregister, group)
+	 * @param   array  $user     Holds the user data.
+	 * @param   array  $options  Array holding options (remember, autoregister, group).
+	 *
+	 * @return  boolean  True on success.
 	 *
-	 * @return  boolean  True on success
 	 * @since   1.5
 	 */
 	public function onUserLogin($user, $options = array())
@@ -431,7 +476,7 @@ public function onUserLogin($user, $options = array())
 		$menu = $app->getMenu();
 		if ($app->isSite() && $this->params->get('automatic_change', 1))
 		{
-			// Load associations
+			// Load associations.
 			$assoc = JLanguageAssociations::isEnabled();
 
 			if ($assoc)
@@ -451,37 +496,38 @@ public function onUserLogin($user, $options = array())
 
 			if ($lang_code != self::$tag)
 			{
-				// Change language
+				// Change language.
 				self::$tag = $lang_code;
 
-				// Create a cookie
+				// Create a cookie.
 				$conf = JFactory::getConfig();
 				$cookie_domain 	= $conf->get('config.cookie_domain', '');
 				$cookie_path 	= $conf->get('config.cookie_path', '/');
 				setcookie(JApplication::getHash('language'), $lang_code, $this->getLangCookieTime(), $cookie_path, $cookie_domain);
 
-				// Change the language code
+				// Change the language code.
 				JFactory::getLanguage()->setLanguage($lang_code);
 
-				// Change the redirect (language have changed)
+				// Change the redirect (language has changed).
 				if (isset($associations[$lang_code]) && $menu->getItem($associations[$lang_code]))
 				{
 					$itemid = $associations[$lang_code];
-					$app->setUserState('users.login.form.return', 'index.php?&Itemid='.$itemid);
+					$app->setUserState('users.login.form.return', 'index.php?&Itemid=' . $itemid);
 				}
 				else
 				{
 					$itemid = isset(self::$homes[$lang_code]) ? self::$homes[$lang_code]->id : self::$homes['*']->id;
-					$app->setUserState('users.login.form.return', 'index.php?&Itemid='.$itemid);
+					$app->setUserState('users.login.form.return', 'index.php?&Itemid=' . $itemid);
 				}
 			}
 		}
 	}
 
 	/**
-	 * This method adds alternate meta tags for associated menu items
+	 * Method to add alternative meta tags for associated menu items.
+	 *
+	 * @return  void
 	 *
-	 * @return  nothing
 	 * @since   1.7
 	 */
 	public function onAfterDispatch()
@@ -495,43 +541,42 @@ public function onAfterDispatch()
 
 		if ($app->isSite() && $this->params->get('alternate_meta') && $doc->getType() == 'html')
 		{
-			// Get active menu item
+			// Get active menu item.
 			$active = $menu->getActive();
 
-			// load menu associations
+			// Load menu associations.
 			if ($active)
 			{
-
-				// Get menu item link
+				// Get menu item link.
 				if ($app->getCfg('sef'))
 				{
-					$active_link = JRoute::_('index.php?Itemid='.$active->id, false);
+					$active_link = JRoute::_('index.php?Itemid=' . $active->id, false);
 				}
 				else
 				{
-					$active_link = JRoute::_($active->link.'&Itemid='.$active->id, false);
+					$active_link = JRoute::_($active->link.'&Itemid=' . $active->id, false);
 				}
 
-				if ($active_link == JUri::base(true).'/')
+				if ($active_link == JUri::base(true) . '/')
 				{
 					$active_link .= 'index.php';
 				}
 
-				// Get current link
+				// Get current link.
 				$current_link = JUri::getInstance()->toString(array('path', 'query'));
-				if ($current_link == JUri::base(true).'/')
+				if ($current_link == JUri::base(true) . '/')
 				{
 					$current_link .= 'index.php';
 				}
 
-				// Check the exact menu item's URL
+				// Check the exact menu item's URL.
 				if ($active_link == $current_link)
 				{
 					$associations = MenusHelper::getAssociations($active->id);
 					unset($associations[$active->language]);
 				}
 			}
-			// load component associations
+			// Load component associations.
 			$cName = JString::ucfirst($eName.'HelperAssociation');
 			JLoader::register($cName, JPath::clean(JPATH_COMPONENT_SITE . '/helpers/association.php'));
 
@@ -540,7 +585,8 @@ public function onAfterDispatch()
 				$cassociations = call_user_func(array($cName, 'getAssociations'));
 
 				$lang_code = $app->input->cookie->getString(JApplication::getHash('language'));
-				// No cookie - let's try to detect browser language or use site default
+
+				// No cookie - let's try to detect browser language or use site default.
 				if (!$lang_code)
 				{
 					if ($this->params->get('detect_browser', 1)){
@@ -552,7 +598,7 @@ public function onAfterDispatch()
 				unset($cassociations[$lang_code]);
 			}
 
-			// handle the default associations
+			// Handle the default associations.
 			if ((!empty($associations) || !empty($cassociations)) && $this->params->get('item_associations'))
 			{
 
@@ -576,18 +622,18 @@ public function onAfterDispatch()
 						{
 							if ($app->getCfg('sef'))
 							{
-								$link = JRoute::_('index.php?Itemid='.$item->id.'&lang='.$language->sef);
+								$link = JRoute::_('index.php?Itemid=' . $item->id . '&lang='.$language->sef);
 							}
 							else
 							{
-								$link = JRoute::_($item->link.'&Itemid='.$item->id.'&lang='.$language->sef);
+								$link = JRoute::_($item->link . '&Itemid=' . $item->id . '&lang='.$language->sef);
 							}
 							$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 						}
 					}
 				}
 			}
-			// link to the home page of each language
+			// Link to the home page of each language.
 			elseif ($active && $active->home)
 			{
 
@@ -604,11 +650,11 @@ public function onAfterDispatch()
 					{
 						if ($app->getCfg('sef'))
 						{
-							$link = JRoute::_('index.php?Itemid='.$item->id.'&lang='.$language->sef);
+							$link = JRoute::_('index.php?Itemid=' . $item->id . '&lang=' . $language->sef);
 						}
 						else
 						{
-							$link = JRoute::_($item->link.'&Itemid='.$item->id.'&lang='.$language->sef);
+							$link = JRoute::_($item->link.'&Itemid=' . $item->id . '&lang=' . $language->sef);
 						}
 						$doc->addHeadLink($server . $link, 'alternate', 'rel', array('hreflang' => $language->lang_code));
 					}
@@ -618,7 +664,7 @@ public function onAfterDispatch()
 	}
 
 	/**
-	 * Getting the Language Cookie settings
+	 * Get the language cookie settings.
 	 *
 	 * @return  string  The cookie time.
 	 *
diff --git a/plugins/system/languagefilter/languagefilter.xml b/plugins/system/languagefilter/languagefilter.xml
index 616a82e..df486ee 100644
--- a/plugins/system/languagefilter/languagefilter.xml
+++ b/plugins/system/languagefilter/languagefilter.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_languagefilter</name>
 	<author>Joomla! Project</author>
 	<creationDate>July 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/log/log.php b/plugins/system/log/log.php
index fa01f64..29b064f 100644
--- a/plugins/system/log/log.php
+++ b/plugins/system/log/log.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Plugin
  * @subpackage  System.log
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 /**
- * Joomla! System Logging Plugin
+ * Joomla! System Logging Plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  System.log
@@ -18,6 +18,15 @@
  */
 class PlgSystemLog extends JPlugin
 {
+	/**
+	 * Called if user fails to be logged in.
+	 *
+	 * @param   array  $response  Array of response data.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.5
+	 */
 	public function onUserLoginFailure($response)
 	{
 		$errorlog = array();
diff --git a/plugins/system/log/log.xml b/plugins/system/log/log.xml
index 2a1148d..7a39b7e 100644
--- a/plugins/system/log/log.xml
+++ b/plugins/system/log/log.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_log</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/logout/logout.php b/plugins/system/logout/logout.php
index be3c233..0491c6d 100644
--- a/plugins/system/logout/logout.php
+++ b/plugins/system/logout/logout.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.logout
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -27,12 +27,11 @@ class PlgSystemLogout extends JPlugin
 	protected $autoloadLanguage = true;
 
 	/**
-	 * Object Constructor.
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe -- event dispatcher.
+	 * @param   object  $config    An optional associative array of configuration settings.
 	 *
-	 * @access	public
-	 * @param   object	The object to observe -- event dispatcher.
-	 * @param   object	The configuration object for the plugin.
-	 * @return  void
 	 * @since   1.6
 	 */
 	public function __construct(&$subject, $config)
@@ -43,7 +42,7 @@ public function __construct(&$subject, $config)
 		$hash  = JApplication::getHash('PlgSystemLogout');
 		if (JFactory::getApplication()->isSite() && $input->cookie->getString($hash))
 		{
-			// Destroy the cookie
+			// Destroy the cookie.
 			$conf = JFactory::getConfig();
 			$cookie_domain = $conf->get('config.cookie_domain', '');
 			$cookie_path   = $conf->get('config.cookie_path', '/');
@@ -55,19 +54,20 @@ public function __construct(&$subject, $config)
 	}
 
 	/**
-	 * This method should handle any logout logic and report back to the subject
+	 * Method to handle any logout logic and report back to the subject.
+	 *
+	 * @param   array  $user     Holds the user data.
+	 * @param   array  $options  Array holding options (client, ...).
 	 *
-	 * @param   array  $user		Holds the user data.
-	 * @param   array  $options	Array holding options (client, ...).
+	 * @return  boolean  Always returns true.
 	 *
-	 * @return  boolean Always returns true
 	 * @since   1.6
 	 */
 	public function onUserLogout($user, $options = array())
 	{
 		if (JFactory::getApplication()->isSite())
 		{
-			// Create the cookie
+			// Create the cookie.
 			$hash = JApplication::getHash('PlgSystemLogout');
 			$conf = JFactory::getConfig();
 			$cookie_domain 	= $conf->get('config.cookie_domain', '');
@@ -77,6 +77,15 @@ public function onUserLogout($user, $options = array())
 		return true;
 	}
 
+	/**
+	 * Method to handle an error condition.
+	 *
+	 * @param   Exception  &$error  The Exception object to be handled.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
 	public static function handleError(&$error)
 	{
 		// Get the application object.
@@ -85,13 +94,13 @@ public static function handleError(&$error)
 		// Make sure the error is a 403 and we are in the frontend.
 		if ($error->getCode() == 403 and $app->isSite())
 		{
-			// Redirect to the home page
+			// Redirect to the home page.
 			$app->enqueueMessage(JText::_('PLG_SYSTEM_LOGOUT_REDIRECT'));
 			$app->redirect('index.php', true);
 		}
 		else
 		{
-			// Render the error page.
+			// Render the custom error page.
 			JError::customErrorPage($error);
 		}
 	}
diff --git a/plugins/system/logout/logout.xml b/plugins/system/logout/logout.xml
index 95b98fc..0d6244b 100644
--- a/plugins/system/logout/logout.xml
+++ b/plugins/system/logout/logout.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_logout</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/p3p/p3p.php b/plugins/system/p3p/p3p.php
index edc2bb8..12c5e44 100644
--- a/plugins/system/p3p/p3p.php
+++ b/plugins/system/p3p/p3p.php
@@ -3,14 +3,14 @@
  * @package     Joomla.Plugin
  * @subpackage  System.p3p
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 defined('_JEXEC') or die;
 
 /**
- * Joomla! P3P Header Plugin
+ * Joomla! P3P Header Plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  System.p3p
@@ -18,20 +18,26 @@
  */
 class PlgSystemP3p extends JPlugin
 {
-	/*
+	/**
+	 * After initialise.
+	 *
+	 * @return  void
+	 *
 	 * @since   1.6
 	 */
 	public function onAfterInitialise()
 	{
-		// Get the header
+		// Get the header.
 		$header = $this->params->get('header', 'NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM');
 		$header = trim($header);
-		// Bail out on empty header (why would anyone do that?!)
+
+		// Bail out on empty header (why would anyone do that?!).
 		if ( empty($header) )
 		{
 			return;
 		}
-		// Replace any existing P3P headers in the response
+
+		// Replace any existing P3P headers in the response.
 		JFactory::getApplication()->setHeader('P3P', 'CP="'.$header.'"', true);
 	}
 }
diff --git a/plugins/system/p3p/p3p.xml b/plugins/system/p3p/p3p.xml
index 0539eb8..18ce803 100644
--- a/plugins/system/p3p/p3p.xml
+++ b/plugins/system/p3p/p3p.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_p3p</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2010</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/redirect/redirect.php b/plugins/system/redirect/redirect.php
index 6f75de2..62651b1 100644
--- a/plugins/system/redirect/redirect.php
+++ b/plugins/system/redirect/redirect.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.redirect
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -19,12 +19,11 @@
 class PlgSystemRedirect extends JPlugin
 {
 	/**
-	 * Object Constructor.
+	 * Constructor.
+	 *
+	 * @param   object  &$subject  The object to observe
+	 * @param   array   $config    An optional associative array of configuration settings.
 	 *
-	 * @access    public
-	 * @param   object    The object to observe -- event dispatcher.
-	 * @param   object    The configuration object for the plugin.
-	 * @return  void
 	 * @since   1.6
 	 */
 	public function __construct(&$subject, $config)
@@ -36,6 +35,15 @@ public function __construct(&$subject, $config)
 		set_exception_handler(array('PlgSystemRedirect', 'handleError'));
 	}
 
+	/**
+	 * Method to handle an error condition.
+	 *
+	 * @param   Exception  &$error  The Exception object to be handled.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
 	public static function handleError(&$error)
 	{
 		// Get the application object.
@@ -103,7 +111,7 @@ public static function handleError(&$error)
 				}
 				else
 				{
-					// Existing error url, increase hit counter
+					// Existing error url, increase hit counter.
 					$query->clear()
 						->update($db->quoteName('#__redirect_links'))
 						->set($db->quoteName('hits') . ' = ' . $db->quote('hits') . ' + 1')
@@ -111,6 +119,7 @@ public static function handleError(&$error)
 					$db->setQuery($query);
 					$db->execute();
 				}
+
 				// Render the error page.
 				JError::customErrorPage($error);
 			}
diff --git a/plugins/system/redirect/redirect.xml b/plugins/system/redirect/redirect.xml
index e2d0ad3..dac2320 100644
--- a/plugins/system/redirect/redirect.xml
+++ b/plugins/system/redirect/redirect.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_redirect</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2009</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/remember/remember.php b/plugins/system/remember/remember.php
index f084014..6aed3d0 100644
--- a/plugins/system/remember/remember.php
+++ b/plugins/system/remember/remember.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  System.remember
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,7 +21,7 @@
 class PlgSystemRemember extends JPlugin
 {
 	/**
-	 * Application object
+	 * Application object.
 	 *
 	 * @var    JApplicationCms
 	 * @since  3.2
@@ -29,7 +29,7 @@ class PlgSystemRemember extends JPlugin
 	protected $app;
 
 	/**
-	 * Database object
+	 * Database object.
 	 *
 	 * @var    JDatabaseDriver
 	 * @since  3.2
@@ -77,9 +77,11 @@ class PlgSystemRemember extends JPlugin
 	protected $length;
 
 	/**
-	 * Constructor. We use it to set the app and db properties.
+	 * Constructor.
+	 * 
+	 * Used to set the application and database properties.
 	 *
-	 * @param   object  &$subject  The object to observe
+	 * @param   object  &$subject  The object to observe.
 	 * @param   array   $config    An optional associative array of configuration settings.
 	 *                             Recognized key values include 'name', 'group', 'params', 'language'
 	 *                             (this list is not meant to be comprehensive).
@@ -99,7 +101,7 @@ public function __construct(&$subject, $config = array())
 	}
 
 	/**
-	 * Remember me method to run onAfterInitialise
+	 * Remember me method to run onAfterInitialise.
 	 *
 	 * @return  boolean
 	 *
@@ -108,7 +110,7 @@ public function __construct(&$subject, $config = array())
 	 */
 	public function onAfterInitialise()
 	{
-		// No remember me for admin
+		// No remember me for admin.
 		if ($this->app->isAdmin())
 		{
 			return false;
@@ -120,10 +122,10 @@ public function onAfterInitialise()
 		$this->app->rememberCookieSecure   = $this->secure;
 		$this->app->rememberCookieLength   = $this->length;
 
-		// Check for a cookie
+		// Check for a cookie.
 		if ($user->get('guest') == 1)
 		{
-			// Create the cookie name and data
+			// Create the cookie name and data.
 			$rememberArray = JUserHelper::getRememberCookieData();
 
 			if ($rememberArray !== false)
@@ -144,7 +146,7 @@ public function onAfterInitialise()
 					JLog::add('Error in deleting expired cookie tokens.', JLog::WARNING, 'error');
 				}
 
-				// Find the matching record if it exists
+				// Find the matching record if it exists.
 				$query = $this->db->getQuery(true)
 					->select($this->db->quoteName(array('user_id', 'token', 'series', 'time', 'invalid')))
 					->from($this->db->quoteName('#__user_keys'))
@@ -177,7 +179,7 @@ public function onAfterInitialise()
 						return false;
 					}
 
-					// Set up the credentials array to pass to onUserAuthenticate
+					// Set up the credentials array to pass to onUserAuthenticate.
 					$credentials = array(
 						'username' => $results[0]->user_id,
 					);
diff --git a/plugins/system/remember/remember.xml b/plugins/system/remember/remember.xml
index eb95369..6e7e3d1 100644
--- a/plugins/system/remember/remember.xml
+++ b/plugins/system/remember/remember.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_remember</name>
 	<author>Joomla! Project</author>
 	<creationDate>April 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/sef/sef.php b/plugins/system/sef/sef.php
index 75383dd..6da4845 100644
--- a/plugins/system/sef/sef.php
+++ b/plugins/system/sef/sef.php
@@ -3,13 +3,13 @@
  * @package     Joomla.Plugin
  * @subpackage  System.sef
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
 
 /**
- * Joomla! SEF Plugin
+ * Joomla! SEF Plugin.
  *
  * @package     Joomla.Plugin
  * @subpackage  System.sef
@@ -18,7 +18,7 @@
 class PlgSystemSef extends JPlugin
 {
 	/**
-	 * Add the canonical uri to the head
+	 * Add the canonical uri to the head.
 	 *
 	 * @return  void
 	 *
@@ -55,7 +55,7 @@ public function onAfterRoute()
 	}
 
 	/**
-	 * Converting the site URL to fit to the HTTP request
+	 * Convert the site URL to fit to the HTTP request.
 	 *
 	 * @return  void
 	 */
@@ -68,7 +68,7 @@ public function onAfterRender()
 			return true;
 		}
 
-		// Replace src links
+		// Replace src links.
 		$base   = JUri::base(true).'/';
 		$buffer = $app->getBody();
 
@@ -76,7 +76,8 @@ public function onAfterRender()
 		$buffer = preg_replace_callback($regex, array('PlgSystemSef', 'route'), $buffer);
 		$this->checkBuffer($buffer);
 
-		$protocols = '[a-zA-Z0-9]+:'; //To check for all unknown protocals (a protocol must contain at least one alpahnumeric fillowed by :
+		// Check for all unknown protocals (a protocol must contain at least one alpahnumeric character followed by a ":").
+		$protocols = '[a-zA-Z0-9]+:';
 		$regex     = '#(src|href|poster)="(?!/|' . $protocols . '|\#|\')([^"]*)"#m';
 		$buffer    = preg_replace($regex, "$1=\"$base\$2\"", $buffer);
 		$this->checkBuffer($buffer);
@@ -90,22 +91,22 @@ public function onAfterRender()
 		$buffer = preg_replace($regex, '$1="this.src=$2' . $base .'$3$4"', $buffer);
 		$this->checkBuffer($buffer);
 
-		// Background image
+		// Background image.
 		$regex  = '#style\s*=\s*[\'\"](.*):\s*url\s*\([\'\"]?(?!/|' . $protocols . '|\#)([^\)\'\"]+)[\'\"]?\)#m';
 		$buffer = preg_replace($regex, 'style="$1: url(\'' . $base .'$2$3\')', $buffer);
 		$this->checkBuffer($buffer);
 
-		// OBJECT <param name="xx", value="yy"> -- fix it only inside the <param> tag
+		// OBJECT <param name="xx", value="yy"> -- fix it only inside the <param> tag.
 		$regex  = '#(<param\s+)name\s*=\s*"(movie|src|url)"[^>]\s*value\s*=\s*"(?!/|' . $protocols . '|\#|\')([^"]*)"#m';
 		$buffer = preg_replace($regex, '$1name="$2" value="' . $base . '$3"', $buffer);
 		$this->checkBuffer($buffer);
 
-		// OBJECT <param value="xx", name="yy"> -- fix it only inside the <param> tag
+		// OBJECT <param value="xx", name="yy"> -- fix it only inside the <param> tag.
 		$regex  = '#(<param\s+[^>]*)value\s*=\s*"(?!/|' . $protocols . '|\#|\')([^"]*)"\s*name\s*=\s*"(movie|src|url)"#m';
 		$buffer = preg_replace($regex, '<param value="' . $base .'$2" name="$3"', $buffer);
 		$this->checkBuffer($buffer);
 
-		// OBJECT data="xx" attribute -- fix it only in the object tag
+		// OBJECT data="xx" attribute -- fix it only in the object tag.
 		$regex  = '#(<object\s+[^>]*)data\s*=\s*"(?!/|' . $protocols . '|\#|\')([^"]*)"#m';
 		$buffer = preg_replace($regex, '$1data="' . $base . '$2"$3', $buffer);
 		$this->checkBuffer($buffer);
@@ -115,7 +116,9 @@ public function onAfterRender()
 	}
 
 	/**
-	 * @param   string  $buffer
+	 * Check the buffer.
+	 *
+	 * @param   string  $buffer  Buffer to be checked.
 	 *
 	 * @return  void
 	 */
@@ -142,9 +145,9 @@ private function checkBuffer($buffer)
 	}
 
 	/**
-	 * Replaces the matched tags
+	 * Replace the matched tags.
 	 *
-	 * @param   array  &$matches  An array of matches (see preg_match_all)
+	 * @param   array  &$matches  An array of matches (see preg_match_all).
 	 *
 	 * @return  string
 	 */
diff --git a/plugins/system/sef/sef.xml b/plugins/system/sef/sef.xml
index dac575d..31670f9 100644
--- a/plugins/system/sef/sef.xml
+++ b/plugins/system/sef/sef.xml
@@ -3,7 +3,7 @@
 	<name>plg_system_sef</name>
 	<author>Joomla! Project</author>
 	<creationDate>December 2007</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/system/t3/admin/css/admin-j25.css b/plugins/system/t3/admin/css/admin-j25.css
index e69765a..f2b8aa2 100644
--- a/plugins/system/t3/admin/css/admin-j25.css
+++ b/plugins/system/t3/admin/css/admin-j25.css
@@ -141,7 +141,7 @@ div#element-box div.m {
 ---------------------------------------------------*/
 .t3-admin-assignment h5 {
   color: #333;
-  margin: 0 0 5px -18px;
+  margin: 0 0 5px 0;
 }
 
 .t3-admin-assignment ul.menu-links,
diff --git a/plugins/system/t3/admin/fonts/glyphicon/css/glyphicon.css b/plugins/system/t3/admin/fonts/glyphicon/css/glyphicon.css
new file mode 100644
index 0000000..75822de
--- /dev/null
+++ b/plugins/system/t3/admin/fonts/glyphicon/css/glyphicon.css
@@ -0,0 +1,620 @@
+/* Bootstrap 3.x Glyphicon */
+
+@font-face {
+  font-family: 'Glyphicons Halflings';
+
+  src: url('../fonts/glyphicons-halflings-regular.eot');
+  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
+}
+.glyphicon {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+.glyphicon-asterisk:before {
+  content: "\2a";
+}
+.glyphicon-plus:before {
+  content: "\2b";
+}
+.glyphicon-euro:before {
+  content: "\20ac";
+}
+.glyphicon-minus:before {
+  content: "\2212";
+}
+.glyphicon-cloud:before {
+  content: "\2601";
+}
+.glyphicon-envelope:before {
+  content: "\2709";
+}
+.glyphicon-pencil:before {
+  content: "\270f";
+}
+.glyphicon-glass:before {
+  content: "\e001";
+}
+.glyphicon-music:before {
+  content: "\e002";
+}
+.glyphicon-search:before {
+  content: "\e003";
+}
+.glyphicon-heart:before {
+  content: "\e005";
+}
+.glyphicon-star:before {
+  content: "\e006";
+}
+.glyphicon-star-empty:before {
+  content: "\e007";
+}
+.glyphicon-user:before {
+  content: "\e008";
+}
+.glyphicon-film:before {
+  content: "\e009";
+}
+.glyphicon-th-large:before {
+  content: "\e010";
+}
+.glyphicon-th:before {
+  content: "\e011";
+}
+.glyphicon-th-list:before {
+  content: "\e012";
+}
+.glyphicon-ok:before {
+  content: "\e013";
+}
+.glyphicon-remove:before {
+  content: "\e014";
+}
+.glyphicon-zoom-in:before {
+  content: "\e015";
+}
+.glyphicon-zoom-out:before {
+  content: "\e016";
+}
+.glyphicon-off:before {
+  content: "\e017";
+}
+.glyphicon-signal:before {
+  content: "\e018";
+}
+.glyphicon-cog:before {
+  content: "\e019";
+}
+.glyphicon-trash:before {
+  content: "\e020";
+}
+.glyphicon-home:before {
+  content: "\e021";
+}
+.glyphicon-file:before {
+  content: "\e022";
+}
+.glyphicon-time:before {
+  content: "\e023";
+}
+.glyphicon-road:before {
+  content: "\e024";
+}
+.glyphicon-download-alt:before {
+  content: "\e025";
+}
+.glyphicon-download:before {
+  content: "\e026";
+}
+.glyphicon-upload:before {
+  content: "\e027";
+}
+.glyphicon-inbox:before {
+  content: "\e028";
+}
+.glyphicon-play-circle:before {
+  content: "\e029";
+}
+.glyphicon-repeat:before {
+  content: "\e030";
+}
+.glyphicon-refresh:before {
+  content: "\e031";
+}
+.glyphicon-list-alt:before {
+  content: "\e032";
+}
+.glyphicon-lock:before {
+  content: "\e033";
+}
+.glyphicon-flag:before {
+  content: "\e034";
+}
+.glyphicon-headphones:before {
+  content: "\e035";
+}
+.glyphicon-volume-off:before {
+  content: "\e036";
+}
+.glyphicon-volume-down:before {
+  content: "\e037";
+}
+.glyphicon-volume-up:before {
+  content: "\e038";
+}
+.glyphicon-qrcode:before {
+  content: "\e039";
+}
+.glyphicon-barcode:before {
+  content: "\e040";
+}
+.glyphicon-tag:before {
+  content: "\e041";
+}
+.glyphicon-tags:before {
+  content: "\e042";
+}
+.glyphicon-book:before {
+  content: "\e043";
+}
+.glyphicon-bookmark:before {
+  content: "\e044";
+}
+.glyphicon-print:before {
+  content: "\e045";
+}
+.glyphicon-camera:before {
+  content: "\e046";
+}
+.glyphicon-font:before {
+  content: "\e047";
+}
+.glyphicon-bold:before {
+  content: "\e048";
+}
+.glyphicon-italic:before {
+  content: "\e049";
+}
+.glyphicon-text-height:before {
+  content: "\e050";
+}
+.glyphicon-text-width:before {
+  content: "\e051";
+}
+.glyphicon-align-left:before {
+  content: "\e052";
+}
+.glyphicon-align-center:before {
+  content: "\e053";
+}
+.glyphicon-align-right:before {
+  content: "\e054";
+}
+.glyphicon-align-justify:before {
+  content: "\e055";
+}
+.glyphicon-list:before {
+  content: "\e056";
+}
+.glyphicon-indent-left:before {
+  content: "\e057";
+}
+.glyphicon-indent-right:before {
+  content: "\e058";
+}
+.glyphicon-facetime-video:before {
+  content: "\e059";
+}
+.glyphicon-picture:before {
+  content: "\e060";
+}
+.glyphicon-map-marker:before {
+  content: "\e062";
+}
+.glyphicon-adjust:before {
+  content: "\e063";
+}
+.glyphicon-tint:before {
+  content: "\e064";
+}
+.glyphicon-edit:before {
+  content: "\e065";
+}
+.glyphicon-share:before {
+  content: "\e066";
+}
+.glyphicon-check:before {
+  content: "\e067";
+}
+.glyphicon-move:before {
+  content: "\e068";
+}
+.glyphicon-step-backward:before {
+  content: "\e069";
+}
+.glyphicon-fast-backward:before {
+  content: "\e070";
+}
+.glyphicon-backward:before {
+  content: "\e071";
+}
+.glyphicon-play:before {
+  content: "\e072";
+}
+.glyphicon-pause:before {
+  content: "\e073";
+}
+.glyphicon-stop:before {
+  content: "\e074";
+}
+.glyphicon-forward:before {
+  content: "\e075";
+}
+.glyphicon-fast-forward:before {
+  content: "\e076";
+}
+.glyphicon-step-forward:before {
+  content: "\e077";
+}
+.glyphicon-eject:before {
+  content: "\e078";
+}
+.glyphicon-chevron-left:before {
+  content: "\e079";
+}
+.glyphicon-chevron-right:before {
+  content: "\e080";
+}
+.glyphicon-plus-sign:before {
+  content: "\e081";
+}
+.glyphicon-minus-sign:before {
+  content: "\e082";
+}
+.glyphicon-remove-sign:before {
+  content: "\e083";
+}
+.glyphicon-ok-sign:before {
+  content: "\e084";
+}
+.glyphicon-question-sign:before {
+  content: "\e085";
+}
+.glyphicon-info-sign:before {
+  content: "\e086";
+}
+.glyphicon-screenshot:before {
+  content: "\e087";
+}
+.glyphicon-remove-circle:before {
+  content: "\e088";
+}
+.glyphicon-ok-circle:before {
+  content: "\e089";
+}
+.glyphicon-ban-circle:before {
+  content: "\e090";
+}
+.glyphicon-arrow-left:before {
+  content: "\e091";
+}
+.glyphicon-arrow-right:before {
+  content: "\e092";
+}
+.glyphicon-arrow-up:before {
+  content: "\e093";
+}
+.glyphicon-arrow-down:before {
+  content: "\e094";
+}
+.glyphicon-share-alt:before {
+  content: "\e095";
+}
+.glyphicon-resize-full:before {
+  content: "\e096";
+}
+.glyphicon-resize-small:before {
+  content: "\e097";
+}
+.glyphicon-exclamation-sign:before {
+  content: "\e101";
+}
+.glyphicon-gift:before {
+  content: "\e102";
+}
+.glyphicon-leaf:before {
+  content: "\e103";
+}
+.glyphicon-fire:before {
+  content: "\e104";
+}
+.glyphicon-eye-open:before {
+  content: "\e105";
+}
+.glyphicon-eye-close:before {
+  content: "\e106";
+}
+.glyphicon-warning-sign:before {
+  content: "\e107";
+}
+.glyphicon-plane:before {
+  content: "\e108";
+}
+.glyphicon-calendar:before {
+  content: "\e109";
+}
+.glyphicon-random:before {
+  content: "\e110";
+}
+.glyphicon-comment:before {
+  content: "\e111";
+}
+.glyphicon-magnet:before {
+  content: "\e112";
+}
+.glyphicon-chevron-up:before {
+  content: "\e113";
+}
+.glyphicon-chevron-down:before {
+  content: "\e114";
+}
+.glyphicon-retweet:before {
+  content: "\e115";
+}
+.glyphicon-shopping-cart:before {
+  content: "\e116";
+}
+.glyphicon-folder-close:before {
+  content: "\e117";
+}
+.glyphicon-folder-open:before {
+  content: "\e118";
+}
+.glyphicon-resize-vertical:before {
+  content: "\e119";
+}
+.glyphicon-resize-horizontal:before {
+  content: "\e120";
+}
+.glyphicon-hdd:before {
+  content: "\e121";
+}
+.glyphicon-bullhorn:before {
+  content: "\e122";
+}
+.glyphicon-bell:before {
+  content: "\e123";
+}
+.glyphicon-certificate:before {
+  content: "\e124";
+}
+.glyphicon-thumbs-up:before {
+  content: "\e125";
+}
+.glyphicon-thumbs-down:before {
+  content: "\e126";
+}
+.glyphicon-hand-right:before {
+  content: "\e127";
+}
+.glyphicon-hand-left:before {
+  content: "\e128";
+}
+.glyphicon-hand-up:before {
+  content: "\e129";
+}
+.glyphicon-hand-down:before {
+  content: "\e130";
+}
+.glyphicon-circle-arrow-right:before {
+  content: "\e131";
+}
+.glyphicon-circle-arrow-left:before {
+  content: "\e132";
+}
+.glyphicon-circle-arrow-up:before {
+  content: "\e133";
+}
+.glyphicon-circle-arrow-down:before {
+  content: "\e134";
+}
+.glyphicon-globe:before {
+  content: "\e135";
+}
+.glyphicon-wrench:before {
+  content: "\e136";
+}
+.glyphicon-tasks:before {
+  content: "\e137";
+}
+.glyphicon-filter:before {
+  content: "\e138";
+}
+.glyphicon-briefcase:before {
+  content: "\e139";
+}
+.glyphicon-fullscreen:before {
+  content: "\e140";
+}
+.glyphicon-dashboard:before {
+  content: "\e141";
+}
+.glyphicon-paperclip:before {
+  content: "\e142";
+}
+.glyphicon-heart-empty:before {
+  content: "\e143";
+}
+.glyphicon-link:before {
+  content: "\e144";
+}
+.glyphicon-phone:before {
+  content: "\e145";
+}
+.glyphicon-pushpin:before {
+  content: "\e146";
+}
+.glyphicon-usd:before {
+  content: "\e148";
+}
+.glyphicon-gbp:before {
+  content: "\e149";
+}
+.glyphicon-sort:before {
+  content: "\e150";
+}
+.glyphicon-sort-by-alphabet:before {
+  content: "\e151";
+}
+.glyphicon-sort-by-alphabet-alt:before {
+  content: "\e152";
+}
+.glyphicon-sort-by-order:before {
+  content: "\e153";
+}
+.glyphicon-sort-by-order-alt:before {
+  content: "\e154";
+}
+.glyphicon-sort-by-attributes:before {
+  content: "\e155";
+}
+.glyphicon-sort-by-attributes-alt:before {
+  content: "\e156";
+}
+.glyphicon-unchecked:before {
+  content: "\e157";
+}
+.glyphicon-expand:before {
+  content: "\e158";
+}
+.glyphicon-collapse-down:before {
+  content: "\e159";
+}
+.glyphicon-collapse-up:before {
+  content: "\e160";
+}
+.glyphicon-log-in:before {
+  content: "\e161";
+}
+.glyphicon-flash:before {
+  content: "\e162";
+}
+.glyphicon-log-out:before {
+  content: "\e163";
+}
+.glyphicon-new-window:before {
+  content: "\e164";
+}
+.glyphicon-record:before {
+  content: "\e165";
+}
+.glyphicon-save:before {
+  content: "\e166";
+}
+.glyphicon-open:before {
+  content: "\e167";
+}
+.glyphicon-saved:before {
+  content: "\e168";
+}
+.glyphicon-import:before {
+  content: "\e169";
+}
+.glyphicon-export:before {
+  content: "\e170";
+}
+.glyphicon-send:before {
+  content: "\e171";
+}
+.glyphicon-floppy-disk:before {
+  content: "\e172";
+}
+.glyphicon-floppy-saved:before {
+  content: "\e173";
+}
+.glyphicon-floppy-remove:before {
+  content: "\e174";
+}
+.glyphicon-floppy-save:before {
+  content: "\e175";
+}
+.glyphicon-floppy-open:before {
+  content: "\e176";
+}
+.glyphicon-credit-card:before {
+  content: "\e177";
+}
+.glyphicon-transfer:before {
+  content: "\e178";
+}
+.glyphicon-cutlery:before {
+  content: "\e179";
+}
+.glyphicon-header:before {
+  content: "\e180";
+}
+.glyphicon-compressed:before {
+  content: "\e181";
+}
+.glyphicon-earphone:before {
+  content: "\e182";
+}
+.glyphicon-phone-alt:before {
+  content: "\e183";
+}
+.glyphicon-tower:before {
+  content: "\e184";
+}
+.glyphicon-stats:before {
+  content: "\e185";
+}
+.glyphicon-sd-video:before {
+  content: "\e186";
+}
+.glyphicon-hd-video:before {
+  content: "\e187";
+}
+.glyphicon-subtitles:before {
+  content: "\e188";
+}
+.glyphicon-sound-stereo:before {
+  content: "\e189";
+}
+.glyphicon-sound-dolby:before {
+  content: "\e190";
+}
+.glyphicon-sound-5-1:before {
+  content: "\e191";
+}
+.glyphicon-sound-6-1:before {
+  content: "\e192";
+}
+.glyphicon-sound-7-1:before {
+  content: "\e193";
+}
+.glyphicon-copyright-mark:before {
+  content: "\e194";
+}
+.glyphicon-registration-mark:before {
+  content: "\e195";
+}
+.glyphicon-cloud-download:before {
+  content: "\e197";
+}
+.glyphicon-cloud-upload:before {
+  content: "\e198";
+}
+.glyphicon-tree-conifer:before {
+  content: "\e199";
+}
+.glyphicon-tree-deciduous:before {
+  content: "\e200";
+}
\ No newline at end of file
diff --git a/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.eot b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000..423bd5d
Binary files /dev/null and b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.eot differ
diff --git a/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.svg b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 0000000..4469488
--- /dev/null
+++ b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,229 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="glyphicons_halflingsregular" horiz-adv-x="1200" >
+<font-face units-per-em="1200" ascent="960" descent="-240" />
+<missing-glyph horiz-adv-x="500" />
+<glyph />
+<glyph />
+<glyph unicode="&#xd;" />
+<glyph unicode=" " />
+<glyph unicode="*" d="M100 500v200h259l-183 183l141 141l183 -183v259h200v-259l183 183l141 -141l-183 -183h259v-200h-259l183 -183l-141 -141l-183 183v-259h-200v259l-183 -183l-141 141l183 183h-259z" />
+<glyph unicode="+" d="M0 400v300h400v400h300v-400h400v-300h-400v-400h-300v400h-400z" />
+<glyph unicode="&#xa0;" />
+<glyph unicode="&#x2000;" horiz-adv-x="652" />
+<glyph unicode="&#x2001;" horiz-adv-x="1304" />
+<glyph unicode="&#x2002;" horiz-adv-x="652" />
+<glyph unicode="&#x2003;" horiz-adv-x="1304" />
+<glyph unicode="&#x2004;" horiz-adv-x="434" />
+<glyph unicode="&#x2005;" horiz-adv-x="326" />
+<glyph unicode="&#x2006;" horiz-adv-x="217" />
+<glyph unicode="&#x2007;" horiz-adv-x="217" />
+<glyph unicode="&#x2008;" horiz-adv-x="163" />
+<glyph unicode="&#x2009;" horiz-adv-x="260" />
+<glyph unicode="&#x200a;" horiz-adv-x="72" />
+<glyph unicode="&#x202f;" horiz-adv-x="260" />
+<glyph unicode="&#x205f;" horiz-adv-x="326" />
+<glyph unicode="&#x20ac;" d="M100 500l100 100h113q0 47 5 100h-218l100 100h135q37 167 112 257q117 141 297 141q242 0 354 -189q60 -103 66 -209h-181q0 55 -25.5 99t-63.5 68t-75 36.5t-67 12.5q-24 0 -52.5 -10t-62.5 -32t-65.5 -67t-50.5 -107h379l-100 -100h-300q-6 -46 -6 -100h406l-100 -100 h-300q9 -74 33 -132t52.5 -91t62 -54.5t59 -29t46.5 -7.5q29 0 66 13t75 37t63.5 67.5t25.5 96.5h174q-31 -172 -128 -278q-107 -117 -274 -117q-205 0 -324 158q-36 46 -69 131.5t-45 205.5h-217z" />
+<glyph unicode="&#x2212;" d="M200 400h900v300h-900v-300z" />
+<glyph unicode="&#x2601;" d="M-14 494q0 -80 56.5 -137t135.5 -57h750q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5z" />
+<glyph unicode="&#x2709;" d="M0 100l400 400l200 -200l200 200l400 -400h-1200zM0 300v600l300 -300zM0 1100l600 -603l600 603h-1200zM900 600l300 300v-600z" />
+<glyph unicode="&#x270f;" d="M-13 -13l333 112l-223 223zM187 403l214 -214l614 614l-214 214zM887 1103l214 -214l99 92q13 13 13 32.5t-13 33.5l-153 153q-15 13 -33 13t-33 -13z" />
+<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
+<glyph unicode="&#xe001;" d="M0 1200h1200l-500 -550v-550h300v-100h-800v100h300v550z" />
+<glyph unicode="&#xe002;" d="M14 84q18 -55 86 -75.5t147 5.5q65 21 109 69t44 90v606l600 155v-521q-64 16 -138 -7q-79 -26 -122.5 -83t-25.5 -111q17 -55 85.5 -75.5t147.5 4.5q70 23 111.5 63.5t41.5 95.5v881q0 10 -7 15.5t-17 2.5l-752 -193q-10 -3 -17 -12.5t-7 -19.5v-689q-64 17 -138 -7 q-79 -25 -122.5 -82t-25.5 -112z" />
+<glyph unicode="&#xe003;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233z" />
+<glyph unicode="&#xe005;" d="M100 784q0 64 28 123t73 100.5t104.5 64t119 20.5t120 -38.5t104.5 -104.5q48 69 109.5 105t121.5 38t118.5 -20.5t102.5 -64t71 -100.5t27 -123q0 -57 -33.5 -117.5t-94 -124.5t-126.5 -127.5t-150 -152.5t-146 -174q-62 85 -145.5 174t-149.5 152.5t-126.5 127.5 t-94 124.5t-33.5 117.5z" />
+<glyph unicode="&#xe006;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1z" />
+<glyph unicode="&#xe007;" d="M-72 800h479l146 400h2l146 -400h472l-382 -278l145 -449l-384 275l-382 -275l146 447zM168 71l2 1zM237 700l196 -142l-73 -226l192 140l195 -141l-74 229l193 140h-235l-77 211l-78 -211h-239z" />
+<glyph unicode="&#xe008;" d="M0 0v143l400 257v100q-37 0 -68.5 74.5t-31.5 125.5v200q0 124 88 212t212 88t212 -88t88 -212v-200q0 -51 -31.5 -125.5t-68.5 -74.5v-100l400 -257v-143h-1200z" />
+<glyph unicode="&#xe009;" d="M0 0v1100h1200v-1100h-1200zM100 100h100v100h-100v-100zM100 300h100v100h-100v-100zM100 500h100v100h-100v-100zM100 700h100v100h-100v-100zM100 900h100v100h-100v-100zM300 100h600v400h-600v-400zM300 600h600v400h-600v-400zM1000 100h100v100h-100v-100z M1000 300h100v100h-100v-100zM1000 500h100v100h-100v-100zM1000 700h100v100h-100v-100zM1000 900h100v100h-100v-100z" />
+<glyph unicode="&#xe010;" d="M0 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM0 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400 q-21 0 -35.5 14.5t-14.5 35.5zM600 50v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5zM600 650v400q0 21 14.5 35.5t35.5 14.5h400q21 0 35.5 -14.5t14.5 -35.5v-400 q0 -21 -14.5 -35.5t-35.5 -14.5h-400q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe011;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200 q-21 0 -35.5 14.5t-14.5 35.5zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 450v200q0 21 14.5 35.5t35.5 14.5h200 q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM800 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe012;" d="M0 50v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM0 450q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v200q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5 t-14.5 -35.5v-200zM0 850v200q0 21 14.5 35.5t35.5 14.5h200q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5zM400 50v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5 t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 450v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5zM400 850v200q0 21 14.5 35.5t35.5 14.5h700q21 0 35.5 -14.5t14.5 -35.5 v-200q0 -21 -14.5 -35.5t-35.5 -14.5h-700q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe013;" d="M29 454l419 -420l818 820l-212 212l-607 -607l-206 207z" />
+<glyph unicode="&#xe014;" d="M106 318l282 282l-282 282l212 212l282 -282l282 282l212 -212l-282 -282l282 -282l-212 -212l-282 282l-282 -282z" />
+<glyph unicode="&#xe015;" d="M23 693q0 200 142 342t342 142t342 -142t142 -342q0 -142 -78 -261l300 -300q7 -8 7 -18t-7 -18l-109 -109q-8 -7 -18 -7t-18 7l-300 300q-119 -78 -261 -78q-200 0 -342 142t-142 342zM176 693q0 -136 97 -233t234 -97t233.5 96.5t96.5 233.5t-96.5 233.5t-233.5 96.5 t-234 -97t-97 -233zM300 600v200h100v100h200v-100h100v-200h-100v-100h-200v100h-100z" />
+<glyph unicode="&#xe016;" d="M23 694q0 200 142 342t342 142t342 -142t142 -342q0 -141 -78 -262l300 -299q7 -7 7 -18t-7 -18l-109 -109q-8 -8 -18 -8t-18 8l-300 299q-120 -77 -261 -77q-200 0 -342 142t-142 342zM176 694q0 -136 97 -233t234 -97t233.5 97t96.5 233t-96.5 233t-233.5 97t-234 -97 t-97 -233zM300 601h400v200h-400v-200z" />
+<glyph unicode="&#xe017;" d="M23 600q0 183 105 331t272 210v-166q-103 -55 -165 -155t-62 -220q0 -177 125 -302t302 -125t302 125t125 302q0 120 -62 220t-165 155v166q167 -62 272 -210t105 -331q0 -118 -45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5 zM500 750q0 -21 14.5 -35.5t35.5 -14.5h100q21 0 35.5 14.5t14.5 35.5v400q0 21 -14.5 35.5t-35.5 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-400z" />
+<glyph unicode="&#xe018;" d="M100 1h200v300h-200v-300zM400 1v500h200v-500h-200zM700 1v800h200v-800h-200zM1000 1v1200h200v-1200h-200z" />
+<glyph unicode="&#xe019;" d="M26 601q0 -33 6 -74l151 -38l2 -6q14 -49 38 -93l3 -5l-80 -134q45 -59 105 -105l133 81l5 -3q45 -26 94 -39l5 -2l38 -151q40 -5 74 -5q27 0 74 5l38 151l6 2q46 13 93 39l5 3l134 -81q56 44 104 105l-80 134l3 5q24 44 39 93l1 6l152 38q5 40 5 74q0 28 -5 73l-152 38 l-1 6q-16 51 -39 93l-3 5l80 134q-44 58 -104 105l-134 -81l-5 3q-45 25 -93 39l-6 1l-38 152q-40 5 -74 5q-27 0 -74 -5l-38 -152l-5 -1q-50 -14 -94 -39l-5 -3l-133 81q-59 -47 -105 -105l80 -134l-3 -5q-25 -47 -38 -93l-2 -6l-151 -38q-6 -48 -6 -73zM385 601 q0 88 63 151t152 63t152 -63t63 -151q0 -89 -63 -152t-152 -63t-152 63t-63 152z" />
+<glyph unicode="&#xe020;" d="M100 1025v50q0 10 7.5 17.5t17.5 7.5h275v100q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5v-100h275q10 0 17.5 -7.5t7.5 -17.5v-50q0 -11 -7 -18t-18 -7h-1050q-11 0 -18 7t-7 18zM200 100v800h900v-800q0 -41 -29.5 -71t-70.5 -30h-700q-41 0 -70.5 30 t-29.5 71zM300 100h100v700h-100v-700zM500 100h100v700h-100v-700zM500 1100h300v100h-300v-100zM700 100h100v700h-100v-700zM900 100h100v700h-100v-700z" />
+<glyph unicode="&#xe021;" d="M1 601l656 644l644 -644h-200v-600h-300v400h-300v-400h-300v600h-200z" />
+<glyph unicode="&#xe022;" d="M100 25v1150q0 11 7 18t18 7h475v-500h400v-675q0 -11 -7 -18t-18 -7h-850q-11 0 -18 7t-7 18zM700 800v300l300 -300h-300z" />
+<glyph unicode="&#xe023;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 500v400h100 v-300h200v-100h-300z" />
+<glyph unicode="&#xe024;" d="M-100 0l431 1200h209l-21 -300h162l-20 300h208l431 -1200h-538l-41 400h-242l-40 -400h-539zM488 500h224l-27 300h-170z" />
+<glyph unicode="&#xe025;" d="M0 0v400h490l-290 300h200v500h300v-500h200l-290 -300h490v-400h-1100zM813 200h175v100h-175v-100z" />
+<glyph unicode="&#xe026;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM188 600q0 -170 121 -291t291 -121t291 121t121 291t-121 291t-291 121 t-291 -121t-121 -291zM350 600h150v300h200v-300h150l-250 -300z" />
+<glyph unicode="&#xe027;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM350 600l250 300 l250 -300h-150v-300h-200v300h-150z" />
+<glyph unicode="&#xe028;" d="M0 25v475l200 700h800q199 -700 200 -700v-475q0 -11 -7 -18t-18 -7h-1150q-11 0 -18 7t-7 18zM200 500h200l50 -200h300l50 200h200l-97 500h-606z" />
+<glyph unicode="&#xe029;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM500 397v401 l297 -200z" />
+<glyph unicode="&#xe030;" d="M23 600q0 -118 45.5 -224.5t123 -184t184 -123t224.5 -45.5t224.5 45.5t184 123t123 184t45.5 224.5h-150q0 -177 -125 -302t-302 -125t-302 125t-125 302t125 302t302 125q136 0 246 -81l-146 -146h400v400l-145 -145q-157 122 -355 122q-118 0 -224.5 -45.5t-184 -123 t-123 -184t-45.5 -224.5z" />
+<glyph unicode="&#xe031;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5q198 0 355 -122l145 145v-400h-400l147 147q-112 80 -247 80q-177 0 -302 -125t-125 -302h-150zM100 0v400h400l-147 -147q112 -80 247 -80q177 0 302 125t125 302h150q0 -118 -45.5 -224.5t-123 -184t-184 -123 t-224.5 -45.5q-198 0 -355 122z" />
+<glyph unicode="&#xe032;" d="M100 0h1100v1200h-1100v-1200zM200 100v900h900v-900h-900zM300 200v100h100v-100h-100zM300 400v100h100v-100h-100zM300 600v100h100v-100h-100zM300 800v100h100v-100h-100zM500 200h500v100h-500v-100zM500 400v100h500v-100h-500zM500 600v100h500v-100h-500z M500 800v100h500v-100h-500z" />
+<glyph unicode="&#xe033;" d="M0 100v600q0 41 29.5 70.5t70.5 29.5h100v200q0 82 59 141t141 59h300q82 0 141 -59t59 -141v-200h100q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-900q-41 0 -70.5 29.5t-29.5 70.5zM400 800h300v150q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-150z" />
+<glyph unicode="&#xe034;" d="M100 0v1100h100v-1100h-100zM300 400q60 60 127.5 84t127.5 17.5t122 -23t119 -30t110 -11t103 42t91 120.5v500q-40 -81 -101.5 -115.5t-127.5 -29.5t-138 25t-139.5 40t-125.5 25t-103 -29.5t-65 -115.5v-500z" />
+<glyph unicode="&#xe035;" d="M0 275q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 127 70.5 231.5t184.5 161.5t245 57t245 -57t184.5 -161.5t70.5 -231.5v-300q0 -11 7 -18t18 -7h50q11 0 18 7t7 18v300q0 116 -49.5 227t-131 192.5t-192.5 131t-227 49.5t-227 -49.5t-192.5 -131t-131 -192.5 t-49.5 -227v-300zM200 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14zM800 20v460q0 8 6 14t14 6h160q8 0 14 -6t6 -14v-460q0 -8 -6 -14t-14 -6h-160q-8 0 -14 6t-6 14z" />
+<glyph unicode="&#xe036;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM688 459l141 141l-141 141l71 71l141 -141l141 141l71 -71l-141 -141l141 -141l-71 -71l-141 141l-141 -141z" />
+<glyph unicode="&#xe037;" d="M0 400h300l300 -200v800l-300 -200h-300v-400zM700 857l69 53q111 -135 111 -310q0 -169 -106 -302l-67 54q86 110 86 248q0 146 -93 257z" />
+<glyph unicode="&#xe038;" d="M0 401v400h300l300 200v-800l-300 200h-300zM702 858l69 53q111 -135 111 -310q0 -170 -106 -303l-67 55q86 110 86 248q0 145 -93 257zM889 951l7 -8q123 -151 123 -344q0 -189 -119 -339l-7 -8l81 -66l6 8q142 178 142 405q0 230 -144 408l-6 8z" />
+<glyph unicode="&#xe039;" d="M0 0h500v500h-200v100h-100v-100h-200v-500zM0 600h100v100h400v100h100v100h-100v300h-500v-600zM100 100v300h300v-300h-300zM100 800v300h300v-300h-300zM200 200v100h100v-100h-100zM200 900h100v100h-100v-100zM500 500v100h300v-300h200v-100h-100v-100h-200v100 h-100v100h100v200h-200zM600 0v100h100v-100h-100zM600 1000h100v-300h200v-300h300v200h-200v100h200v500h-600v-200zM800 800v300h300v-300h-300zM900 0v100h300v-100h-300zM900 900v100h100v-100h-100zM1100 200v100h100v-100h-100z" />
+<glyph unicode="&#xe040;" d="M0 200h100v1000h-100v-1000zM100 0v100h300v-100h-300zM200 200v1000h100v-1000h-100zM500 0v91h100v-91h-100zM500 200v1000h200v-1000h-200zM700 0v91h100v-91h-100zM800 200v1000h100v-1000h-100zM900 0v91h200v-91h-200zM1000 200v1000h200v-1000h-200z" />
+<glyph unicode="&#xe041;" d="M1 700v475q0 10 7.5 17.5t17.5 7.5h474l700 -700l-500 -500zM148 953q0 -42 29 -71q30 -30 71.5 -30t71.5 30q29 29 29 71t-29 71q-30 30 -71.5 30t-71.5 -30q-29 -29 -29 -71z" />
+<glyph unicode="&#xe042;" d="M2 700v475q0 11 7 18t18 7h474l700 -700l-500 -500zM148 953q0 -42 30 -71q29 -30 71 -30t71 30q30 29 30 71t-30 71q-29 30 -71 30t-71 -30q-30 -29 -30 -71zM701 1200h100l700 -700l-500 -500l-50 50l450 450z" />
+<glyph unicode="&#xe043;" d="M100 0v1025l175 175h925v-1000l-100 -100v1000h-750l-100 -100h750v-1000h-900z" />
+<glyph unicode="&#xe044;" d="M200 0l450 444l450 -443v1150q0 20 -14.5 35t-35.5 15h-800q-21 0 -35.5 -15t-14.5 -35v-1151z" />
+<glyph unicode="&#xe045;" d="M0 100v700h200l100 -200h600l100 200h200v-700h-200v200h-800v-200h-200zM253 829l40 -124h592l62 124l-94 346q-2 11 -10 18t-18 7h-450q-10 0 -18 -7t-10 -18zM281 24l38 152q2 10 11.5 17t19.5 7h500q10 0 19.5 -7t11.5 -17l38 -152q2 -10 -3.5 -17t-15.5 -7h-600 q-10 0 -15.5 7t-3.5 17z" />
+<glyph unicode="&#xe046;" d="M0 200q0 -41 29.5 -70.5t70.5 -29.5h1000q41 0 70.5 29.5t29.5 70.5v600q0 41 -29.5 70.5t-70.5 29.5h-150q-4 8 -11.5 21.5t-33 48t-53 61t-69 48t-83.5 21.5h-200q-41 0 -82 -20.5t-70 -50t-52 -59t-34 -50.5l-12 -20h-150q-41 0 -70.5 -29.5t-29.5 -70.5v-600z M356 500q0 100 72 172t172 72t172 -72t72 -172t-72 -172t-172 -72t-172 72t-72 172zM494 500q0 -44 31 -75t75 -31t75 31t31 75t-31 75t-75 31t-75 -31t-31 -75zM900 700v100h100v-100h-100z" />
+<glyph unicode="&#xe047;" d="M53 0h365v66q-41 0 -72 11t-49 38t1 71l92 234h391l82 -222q16 -45 -5.5 -88.5t-74.5 -43.5v-66h417v66q-34 1 -74 43q-18 19 -33 42t-21 37l-6 13l-385 998h-93l-399 -1006q-24 -48 -52 -75q-12 -12 -33 -25t-36 -20l-15 -7v-66zM416 521l178 457l46 -140l116 -317h-340 z" />
+<glyph unicode="&#xe048;" d="M100 0v89q41 7 70.5 32.5t29.5 65.5v827q0 28 -1 39.5t-5.5 26t-15.5 21t-29 14t-49 14.5v70h471q120 0 213 -88t93 -228q0 -55 -11.5 -101.5t-28 -74t-33.5 -47.5t-28 -28l-12 -7q8 -3 21.5 -9t48 -31.5t60.5 -58t47.5 -91.5t21.5 -129q0 -84 -59 -156.5t-142 -111 t-162 -38.5h-500zM400 200h161q89 0 153 48.5t64 132.5q0 90 -62.5 154.5t-156.5 64.5h-159v-400zM400 700h139q76 0 130 61.5t54 138.5q0 82 -84 130.5t-239 48.5v-379z" />
+<glyph unicode="&#xe049;" d="M200 0v57q77 7 134.5 40.5t65.5 80.5l173 849q10 56 -10 74t-91 37q-6 1 -10.5 2.5t-9.5 2.5v57h425l2 -57q-33 -8 -62 -25.5t-46 -37t-29.5 -38t-17.5 -30.5l-5 -12l-128 -825q-10 -52 14 -82t95 -36v-57h-500z" />
+<glyph unicode="&#xe050;" d="M-75 200h75v800h-75l125 167l125 -167h-75v-800h75l-125 -167zM300 900v300h150h700h150v-300h-50q0 29 -8 48.5t-18.5 30t-33.5 15t-39.5 5.5t-50.5 1h-200v-850l100 -50v-100h-400v100l100 50v850h-200q-34 0 -50.5 -1t-40 -5.5t-33.5 -15t-18.5 -30t-8.5 -48.5h-49z " />
+<glyph unicode="&#xe051;" d="M33 51l167 125v-75h800v75l167 -125l-167 -125v75h-800v-75zM100 901v300h150h700h150v-300h-50q0 29 -8 48.5t-18 30t-33.5 15t-40 5.5t-50.5 1h-200v-650l100 -50v-100h-400v100l100 50v650h-200q-34 0 -50.5 -1t-39.5 -5.5t-33.5 -15t-18.5 -30t-8 -48.5h-50z" />
+<glyph unicode="&#xe052;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 350q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM0 650q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1000q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 950q0 -20 14.5 -35t35.5 -15h600q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-600q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe053;" d="M0 50q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM0 650q0 -20 14.5 -35t35.5 -15h1100q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5 v-100zM200 350q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM200 950q0 -20 14.5 -35t35.5 -15h700q21 0 35.5 15t14.5 35v100q0 21 -14.5 35.5t-35.5 14.5h-700q-21 0 -35.5 -14.5 t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe054;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM100 650v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1000q-21 0 -35.5 15 t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM500 950v100q0 21 14.5 35.5t35.5 14.5h600q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-600 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe055;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h1100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-1100 q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe056;" d="M0 50v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 350v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM0 650v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15t-14.5 35zM0 950v100q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-100q-21 0 -35.5 15 t-14.5 35zM300 50v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 350v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800 q-21 0 -35.5 15t-14.5 35zM300 650v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15h-800q-21 0 -35.5 15t-14.5 35zM300 950v100q0 21 14.5 35.5t35.5 14.5h800q21 0 35.5 -14.5t14.5 -35.5v-100q0 -20 -14.5 -35t-35.5 -15 h-800q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe057;" d="M-101 500v100h201v75l166 -125l-166 -125v75h-201zM300 0h100v1100h-100v-1100zM500 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35 v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 650q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM500 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100 q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100z" />
+<glyph unicode="&#xe058;" d="M1 50q0 -20 14.5 -35t35.5 -15h600q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-600q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 350q0 -20 14.5 -35t35.5 -15h300q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-300q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 650 q0 -20 14.5 -35t35.5 -15h500q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-500q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM1 950q0 -20 14.5 -35t35.5 -15h100q20 0 35 15t15 35v100q0 21 -15 35.5t-35 14.5h-100q-21 0 -35.5 -14.5t-14.5 -35.5v-100zM801 0v1100h100v-1100 h-100zM934 550l167 -125v75h200v100h-200v75z" />
+<glyph unicode="&#xe059;" d="M0 275v650q0 31 22 53t53 22h750q31 0 53 -22t22 -53v-650q0 -31 -22 -53t-53 -22h-750q-31 0 -53 22t-22 53zM900 600l300 300v-600z" />
+<glyph unicode="&#xe060;" d="M0 44v1012q0 18 13 31t31 13h1112q19 0 31.5 -13t12.5 -31v-1012q0 -18 -12.5 -31t-31.5 -13h-1112q-18 0 -31 13t-13 31zM100 263l247 182l298 -131l-74 156l293 318l236 -288v500h-1000v-737zM208 750q0 56 39 95t95 39t95 -39t39 -95t-39 -95t-95 -39t-95 39t-39 95z " />
+<glyph unicode="&#xe062;" d="M148 745q0 124 60.5 231.5t165 172t226.5 64.5q123 0 227 -63t164.5 -169.5t60.5 -229.5t-73 -272q-73 -114 -166.5 -237t-150.5 -189l-57 -66q-10 9 -27 26t-66.5 70.5t-96 109t-104 135.5t-100.5 155q-63 139 -63 262zM342 772q0 -107 75.5 -182.5t181.5 -75.5 q107 0 182.5 75.5t75.5 182.5t-75.5 182t-182.5 75t-182 -75.5t-75 -181.5z" />
+<glyph unicode="&#xe063;" d="M1 600q0 122 47.5 233t127.5 191t191 127.5t233 47.5t233 -47.5t191 -127.5t127.5 -191t47.5 -233t-47.5 -233t-127.5 -191t-191 -127.5t-233 -47.5t-233 47.5t-191 127.5t-127.5 191t-47.5 233zM173 600q0 -177 125.5 -302t301.5 -125v854q-176 0 -301.5 -125 t-125.5 -302z" />
+<glyph unicode="&#xe064;" d="M117 406q0 94 34 186t88.5 172.5t112 159t115 177t87.5 194.5q21 -71 57.5 -142.5t76 -130.5t83 -118.5t82 -117t70 -116t50 -125.5t18.5 -136q0 -89 -39 -165.5t-102 -126.5t-140 -79.5t-156 -33.5q-114 6 -211.5 53t-161.5 138.5t-64 210.5zM243 414q14 -82 59.5 -136 t136.5 -80l16 98q-7 6 -18 17t-34 48t-33 77q-15 73 -14 143.5t10 122.5l9 51q-92 -110 -119.5 -185t-12.5 -156z" />
+<glyph unicode="&#xe065;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5q366 -6 397 -14l-186 -186h-311q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v125l200 200v-225q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM436 341l161 50l412 412l-114 113l-405 -405zM995 1015l113 -113l113 113l-21 85l-92 28z" />
+<glyph unicode="&#xe066;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h261l2 -80q-133 -32 -218 -120h-145q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5l200 153v-53q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5 zM423 524q30 38 81.5 64t103 35.5t99 14t77.5 3.5l29 -1v-209l360 324l-359 318v-216q-7 0 -19 -1t-48 -8t-69.5 -18.5t-76.5 -37t-76.5 -59t-62 -88t-39.5 -121.5z" />
+<glyph unicode="&#xe067;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q60 0 127 -23l-178 -177h-349q-41 0 -70.5 -29.5t-29.5 -70.5v-500q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v69l200 200v-169q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5 t-117.5 282.5zM342 632l283 -284l566 567l-136 137l-430 -431l-147 147z" />
+<glyph unicode="&#xe068;" d="M0 603l300 296v-198h200v200h-200l300 300l295 -300h-195v-200h200v198l300 -296l-300 -300v198h-200v-200h195l-295 -300l-300 300h200v200h-200v-198z" />
+<glyph unicode="&#xe069;" d="M200 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-1100l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe070;" d="M0 50v1000q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-437l500 487v-487l500 487v-1100l-500 488v-488l-500 488v-438q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5z" />
+<glyph unicode="&#xe071;" d="M136 550l564 550v-487l500 487v-1100l-500 488v-488z" />
+<glyph unicode="&#xe072;" d="M200 0l900 550l-900 550v-1100z" />
+<glyph unicode="&#xe073;" d="M200 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200q-21 0 -35.5 -14.5t-14.5 -35.5v-800zM600 150q0 -21 14.5 -35.5t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v800q0 21 -14.5 35.5t-35.5 14.5h-200 q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe074;" d="M200 150q0 -20 14.5 -35t35.5 -15h800q21 0 35.5 15t14.5 35v800q0 21 -14.5 35.5t-35.5 14.5h-800q-21 0 -35.5 -14.5t-14.5 -35.5v-800z" />
+<glyph unicode="&#xe075;" d="M0 0v1100l500 -487v487l564 -550l-564 -550v488z" />
+<glyph unicode="&#xe076;" d="M0 0v1100l500 -487v487l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438l-500 -488v488z" />
+<glyph unicode="&#xe077;" d="M300 0v1100l500 -487v437q0 21 14.5 35.5t35.5 14.5h100q21 0 35.5 -14.5t14.5 -35.5v-1000q0 -21 -14.5 -35.5t-35.5 -14.5h-100q-21 0 -35.5 14.5t-14.5 35.5v438z" />
+<glyph unicode="&#xe078;" d="M100 250v100q0 21 14.5 35.5t35.5 14.5h1000q21 0 35.5 -14.5t14.5 -35.5v-100q0 -21 -14.5 -35.5t-35.5 -14.5h-1000q-21 0 -35.5 14.5t-14.5 35.5zM100 500h1100l-550 564z" />
+<glyph unicode="&#xe079;" d="M185 599l592 -592l240 240l-353 353l353 353l-240 240z" />
+<glyph unicode="&#xe080;" d="M272 194l353 353l-353 353l241 240l572 -571l21 -22l-1 -1v-1l-592 -591z" />
+<glyph unicode="&#xe081;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h200v-200h200v200h200v200h-200v200h-200v-200h-200v-200z" />
+<glyph unicode="&#xe082;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM300 500h600v200h-600v-200z" />
+<glyph unicode="&#xe083;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM246 459l213 -213l141 142l141 -142l213 213l-142 141l142 141l-213 212l-141 -141l-141 142l-212 -213l141 -141z" />
+<glyph unicode="&#xe084;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -299.5t-217.5 -217.5t-299.5 -80t-299.5 80t-217.5 217.5t-80 299.5zM270 551l276 -277l411 411l-175 174l-236 -236l-102 102z" />
+<glyph unicode="&#xe085;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM363 700h144q4 0 11.5 -1t11 -1t6.5 3t3 9t1 11t3.5 8.5t3.5 6t5.5 4t6.5 2.5t9 1.5t9 0.5h11.5h12.5q19 0 30 -10t11 -26 q0 -22 -4 -28t-27 -22q-5 -1 -12.5 -3t-27 -13.5t-34 -27t-26.5 -46t-11 -68.5h200q5 3 14 8t31.5 25.5t39.5 45.5t31 69t14 94q0 51 -17.5 89t-42 58t-58.5 32t-58.5 15t-51.5 3q-105 0 -172 -56t-67 -183zM500 300h200v100h-200v-100z" />
+<glyph unicode="&#xe086;" d="M3 600q0 162 80 299.5t217.5 217.5t299.5 80t299.5 -80t217.5 -217.5t80 -299.5t-80 -300t-217.5 -218t-299.5 -80t-299.5 80t-217.5 218t-80 300zM400 300h400v100h-100v300h-300v-100h100v-200h-100v-100zM500 800h200v100h-200v-100z" />
+<glyph unicode="&#xe087;" d="M0 500v200h194q15 60 36 104.5t55.5 86t88 69t126.5 40.5v200h200v-200q54 -20 113 -60t112.5 -105.5t71.5 -134.5h203v-200h-203q-25 -102 -116.5 -186t-180.5 -117v-197h-200v197q-140 27 -208 102.5t-98 200.5h-194zM290 500q24 -73 79.5 -127.5t130.5 -78.5v206h200 v-206q149 48 201 206h-201v200h200q-25 74 -76 127.5t-124 76.5v-204h-200v203q-75 -24 -130 -77.5t-79 -125.5h209v-200h-210z" />
+<glyph unicode="&#xe088;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM356 465l135 135 l-135 135l109 109l135 -135l135 135l109 -109l-135 -135l135 -135l-109 -109l-135 135l-135 -135z" />
+<glyph unicode="&#xe089;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM322 537l141 141 l87 -87l204 205l142 -142l-346 -345z" />
+<glyph unicode="&#xe090;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -115 62 -215l568 567q-100 62 -216 62q-171 0 -292.5 -121.5t-121.5 -292.5zM391 245q97 -59 209 -59q171 0 292.5 121.5t121.5 292.5 q0 112 -59 209z" />
+<glyph unicode="&#xe091;" d="M0 547l600 453v-300h600v-300h-600v-301z" />
+<glyph unicode="&#xe092;" d="M0 400v300h600v300l600 -453l-600 -448v301h-600z" />
+<glyph unicode="&#xe093;" d="M204 600l450 600l444 -600h-298v-600h-300v600h-296z" />
+<glyph unicode="&#xe094;" d="M104 600h296v600h300v-600h298l-449 -600z" />
+<glyph unicode="&#xe095;" d="M0 200q6 132 41 238.5t103.5 193t184 138t271.5 59.5v271l600 -453l-600 -448v301q-95 -2 -183 -20t-170 -52t-147 -92.5t-100 -135.5z" />
+<glyph unicode="&#xe096;" d="M0 0v400l129 -129l294 294l142 -142l-294 -294l129 -129h-400zM635 777l142 -142l294 294l129 -129v400h-400l129 -129z" />
+<glyph unicode="&#xe097;" d="M34 176l295 295l-129 129h400v-400l-129 130l-295 -295zM600 600v400l129 -129l295 295l142 -141l-295 -295l129 -130h-400z" />
+<glyph unicode="&#xe101;" d="M23 600q0 118 45.5 224.5t123 184t184 123t224.5 45.5t224.5 -45.5t184 -123t123 -184t45.5 -224.5t-45.5 -224.5t-123 -184t-184 -123t-224.5 -45.5t-224.5 45.5t-184 123t-123 184t-45.5 224.5zM456 851l58 -302q4 -20 21.5 -34.5t37.5 -14.5h54q20 0 37.5 14.5 t21.5 34.5l58 302q4 20 -8 34.5t-33 14.5h-207q-20 0 -32 -14.5t-8 -34.5zM500 300h200v100h-200v-100z" />
+<glyph unicode="&#xe102;" d="M0 800h100v-200h400v300h200v-300h400v200h100v100h-111v6t-1 15t-3 18l-34 172q-11 39 -41.5 63t-69.5 24q-32 0 -61 -17l-239 -144q-22 -13 -40 -35q-19 24 -40 36l-238 144q-33 18 -62 18q-39 0 -69.5 -23t-40.5 -61l-35 -177q-2 -8 -3 -18t-1 -15v-6h-111v-100z M100 0h400v400h-400v-400zM200 900q-3 0 14 48t35 96l18 47l214 -191h-281zM700 0v400h400v-400h-400zM731 900l202 197q5 -12 12 -32.5t23 -64t25 -72t7 -28.5h-269z" />
+<glyph unicode="&#xe103;" d="M0 -22v143l216 193q-9 53 -13 83t-5.5 94t9 113t38.5 114t74 124q47 60 99.5 102.5t103 68t127.5 48t145.5 37.5t184.5 43.5t220 58.5q0 -189 -22 -343t-59 -258t-89 -181.5t-108.5 -120t-122 -68t-125.5 -30t-121.5 -1.5t-107.5 12.5t-87.5 17t-56.5 7.5l-99 -55z M238.5 300.5q19.5 -6.5 86.5 76.5q55 66 367 234q70 38 118.5 69.5t102 79t99 111.5t86.5 148q22 50 24 60t-6 19q-7 5 -17 5t-26.5 -14.5t-33.5 -39.5q-35 -51 -113.5 -108.5t-139.5 -89.5l-61 -32q-369 -197 -458 -401q-48 -111 -28.5 -117.5z" />
+<glyph unicode="&#xe104;" d="M111 408q0 -33 5 -63q9 -56 44 -119.5t105 -108.5q31 -21 64 -16t62 23.5t57 49.5t48 61.5t35 60.5q32 66 39 184.5t-13 157.5q79 -80 122 -164t26 -184q-5 -33 -20.5 -69.5t-37.5 -80.5q-10 -19 -14.5 -29t-12 -26t-9 -23.5t-3 -19t2.5 -15.5t11 -9.5t19.5 -5t30.5 2.5 t42 8q57 20 91 34t87.5 44.5t87 64t65.5 88.5t47 122q38 172 -44.5 341.5t-246.5 278.5q22 -44 43 -129q39 -159 -32 -154q-15 2 -33 9q-79 33 -120.5 100t-44 175.5t48.5 257.5q-13 -8 -34 -23.5t-72.5 -66.5t-88.5 -105.5t-60 -138t-8 -166.5q2 -12 8 -41.5t8 -43t6 -39.5 t3.5 -39.5t-1 -33.5t-6 -31.5t-13.5 -24t-21 -20.5t-31 -12q-38 -10 -67 13t-40.5 61.5t-15 81.5t10.5 75q-52 -46 -83.5 -101t-39 -107t-7.5 -85z" />
+<glyph unicode="&#xe105;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5t145.5 -23.5t132.5 -59t116.5 -83.5t97 -90t74.5 -85.5t49 -63.5t20 -30l26 -40l-26 -40q-6 -10 -20 -30t-49 -63.5t-74.5 -85.5t-97 -90t-116.5 -83.5t-132.5 -59t-145.5 -23.5 t-145.5 23.5t-132.5 59t-116.5 83.5t-97 90t-74.5 85.5t-49 63.5t-20 30zM120 600q7 -10 40.5 -58t56 -78.5t68 -77.5t87.5 -75t103 -49.5t125 -21.5t123.5 20t100.5 45.5t85.5 71.5t66.5 75.5t58 81.5t47 66q-1 1 -28.5 37.5t-42 55t-43.5 53t-57.5 63.5t-58.5 54 q49 -74 49 -163q0 -124 -88 -212t-212 -88t-212 88t-88 212q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l105 105q-37 24 -75 72t-57 84l-20 36z" />
+<glyph unicode="&#xe106;" d="M-61 600l26 40q6 10 20 30t49 63.5t74.5 85.5t97 90t116.5 83.5t132.5 59t145.5 23.5q61 0 121 -17l37 142h148l-314 -1200h-148l37 143q-82 21 -165 71.5t-140 102t-109.5 112t-72 88.5t-29.5 43zM120 600q210 -282 393 -336l37 141q-107 18 -178.5 101.5t-71.5 193.5 q0 85 46 158q-102 -87 -226 -258zM377 656q49 -124 154 -191l47 47l23 87q-30 28 -59 69t-44 68l-14 26zM780 161l38 145q22 15 44.5 34t46 44t40.5 44t41 50.5t33.5 43.5t33 44t24.5 34q-97 127 -140 175l39 146q67 -54 131.5 -125.5t87.5 -103.5t36 -52l26 -40l-26 -40 q-7 -12 -25.5 -38t-63.5 -79.5t-95.5 -102.5t-124 -100t-146.5 -79z" />
+<glyph unicode="&#xe107;" d="M-97.5 34q13.5 -34 50.5 -34h1294q37 0 50.5 35.5t-7.5 67.5l-642 1056q-20 33 -48 36t-48 -29l-642 -1066q-21 -32 -7.5 -66zM155 200l445 723l445 -723h-345v100h-200v-100h-345zM500 600l100 -300l100 300v100h-200v-100z" />
+<glyph unicode="&#xe108;" d="M100 262v41q0 20 11 44.5t26 38.5l363 325v339q0 62 44 106t106 44t106 -44t44 -106v-339l363 -325q15 -14 26 -38.5t11 -44.5v-41q0 -20 -12 -26.5t-29 5.5l-359 249v-263q100 -91 100 -113v-64q0 -21 -13 -29t-32 1l-94 78h-222l-94 -78q-19 -9 -32 -1t-13 29v64 q0 22 100 113v263l-359 -249q-17 -12 -29 -5.5t-12 26.5z" />
+<glyph unicode="&#xe109;" d="M0 50q0 -20 14.5 -35t35.5 -15h1000q21 0 35.5 15t14.5 35v750h-1100v-750zM0 900h1100v150q0 21 -14.5 35.5t-35.5 14.5h-150v100h-100v-100h-500v100h-100v-100h-150q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 100v100h100v-100h-100zM100 300v100h100v-100h-100z M100 500v100h100v-100h-100zM300 100v100h100v-100h-100zM300 300v100h100v-100h-100zM300 500v100h100v-100h-100zM500 100v100h100v-100h-100zM500 300v100h100v-100h-100zM500 500v100h100v-100h-100zM700 100v100h100v-100h-100zM700 300v100h100v-100h-100zM700 500 v100h100v-100h-100zM900 100v100h100v-100h-100zM900 300v100h100v-100h-100zM900 500v100h100v-100h-100z" />
+<glyph unicode="&#xe110;" d="M0 200v200h259l600 600h241v198l300 -295l-300 -300v197h-159l-600 -600h-341zM0 800h259l122 -122l141 142l-181 180h-341v-200zM678 381l141 142l122 -123h159v198l300 -295l-300 -300v197h-241z" />
+<glyph unicode="&#xe111;" d="M0 400v600q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-600q0 -41 -29.5 -70.5t-70.5 -29.5h-596l-304 -300v300h-100q-41 0 -70.5 29.5t-29.5 70.5z" />
+<glyph unicode="&#xe112;" d="M100 600v200h300v-250q0 -113 6 -145q17 -92 102 -117q39 -11 92 -11q37 0 66.5 5.5t50 15.5t36 24t24 31.5t14 37.5t7 42t2.5 45t0 47v25v250h300v-200q0 -42 -3 -83t-15 -104t-31.5 -116t-58 -109.5t-89 -96.5t-129 -65.5t-174.5 -25.5t-174.5 25.5t-129 65.5t-89 96.5 t-58 109.5t-31.5 116t-15 104t-3 83zM100 900v300h300v-300h-300zM800 900v300h300v-300h-300z" />
+<glyph unicode="&#xe113;" d="M-30 411l227 -227l352 353l353 -353l226 227l-578 579z" />
+<glyph unicode="&#xe114;" d="M70 797l580 -579l578 579l-226 227l-353 -353l-352 353z" />
+<glyph unicode="&#xe115;" d="M-198 700l299 283l300 -283h-203v-400h385l215 -200h-800v600h-196zM402 1000l215 -200h381v-400h-198l299 -283l299 283h-200v600h-796z" />
+<glyph unicode="&#xe116;" d="M18 939q-5 24 10 42q14 19 39 19h896l38 162q5 17 18.5 27.5t30.5 10.5h94q20 0 35 -14.5t15 -35.5t-15 -35.5t-35 -14.5h-54l-201 -961q-2 -4 -6 -10.5t-19 -17.5t-33 -11h-31v-50q0 -20 -14.5 -35t-35.5 -15t-35.5 15t-14.5 35v50h-300v-50q0 -20 -14.5 -35t-35.5 -15 t-35.5 15t-14.5 35v50h-50q-21 0 -35.5 15t-14.5 35q0 21 14.5 35.5t35.5 14.5h535l48 200h-633q-32 0 -54.5 21t-27.5 43z" />
+<glyph unicode="&#xe117;" d="M0 0v800h1200v-800h-1200zM0 900v100h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-100h-1200z" />
+<glyph unicode="&#xe118;" d="M1 0l300 700h1200l-300 -700h-1200zM1 400v600h200q0 41 29.5 70.5t70.5 29.5h300q41 0 70.5 -29.5t29.5 -70.5h500v-200h-1000z" />
+<glyph unicode="&#xe119;" d="M302 300h198v600h-198l298 300l298 -300h-198v-600h198l-298 -300z" />
+<glyph unicode="&#xe120;" d="M0 600l300 298v-198h600v198l300 -298l-300 -297v197h-600v-197z" />
+<glyph unicode="&#xe121;" d="M0 100v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM31 400l172 739q5 22 23 41.5t38 19.5h672q19 0 37.5 -22.5t23.5 -45.5l172 -732h-1138zM800 100h100v100h-100v-100z M1000 100h100v100h-100v-100z" />
+<glyph unicode="&#xe122;" d="M-101 600v50q0 24 25 49t50 38l25 13v-250l-11 5.5t-24 14t-30 21.5t-24 27.5t-11 31.5zM99 500v250v5q0 13 0.5 18.5t2.5 13t8 10.5t15 3h200l675 250v-850l-675 200h-38l47 -276q2 -12 -3 -17.5t-11 -6t-21 -0.5h-8h-83q-20 0 -34.5 14t-18.5 35q-56 337 -56 351z M1100 200v850q0 21 14.5 35.5t35.5 14.5q20 0 35 -14.5t15 -35.5v-850q0 -20 -15 -35t-35 -15q-21 0 -35.5 15t-14.5 35z" />
+<glyph unicode="&#xe123;" d="M74 350q0 21 13.5 35.5t33.5 14.5h17l118 173l63 327q15 77 76 140t144 83l-18 32q-6 19 3 32t29 13h94q20 0 29 -10.5t3 -29.5l-18 -37q83 -19 144 -82.5t76 -140.5l63 -327l118 -173h17q20 0 33.5 -14.5t13.5 -35.5q0 -20 -13 -40t-31 -27q-22 -9 -63 -23t-167.5 -37 t-251.5 -23t-245.5 20.5t-178.5 41.5l-58 20q-18 7 -31 27.5t-13 40.5zM497 110q12 -49 40 -79.5t63 -30.5t63 30.5t39 79.5q-48 -6 -102 -6t-103 6z" />
+<glyph unicode="&#xe124;" d="M21 445l233 -45l-78 -224l224 78l45 -233l155 179l155 -179l45 233l224 -78l-78 224l234 45l-180 155l180 156l-234 44l78 225l-224 -78l-45 233l-155 -180l-155 180l-45 -233l-224 78l78 -225l-233 -44l179 -156z" />
+<glyph unicode="&#xe125;" d="M0 200h200v600h-200v-600zM300 275q0 -75 100 -75h61q123 -100 139 -100h250q46 0 83 57l238 344q29 31 29 74v100q0 44 -30.5 84.5t-69.5 40.5h-328q28 118 28 125v150q0 44 -30.5 84.5t-69.5 40.5h-50q-27 0 -51 -20t-38 -48l-96 -198l-145 -196q-20 -26 -20 -63v-400z M400 300v375l150 212l100 213h50v-175l-50 -225h450v-125l-250 -375h-214l-136 100h-100z" />
+<glyph unicode="&#xe126;" d="M0 400v600h200v-600h-200zM300 525v400q0 75 100 75h61q123 100 139 100h250q46 0 83 -57l238 -344q29 -31 29 -74v-100q0 -44 -30.5 -84.5t-69.5 -40.5h-328q28 -118 28 -125v-150q0 -44 -30.5 -84.5t-69.5 -40.5h-50q-27 0 -51 20t-38 48l-96 198l-145 196 q-20 26 -20 63zM400 525l150 -212l100 -213h50v175l-50 225h450v125l-250 375h-214l-136 -100h-100v-375z" />
+<glyph unicode="&#xe127;" d="M8 200v600h200v-600h-200zM308 275v525q0 17 14 35.5t28 28.5l14 9l362 230q14 6 25 6q17 0 29 -12l109 -112q14 -14 14 -34q0 -18 -11 -32l-85 -121h302q85 0 138.5 -38t53.5 -110t-54.5 -111t-138.5 -39h-107l-130 -339q-7 -22 -20.5 -41.5t-28.5 -19.5h-341 q-7 0 -90 81t-83 94zM408 289l100 -89h293l131 339q6 21 19.5 41t28.5 20h203q16 0 25 15t9 36q0 20 -9 34.5t-25 14.5h-457h-6.5h-7.5t-6.5 0.5t-6 1t-5 1.5t-5.5 2.5t-4 4t-4 5.5q-5 12 -5 20q0 14 10 27l147 183l-86 83l-339 -236v-503z" />
+<glyph unicode="&#xe128;" d="M-101 651q0 72 54 110t139 37h302l-85 121q-11 16 -11 32q0 21 14 34l109 113q13 12 29 12q11 0 25 -6l365 -230q7 -4 16.5 -10.5t26 -26t16.5 -36.5v-526q0 -13 -85.5 -93.5t-93.5 -80.5h-342q-15 0 -28.5 20t-19.5 41l-131 339h-106q-84 0 -139 39t-55 111zM-1 601h222 q15 0 28.5 -20.5t19.5 -40.5l131 -339h293l106 89v502l-342 237l-87 -83l145 -184q10 -11 10 -26q0 -11 -5 -20q-1 -3 -3.5 -5.5l-4 -4t-5 -2.5t-5.5 -1.5t-6.5 -1t-6.5 -0.5h-7.5h-6.5h-476v-100zM999 201v600h200v-600h-200z" />
+<glyph unicode="&#xe129;" d="M97 719l230 -363q4 -6 10.5 -15.5t26 -25t36.5 -15.5h525q13 0 94 83t81 90v342q0 15 -20 28.5t-41 19.5l-339 131v106q0 84 -39 139t-111 55t-110 -53.5t-38 -138.5v-302l-121 84q-15 12 -33.5 11.5t-32.5 -13.5l-112 -110q-22 -22 -6 -53zM172 739l83 86l183 -146 q22 -18 47 -5q3 1 5.5 3.5l4 4t2.5 5t1.5 5.5t1 6.5t0.5 6v7.5v7v456q0 22 25 31t50 -0.5t25 -30.5v-202q0 -16 20 -29.5t41 -19.5l339 -130v-294l-89 -100h-503zM400 0v200h600v-200h-600z" />
+<glyph unicode="&#xe130;" d="M1 585q-15 -31 7 -53l112 -110q13 -13 32 -13.5t34 10.5l121 85l-1 -302q0 -84 38.5 -138t110.5 -54t111 55t39 139v106l339 131q20 6 40.5 19.5t20.5 28.5v342q0 7 -81 90t-94 83h-525q-17 0 -35.5 -14t-28.5 -28l-10 -15zM76 565l237 339h503l89 -100v-294l-340 -130 q-20 -6 -40 -20t-20 -29v-202q0 -22 -25 -31t-50 0t-25 31v456v14.5t-1.5 11.5t-5 12t-9.5 7q-24 13 -46 -5l-184 -146zM305 1104v200h600v-200h-600z" />
+<glyph unicode="&#xe131;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q162 0 299.5 -80t217.5 -218t80 -300t-80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 500h300l-2 -194l402 294l-402 298v-197h-298v-201z" />
+<glyph unicode="&#xe132;" d="M0 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t231.5 47.5q122 0 232.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-218 -217.5t-300 -80t-299.5 80t-217.5 217.5t-80 299.5zM200 600l400 -294v194h302v201h-300v197z" />
+<glyph unicode="&#xe133;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600h200v-300h200v300h200l-300 400z" />
+<glyph unicode="&#xe134;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM300 600l300 -400l300 400h-200v300h-200v-300h-200z" />
+<glyph unicode="&#xe135;" d="M5 597q0 122 47.5 232.5t127.5 190.5t190.5 127.5t232.5 47.5q121 0 231.5 -47.5t190.5 -127.5t127.5 -190.5t47.5 -232.5q0 -162 -80 -299.5t-217.5 -217.5t-299.5 -80t-300 80t-218 217.5t-80 299.5zM254 780q-8 -34 5.5 -93t7.5 -87q0 -9 17 -44t16 -60q12 0 23 -5.5 t23 -15t20 -13.5q20 -10 108 -42q22 -8 53 -31.5t59.5 -38.5t57.5 -11q8 -18 -15 -55.5t-20 -57.5q12 -21 22.5 -34.5t28 -27t36.5 -17.5q0 -6 -3 -15.5t-3.5 -14.5t4.5 -17q101 -2 221 111q31 30 47 48t34 49t21 62q-14 9 -37.5 9.5t-35.5 7.5q-14 7 -49 15t-52 19 q-9 0 -39.5 -0.5t-46.5 -1.5t-39 -6.5t-39 -16.5q-50 -35 -66 -12q-4 2 -3.5 25.5t0.5 25.5q-6 13 -26.5 17t-24.5 7q2 22 -2 41t-16.5 28t-38.5 -20q-23 -25 -42 4q-19 28 -8 58q8 16 22 22q6 -1 26 -1.5t33.5 -4.5t19.5 -13q12 -19 32 -37.5t34 -27.5l14 -8q0 3 9.5 39.5 t5.5 57.5q-4 23 14.5 44.5t22.5 31.5q5 14 10 35t8.5 31t15.5 22.5t34 21.5q-6 18 10 37q8 0 23.5 -1.5t24.5 -1.5t20.5 4.5t20.5 15.5q-10 23 -30.5 42.5t-38 30t-49 26.5t-43.5 23q11 41 1 44q31 -13 58.5 -14.5t39.5 3.5l11 4q6 36 -17 53.5t-64 28.5t-56 23 q-19 -3 -37 0q-15 -12 -36.5 -21t-34.5 -12t-44 -8t-39 -6q-15 -3 -46 0t-45 -3q-20 -6 -51.5 -25.5t-34.5 -34.5q-3 -11 6.5 -22.5t8.5 -18.5q-3 -34 -27.5 -91t-29.5 -79zM518 915q3 12 16 30.5t16 25.5q10 -10 18.5 -10t14 6t14.5 14.5t16 12.5q0 -18 8 -42.5t16.5 -44 t9.5 -23.5q-6 1 -39 5t-53.5 10t-36.5 16z" />
+<glyph unicode="&#xe136;" d="M0 164.5q0 21.5 15 37.5l600 599q-33 101 6 201.5t135 154.5q164 92 306 -9l-259 -138l145 -232l251 126q13 -175 -151 -267q-123 -70 -253 -23l-596 -596q-15 -16 -36.5 -16t-36.5 16l-111 110q-15 15 -15 36.5z" />
+<glyph unicode="&#xe137;" horiz-adv-x="1220" d="M0 196v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 596v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000 q-41 0 -70.5 29.5t-29.5 70.5zM0 996v100q0 41 29.5 70.5t70.5 29.5h1000q41 0 70.5 -29.5t29.5 -70.5v-100q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM600 596h500v100h-500v-100zM800 196h300v100h-300v-100zM900 996h200v100h-200v-100z" />
+<glyph unicode="&#xe138;" d="M100 1100v100h1000v-100h-1000zM150 1000h900l-350 -500v-300l-200 -200v500z" />
+<glyph unicode="&#xe139;" d="M0 200v200h1200v-200q0 -41 -29.5 -70.5t-70.5 -29.5h-1000q-41 0 -70.5 29.5t-29.5 70.5zM0 500v400q0 41 29.5 70.5t70.5 29.5h300v100q0 41 29.5 70.5t70.5 29.5h200q41 0 70.5 -29.5t29.5 -70.5v-100h300q41 0 70.5 -29.5t29.5 -70.5v-400h-500v100h-200v-100h-500z M500 1000h200v100h-200v-100z" />
+<glyph unicode="&#xe140;" d="M0 0v400l129 -129l200 200l142 -142l-200 -200l129 -129h-400zM0 800l129 129l200 -200l142 142l-200 200l129 129h-400v-400zM729 329l142 142l200 -200l129 129v-400h-400l129 129zM729 871l200 200l-129 129h400v-400l-129 129l-200 -200z" />
+<glyph unicode="&#xe141;" d="M0 596q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 596q0 -172 121.5 -293t292.5 -121t292.5 121t121.5 293q0 171 -121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM291 655 q0 23 15.5 38.5t38.5 15.5t39 -16t16 -38q0 -23 -16 -39t-39 -16q-22 0 -38 16t-16 39zM400 850q0 22 16 38.5t39 16.5q22 0 38 -16t16 -39t-16 -39t-38 -16q-23 0 -39 16.5t-16 38.5zM513 609q0 32 21 56.5t52 29.5l122 126l1 1q-9 14 -9 28q0 22 16 38.5t39 16.5 q22 0 38 -16t16 -39t-16 -39t-38 -16q-16 0 -29 10l-55 -145q17 -22 17 -51q0 -36 -25.5 -61.5t-61.5 -25.5q-37 0 -62.5 25.5t-25.5 61.5zM800 655q0 22 16 38t39 16t38.5 -15.5t15.5 -38.5t-16 -39t-38 -16q-23 0 -39 16t-16 39z" />
+<glyph unicode="&#xe142;" d="M-40 375q-13 -95 35 -173q35 -57 94 -89t129 -32q63 0 119 28q33 16 65 40.5t52.5 45.5t59.5 64q40 44 57 61l394 394q35 35 47 84t-3 96q-27 87 -117 104q-20 2 -29 2q-46 0 -79.5 -17t-67.5 -51l-388 -396l-7 -7l69 -67l377 373q20 22 39 38q23 23 50 23q38 0 53 -36 q16 -39 -20 -75l-547 -547q-52 -52 -125 -52q-55 0 -100 33t-54 96q-5 35 2.5 66t31.5 63t42 50t56 54q24 21 44 41l348 348q52 52 82.5 79.5t84 54t107.5 26.5q25 0 48 -4q95 -17 154 -94.5t51 -175.5q-7 -101 -98 -192l-252 -249l-253 -256l7 -7l69 -60l517 511 q67 67 95 157t11 183q-16 87 -67 154t-130 103q-69 33 -152 33q-107 0 -197 -55q-40 -24 -111 -95l-512 -512q-68 -68 -81 -163z" />
+<glyph unicode="&#xe143;" d="M79 784q0 131 99 229.5t230 98.5q144 0 242 -129q103 129 245 129q130 0 227 -98.5t97 -229.5q0 -46 -17.5 -91t-61 -99t-77 -89.5t-104.5 -105.5q-197 -191 -293 -322l-17 -23l-16 23q-43 58 -100 122.5t-92 99.5t-101 100l-84.5 84.5t-68 74t-60 78t-33.5 70.5t-15 78z M250 784q0 -27 30.5 -70t61.5 -75.5t95 -94.5l22 -22q93 -90 190 -201q82 92 195 203l12 12q64 62 97.5 97t64.5 79t31 72q0 71 -48 119.5t-106 48.5q-73 0 -131 -83l-118 -171l-114 174q-51 80 -124 80q-59 0 -108.5 -49.5t-49.5 -118.5z" />
+<glyph unicode="&#xe144;" d="M57 353q0 -94 66 -160l141 -141q66 -66 159 -66q95 0 159 66l283 283q66 66 66 159t-66 159l-141 141q-12 12 -19 17l-105 -105l212 -212l-389 -389l-247 248l95 95l-18 18q-46 45 -75 101l-55 -55q-66 -66 -66 -159zM269 706q0 -93 66 -159l141 -141l19 -17l105 105 l-212 212l389 389l247 -247l-95 -96l18 -18q46 -46 77 -99l29 29q35 35 62.5 88t27.5 96q0 93 -66 159l-141 141q-66 66 -159 66q-95 0 -159 -66l-283 -283q-66 -64 -66 -159z" />
+<glyph unicode="&#xe145;" d="M200 100v953q0 21 30 46t81 48t129 38t163 15t162 -15t127 -38t79 -48t29 -46v-953q0 -41 -29.5 -70.5t-70.5 -29.5h-600q-41 0 -70.5 29.5t-29.5 70.5zM300 300h600v700h-600v-700zM496 150q0 -43 30.5 -73.5t73.5 -30.5t73.5 30.5t30.5 73.5t-30.5 73.5t-73.5 30.5 t-73.5 -30.5t-30.5 -73.5z" />
+<glyph unicode="&#xe146;" d="M0 0l303 380l207 208l-210 212h300l267 279l-35 36q-15 14 -15 35t15 35q14 15 35 15t35 -15l283 -282q15 -15 15 -36t-15 -35q-14 -15 -35 -15t-35 15l-36 35l-279 -267v-300l-212 210l-208 -207z" />
+<glyph unicode="&#xe148;" d="M295 433h139q5 -77 48.5 -126.5t117.5 -64.5v335l-27 7q-46 14 -79 26.5t-72 36t-62.5 52t-40 72.5t-16.5 99q0 92 44 159.5t109 101t144 40.5v78h100v-79q38 -4 72.5 -13.5t75.5 -31.5t71 -53.5t51.5 -84t24.5 -118.5h-159q-8 72 -35 109.5t-101 50.5v-307l64 -14 q34 -7 64 -16.5t70 -31.5t67.5 -52t47.5 -80.5t20 -112.5q0 -139 -89 -224t-244 -96v-77h-100v78q-152 17 -237 104q-40 40 -52.5 93.5t-15.5 139.5zM466 889q0 -29 8 -51t16.5 -34t29.5 -22.5t31 -13.5t38 -10q7 -2 11 -3v274q-61 -8 -97.5 -37.5t-36.5 -102.5zM700 237 q170 18 170 151q0 64 -44 99.5t-126 60.5v-311z" />
+<glyph unicode="&#xe149;" d="M100 600v100h166q-24 49 -44 104q-10 26 -14.5 55.5t-3 72.5t25 90t68.5 87q97 88 263 88q129 0 230 -89t101 -208h-153q0 52 -34 89.5t-74 51.5t-76 14q-37 0 -79 -14.5t-62 -35.5q-41 -44 -41 -101q0 -11 2.5 -24.5t5.5 -24t9.5 -26.5t10.5 -25t14 -27.5t14 -25.5 t15.5 -27t13.5 -24h242v-100h-197q8 -50 -2.5 -115t-31.5 -94q-41 -59 -99 -113q35 11 84 18t70 7q32 1 102 -16t104 -17q76 0 136 30l50 -147q-41 -25 -80.5 -36.5t-59 -13t-61.5 -1.5q-23 0 -128 33t-155 29q-39 -4 -82 -17t-66 -25l-24 -11l-55 145l16.5 11t15.5 10 t13.5 9.5t14.5 12t14.5 14t17.5 18.5q48 55 54 126.5t-30 142.5h-221z" />
+<glyph unicode="&#xe150;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM602 900l298 300l298 -300h-198v-900h-200v900h-198z" />
+<glyph unicode="&#xe151;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v200h100v-100h200v-100h-300zM700 400v100h300v-200h-99v-100h-100v100h99v100h-200zM700 700v500h300v-500h-100v100h-100v-100h-100zM801 900h100v200h-100v-200z" />
+<glyph unicode="&#xe152;" d="M2 300h198v900h200v-900h198l-298 -300zM700 0v500h300v-500h-100v100h-100v-100h-100zM700 700v200h100v-100h200v-100h-300zM700 1100v100h300v-200h-99v-100h-100v100h99v100h-200zM801 200h100v200h-100v-200z" />
+<glyph unicode="&#xe153;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 100v400h300v-500h-100v100h-200zM800 1100v100h200v-500h-100v400h-100zM901 200h100v200h-100v-200z" />
+<glyph unicode="&#xe154;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM800 400v100h200v-500h-100v400h-100zM800 800v400h300v-500h-100v100h-200zM901 900h100v200h-100v-200z" />
+<glyph unicode="&#xe155;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h500v-200h-500zM700 400v200h400v-200h-400zM700 700v200h300v-200h-300zM700 1000v200h200v-200h-200z" />
+<glyph unicode="&#xe156;" d="M2 300l298 -300l298 300h-198v900h-200v-900h-198zM700 100v200h200v-200h-200zM700 400v200h300v-200h-300zM700 700v200h400v-200h-400zM700 1000v200h500v-200h-500z" />
+<glyph unicode="&#xe157;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q162 0 281 -118.5t119 -281.5v-300q0 -165 -118.5 -282.5t-281.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500z" />
+<glyph unicode="&#xe158;" d="M0 400v300q0 163 119 281.5t281 118.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-163 0 -281.5 117.5t-118.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM400 300l333 250l-333 250v-500z" />
+<glyph unicode="&#xe159;" d="M0 400v300q0 163 117.5 281.5t282.5 118.5h300q163 0 281.5 -119t118.5 -281v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-300q-165 0 -282.5 117.5t-117.5 282.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 700l250 -333l250 333h-500z" />
+<glyph unicode="&#xe160;" d="M0 400v300q0 165 117.5 282.5t282.5 117.5h300q165 0 282.5 -117.5t117.5 -282.5v-300q0 -162 -118.5 -281t-281.5 -119h-300q-165 0 -282.5 118.5t-117.5 281.5zM200 300q0 -41 29.5 -70.5t70.5 -29.5h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5 h-500q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM300 400h500l-250 333z" />
+<glyph unicode="&#xe161;" d="M0 400v300h300v200l400 -350l-400 -350v200h-300zM500 0v200h500q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-500v200h400q165 0 282.5 -117.5t117.5 -282.5v-300q0 -165 -117.5 -282.5t-282.5 -117.5h-400z" />
+<glyph unicode="&#xe162;" d="M216 519q10 -19 32 -19h302q-155 -438 -160 -458q-5 -21 4 -32l9 -8l9 -1q13 0 26 16l538 630q15 19 6 36q-8 18 -32 16h-300q1 4 78 219.5t79 227.5q2 17 -6 27l-8 8h-9q-16 0 -25 -15q-4 -5 -98.5 -111.5t-228 -257t-209.5 -238.5q-17 -19 -7 -40z" />
+<glyph unicode="&#xe163;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q47 0 100 15v185h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h500v185q-14 4 -114 7.5t-193 5.5l-93 2q-165 0 -282.5 -117.5t-117.5 -282.5v-300zM600 400v300h300v200l400 -350l-400 -350v200h-300z " />
+<glyph unicode="&#xe164;" d="M0 400q0 -165 117.5 -282.5t282.5 -117.5h300q163 0 281.5 117.5t118.5 282.5v98l-78 73l-122 -123v-148q0 -41 -29.5 -70.5t-70.5 -29.5h-500q-41 0 -70.5 29.5t-29.5 70.5v500q0 41 29.5 70.5t70.5 29.5h156l118 122l-74 78h-100q-165 0 -282.5 -117.5t-117.5 -282.5 v-300zM496 709l353 342l-149 149h500v-500l-149 149l-342 -353z" />
+<glyph unicode="&#xe165;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM406 600 q0 80 57 137t137 57t137 -57t57 -137t-57 -137t-137 -57t-137 57t-57 137z" />
+<glyph unicode="&#xe166;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 800l445 -500l450 500h-295v400h-300v-400h-300zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe167;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 700h300v-300h300v300h295l-445 500zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe168;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 705l305 -305l596 596l-154 155l-442 -442l-150 151zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe169;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM100 988l97 -98l212 213l-97 97zM200 401h700v699l-250 -239l-149 149l-212 -212l149 -149zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe170;" d="M0 0v275q0 11 7 18t18 7h1048q11 0 19 -7.5t8 -17.5v-275h-1100zM200 612l212 -212l98 97l-213 212zM300 1200l239 -250l-149 -149l212 -212l149 148l248 -237v700h-699zM900 150h100v50h-100v-50z" />
+<glyph unicode="&#xe171;" d="M23 415l1177 784v-1079l-475 272l-310 -393v416h-392zM494 210l672 938l-672 -712v-226z" />
+<glyph unicode="&#xe172;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-850q0 -21 -15 -35.5t-35 -14.5h-150v400h-700v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe173;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-218l-276 -275l-120 120l-126 -127h-378v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM581 306l123 123l120 -120l353 352l123 -123l-475 -476zM600 1000h100v200h-100v-200z" />
+<glyph unicode="&#xe174;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-269l-103 -103l-170 170l-298 -298h-329v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 1000h100v200h-100v-200zM700 133l170 170l-170 170l127 127l170 -170l170 170l127 -128l-170 -169l170 -170 l-127 -127l-170 170l-170 -170z" />
+<glyph unicode="&#xe175;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-300h-400v-200h-500v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300l300 -300l300 300h-200v300h-200v-300h-200zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe176;" d="M0 150v1000q0 20 14.5 35t35.5 15h250v-300h500v300h100l200 -200v-402l-200 200l-298 -298h-402v-400h-150q-21 0 -35.5 14.5t-14.5 35.5zM600 300h200v-300h200v300h200l-300 300zM600 1000v200h100v-200h-100z" />
+<glyph unicode="&#xe177;" d="M0 250q0 -21 14.5 -35.5t35.5 -14.5h1100q21 0 35.5 14.5t14.5 35.5v550h-1200v-550zM0 900h1200v150q0 21 -14.5 35.5t-35.5 14.5h-1100q-21 0 -35.5 -14.5t-14.5 -35.5v-150zM100 300v200h400v-200h-400z" />
+<glyph unicode="&#xe178;" d="M0 400l300 298v-198h400v-200h-400v-198zM100 800v200h100v-200h-100zM300 800v200h100v-200h-100zM500 800v200h400v198l300 -298l-300 -298v198h-400zM800 300v200h100v-200h-100zM1000 300h100v200h-100v-200z" />
+<glyph unicode="&#xe179;" d="M100 700v400l50 100l50 -100v-300h100v300l50 100l50 -100v-300h100v300l50 100l50 -100v-400l-100 -203v-447q0 -21 -14.5 -35.5t-35.5 -14.5h-200q-21 0 -35.5 14.5t-14.5 35.5v447zM800 597q0 -29 10.5 -55.5t25 -43t29 -28.5t25.5 -18l10 -5v-397q0 -21 14.5 -35.5 t35.5 -14.5h200q21 0 35.5 14.5t14.5 35.5v1106q0 31 -18 40.5t-44 -7.5l-276 -117q-25 -16 -43.5 -50.5t-18.5 -65.5v-359z" />
+<glyph unicode="&#xe180;" d="M100 0h400v56q-75 0 -87.5 6t-12.5 44v394h500v-394q0 -38 -12.5 -44t-87.5 -6v-56h400v56q-4 0 -11 0.5t-24 3t-30 7t-24 15t-11 24.5v888q0 22 25 34.5t50 13.5l25 2v56h-400v-56q75 0 87.5 -6t12.5 -44v-394h-500v394q0 38 12.5 44t87.5 6v56h-400v-56q4 0 11 -0.5 t24 -3t30 -7t24 -15t11 -24.5v-888q0 -22 -25 -34.5t-50 -13.5l-25 -2v-56z" />
+<glyph unicode="&#xe181;" d="M0 300q0 -41 29.5 -70.5t70.5 -29.5h300q41 0 70.5 29.5t29.5 70.5v500q0 41 -29.5 70.5t-70.5 29.5h-300q-41 0 -70.5 -29.5t-29.5 -70.5v-500zM100 100h400l200 200h105l295 98v-298h-425l-100 -100h-375zM100 300v200h300v-200h-300zM100 600v200h300v-200h-300z M100 1000h400l200 -200v-98l295 98h105v200h-425l-100 100h-375zM700 402v163l400 133v-163z" />
+<glyph unicode="&#xe182;" d="M16.5 974.5q0.5 -21.5 16 -90t46.5 -140t104 -177.5t175 -208q103 -103 207.5 -176t180 -103.5t137 -47t92.5 -16.5l31 1l163 162q16 17 13 40.5t-22 37.5l-192 136q-19 14 -45 12t-42 -19l-119 -118q-143 103 -267 227q-126 126 -227 268l118 118q17 17 20 41.5 t-11 44.5l-139 194q-14 19 -36.5 22t-40.5 -14l-162 -162q-1 -11 -0.5 -32.5z" />
+<glyph unicode="&#xe183;" d="M0 50v212q0 20 10.5 45.5t24.5 39.5l365 303v50q0 4 1 10.5t12 22.5t30 28.5t60 23t97 10.5t97 -10t60 -23.5t30 -27.5t12 -24l1 -10v-50l365 -303q14 -14 24.5 -39.5t10.5 -45.5v-212q0 -21 -15 -35.5t-35 -14.5h-1100q-21 0 -35.5 14.5t-14.5 35.5zM0 712 q0 -21 14.5 -33.5t34.5 -8.5l202 33q20 4 34.5 21t14.5 38v146q141 24 300 24t300 -24v-146q0 -21 14.5 -38t34.5 -21l202 -33q20 -4 34.5 8.5t14.5 33.5v200q-6 8 -19 20.5t-63 45t-112 57t-171 45t-235 20.5q-92 0 -175 -10.5t-141.5 -27t-108.5 -36.5t-81.5 -40 t-53.5 -36.5t-31 -27.5l-9 -10v-200z" />
+<glyph unicode="&#xe184;" d="M100 0v100h1100v-100h-1100zM175 200h950l-125 150v250l100 100v400h-100v-200h-100v200h-200v-200h-100v200h-200v-200h-100v200h-100v-400l100 -100v-250z" />
+<glyph unicode="&#xe185;" d="M100 0h300v400q0 41 -29.5 70.5t-70.5 29.5h-100q-41 0 -70.5 -29.5t-29.5 -70.5v-400zM500 0v1000q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-1000h-300zM900 0v700q0 41 29.5 70.5t70.5 29.5h100q41 0 70.5 -29.5t29.5 -70.5v-700h-300z" />
+<glyph unicode="&#xe186;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe187;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h100v200h100v-200h100v500h-100v-200h-100v200h-100v-500zM600 300h200v100h100v300h-100v100h-200v-500 zM700 400v300h100v-300h-100z" />
+<glyph unicode="&#xe188;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v100h-200v300h200v100h-300v-500zM600 300h300v100h-200v300h200v100h-300v-500z" />
+<glyph unicode="&#xe189;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 550l300 -150v300zM600 400l300 150l-300 150v-300z" />
+<glyph unicode="&#xe190;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300v500h700v-500h-700zM300 400h130q41 0 68 42t27 107t-28.5 108t-66.5 43h-130v-300zM575 549 q0 -65 27 -107t68 -42h130v300h-130q-38 0 -66.5 -43t-28.5 -108z" />
+<glyph unicode="&#xe191;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v300h-200v100h200v100h-300v-300h200v-100h-200v-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe192;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 300h300v400h-200v100h-100v-500zM301 400v200h100v-200h-100zM601 300h100v100h-100v-100zM700 700h100 v-400h100v500h-200v-100z" />
+<glyph unicode="&#xe193;" d="M-100 300v500q0 124 88 212t212 88h700q124 0 212 -88t88 -212v-500q0 -124 -88 -212t-212 -88h-700q-124 0 -212 88t-88 212zM100 200h900v700h-900v-700zM200 700v100h300v-300h-99v-100h-100v100h99v200h-200zM201 300v100h100v-100h-100zM601 300v100h100v-100h-100z M700 700v100h200v-500h-100v400h-100z" />
+<glyph unicode="&#xe194;" d="M4 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM186 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 500v200 l100 100h300v-100h-300v-200h300v-100h-300z" />
+<glyph unicode="&#xe195;" d="M0 600q0 162 80 299t217 217t299 80t299 -80t217 -217t80 -299t-80 -299t-217 -217t-299 -80t-299 80t-217 217t-80 299zM182 600q0 -171 121.5 -292.5t292.5 -121.5t292.5 121.5t121.5 292.5t-121.5 292.5t-292.5 121.5t-292.5 -121.5t-121.5 -292.5zM400 400v400h300 l100 -100v-100h-100v100h-200v-100h200v-100h-200v-100h-100zM700 400v100h100v-100h-100z" />
+<glyph unicode="&#xe197;" d="M-14 494q0 -80 56.5 -137t135.5 -57h222v300h400v-300h128q120 0 205 86t85 208q0 120 -85 206.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200h200v300h200v-300 h200l-300 -300z" />
+<glyph unicode="&#xe198;" d="M-14 494q0 -80 56.5 -137t135.5 -57h8l414 414l403 -403q94 26 154.5 104t60.5 178q0 121 -85 207.5t-205 86.5q-46 0 -90 -14q-44 97 -134.5 156.5t-200.5 59.5q-152 0 -260 -107.5t-108 -260.5q0 -25 2 -37q-66 -14 -108.5 -67.5t-42.5 -122.5zM300 200l300 300 l300 -300h-200v-300h-200v300h-200z" />
+<glyph unicode="&#xe199;" d="M100 200h400v-155l-75 -45h350l-75 45v155h400l-270 300h170l-270 300h170l-300 333l-300 -333h170l-270 -300h170z" />
+<glyph unicode="&#xe200;" d="M121 700q0 -53 28.5 -97t75.5 -65q-4 -16 -4 -38q0 -74 52.5 -126.5t126.5 -52.5q56 0 100 30v-306l-75 -45h350l-75 45v306q46 -30 100 -30q74 0 126.5 52.5t52.5 126.5q0 24 -9 55q50 32 79.5 83t29.5 112q0 90 -61.5 155.5t-150.5 71.5q-26 89 -99.5 145.5 t-167.5 56.5q-116 0 -197.5 -81.5t-81.5 -197.5q0 -4 1 -12t1 -11q-14 2 -23 2q-74 0 -126.5 -52.5t-52.5 -126.5z" />
+</font>
+</defs></svg> 
\ No newline at end of file
diff --git a/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.ttf b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000..a498ef4
Binary files /dev/null and b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.ttf differ
diff --git a/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.woff b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000..d83c539
Binary files /dev/null and b/plugins/system/t3/admin/fonts/glyphicon/fonts/glyphicons-halflings-regular.woff differ
diff --git a/plugins/system/t3/admin/layout/js/layout.js b/plugins/system/t3/admin/layout/js/layout.js
index 91bd01b..d90c95f 100644
--- a/plugins/system/t3/admin/layout/js/layout.js
+++ b/plugins/system/t3/admin/layout/js/layout.js
@@ -824,7 +824,7 @@ T3AdminLayout = window.T3AdminLayout || {};
 				grid: gridsize + absgap,
 				gap: absgap,
 				minwidth: gridsize,
-				maxwidth: (minsize + absgap) * cmaxcol - absgap + 6
+				maxwidth: (gridsize + absgap) * T3AdminLayout.layout.maxgrid - absgap + 6
 			});
 
 			jspl.find('.t3-admin-layout-unit').each(function(idx){
diff --git a/plugins/system/t3/admin/megamenu/css/megamenu.css b/plugins/system/t3/admin/megamenu/css/megamenu.css
index b477db9..459d7da 100644
--- a/plugins/system/t3/admin/megamenu/css/megamenu.css
+++ b/plugins/system/t3/admin/megamenu/css/megamenu.css
@@ -114,6 +114,8 @@ body.bd {
 #t3-admin-mm-tb .admin-toolbox li > label {
   font-size: 11px;
   color: #999999;
+  display: inline-block;
+
 }
 
 #t3-admin-mm-tb .btn [class^="icon-"],
diff --git a/plugins/system/t3/admin/megamenu/megamenu.tpl.php b/plugins/system/t3/admin/megamenu/megamenu.tpl.php
index 13b2e39..1d57bbf 100644
--- a/plugins/system/t3/admin/megamenu/megamenu.tpl.php
+++ b/plugins/system/t3/admin/megamenu/megamenu.tpl.php
@@ -26,6 +26,7 @@
   <link type="text/css" rel="stylesheet" href="<?php echo T3_ADMIN_URL; ?>/admin/megamenu/css/megamenu.css" />
   <link type="text/css" rel="stylesheet" href="<?php echo T3_ADMIN_URL; ?>/admin/css/admin.css" />
   <link type="text/css" rel="stylesheet" href="<?php echo T3_ADMIN_URL; ?>/admin/fonts/fa4/css/font-awesome.css" />
+  <link type="text/css" rel="stylesheet" href="<?php echo T3_ADMIN_URL; ?>/admin/fonts/glyphicon/css/glyphicon.css" />
 
   <script type="text/javascript" src="<?php echo T3_ADMIN_URL; ?>/admin/js/jquery-1.8.3.min.js"></script>
   <script type="text/javascript" src="<?php echo T3_ADMIN_URL; ?>/admin/bootstrap/js/bootstrap.js"></script>
@@ -44,7 +45,7 @@
       <div class="controls-row">
         <div class="control-group t3-control-group">
           <div class="control-label t3-control-label">
-            <label id="menu-type-lbl" for="menu-type" class="hasTip" title="<?php echo JText::_('T3_NAVIGATION_MM_TYPE_LABEL'), '::', JTexT::_('T3_NAVIGATION_MM_TYPE_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_TYPE_LABEL'); ?></label>
+            <label id="menu-type-lbl" for="menu-type" class="hasTip" data-placement="right" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_TYPE_LABEL', 'T3_NAVIGATION_MM_TYPE_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_TYPE_LABEL'); ?></label>
           </div>
           <div class="controls t3-controls">
             <select id="menu-type" name="menu-type">
@@ -56,10 +57,9 @@
         </div>
         <div class="control-group t3-control-group">
           <div class="control-label t3-control-label">
-            <label id="access-level-lbl" for="access-level" class="hasTip" title="<?php echo JText::_('T3_NAVIGATION_ACL_LABEL'), '::', JTexT::_('T3_NAVIGATION_ACL_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_ACL_LABEL'); ?></label>
+            <label id="access-level-lbl" for="access-level" class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_ACL_LABEL', 'T3_NAVIGATION_ACL_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_ACL_LABEL'); ?></label>
           </div>
           <div class="controls t3-controls">
-            <?php //echo JHtml::_('access.level', 'access-level', '', 'multiple="multiple"', array(), 'access-level') ?>
             <select id="access-level" name="access-level">
               <?php foreach (self::access() as $access) : ?>
                 <option value="<?php echo $access->value ?>"><?php echo $access->text ?></option>
@@ -89,47 +89,47 @@
         <div class="t3-admin-mm-row clearfix">
 
           <div id="t3-admin-mm-intro" class="pull-left">
-            <h3><?php echo JTexT::_('T3_NAVIGATION_MM_TOOLBOX') ?></h3>
-            <p><?php echo JTexT::_('T3_NAVIGATION_MM_TOOLBOX_DESC') ?></p>
+            <h3><?php echo JText::_('T3_NAVIGATION_MM_TOOLBOX') ?></h3>
+            <p><?php echo JText::_('T3_NAVIGATION_MM_TOOLBOX_DESC') ?></p>
           </div>
 
           <div id="t3-admin-mm-tb">
             <div id="t3-admin-mm-toolitem" class="admin-toolbox">
-              <h3><?php echo JTexT::_('T3_NAVIGATION_MM_ITEM_CONF') ?></h3>
+              <h3><?php echo JText::_('T3_NAVIGATION_MM_ITEM_CONF') ?></h3>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_SUBMENU'), '::', JTexT::_('T3_NAVIGATION_MM_SUBMENU_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_SUBMENU') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_SUBMENU', 'T3_NAVIGATION_MM_SUBMENU_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_SUBMENU') ?></label>
                   <fieldset class="radio btn-group toolitem-sub">
                     <input type="radio" id="toggleSub0" class="toolbox-toggle" data-action="toggleSub" name="toggleSub" value="0"/>
-                    <label for="toggleSub0"><?php echo JTexT::_('JNO') ?></label>
+                    <label for="toggleSub0"><?php echo JText::_('JNO') ?></label>
                     <input type="radio" id="toggleSub1" class="toolbox-toggle" data-action="toggleSub" name="toggleSub" value="1" checked="checked"/>
-                    <label for="toggleSub1"><?php echo JTexT::_('JYES') ?></label>
+                    <label for="toggleSub1"><?php echo JText::_('JYES') ?></label>
                   </fieldset>
                 </li>
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_GROUP'), '::', JTexT::_('T3_NAVIGATION_MM_GROUP_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_GROUP') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_GROUP', 'T3_NAVIGATION_MM_GROUP_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_GROUP') ?></label>
                   <fieldset class="radio btn-group toolitem-group">
                     <input type="radio" id="toggleGroup0" class="toolbox-toggle" data-action="toggleGroup" name="toggleGroup" value="0"/>
-                    <label for="toggleGroup0"><?php echo JTexT::_('JNO') ?></label>
+                    <label for="toggleGroup0"><?php echo JText::_('JNO') ?></label>
                     <input type="radio" id="toggleGroup1" class="toolbox-toggle" data-action="toggleGroup" name="toggleGroup" value="1" checked="checked"/>
-                    <label for="toggleGroup1"><?php echo JTexT::_('JYES') ?></label>
+                    <label for="toggleGroup1"><?php echo JText::_('JYES') ?></label>
                   </fieldset>
                 </li>
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_POSITIONS'), '::', JTexT::_('T3_NAVIGATION_MM_POSITIONS_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_POSITIONS') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_POSITIONS', 'T3_NAVIGATION_MM_POSITIONS_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_POSITIONS') ?></label>
                   <fieldset class="btn-group">
-                    <a href="" class="btn toolitem-moveleft toolbox-action" data-action="moveItemsLeft" title="<?php echo JTexT::_('T3_NAVIGATION_MM_MOVE_LEFT') ?>"><i class="icon-arrow-left"></i></a>
-                    <a href="" class="btn toolitem-moveright toolbox-action" data-action="moveItemsRight" title="<?php echo JTexT::_('T3_NAVIGATION_MM_MOVE_RIGHT') ?>"><i class="icon-arrow-right"></i></a>
+                    <a href="" class="btn toolitem-moveleft toolbox-action" data-action="moveItemsLeft" title="<?php echo JText::_('T3_NAVIGATION_MM_MOVE_LEFT') ?>"><i class="icon-arrow-left"></i></a>
+                    <a href="" class="btn toolitem-moveright toolbox-action" data-action="moveItemsRight" title="<?php echo JText::_('T3_NAVIGATION_MM_MOVE_RIGHT') ?>"><i class="icon-arrow-right"></i></a>
                   </fieldset>
                 </li>
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_EX_CLASS'), '::', JTexT::_('T3_NAVIGATION_MM_EX_CLASS_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_EX_CLASS') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_EX_CLASS', 'T3_NAVIGATION_MM_EX_CLASS_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_EX_CLASS') ?></label>
                   <fieldset class="">
                     <input type="text" class="input-medium toolitem-exclass toolbox-input" name="toolitem-exclass" data-name="class" value="" />
                   </fieldset>
@@ -137,8 +137,8 @@
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_ICON'), '::', JTexT::_('T3_NAVIGATION_MM_ICON_DESC') ?>">
-                    <a href="http://fortawesome.github.io/Font-Awesome/#icons-web-app" target="_blank"><i class="icon-search"></i>  <?php echo JTexT::_('T3_NAVIGATION_MM_ICON') ?></a>
+                  <label class="hasTip" data-placement="right" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_ICON', 'T3_NAVIGATION_MM_ICON_DESC') ?>">
+                    <a href="http://fortawesome.github.io/Font-Awesome/icons" target="_blank"><i class="icon-search"></i>  <?php echo JText::_('T3_NAVIGATION_MM_ICON') ?></a>
                   </label>
                   <fieldset class="">
                     <input type="text" class="input-medium toolitem-xicon toolbox-input" name="toolitem-xicon" data-name="xicon" value="" />
@@ -147,8 +147,8 @@
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_CAPTION'), '::', JTexT::_('T3_NAVIGATION_MM_CAPTION_DESC') ?>">
-                    <?php echo JTexT::_('T3_NAVIGATION_MM_CAPTION') ?>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_CAPTION', 'T3_NAVIGATION_MM_CAPTION_DESC') ?>">
+                    <?php echo JText::_('T3_NAVIGATION_MM_CAPTION') ?>
                   </label>
                   <fieldset class="">
                     <input type="text" class="input-large toolitem-caption toolbox-input" name="toolitem-caption" data-name="caption" value="" />
@@ -158,10 +158,10 @@
             </div>
 
             <div id="t3-admin-mm-toolsub" class="admin-toolbox">
-              <h3><?php echo JTexT::_('T3_NAVIGATION_MM_SUBMNEU_CONF') ?></h3>
+              <h3><?php echo JText::_('T3_NAVIGATION_MM_SUBMNEU_CONF') ?></h3>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_SUBMNEU_GRID'), '::', JTexT::_('T3_NAVIGATION_MM_SUBMNEU_GRID_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_SUBMNEU_GRID') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_SUBMNEU_GRID', 'T3_NAVIGATION_MM_SUBMNEU_GRID_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_SUBMNEU_GRID') ?></label>
                   <fieldset class="btn-group">
                     <a href="" class="btn toolsub-addrow toolbox-action" data-action="addRow"><i class="icon-plus"></i></a>
                   </fieldset>
@@ -169,18 +169,18 @@
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_HIDE_COLLAPSE'), '::', JTexT::_('T3_NAVIGATION_MM_HIDE_COLLAPSE_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_HIDE_COLLAPSE') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_HIDE_COLLAPSE', 'T3_NAVIGATION_MM_HIDE_COLLAPSE_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_HIDE_COLLAPSE') ?></label>
                   <fieldset class="radio btn-group toolsub-hidewhencollapse">
                     <input type="radio" id="togglesubHideWhenCollapse0" class="toolbox-toggle" data-action="hideWhenCollapse" name="togglesubHideWhenCollapse" value="0" checked="checked"/>
-                    <label for="togglesubHideWhenCollapse0"><?php echo JTexT::_('JNO') ?></label>
+                    <label for="togglesubHideWhenCollapse0"><?php echo JText::_('JNO') ?></label>
                     <input type="radio" id="togglesubHideWhenCollapse1" class="toolbox-toggle" data-action="hideWhenCollapse" name="togglesubHideWhenCollapse" value="1"/>
-                    <label for="togglesubHideWhenCollapse1"><?php echo JTexT::_('JYES') ?></label>
+                    <label for="togglesubHideWhenCollapse1"><?php echo JText::_('JYES') ?></label>
                   </fieldset>
                 </li>
               </ul>                    
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_SUBMNEU_WIDTH_PX'), '::', JTexT::_('T3_NAVIGATION_MM_SUBMNEU_WIDTH_PX_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_SUBMNEU_WIDTH_PX') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_SUBMNEU_WIDTH_PX', 'T3_NAVIGATION_MM_SUBMNEU_WIDTH_PX_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_SUBMNEU_WIDTH_PX') ?></label>
                   <fieldset class="">
                     <input type="text" class="toolsub-width toolbox-input input-small" name="toolsub-width" data-name="width" value="" />
                   </fieldset>
@@ -188,20 +188,20 @@
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_ALIGN'), '::', JTexT::_('T3_NAVIGATION_MM_ALIGN_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_ALIGN') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_ALIGN', 'T3_NAVIGATION_MM_ALIGN_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_ALIGN') ?></label>
                   <fieldset class="toolsub-alignment">
                     <div class="btn-group">
-                      <a class="btn toolsub-align-left toolbox-action" href="#" data-action="alignment" data-align="left" title="<?php echo JTexT::_('T3_NAVIGATION_MM_ALIGN_LEFT') ?>"><i class="icon-align-left"></i></a>
-                      <a class="btn toolsub-align-right toolbox-action" href="#" data-action="alignment" data-align="right" title="<?php echo JTexT::_('T3_NAVIGATION_MM_ALIGN_RIGHT') ?>"><i class="icon-align-right"></i></a>
-                      <a class="btn toolsub-align-center toolbox-action" href="#" data-action="alignment" data-align="center" title="<?php echo JTexT::_('T3_NAVIGATION_MM_ALIGN_CENTER') ?>"><i class="icon-align-center"></i></a>
-                      <a class="btn toolsub-align-justify toolbox-action" href="#" data-action="alignment" data-align="justify" title="<?php echo JTexT::_('T3_NAVIGATION_MM_ALIGN_JUSTIFY') ?>"><i class="icon-align-justify"></i></a>
+                      <a class="btn toolsub-align-left toolbox-action" href="#" data-action="alignment" data-align="left" title="<?php echo JText::_('T3_NAVIGATION_MM_ALIGN_LEFT') ?>"><i class="icon-align-left"></i></a>
+                      <a class="btn toolsub-align-right toolbox-action" href="#" data-action="alignment" data-align="right" title="<?php echo JText::_('T3_NAVIGATION_MM_ALIGN_RIGHT') ?>"><i class="icon-align-right"></i></a>
+                      <a class="btn toolsub-align-center toolbox-action" href="#" data-action="alignment" data-align="center" title="<?php echo JText::_('T3_NAVIGATION_MM_ALIGN_CENTER') ?>"><i class="icon-align-center"></i></a>
+                      <a class="btn toolsub-align-justify toolbox-action" href="#" data-action="alignment" data-align="justify" title="<?php echo JText::_('T3_NAVIGATION_MM_ALIGN_JUSTIFY') ?>"><i class="icon-align-justify"></i></a>
                     </div>
                   </fieldset>
                 </li>
               </ul>          
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_EX_CLASS'), '::', JTexT::_('T3_NAVIGATION_MM_EX_CLASS_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_EX_CLASS') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_EX_CLASS', 'T3_NAVIGATION_MM_EX_CLASS_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_EX_CLASS') ?></label>
                   <fieldset class="">
                     <input type="text" class="toolsub-exclass toolbox-input input-medium" name="toolsub-exclass" data-name="class" value="" />
                   </fieldset>
@@ -210,10 +210,10 @@
             </div>
 
             <div id="t3-admin-mm-toolcol" class="admin-toolbox">
-              <h3><?php echo JTexT::_('T3_NAVIGATION_MM_COLUMN_CONF') ?></h3>
+              <h3><?php echo JText::_('T3_NAVIGATION_MM_COLUMN_CONF') ?></h3>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_ADD_REMOVE_COLUMN'), '::', JTexT::_('T3_NAVIGATION_MM_ADD_REMOVE_COLUMN_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_ADD_REMOVE_COLUMN') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_ADD_REMOVE_COLUMN', 'T3_NAVIGATION_MM_ADD_REMOVE_COLUMN_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_ADD_REMOVE_COLUMN') ?></label>
                   <fieldset class="btn-group">
                     <a href="" class="btn toolcol-addcol toolbox-action" data-action="addColumn"><i class="icon-plus"></i></a>
                     <a href="" class="btn toolcol-removecol toolbox-action" data-action="removeColumn"><i class="icon-minus"></i></a>
@@ -222,18 +222,18 @@
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_HIDE_COLLAPSE'), '::', JTexT::_('T3_NAVIGATION_MM_HIDE_COLLAPSE_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_HIDE_COLLAPSE') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_HIDE_COLLAPSE', 'T3_NAVIGATION_MM_HIDE_COLLAPSE_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_HIDE_COLLAPSE') ?></label>
                   <fieldset class="radio btn-group toolcol-hidewhencollapse">
                     <input type="radio" id="toggleHideWhenCollapse0" class="toolbox-toggle" data-action="hideWhenCollapse" name="toggleHideWhenCollapse" value="0" checked="checked"/>
-                    <label for="toggleHideWhenCollapse0"><?php echo JTexT::_('JNO') ?></label>
+                    <label for="toggleHideWhenCollapse0"><?php echo JText::_('JNO') ?></label>
                     <input type="radio" id="toggleHideWhenCollapse1" class="toolbox-toggle" data-action="hideWhenCollapse" name="toggleHideWhenCollapse" value="1"/>
-                    <label for="toggleHideWhenCollapse1"><?php echo JTexT::_('JYES') ?></label>
+                    <label for="toggleHideWhenCollapse1"><?php echo JText::_('JYES') ?></label>
                   </fieldset>
                 </li>
               </ul>          
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_WIDTH_SPAN'), '::', JTexT::_('T3_NAVIGATION_MM_WIDTH_SPAN_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_WIDTH_SPAN') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_WIDTH_SPAN', 'T3_NAVIGATION_MM_WIDTH_SPAN_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_WIDTH_SPAN') ?></label>
                   <fieldset class="">
                     <select class="toolcol-width toolbox-input toolbox-select input-mini" name="toolcol-width" data-name="width">
                       <option value="1">1</option>
@@ -254,9 +254,9 @@
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_MODULE'), '::', JTexT::_('T3_NAVIGATION_MM_MODULE_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_MODULE') ?></label>
+                  <label class="hasTip" title="<?php echo self::tooltipText('T3_NAVIGATION_MM_MODULE', 'T3_NAVIGATION_MM_MODULE_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_MODULE') ?></label>
                   <fieldset class="">
-                    <select class="toolcol-position toolbox-input toolbox-select" name="toolcol-position" data-name="position" data-placeholder="<?php echo JTexT::_('T3_NAVIGATION_MM_SELECT_MODULE') ?>">
+                    <select class="toolcol-position toolbox-input toolbox-select" name="toolcol-position" data-name="position" data-placeholder="<?php echo JText::_('T3_NAVIGATION_MM_SELECT_MODULE') ?>">
                       <option value=""></option>
                       <?php foreach (T3AdminMegamenu::modules() as $module): ?>
                         <option value="<?php echo $module->id ?>"><?php echo $module->title ?></option>
@@ -267,7 +267,7 @@
               </ul>
               <ul>
                 <li>
-                  <label class="hasTip" title="<?php echo JTexT::_('T3_NAVIGATION_MM_EX_CLASS'), '::', JTexT::_('T3_NAVIGATION_MM_EX_CLASS_DESC') ?>"><?php echo JTexT::_('T3_NAVIGATION_MM_EX_CLASS') ?></label>
+                  <label class="hasTip" title="<strong><?php echo self::tooltipText('T3_NAVIGATION_MM_EX_CLASS', 'T3_NAVIGATION_MM_EX_CLASS_DESC') ?>"><?php echo JText::_('T3_NAVIGATION_MM_EX_CLASS') ?></label>
                   <fieldset class="">
                     <input type="text" class="input-medium toolcol-exclass toolbox-input" name="toolcol-exclass" data-name="class" value="" />
                   </fieldset>
@@ -278,8 +278,8 @@
 
           <div class="toolbox-actions-group hidden">
             <button class="t3-admin-tog-fullscreen toolbox-action toolbox-togglescreen" data-action="toggleScreen" data-iconfull="icon-resize-full" data-iconsmall="icon-resize-small"><i class="icon-resize-full"></i></button>
-            <button class="btn btn-success toolbox-action toolbox-saveConfig hide" data-action="saveConfig"><i class="icon-save"></i>  <?php echo JTexT::_('T3_NAVIGATION_MM_SAVE') ?></button>
-            <!--button class="btn btn-danger toolbox-action toolbox-resetConfig"><i class="icon-undo"></i><?php echo JTexT::_('T3_NAVIGATION_MM_RESET') ?></button-->
+            <button class="btn btn-success toolbox-action toolbox-saveConfig hide" data-action="saveConfig"><i class="icon-save"></i>  <?php echo JText::_('T3_NAVIGATION_MM_SAVE') ?></button>
+            <!--button class="btn btn-danger toolbox-action toolbox-resetConfig"><i class="icon-undo"></i><?php echo JText::_('T3_NAVIGATION_MM_RESET') ?></button-->
           </div>
 
         </div>
@@ -301,16 +301,16 @@
     <div id="t3-admin-megamenu-dlg" class="modal fade hide">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal">×</button>
-        <h3><?php echo JTexT::_('T3_NAVIGATION_ASK_DELETE') ?></h3>
+        <h3><?php echo JText::_('T3_NAVIGATION_ASK_DELETE') ?></h3>
       </div>
       <div class="modal-body">
         <div class="message-block">
-          <p class="msg"><?php echo JTexT::_('T3_NAVIGATION_ASK_DELETE_DESC') ?></p>
+          <p class="msg"><?php echo JText::_('T3_NAVIGATION_ASK_DELETE_DESC') ?></p>
         </div>
       </div>
       <div class="modal-footer">
-        <button class="btn cancel" data-dismiss="modal"><?php echo JTexT::_('JCANCEL') ?></button>
-        <button class="btn btn-danger yes"><?php echo JTexT::_('T3_NAVIGATION_LABEL_DELETEIT') ?></button>
+        <button class="btn cancel" data-dismiss="modal"><?php echo JText::_('JCANCEL') ?></button>
+        <button class="btn btn-danger yes"><?php echo JText::_('T3_NAVIGATION_LABEL_DELETEIT') ?></button>
       </div>
     </div>
   </div>
@@ -329,6 +329,11 @@
       $.get('index.php');
     }, <?php echo $refreshTime; ?>);
 
+    //init tooltip
+    $('.hasTip').tooltip({
+      html: true
+    });
+
     //]]>
   </script>
 </body>
diff --git a/plugins/system/t3/admin/tpls/default.php b/plugins/system/t3/admin/tpls/default.php
index 01b2a91..13eb584 100644
--- a/plugins/system/t3/admin/tpls/default.php
+++ b/plugins/system/t3/admin/tpls/default.php
@@ -19,7 +19,7 @@
 JHtml::_('behavior.formvalidation');
 JHtml::_('behavior.keepalive');
 $user = JFactory::getUser();
-$canDo = TemplatesHelper::getActions();
+$canDo = method_exists('TemplatesHelper', 'getActions') ? TemplatesHelper::getActions() : JHelperContent::getActions('com_templates');
 $iswritable = is_writable('t3test.txt');
 ?>
 <?php if($iswritable): ?>
diff --git a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.css b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.css
index df2d3d9..11fcc9b 100644
--- a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.css
+++ b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.css
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
 .btn-default,
@@ -10,11 +10,10 @@
 .btn-info,
 .btn-warning,
 .btn-danger {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 1px rgba(0, 0, 0, 0.075);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, .2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 1px rgba(0, 0, 0, .075);
 }
-
 .btn-default:active,
 .btn-primary:active,
 .btn-success:active,
@@ -27,371 +26,322 @@
 .btn-info.active,
 .btn-warning.active,
 .btn-danger.active {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
-
 .btn:active,
 .btn.active {
   background-image: none;
 }
-
 .btn-default {
   text-shadow: 0 1px 0 #fff;
-  background-image: -webkit-linear-gradient(top, #ffffff 0%, #e0e0e0 100%);
-  background-image: linear-gradient(to bottom, #ffffff 0%, #e0e0e0 100%);
+  background-image: -webkit-linear-gradient(top, #fff 0%, #e0e0e0 100%);
+  background-image:         linear-gradient(to bottom, #fff 0%, #e0e0e0 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
   border-color: #dbdbdb;
   border-color: #ccc;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
-
 .btn-default:hover,
 .btn-default:focus {
   background-color: #e0e0e0;
   background-position: 0 -15px;
 }
-
 .btn-default:active,
 .btn-default.active {
   background-color: #e0e0e0;
   border-color: #dbdbdb;
 }
-
 .btn-primary {
   background-image: -webkit-linear-gradient(top, #428bca 0%, #2d6ca2 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
+  background-image:         linear-gradient(to bottom, #428bca 0%, #2d6ca2 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
   border-color: #2b669a;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
-
 .btn-primary:hover,
 .btn-primary:focus {
   background-color: #2d6ca2;
   background-position: 0 -15px;
 }
-
 .btn-primary:active,
 .btn-primary.active {
   background-color: #2d6ca2;
   border-color: #2b669a;
 }
-
 .btn-success {
   background-image: -webkit-linear-gradient(top, #5cb85c 0%, #419641 100%);
-  background-image: linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+  background-image:         linear-gradient(to bottom, #5cb85c 0%, #419641 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
   border-color: #3e8f3e;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
-
 .btn-success:hover,
 .btn-success:focus {
   background-color: #419641;
   background-position: 0 -15px;
 }
-
 .btn-success:active,
 .btn-success.active {
   background-color: #419641;
   border-color: #3e8f3e;
 }
-
+.btn-info {
+  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
+  background-image:         linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  background-repeat: repeat-x;
+  border-color: #28a4c9;
+}
+.btn-info:hover,
+.btn-info:focus {
+  background-color: #2aabd2;
+  background-position: 0 -15px;
+}
+.btn-info:active,
+.btn-info.active {
+  background-color: #2aabd2;
+  border-color: #28a4c9;
+}
 .btn-warning {
   background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #eb9316 100%);
-  background-image: linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #eb9316 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
   border-color: #e38d13;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
-
 .btn-warning:hover,
 .btn-warning:focus {
   background-color: #eb9316;
   background-position: 0 -15px;
 }
-
 .btn-warning:active,
 .btn-warning.active {
   background-color: #eb9316;
   border-color: #e38d13;
 }
-
 .btn-danger {
   background-image: -webkit-linear-gradient(top, #d9534f 0%, #c12e2a 100%);
-  background-image: linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+  background-image:         linear-gradient(to bottom, #d9534f 0%, #c12e2a 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
   border-color: #b92c28;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 }
-
 .btn-danger:hover,
 .btn-danger:focus {
   background-color: #c12e2a;
   background-position: 0 -15px;
 }
-
 .btn-danger:active,
 .btn-danger.active {
   background-color: #c12e2a;
   border-color: #b92c28;
 }
-
-.btn-info {
-  background-image: -webkit-linear-gradient(top, #5bc0de 0%, #2aabd2 100%);
-  background-image: linear-gradient(to bottom, #5bc0de 0%, #2aabd2 100%);
-  background-repeat: repeat-x;
-  border-color: #28a4c9;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-.btn-info:hover,
-.btn-info:focus {
-  background-color: #2aabd2;
-  background-position: 0 -15px;
-}
-
-.btn-info:active,
-.btn-info.active {
-  background-color: #2aabd2;
-  border-color: #28a4c9;
-}
-
 .thumbnail,
 .img-thumbnail {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
 }
-
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
   background-color: #e8e8e8;
   background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
   background-color: #357ebd;
   background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .navbar-default {
-  background-image: -webkit-linear-gradient(top, #ffffff 0%, #f8f8f8 100%);
-  background-image: linear-gradient(to bottom, #ffffff 0%, #f8f8f8 100%);
+  background-image: -webkit-linear-gradient(top, #fff 0%, #f8f8f8 100%);
+  background-image:         linear-gradient(to bottom, #fff 0%, #f8f8f8 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
   background-repeat: repeat-x;
   border-radius: 4px;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.15), 0 1px 5px rgba(0, 0, 0, 0.075);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .15), 0 1px 5px rgba(0, 0, 0, .075);
 }
-
 .navbar-default .navbar-nav > .active > a {
   background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f3f3f3 100%);
-  background-image: linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f3f3f3 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.075);
+  background-repeat: repeat-x;
+  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .075);
 }
-
 .navbar-brand,
 .navbar-nav > li > a {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, .25);
 }
-
 .navbar-inverse {
-  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222222 100%);
-  background-image: linear-gradient(to bottom, #3c3c3c 0%, #222222 100%);
-  background-repeat: repeat-x;
+  background-image: -webkit-linear-gradient(top, #3c3c3c 0%, #222 100%);
+  background-image:         linear-gradient(to bottom, #3c3c3c 0%, #222 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  background-repeat: repeat-x;
 }
-
 .navbar-inverse .navbar-nav > .active > a {
-  background-image: -webkit-linear-gradient(top, #222222 0%, #282828 100%);
-  background-image: linear-gradient(to bottom, #222222 0%, #282828 100%);
-  background-repeat: repeat-x;
+  background-image: -webkit-linear-gradient(top, #222 0%, #282828 100%);
+  background-image:         linear-gradient(to bottom, #222 0%, #282828 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);
-  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
-          box-shadow: inset 0 3px 9px rgba(0, 0, 0, 0.25);
+  background-repeat: repeat-x;
+  -webkit-box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
+          box-shadow: inset 0 3px 9px rgba(0, 0, 0, .25);
 }
-
 .navbar-inverse .navbar-brand,
 .navbar-inverse .navbar-nav > li > a {
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, .25);
 }
-
 .navbar-static-top,
 .navbar-fixed-top,
 .navbar-fixed-bottom {
   border-radius: 0;
 }
-
 .alert {
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.2);
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, .2);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .25), 0 1px 2px rgba(0, 0, 0, .05);
 }
-
 .alert-success {
   background-image: -webkit-linear-gradient(top, #dff0d8 0%, #c8e5bc 100%);
-  background-image: linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+  background-image:         linear-gradient(to bottom, #dff0d8 0%, #c8e5bc 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
   background-repeat: repeat-x;
   border-color: #b2dba1;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);
 }
-
 .alert-info {
   background-image: -webkit-linear-gradient(top, #d9edf7 0%, #b9def0 100%);
-  background-image: linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+  background-image:         linear-gradient(to bottom, #d9edf7 0%, #b9def0 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
   background-repeat: repeat-x;
   border-color: #9acfea;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);
 }
-
 .alert-warning {
   background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #f8efc0 100%);
-  background-image: linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #f8efc0 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
   background-repeat: repeat-x;
   border-color: #f5e79e;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);
 }
-
 .alert-danger {
   background-image: -webkit-linear-gradient(top, #f2dede 0%, #e7c3c3 100%);
-  background-image: linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+  background-image:         linear-gradient(to bottom, #f2dede 0%, #e7c3c3 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
   background-repeat: repeat-x;
   border-color: #dca7a7;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);
 }
-
 .progress {
   background-image: -webkit-linear-gradient(top, #ebebeb 0%, #f5f5f5 100%);
-  background-image: linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #ebebeb 0%, #f5f5f5 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .progress-bar {
   background-image: -webkit-linear-gradient(top, #428bca 0%, #3071a9 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #428bca 0%, #3071a9 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .progress-bar-success {
   background-image: -webkit-linear-gradient(top, #5cb85c 0%, #449d44 100%);
-  background-image: linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #5cb85c 0%, #449d44 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .progress-bar-info {
   background-image: -webkit-linear-gradient(top, #5bc0de 0%, #31b0d5 100%);
-  background-image: linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #5bc0de 0%, #31b0d5 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .progress-bar-warning {
   background-image: -webkit-linear-gradient(top, #f0ad4e 0%, #ec971f 100%);
-  background-image: linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #f0ad4e 0%, #ec971f 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .progress-bar-danger {
   background-image: -webkit-linear-gradient(top, #d9534f 0%, #c9302c 100%);
-  background-image: linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #d9534f 0%, #c9302c 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .list-group {
   border-radius: 4px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.075);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, .075);
 }
-
 .list-group-item.active,
 .list-group-item.active:hover,
 .list-group-item.active:focus {
   text-shadow: 0 -1px 0 #3071a9;
   background-image: -webkit-linear-gradient(top, #428bca 0%, #3278b3 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+  background-image:         linear-gradient(to bottom, #428bca 0%, #3278b3 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
   background-repeat: repeat-x;
   border-color: #3278b3;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);
 }
-
 .panel {
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
 }
-
 .panel-default > .panel-heading {
   background-image: -webkit-linear-gradient(top, #f5f5f5 0%, #e8e8e8 100%);
-  background-image: linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #f5f5f5 0%, #e8e8e8 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .panel-primary > .panel-heading {
   background-image: -webkit-linear-gradient(top, #428bca 0%, #357ebd 100%);
-  background-image: linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #428bca 0%, #357ebd 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .panel-success > .panel-heading {
   background-image: -webkit-linear-gradient(top, #dff0d8 0%, #d0e9c6 100%);
-  background-image: linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #dff0d8 0%, #d0e9c6 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .panel-info > .panel-heading {
   background-image: -webkit-linear-gradient(top, #d9edf7 0%, #c4e3f3 100%);
-  background-image: linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #d9edf7 0%, #c4e3f3 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .panel-warning > .panel-heading {
   background-image: -webkit-linear-gradient(top, #fcf8e3 0%, #faf2cc 100%);
-  background-image: linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #fcf8e3 0%, #faf2cc 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .panel-danger > .panel-heading {
   background-image: -webkit-linear-gradient(top, #f2dede 0%, #ebcccc 100%);
-  background-image: linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
-  background-repeat: repeat-x;
+  background-image:         linear-gradient(to bottom, #f2dede 0%, #ebcccc 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);
+  background-repeat: repeat-x;
 }
-
 .well {
   background-image: -webkit-linear-gradient(top, #e8e8e8 0%, #f5f5f5 100%);
-  background-image: linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+  background-image:         linear-gradient(to bottom, #e8e8e8 0%, #f5f5f5 100%);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
   background-repeat: repeat-x;
   border-color: #dcdcdc;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
-          box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(255, 255, 255, 0.1);
-}
\ No newline at end of file
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+          box-shadow: inset 0 1px 3px rgba(0, 0, 0, .05), 0 1px 0 rgba(255, 255, 255, .1);
+}
+/*# sourceMappingURL=bootstrap-theme.css.map */
diff --git a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.css.map b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.css.map
new file mode 100644
index 0000000..29c1319
--- /dev/null
+++ b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["less/theme.less","less/mixins.less"],"names":[],"mappings":"AAeA;AACA;AACA;AACA;AACA;AACA;EACE,wCAAA;ECqGA,2FAAA;EACQ,mFAAA;;ADjGR,YAAC;AAAD,YAAC;AAAD,YAAC;AAAD,SAAC;AAAD,YAAC;AAAD,WAAC;AACD,YAAC;AAAD,YAAC;AAAD,YAAC;AAAD,SAAC;AAAD,YAAC;AAAD,WAAC;EC+FD,wDAAA;EACQ,gDAAA;;ADpER,IAAC;AACD,IAAC;EACC,sBAAA;;AAKJ;EC8PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED/TA,2BAAA;EACA,qBAAA;EAyB2C,yBAAA;EAA2B,kBAAA;;AAvBtE,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAeJ;EC6PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED/TA,2BAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAgBJ;EC4PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED/TA,2BAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAiBJ;EC2PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED/TA,2BAAA;EACA,qBAAA;;AAEA,SAAC;AACD,SAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,SAAC;AACD,SAAC;EACC,yBAAA;EACA,qBAAA;;AAkBJ;EC0PI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED/TA,2BAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,YAAC;AACD,YAAC;EACC,yBAAA;EACA,qBAAA;;AAmBJ;ECyPI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EAEA,sHAAA;EAoCF,mEAAA;ED/TA,2BAAA;EACA,qBAAA;;AAEA,WAAC;AACD,WAAC;EACC,yBAAA;EACA,4BAAA;;AAGF,WAAC;AACD,WAAC;EACC,yBAAA;EACA,qBAAA;;AA2BJ;AACA;EC8CE,kDAAA;EACQ,0CAAA;;ADrCV,cAAe,KAAK,IAAG;AACvB,cAAe,KAAK,IAAG;ECqOnB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EDtOF,yBAAA;;AAEF,cAAe,UAAU;AACzB,cAAe,UAAU,IAAG;AAC5B,cAAe,UAAU,IAAG;EC+NxB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EDhOF,yBAAA;;AAUF;ECmNI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EAoCF,mEAAA;EDvPA,kBAAA;ECcA,2FAAA;EACQ,mFAAA;;ADlBV,eAOE,YAAY,UAAU;EC4MpB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EArMF,wDAAA;EACQ,gDAAA;;ADNV;AACA,WAAY,KAAK;EACf,8CAAA;;AAIF;ECiMI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EAoCF,mEAAA;;ADxOF,eAIE,YAAY,UAAU;EC6LpB,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;EArMF,uDAAA;EACQ,+CAAA;;ADAV,eASE;AATF,eAUE,YAAY,KAAK;EACf,yCAAA;;AAKJ;AACA;AACA;EACE,gBAAA;;AAUF;EACE,6CAAA;EC/BA,0FAAA;EACQ,kFAAA;;AD0CV;ECuJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED9JF,qBAAA;;AAKF;ECsJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED9JF,qBAAA;;AAMF;ECqJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED9JF,qBAAA;;AAOF;ECoJI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED9JF,qBAAA;;AAgBF;EC2II,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADpIJ;ECiII,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADnIJ;ECgII,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADlIJ;EC+HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADjIJ;EC8HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADhIJ;EC6HI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADxHJ;EACE,kBAAA;EC9EA,kDAAA;EACQ,0CAAA;;ADgFV,gBAAgB;AAChB,gBAAgB,OAAO;AACvB,gBAAgB,OAAO;EACrB,6BAAA;EC8GE,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED/GF,qBAAA;;AAUF;EChGE,iDAAA;EACQ,yCAAA;;ADyGV,cAAe;ECwFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;AD1FJ,cAAe;ECuFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADzFJ,cAAe;ECsFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADxFJ,WAAY;ECqFR,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADvFJ,cAAe;ECoFX,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;ADtFJ,aAAc;ECmFV,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;;AD9EJ;EC2EI,kBAAkB,sDAAlB;EACA,kBAAkB,oDAAlB;EACA,2BAAA;EACA,sHAAA;ED5EF,qBAAA;ECzHA,yFAAA;EACQ,iFAAA","sourcesContent":["\n//\n// Load core variables and mixins\n// --------------------------------------------------\n\n@import \"variables.less\";\n@import \"mixins.less\";\n\n\n\n//\n// Buttons\n// --------------------------------------------------\n\n// Common styles\n.btn-default,\n.btn-primary,\n.btn-success,\n.btn-info,\n.btn-warning,\n.btn-danger {\n  text-shadow: 0 -1px 0 rgba(0,0,0,.2);\n  @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);\n  .box-shadow(@shadow);\n\n  // Reset the shadow\n  &:active,\n  &.active {\n    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n  }\n}\n\n// Mixin for generating new styles\n.btn-styles(@btn-color: #555) {\n  #gradient > .vertical(@start-color: @btn-color; @end-color: darken(@btn-color, 12%));\n  .reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners\n  background-repeat: repeat-x;\n  border-color: darken(@btn-color, 14%);\n\n  &:hover,\n  &:focus  {\n    background-color: darken(@btn-color, 12%);\n    background-position: 0 -15px;\n  }\n\n  &:active,\n  &.active {\n    background-color: darken(@btn-color, 12%);\n    border-color: darken(@btn-color, 14%);\n  }\n}\n\n// Common styles\n.btn {\n  // Remove the gradient for the pressed/active state\n  &:active,\n  &.active {\n    background-image: none;\n  }\n}\n\n// Apply the mixin to the buttons\n.btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }\n.btn-primary { .btn-styles(@btn-primary-bg); }\n.btn-success { .btn-styles(@btn-success-bg); }\n.btn-info    { .btn-styles(@btn-info-bg); }\n.btn-warning { .btn-styles(@btn-warning-bg); }\n.btn-danger  { .btn-styles(@btn-danger-bg); }\n\n\n\n//\n// Images\n// --------------------------------------------------\n\n.thumbnail,\n.img-thumbnail {\n  .box-shadow(0 1px 2px rgba(0,0,0,.075));\n}\n\n\n\n//\n// Dropdowns\n// --------------------------------------------------\n\n.dropdown-menu > li > a:hover,\n.dropdown-menu > li > a:focus {\n  #gradient > .vertical(@start-color: @dropdown-link-hover-bg; @end-color: darken(@dropdown-link-hover-bg, 5%));\n  background-color: darken(@dropdown-link-hover-bg, 5%);\n}\n.dropdown-menu > .active > a,\n.dropdown-menu > .active > a:hover,\n.dropdown-menu > .active > a:focus {\n  #gradient > .vertical(@start-color: @dropdown-link-active-bg; @end-color: darken(@dropdown-link-active-bg, 5%));\n  background-color: darken(@dropdown-link-active-bg, 5%);\n}\n\n\n\n//\n// Navbar\n// --------------------------------------------------\n\n// Default navbar\n.navbar-default {\n  #gradient > .vertical(@start-color: lighten(@navbar-default-bg, 10%); @end-color: @navbar-default-bg);\n  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered\n  border-radius: @navbar-border-radius;\n  @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);\n  .box-shadow(@shadow);\n\n  .navbar-nav > .active > a {\n    #gradient > .vertical(@start-color: darken(@navbar-default-bg, 5%); @end-color: darken(@navbar-default-bg, 2%));\n    .box-shadow(inset 0 3px 9px rgba(0,0,0,.075));\n  }\n}\n.navbar-brand,\n.navbar-nav > li > a {\n  text-shadow: 0 1px 0 rgba(255,255,255,.25);\n}\n\n// Inverted navbar\n.navbar-inverse {\n  #gradient > .vertical(@start-color: lighten(@navbar-inverse-bg, 10%); @end-color: @navbar-inverse-bg);\n  .reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered\n\n  .navbar-nav > .active > a {\n    #gradient > .vertical(@start-color: @navbar-inverse-bg; @end-color: lighten(@navbar-inverse-bg, 2.5%));\n    .box-shadow(inset 0 3px 9px rgba(0,0,0,.25));\n  }\n\n  .navbar-brand,\n  .navbar-nav > li > a {\n    text-shadow: 0 -1px 0 rgba(0,0,0,.25);\n  }\n}\n\n// Undo rounded corners in static and fixed navbars\n.navbar-static-top,\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  border-radius: 0;\n}\n\n\n\n//\n// Alerts\n// --------------------------------------------------\n\n// Common styles\n.alert {\n  text-shadow: 0 1px 0 rgba(255,255,255,.2);\n  @shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);\n  .box-shadow(@shadow);\n}\n\n// Mixin for generating new styles\n.alert-styles(@color) {\n  #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 7.5%));\n  border-color: darken(@color, 15%);\n}\n\n// Apply the mixin to the alerts\n.alert-success    { .alert-styles(@alert-success-bg); }\n.alert-info       { .alert-styles(@alert-info-bg); }\n.alert-warning    { .alert-styles(@alert-warning-bg); }\n.alert-danger     { .alert-styles(@alert-danger-bg); }\n\n\n\n//\n// Progress bars\n// --------------------------------------------------\n\n// Give the progress background some depth\n.progress {\n  #gradient > .vertical(@start-color: darken(@progress-bg, 4%); @end-color: @progress-bg)\n}\n\n// Mixin for generating new styles\n.progress-bar-styles(@color) {\n  #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 10%));\n}\n\n// Apply the mixin to the progress bars\n.progress-bar            { .progress-bar-styles(@progress-bar-bg); }\n.progress-bar-success    { .progress-bar-styles(@progress-bar-success-bg); }\n.progress-bar-info       { .progress-bar-styles(@progress-bar-info-bg); }\n.progress-bar-warning    { .progress-bar-styles(@progress-bar-warning-bg); }\n.progress-bar-danger     { .progress-bar-styles(@progress-bar-danger-bg); }\n\n\n\n//\n// List groups\n// --------------------------------------------------\n\n.list-group {\n  border-radius: @border-radius-base;\n  .box-shadow(0 1px 2px rgba(0,0,0,.075));\n}\n.list-group-item.active,\n.list-group-item.active:hover,\n.list-group-item.active:focus {\n  text-shadow: 0 -1px 0 darken(@list-group-active-bg, 10%);\n  #gradient > .vertical(@start-color: @list-group-active-bg; @end-color: darken(@list-group-active-bg, 7.5%));\n  border-color: darken(@list-group-active-border, 7.5%);\n}\n\n\n\n//\n// Panels\n// --------------------------------------------------\n\n// Common styles\n.panel {\n  .box-shadow(0 1px 2px rgba(0,0,0,.05));\n}\n\n// Mixin for generating new styles\n.panel-heading-styles(@color) {\n  #gradient > .vertical(@start-color: @color; @end-color: darken(@color, 5%));\n}\n\n// Apply the mixin to the panel headings only\n.panel-default > .panel-heading   { .panel-heading-styles(@panel-default-heading-bg); }\n.panel-primary > .panel-heading   { .panel-heading-styles(@panel-primary-heading-bg); }\n.panel-success > .panel-heading   { .panel-heading-styles(@panel-success-heading-bg); }\n.panel-info > .panel-heading      { .panel-heading-styles(@panel-info-heading-bg); }\n.panel-warning > .panel-heading   { .panel-heading-styles(@panel-warning-heading-bg); }\n.panel-danger > .panel-heading    { .panel-heading-styles(@panel-danger-heading-bg); }\n\n\n\n//\n// Wells\n// --------------------------------------------------\n\n.well {\n  #gradient > .vertical(@start-color: darken(@well-bg, 5%); @end-color: @well-bg);\n  border-color: darken(@well-bg, 10%);\n  @shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);\n  .box-shadow(@shadow);\n}\n","//\n// Mixins\n// --------------------------------------------------\n\n\n// Utilities\n// -------------------------\n\n// Clearfix\n// Source: http://nicolasgallagher.com/micro-clearfix-hack/\n//\n// For modern browsers\n// 1. The space content is one way to avoid an Opera bug when the\n//    contenteditable attribute is included anywhere else in the document.\n//    Otherwise it causes space to appear at the top and bottom of elements\n//    that are clearfixed.\n// 2. The use of `table` rather than `block` is only necessary if using\n//    `:before` to contain the top-margins of child elements.\n.clearfix() {\n  &:before,\n  &:after {\n    content: \" \"; // 1\n    display: table; // 2\n  }\n  &:after {\n    clear: both;\n  }\n}\n\n// WebKit-style focus\n.tab-focus() {\n  // Default\n  outline: thin dotted;\n  // WebKit\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\n\n// Center-align a block level element\n.center-block() {\n  display: block;\n  margin-left: auto;\n  margin-right: auto;\n}\n\n// Sizing shortcuts\n.size(@width; @height) {\n  width: @width;\n  height: @height;\n}\n.square(@size) {\n  .size(@size; @size);\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n  &:-moz-placeholder            { color: @color; } // Firefox 4-18\n  &::-moz-placeholder           { color: @color;   // Firefox 19+\n                                  opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526\n  &:-ms-input-placeholder       { color: @color; } // Internet Explorer 10+\n  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome\n}\n\n// Text overflow\n// Requires inline-block or block for proper styling\n.text-overflow() {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n// CSS image replacement\n//\n// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for\n// mixins being reused as classes with the same name, this doesn't hold up. As\n// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note\n// that we cannot chain the mixins together in Less, so they are repeated.\n//\n// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757\n\n// Deprecated as of v3.0.1 (will be removed in v4)\n.hide-text() {\n  font: ~\"0/0\" a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n// New mixin to use as of v3.0.1\n.text-hide() {\n  .hide-text();\n}\n\n\n\n// CSS3 PROPERTIES\n// --------------------------------------------------\n\n// Single side border-radius\n.border-top-radius(@radius) {\n  border-top-right-radius: @radius;\n   border-top-left-radius: @radius;\n}\n.border-right-radius(@radius) {\n  border-bottom-right-radius: @radius;\n     border-top-right-radius: @radius;\n}\n.border-bottom-radius(@radius) {\n  border-bottom-right-radius: @radius;\n   border-bottom-left-radius: @radius;\n}\n.border-left-radius(@radius) {\n  border-bottom-left-radius: @radius;\n     border-top-left-radius: @radius;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n//   supported browsers that have box shadow capabilities now support the\n//   standard `box-shadow` property.\n.box-shadow(@shadow) {\n  -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n          box-shadow: @shadow;\n}\n\n// Transitions\n.transition(@transition) {\n  -webkit-transition: @transition;\n          transition: @transition;\n}\n.transition-property(@transition-property) {\n  -webkit-transition-property: @transition-property;\n          transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n  -webkit-transition-delay: @transition-delay;\n          transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n  -webkit-transition-duration: @transition-duration;\n          transition-duration: @transition-duration;\n}\n.transition-transform(@transition) {\n  -webkit-transition: -webkit-transform @transition;\n     -moz-transition: -moz-transform @transition;\n       -o-transition: -o-transform @transition;\n          transition: transform @transition;\n}\n\n// Transformations\n.rotate(@degrees) {\n  -webkit-transform: rotate(@degrees);\n      -ms-transform: rotate(@degrees); // IE9 only\n          transform: rotate(@degrees);\n}\n.scale(@ratio; @ratio-y...) {\n  -webkit-transform: scale(@ratio, @ratio-y);\n      -ms-transform: scale(@ratio, @ratio-y); // IE9 only\n          transform: scale(@ratio, @ratio-y);\n}\n.translate(@x; @y) {\n  -webkit-transform: translate(@x, @y);\n      -ms-transform: translate(@x, @y); // IE9 only\n          transform: translate(@x, @y);\n}\n.skew(@x; @y) {\n  -webkit-transform: skew(@x, @y);\n      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n          transform: skew(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n  -webkit-transform: translate3d(@x, @y, @z);\n          transform: translate3d(@x, @y, @z);\n}\n\n.rotateX(@degrees) {\n  -webkit-transform: rotateX(@degrees);\n      -ms-transform: rotateX(@degrees); // IE9 only\n          transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n  -webkit-transform: rotateY(@degrees);\n      -ms-transform: rotateY(@degrees); // IE9 only\n          transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n  -webkit-perspective: @perspective;\n     -moz-perspective: @perspective;\n          perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n  -webkit-perspective-origin: @perspective;\n     -moz-perspective-origin: @perspective;\n          perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n  -webkit-transform-origin: @origin;\n     -moz-transform-origin: @origin;\n      -ms-transform-origin: @origin; // IE9 only\n          transform-origin: @origin;\n}\n\n// Animations\n.animation(@animation) {\n  -webkit-animation: @animation;\n          animation: @animation;\n}\n.animation-name(@name) {\n  -webkit-animation-name: @name;\n          animation-name: @name;\n}\n.animation-duration(@duration) {\n  -webkit-animation-duration: @duration;\n          animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n  -webkit-animation-timing-function: @timing-function;\n          animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n  -webkit-animation-delay: @delay;\n          animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n  -webkit-animation-iteration-count: @iteration-count;\n          animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n  -webkit-animation-direction: @direction;\n          animation-direction: @direction;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n.backface-visibility(@visibility){\n  -webkit-backface-visibility: @visibility;\n     -moz-backface-visibility: @visibility;\n          backface-visibility: @visibility;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n  -webkit-box-sizing: @boxmodel;\n     -moz-box-sizing: @boxmodel;\n          box-sizing: @boxmodel;\n}\n\n// User select\n// For selecting text on the page\n.user-select(@select) {\n  -webkit-user-select: @select;\n     -moz-user-select: @select;\n      -ms-user-select: @select; // IE10+\n       -o-user-select: @select;\n          user-select: @select;\n}\n\n// Resize anything\n.resizable(@direction) {\n  resize: @direction; // Options: horizontal, vertical, both\n  overflow: auto; // Safari fix\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n  -webkit-column-count: @column-count;\n     -moz-column-count: @column-count;\n          column-count: @column-count;\n  -webkit-column-gap: @column-gap;\n     -moz-column-gap: @column-gap;\n          column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n  word-wrap: break-word;\n  -webkit-hyphens: @mode;\n     -moz-hyphens: @mode;\n      -ms-hyphens: @mode; // IE10+\n       -o-hyphens: @mode;\n          hyphens: @mode;\n}\n\n// Opacity\n.opacity(@opacity) {\n  opacity: @opacity;\n  // IE8 filter\n  @opacity-ie: (@opacity * 100);\n  filter: ~\"alpha(opacity=@{opacity-ie})\";\n}\n\n\n\n// GRADIENTS\n// --------------------------------------------------\n\n#gradient {\n\n  // Horizontal gradient, from left to right\n  //\n  // Creates two color stops, start and end, by specifying a color and position for each color stop.\n  // Color stops are not available in IE9 and below.\n  .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n    background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+\n    background-image:  linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n    background-repeat: repeat-x;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down\n  }\n\n  // Vertical gradient, from top to bottom\n  //\n  // Creates two color stops, start and end, by specifying a color and position for each color stop.\n  // Color stops are not available in IE9 and below.\n  .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n    background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent);  // Safari 5.1-6, Chrome 10+\n    background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n    background-repeat: repeat-x;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down\n  }\n\n  .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {\n    background-repeat: repeat-x;\n    background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+\n    background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n  }\n  .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n    background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);\n    background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);\n    background-repeat: no-repeat;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n  }\n  .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n    background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n    background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n    background-repeat: no-repeat;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n  }\n  .radial(@inner-color: #555; @outer-color: #333) {\n    background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);\n    background-image: radial-gradient(circle, @inner-color, @outer-color);\n    background-repeat: no-repeat;\n  }\n  .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {\n    background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n    background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n  }\n}\n\n// Reset filters for IE\n//\n// When you need to remove a gradient background, do not forget to use this to reset\n// the IE filter for IE9 and below.\n.reset-filter() {\n  filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(enabled = false)\"));\n}\n\n\n\n// Retina images\n//\n// Short retina mixin for setting background-image and -size\n\n.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {\n  background-image: url(\"@{file-1x}\");\n\n  @media\n  only screen and (-webkit-min-device-pixel-ratio: 2),\n  only screen and (   min--moz-device-pixel-ratio: 2),\n  only screen and (     -o-min-device-pixel-ratio: 2/1),\n  only screen and (        min-device-pixel-ratio: 2),\n  only screen and (                min-resolution: 192dpi),\n  only screen and (                min-resolution: 2dppx) {\n    background-image: url(\"@{file-2x}\");\n    background-size: @width-1x @height-1x;\n  }\n}\n\n\n// Responsive image\n//\n// Keep images from scaling beyond the width of their parents.\n\n.img-responsive(@display: block) {\n  display: @display;\n  max-width: 100%; // Part 1: Set a maximum relative to the parent\n  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching\n}\n\n\n// COMPONENT MIXINS\n// --------------------------------------------------\n\n// Horizontal dividers\n// -------------------------\n// Dividers (basically an hr) within dropdowns and nav lists\n.nav-divider(@color: #e5e5e5) {\n  height: 1px;\n  margin: ((@line-height-computed / 2) - 1) 0;\n  overflow: hidden;\n  background-color: @color;\n}\n\n// Panels\n// -------------------------\n.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {\n  border-color: @border;\n\n  & > .panel-heading {\n    color: @heading-text-color;\n    background-color: @heading-bg-color;\n    border-color: @heading-border;\n\n    + .panel-collapse .panel-body {\n      border-top-color: @border;\n    }\n  }\n  & > .panel-footer {\n    + .panel-collapse .panel-body {\n      border-bottom-color: @border;\n    }\n  }\n}\n\n// Alerts\n// -------------------------\n.alert-variant(@background; @border; @text-color) {\n  background-color: @background;\n  border-color: @border;\n  color: @text-color;\n\n  hr {\n    border-top-color: darken(@border, 5%);\n  }\n  .alert-link {\n    color: darken(@text-color, 10%);\n  }\n}\n\n// Tables\n// -------------------------\n.table-row-variant(@state; @background) {\n  // Exact selectors below required to override `.table-striped` and prevent\n  // inheritance to nested tables.\n  .table > thead > tr,\n  .table > tbody > tr,\n  .table > tfoot > tr {\n    > td.@{state},\n    > th.@{state},\n    &.@{state} > td,\n    &.@{state} > th {\n      background-color: @background;\n    }\n  }\n\n  // Hover states for `.table-hover`\n  // Note: this is not available for cells or rows within `thead` or `tfoot`.\n  .table-hover > tbody > tr {\n    > td.@{state}:hover,\n    > th.@{state}:hover,\n    &.@{state}:hover > td,\n    &.@{state}:hover > th {\n      background-color: darken(@background, 5%);\n    }\n  }\n}\n\n// List Groups\n// -------------------------\n.list-group-item-variant(@state; @background; @color) {\n  .list-group-item-@{state} {\n    color: @color;\n    background-color: @background;\n\n    a& {\n      color: @color;\n\n      .list-group-item-heading { color: inherit; }\n\n      &:hover,\n      &:focus {\n        color: @color;\n        background-color: darken(@background, 5%);\n      }\n      &.active,\n      &.active:hover,\n      &.active:focus {\n        color: #fff;\n        background-color: @color;\n        border-color: @color;\n      }\n    }\n  }\n}\n\n// Button variants\n// -------------------------\n// Easily pump out default styles, as well as :hover, :focus, :active,\n// and disabled options for all buttons\n.button-variant(@color; @background; @border) {\n  color: @color;\n  background-color: @background;\n  border-color: @border;\n\n  &:hover,\n  &:focus,\n  &:active,\n  &.active,\n  .open .dropdown-toggle& {\n    color: @color;\n    background-color: darken(@background, 8%);\n        border-color: darken(@border, 12%);\n  }\n  &:active,\n  &.active,\n  .open .dropdown-toggle& {\n    background-image: none;\n  }\n  &.disabled,\n  &[disabled],\n  fieldset[disabled] & {\n    &,\n    &:hover,\n    &:focus,\n    &:active,\n    &.active {\n      background-color: @background;\n          border-color: @border;\n    }\n  }\n\n  .badge {\n    color: @background;\n    background-color: @color;\n  }\n}\n\n// Button sizes\n// -------------------------\n.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n  padding: @padding-vertical @padding-horizontal;\n  font-size: @font-size;\n  line-height: @line-height;\n  border-radius: @border-radius;\n}\n\n// Pagination\n// -------------------------\n.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {\n  > li {\n    > a,\n    > span {\n      padding: @padding-vertical @padding-horizontal;\n      font-size: @font-size;\n    }\n    &:first-child {\n      > a,\n      > span {\n        .border-left-radius(@border-radius);\n      }\n    }\n    &:last-child {\n      > a,\n      > span {\n        .border-right-radius(@border-radius);\n      }\n    }\n  }\n}\n\n// Labels\n// -------------------------\n.label-variant(@color) {\n  background-color: @color;\n  &[href] {\n    &:hover,\n    &:focus {\n      background-color: darken(@color, 10%);\n    }\n  }\n}\n\n// Contextual backgrounds\n// -------------------------\n.bg-variant(@color) {\n  background-color: @color;\n  a&:hover {\n    background-color: darken(@color, 10%);\n  }\n}\n\n// Typography\n// -------------------------\n.text-emphasis-variant(@color) {\n  color: @color;\n  a&:hover {\n    color: darken(@color, 10%);\n  }\n}\n\n// Navbar vertical align\n// -------------------------\n// Vertically center elements in the navbar.\n// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.\n.navbar-vertical-align(@element-height) {\n  margin-top: ((@navbar-height - @element-height) / 2);\n  margin-bottom: ((@navbar-height - @element-height) / 2);\n}\n\n// Progress bars\n// -------------------------\n.progress-bar-variant(@color) {\n  background-color: @color;\n  .progress-striped & {\n    #gradient > .striped();\n  }\n}\n\n// Responsive utilities\n// -------------------------\n// More easily include all the states for responsive-utilities.less.\n.responsive-visibility() {\n  display: block !important;\n  table&  { display: table; }\n  tr&     { display: table-row !important; }\n  th&,\n  td&     { display: table-cell !important; }\n}\n\n.responsive-invisibility() {\n    &,\n  tr&,\n  th&,\n  td& { display: none !important; }\n}\n\n\n// Grid System\n// -----------\n\n// Centered container element\n.container-fixed() {\n  margin-right: auto;\n  margin-left: auto;\n  padding-left:  (@grid-gutter-width / 2);\n  padding-right: (@grid-gutter-width / 2);\n  &:extend(.clearfix all);\n}\n\n// Creates a wrapper for a series of columns\n.make-row(@gutter: @grid-gutter-width) {\n  margin-left:  (@gutter / -2);\n  margin-right: (@gutter / -2);\n  &:extend(.clearfix all);\n}\n\n// Generate the extra small columns\n.make-xs-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  float: left;\n  width: percentage((@columns / @grid-columns));\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n}\n.make-xs-column-offset(@columns) {\n  @media (min-width: @screen-xs-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-xs-column-push(@columns) {\n  @media (min-width: @screen-xs-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-xs-column-pull(@columns) {\n  @media (min-width: @screen-xs-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Generate the small columns\n.make-sm-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-sm-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-offset(@columns) {\n  @media (min-width: @screen-sm-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-push(@columns) {\n  @media (min-width: @screen-sm-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-pull(@columns) {\n  @media (min-width: @screen-sm-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Generate the medium columns\n.make-md-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-md-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-offset(@columns) {\n  @media (min-width: @screen-md-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-push(@columns) {\n  @media (min-width: @screen-md-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-pull(@columns) {\n  @media (min-width: @screen-md-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Generate the large columns\n.make-lg-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-lg-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-offset(@columns) {\n  @media (min-width: @screen-lg-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-push(@columns) {\n  @media (min-width: @screen-lg-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-pull(@columns) {\n  @media (min-width: @screen-lg-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `@grid-columns`.\n\n.make-grid-columns() {\n  // Common styles for all sizes of grid columns, widths 1-12\n  .col(@index) when (@index = 1) { // initial\n    @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n    .col((@index + 1), @item);\n  }\n  .col(@index, @list) when (@index =< @grid-columns) { // general; \"=<\" isn't a typo\n    @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n    .col((@index + 1), ~\"@{list}, @{item}\");\n  }\n  .col(@index, @list) when (@index > @grid-columns) { // terminal\n    @{list} {\n      position: relative;\n      // Prevent columns from collapsing when empty\n      min-height: 1px;\n      // Inner gutter via padding\n      padding-left:  (@grid-gutter-width / 2);\n      padding-right: (@grid-gutter-width / 2);\n    }\n  }\n  .col(1); // kickstart it\n}\n\n.make-grid-columns-float(@class) {\n  .col(@index) when (@index = 1) { // initial\n    @item: ~\".col-@{class}-@{index}\";\n    .col((@index + 1), @item);\n  }\n  .col(@index, @list) when (@index =< @grid-columns) { // general\n    @item: ~\".col-@{class}-@{index}\";\n    .col((@index + 1), ~\"@{list}, @{item}\");\n  }\n  .col(@index, @list) when (@index > @grid-columns) { // terminal\n    @{list} {\n      float: left;\n    }\n  }\n  .col(1); // kickstart it\n}\n\n.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) {\n  .col-@{class}-@{index} {\n    width: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid(@index, @class, @type) when (@type = push) {\n  .col-@{class}-push-@{index} {\n    left: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid(@index, @class, @type) when (@type = pull) {\n  .col-@{class}-pull-@{index} {\n    right: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid(@index, @class, @type) when (@type = offset) {\n  .col-@{class}-offset-@{index} {\n    margin-left: percentage((@index / @grid-columns));\n  }\n}\n\n// Basic looping in LESS\n.make-grid(@index, @class, @type) when (@index >= 0) {\n  .calc-grid(@index, @class, @type);\n  // next iteration\n  .make-grid((@index - 1), @class, @type);\n}\n\n\n// Form validation states\n//\n// Used in forms.less to generate the form validation CSS for warnings, errors,\n// and successes.\n\n.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {\n  // Color the label and help text\n  .help-block,\n  .control-label,\n  .radio,\n  .checkbox,\n  .radio-inline,\n  .checkbox-inline  {\n    color: @text-color;\n  }\n  // Set the border and box shadow on specific inputs to match\n  .form-control {\n    border-color: @border-color;\n    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work\n    &:focus {\n      border-color: darken(@border-color, 10%);\n      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);\n      .box-shadow(@shadow);\n    }\n  }\n  // Set validation states also for addons\n  .input-group-addon {\n    color: @text-color;\n    border-color: @border-color;\n    background-color: @background-color;\n  }\n  // Optional feedback icon\n  .form-control-feedback {\n    color: @text-color;\n  }\n}\n\n// Form control focus state\n//\n// Generate a customized focus state and for any input with the specified color,\n// which defaults to the `@input-focus-border` variable.\n//\n// We highly encourage you to not customize the default value, but instead use\n// this to tweak colors on an as-needed basis. This aesthetic change is based on\n// WebKit's default styles, but applicable to a wider range of browsers. Its\n// usability and accessibility should be taken into account with any change.\n//\n// Example usage: change the default blue border and shadow to white for better\n// contrast against a dark gray background.\n\n.form-control-focus(@color: @input-border-focus) {\n  @color-rgba: rgba(red(@color), green(@color), blue(@color), .6);\n  &:focus {\n    border-color: @color;\n    outline: 0;\n    .box-shadow(~\"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}\");\n  }\n}\n\n// Form control sizing\n//\n// Relative text size, padding, and border-radii changes for form controls. For\n// horizontal sizing, wrap controls in the predefined grid classes. `<select>`\n// element gets special love because it's special, and that's a fact!\n\n.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n  height: @input-height;\n  padding: @padding-vertical @padding-horizontal;\n  font-size: @font-size;\n  line-height: @line-height;\n  border-radius: @border-radius;\n\n  select& {\n    height: @input-height;\n    line-height: @input-height;\n  }\n\n  textarea&,\n  select[multiple]& {\n    height: auto;\n  }\n}\n"]}
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.min.css b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.min.css
index c7b6d39..cff38df 100644
--- a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.min.css
+++ b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap-theme.min.css
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 1px rgba(0,0,0,0.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffe0e0e0',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:linear-gradient(to bottom,#428bca 0,#2d6ca2 100%);background-repeat:repeat-x;border-color:#2b669a;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff2d6ca2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);background-repeat:repeat-x;border-color:#3e8f3e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff419641',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);background-repeat:repeat-x;border-color:#e38d13;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffeb9316',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);background-repeat:repeat-x;border-color:#b92c28;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc12e2a',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);background-repeat:repeat-x;border-color:#28a4c9;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff2aabd2',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#357ebd;background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);background-repeat:repeat-x;border-radius:4px;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#fff8f8f8',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075);box-shadow:inset 0 1px 0 rgba(255,255,255,0.15),0 1px 5px rgba(0,0,0,0.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff3f3f3',GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.075);box-shadow:inset 0 3px 9px rgba(0,0,0,0.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,0.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c',endColorstr='#ff222222',GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#222 0,#282828 100%);background-image:linear-gradient(to bottom,#222 0,#282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff282828',GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,0.25);box-shadow:inset 0 3px 9px rgba(0,0,0,0.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,0.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,0.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05);box-shadow:inset 0 1px 0 rgba(255,255,255,0.25),0 1px 2px rgba(0,0,0,0.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);background-repeat:repeat-x;border-color:#b2dba1;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffc8e5bc',GradientType=0)}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);background-repeat:repeat-x;border-color:#9acfea;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffb9def0',GradientType=0)}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);background-repeat:repeat-x;border-color:#f5e79e;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fff8efc0',GradientType=0)}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);background-repeat:repeat-x;border-color:#dca7a7;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffe7c3c3',GradientType=0)}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb',endColorstr='#fff5f5f5',GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3071a9',GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c',endColorstr='#ff449d44',GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de',endColorstr='#ff31b0d5',GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e',endColorstr='#ffec971f',GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f',endColorstr='#ffc9302c',GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.075);box-shadow:0 1px 2px rgba(0,0,0,0.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);background-repeat:repeat-x;border-color:#3278b3;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff3278b3',GradientType=0)}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,0.05);box-shadow:0 1px 2px rgba(0,0,0,0.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5',endColorstr='#ffe8e8e8',GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca',endColorstr='#ff357ebd',GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8',endColorstr='#ffd0e9c6',GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7',endColorstr='#ffc4e3f3',GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3',endColorstr='#fffaf2cc',GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede',endColorstr='#ffebcccc',GradientType=0)}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);background-repeat:repeat-x;border-color:#dcdcdc;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8',endColorstr='#fff5f5f5',GradientType=0);-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 3px rgba(0,0,0,0.05),0 1px 0 rgba(255,255,255,0.1)}
\ No newline at end of file
+.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn:active,.btn.active{background-image:none}.btn-default{background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;text-shadow:0 1px 0 #fff;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-primary{background-image:-webkit-linear-gradient(top,#428bca 0,#2d6ca2 100%);background-image:linear-gradient(to bottom,#428bca 0,#2d6ca2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff2d6ca2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#2b669a}.btn-primary:hover,.btn-primary:focus{background-color:#2d6ca2;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#2d6ca2;border-color:#2b669a}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-color:#e8e8e8}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0);background-color:#357ebd}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f3f3f3 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f3f3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff3f3f3', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#222 0,#282828 100%);background-image:linear-gradient(to bottom,#222 0,#282828 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff282828', GradientType=0);-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0)}.progress-bar{background-image:-webkit-linear-gradient(top,#428bca 0,#3071a9 100%);background-image:linear-gradient(to bottom,#428bca 0,#3071a9 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3071a9', GradientType=0)}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0)}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0)}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0)}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #3071a9;background-image:-webkit-linear-gradient(top,#428bca 0,#3278b3 100%);background-image:linear-gradient(to bottom,#428bca 0,#3278b3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff3278b3', GradientType=0);border-color:#3278b3}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0)}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#428bca 0,#357ebd 100%);background-image:linear-gradient(to bottom,#428bca 0,#357ebd 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff428bca', endColorstr='#ff357ebd', GradientType=0)}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0)}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0)}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0)}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0)}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)}
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.css b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.css
index 377dff3..14cc1f4 100644
--- a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.css
+++ b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.css
@@ -1,11 +1,18 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
-
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
+html {
+  font-family: sans-serif;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -20,95 +27,49 @@ section,
 summary {
   display: block;
 }
-
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
-
 audio:not([controls]) {
   display: none;
   height: 0;
 }
-
 [hidden],
 template {
   display: none;
 }
-
-html {
-  font-family: sans-serif;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-
-body {
-  margin: 0;
-}
-
 a {
   background: transparent;
 }
-
-a:focus {
-  outline: thin dotted;
-}
-
 a:active,
 a:hover {
   outline: 0;
 }
-
-h1 {
-  margin: 0.67em 0;
-  font-size: 2em;
-}
-
 abbr[title] {
   border-bottom: 1px dotted;
 }
-
 b,
 strong {
   font-weight: bold;
 }
-
 dfn {
   font-style: italic;
 }
-
-hr {
-  height: 0;
-  -moz-box-sizing: content-box;
-       box-sizing: content-box;
+h1 {
+  margin: .67em 0;
+  font-size: 2em;
 }
-
 mark {
   color: #000;
   background: #ff0;
 }
-
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-
-pre {
-  white-space: pre-wrap;
-}
-
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
 small {
   font-size: 80%;
 }
-
 sub,
 sup {
   position: relative;
@@ -116,104 +77,113 @@ sup {
   line-height: 0;
   vertical-align: baseline;
 }
-
 sup {
-  top: -0.5em;
+  top: -.5em;
 }
-
 sub {
-  bottom: -0.25em;
+  bottom: -.25em;
 }
-
 img {
   border: 0;
 }
-
 svg:not(:root) {
   overflow: hidden;
 }
-
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-
-fieldset {
-  padding: 0.35em 0.625em 0.75em;
-  margin: 0 2px;
-  border: 1px solid #c0c0c0;
+hr {
+  height: 0;
+  -moz-box-sizing: content-box;
+       box-sizing: content-box;
 }
-
-legend {
-  padding: 0;
-  border: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
-
 button,
 input,
+optgroup,
 select,
 textarea {
   margin: 0;
-  font-family: inherit;
-  font-size: 100%;
+  font: inherit;
+  color: inherit;
 }
-
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
-
 button,
 select {
   text-transform: none;
 }
-
 button,
 html input[type="button"],
 input[type="reset"],
 input[type="submit"] {
-  cursor: pointer;
   -webkit-appearance: button;
+  cursor: pointer;
 }
-
 button[disabled],
 html input[disabled] {
   cursor: default;
 }
-
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
-  padding: 0;
   box-sizing: border-box;
+  padding: 0;
+}
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
 }
-
 input[type="search"] {
   -webkit-box-sizing: content-box;
      -moz-box-sizing: content-box;
           box-sizing: content-box;
   -webkit-appearance: textfield;
 }
-
 input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  padding: .35em .625em .75em;
+  margin: 0 2px;
+  border: 1px solid #c0c0c0;
+}
+legend {
   padding: 0;
   border: 0;
 }
-
 textarea {
   overflow: auto;
-  vertical-align: top;
 }
-
+optgroup {
+  font-weight: bold;
+}
 table {
-  border-collapse: collapse;
   border-spacing: 0;
+  border-collapse: collapse;
+}
+td,
+th {
+  padding: 0;
 }
-
 @media print {
   * {
     color: #000 !important;
@@ -238,6 +208,7 @@ table {
   pre,
   blockquote {
     border: 1px solid #999;
+
     page-break-inside: avoid;
   }
   thead {
@@ -250,9 +221,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page  {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -288,28 +256,29 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-
-*,
+* {
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
           box-sizing: border-box;
 }
-
 html {
   font-size: 62.5%;
+
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
-
 body {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 1.428571429;
-  color: #333333;
-  background-color: #ffffff;
+  color: #333;
+  background-color: #fff;
 }
-
 input,
 button,
 select,
@@ -318,62 +287,55 @@ textarea {
   font-size: inherit;
   line-height: inherit;
 }
-
 a {
   color: #428bca;
   text-decoration: none;
 }
-
 a:hover,
 a:focus {
   color: #2a6496;
   text-decoration: underline;
 }
-
 a:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
-
 .img-responsive {
   display: block;
-  height: auto;
   max-width: 100%;
+  height: auto;
 }
-
 .img-rounded {
   border-radius: 6px;
 }
-
 .img-thumbnail {
   display: inline-block;
-  height: auto;
   max-width: 100%;
+  height: auto;
   padding: 4px;
   line-height: 1.428571429;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
+  background-color: #fff;
+  border: 1px solid #ddd;
   border-radius: 4px;
-  -webkit-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
+  -webkit-transition: all .2s ease-in-out;
+          transition: all .2s ease-in-out;
 }
-
 .img-circle {
   border-radius: 50%;
 }
-
 hr {
   margin-top: 20px;
   margin-bottom: 20px;
   border: 0;
-  border-top: 1px solid #eeeeee;
+  border-top: 1px solid #eee;
 }
-
 .sr-only {
   position: absolute;
   width: 1px;
@@ -384,7 +346,6 @@ hr {
   clip: rect(0, 0, 0, 0);
   border: 0;
 }
-
 h1,
 h2,
 h3,
@@ -397,12 +358,11 @@ h6,
 .h4,
 .h5,
 .h6 {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-family: inherit;
   font-weight: 500;
   line-height: 1.1;
   color: inherit;
 }
-
 h1 small,
 h2 small,
 h3 small,
@@ -429,210 +389,221 @@ h6 .small,
 .h6 .small {
   font-weight: normal;
   line-height: 1;
-  color: #999999;
+  color: #999;
 }
-
 h1,
+.h1,
 h2,
-h3 {
+.h2,
+h3,
+.h3 {
   margin-top: 20px;
   margin-bottom: 10px;
 }
-
 h1 small,
+.h1 small,
 h2 small,
+.h2 small,
 h3 small,
+.h3 small,
 h1 .small,
+.h1 .small,
 h2 .small,
-h3 .small {
+.h2 .small,
+h3 .small,
+.h3 .small {
   font-size: 65%;
 }
-
 h4,
+.h4,
 h5,
-h6 {
+.h5,
+h6,
+.h6 {
   margin-top: 10px;
   margin-bottom: 10px;
 }
-
 h4 small,
+.h4 small,
 h5 small,
+.h5 small,
 h6 small,
+.h6 small,
 h4 .small,
+.h4 .small,
 h5 .small,
-h6 .small {
+.h5 .small,
+h6 .small,
+.h6 .small {
   font-size: 75%;
 }
-
 h1,
 .h1 {
   font-size: 36px;
 }
-
 h2,
 .h2 {
   font-size: 30px;
 }
-
 h3,
 .h3 {
   font-size: 24px;
 }
-
 h4,
 .h4 {
   font-size: 18px;
 }
-
 h5,
 .h5 {
   font-size: 14px;
 }
-
 h6,
 .h6 {
   font-size: 12px;
 }
-
 p {
   margin: 0 0 10px;
 }
-
 .lead {
   margin-bottom: 20px;
   font-size: 16px;
   font-weight: 200;
   line-height: 1.4;
 }
-
 @media (min-width: 768px) {
   .lead {
     font-size: 21px;
   }
 }
-
 small,
 .small {
   font-size: 85%;
 }
-
 cite {
   font-style: normal;
 }
-
+.text-left {
+  text-align: left;
+}
+.text-right {
+  text-align: right;
+}
+.text-center {
+  text-align: center;
+}
+.text-justify {
+  text-align: justify;
+}
 .text-muted {
-  color: #999999;
+  color: #999;
 }
-
 .text-primary {
   color: #428bca;
 }
-
-.text-primary:hover {
+a.text-primary:hover {
   color: #3071a9;
 }
-
+.text-success {
+  color: #3c763d;
+}
+a.text-success:hover {
+  color: #2b542c;
+}
+.text-info {
+  color: #31708f;
+}
+a.text-info:hover {
+  color: #245269;
+}
 .text-warning {
   color: #8a6d3b;
 }
-
-.text-warning:hover {
+a.text-warning:hover {
   color: #66512c;
 }
-
 .text-danger {
   color: #a94442;
 }
-
-.text-danger:hover {
+a.text-danger:hover {
   color: #843534;
 }
-
-.text-success {
-  color: #3c763d;
+.bg-primary {
+  color: #fff;
+  background-color: #428bca;
 }
-
-.text-success:hover {
-  color: #2b542c;
+a.bg-primary:hover {
+  background-color: #3071a9;
 }
-
-.text-info {
-  color: #31708f;
+.bg-success {
+  background-color: #dff0d8;
 }
-
-.text-info:hover {
-  color: #245269;
+a.bg-success:hover {
+  background-color: #c1e2b3;
 }
-
-.text-left {
-  text-align: left;
+.bg-info {
+  background-color: #d9edf7;
 }
-
-.text-right {
-  text-align: right;
+a.bg-info:hover {
+  background-color: #afd9ee;
 }
-
-.text-center {
-  text-align: center;
+.bg-warning {
+  background-color: #fcf8e3;
 }
-
-.page-header {
-  padding-bottom: 9px;
-  margin: 40px 0 20px;
-  border-bottom: 1px solid #eeeeee;
+a.bg-warning:hover {
+  background-color: #f7ecb5;
+}
+.bg-danger {
+  background-color: #f2dede;
+}
+a.bg-danger:hover {
+  background-color: #e4b9b9;
+}
+.page-header {
+  padding-bottom: 9px;
+  margin: 40px 0 20px;
+  border-bottom: 1px solid #eee;
 }
-
 ul,
 ol {
   margin-top: 0;
   margin-bottom: 10px;
 }
-
 ul ul,
 ol ul,
 ul ol,
 ol ol {
   margin-bottom: 0;
 }
-
 .list-unstyled {
   padding-left: 0;
   list-style: none;
 }
-
 .list-inline {
   padding-left: 0;
   list-style: none;
 }
-
 .list-inline > li {
   display: inline-block;
   padding-right: 5px;
   padding-left: 5px;
 }
-
 .list-inline > li:first-child {
   padding-left: 0;
 }
-
 dl {
   margin-top: 0;
   margin-bottom: 20px;
 }
-
 dt,
 dd {
   line-height: 1.428571429;
 }
-
 dt {
   font-weight: bold;
 }
-
 dd {
   margin-left: 0;
 }
-
 @media (min-width: 768px) {
   .dl-horizontal dt {
     float: left;
@@ -646,104 +617,79 @@ dd {
   .dl-horizontal dd {
     margin-left: 180px;
   }
-  .dl-horizontal dd:before,
-  .dl-horizontal dd:after {
-    display: table;
-    content: " ";
-  }
-  .dl-horizontal dd:after {
-    clear: both;
-  }
-  .dl-horizontal dd:before,
-  .dl-horizontal dd:after {
-    display: table;
-    content: " ";
-  }
-  .dl-horizontal dd:after {
-    clear: both;
-  }
 }
-
 abbr[title],
 abbr[data-original-title] {
   cursor: help;
-  border-bottom: 1px dotted #999999;
+  border-bottom: 1px dotted #999;
 }
-
 .initialism {
   font-size: 90%;
   text-transform: uppercase;
 }
-
 blockquote {
   padding: 10px 20px;
   margin: 0 0 20px;
-  border-left: 5px solid #eeeeee;
-}
-
-blockquote p {
   font-size: 17.5px;
-  font-weight: 300;
-  line-height: 1.25;
+  border-left: 5px solid #eee;
 }
-
-blockquote p:last-child {
+blockquote p:last-child,
+blockquote ul:last-child,
+blockquote ol:last-child {
   margin-bottom: 0;
 }
-
+blockquote footer,
 blockquote small,
 blockquote .small {
   display: block;
+  font-size: 80%;
   line-height: 1.428571429;
-  color: #999999;
+  color: #999;
 }
-
+blockquote footer:before,
 blockquote small:before,
 blockquote .small:before {
   content: '\2014 \00A0';
 }
-
+.blockquote-reverse,
 blockquote.pull-right {
   padding-right: 15px;
   padding-left: 0;
-  border-right: 5px solid #eeeeee;
-  border-left: 0;
-}
-
-blockquote.pull-right p,
-blockquote.pull-right small,
-blockquote.pull-right .small {
   text-align: right;
+  border-right: 5px solid #eee;
+  border-left: 0;
 }
-
+.blockquote-reverse footer:before,
+blockquote.pull-right footer:before,
+.blockquote-reverse small:before,
 blockquote.pull-right small:before,
+.blockquote-reverse .small:before,
 blockquote.pull-right .small:before {
   content: '';
 }
-
+.blockquote-reverse footer:after,
+blockquote.pull-right footer:after,
+.blockquote-reverse small:after,
 blockquote.pull-right small:after,
+.blockquote-reverse .small:after,
 blockquote.pull-right .small:after {
   content: '\00A0 \2014';
 }
-
 blockquote:before,
 blockquote:after {
   content: "";
 }
-
 address {
   margin-bottom: 20px;
   font-style: normal;
   line-height: 1.428571429;
 }
-
 code,
 kbd,
 pre,
 samp {
   font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
-
 code {
   padding: 2px 4px;
   font-size: 90%;
@@ -752,21 +698,27 @@ code {
   background-color: #f9f2f4;
   border-radius: 4px;
 }
-
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #fff;
+  background-color: #333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25);
+}
 pre {
   display: block;
   padding: 9.5px;
   margin: 0 0 10px;
   font-size: 13px;
   line-height: 1.428571429;
-  color: #333333;
+  color: #333;
   word-break: break-all;
   word-wrap: break-word;
   background-color: #f5f5f5;
-  border: 1px solid #cccccc;
+  border: 1px solid #ccc;
   border-radius: 4px;
 }
-
 pre code {
   padding: 0;
   font-size: inherit;
@@ -775,368 +727,205 @@ pre code {
   background-color: transparent;
   border-radius: 0;
 }
-
 .pre-scrollable {
   max-height: 340px;
   overflow-y: scroll;
 }
-
 .container {
   padding-right: 15px;
   padding-left: 15px;
   margin-right: auto;
   margin-left: auto;
 }
-
-.container:before,
-.container:after {
-  display: table;
-  content: " ";
-}
-
-.container:after {
-  clear: both;
-}
-
-.container:before,
-.container:after {
-  display: table;
-  content: " ";
-}
-
-.container:after {
-  clear: both;
-}
-
 @media (min-width: 768px) {
   .container {
     width: 750px;
   }
 }
-
 @media (min-width: 992px) {
   .container {
     width: 970px;
   }
 }
-
 @media (min-width: 1200px) {
   .container {
     width: 1170px;
   }
 }
-
+.container-fluid {
+  padding-right: 15px;
+  padding-left: 15px;
+  margin-right: auto;
+  margin-left: auto;
+}
 .row {
   margin-right: -15px;
   margin-left: -15px;
 }
-
-.row:before,
-.row:after {
-  display: table;
-  content: " ";
-}
-
-.row:after {
-  clear: both;
-}
-
-.row:before,
-.row:after {
-  display: table;
-  content: " ";
-}
-
-.row:after {
-  clear: both;
-}
-
-.col-xs-1,
-.col-sm-1,
-.col-md-1,
-.col-lg-1,
-.col-xs-2,
-.col-sm-2,
-.col-md-2,
-.col-lg-2,
-.col-xs-3,
-.col-sm-3,
-.col-md-3,
-.col-lg-3,
-.col-xs-4,
-.col-sm-4,
-.col-md-4,
-.col-lg-4,
-.col-xs-5,
-.col-sm-5,
-.col-md-5,
-.col-lg-5,
-.col-xs-6,
-.col-sm-6,
-.col-md-6,
-.col-lg-6,
-.col-xs-7,
-.col-sm-7,
-.col-md-7,
-.col-lg-7,
-.col-xs-8,
-.col-sm-8,
-.col-md-8,
-.col-lg-8,
-.col-xs-9,
-.col-sm-9,
-.col-md-9,
-.col-lg-9,
-.col-xs-10,
-.col-sm-10,
-.col-md-10,
-.col-lg-10,
-.col-xs-11,
-.col-sm-11,
-.col-md-11,
-.col-lg-11,
-.col-xs-12,
-.col-sm-12,
-.col-md-12,
-.col-lg-12 {
+.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
   padding-right: 15px;
   padding-left: 15px;
 }
-
-.col-xs-1,
-.col-xs-2,
-.col-xs-3,
-.col-xs-4,
-.col-xs-5,
-.col-xs-6,
-.col-xs-7,
-.col-xs-8,
-.col-xs-9,
-.col-xs-10,
-.col-xs-11,
-.col-xs-12 {
+.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 {
   float: left;
 }
-
 .col-xs-12 {
   width: 100%;
 }
-
 .col-xs-11 {
   width: 91.66666666666666%;
 }
-
 .col-xs-10 {
   width: 83.33333333333334%;
 }
-
 .col-xs-9 {
   width: 75%;
 }
-
 .col-xs-8 {
   width: 66.66666666666666%;
 }
-
 .col-xs-7 {
   width: 58.333333333333336%;
 }
-
 .col-xs-6 {
   width: 50%;
 }
-
 .col-xs-5 {
   width: 41.66666666666667%;
 }
-
 .col-xs-4 {
   width: 33.33333333333333%;
 }
-
 .col-xs-3 {
   width: 25%;
 }
-
 .col-xs-2 {
   width: 16.666666666666664%;
 }
-
 .col-xs-1 {
   width: 8.333333333333332%;
 }
-
 .col-xs-pull-12 {
   right: 100%;
 }
-
 .col-xs-pull-11 {
   right: 91.66666666666666%;
 }
-
 .col-xs-pull-10 {
   right: 83.33333333333334%;
 }
-
 .col-xs-pull-9 {
   right: 75%;
 }
-
 .col-xs-pull-8 {
   right: 66.66666666666666%;
 }
-
 .col-xs-pull-7 {
   right: 58.333333333333336%;
 }
-
 .col-xs-pull-6 {
   right: 50%;
 }
-
 .col-xs-pull-5 {
   right: 41.66666666666667%;
 }
-
 .col-xs-pull-4 {
   right: 33.33333333333333%;
 }
-
 .col-xs-pull-3 {
   right: 25%;
 }
-
 .col-xs-pull-2 {
   right: 16.666666666666664%;
 }
-
 .col-xs-pull-1 {
   right: 8.333333333333332%;
 }
-
 .col-xs-pull-0 {
   right: 0;
 }
-
 .col-xs-push-12 {
   left: 100%;
 }
-
 .col-xs-push-11 {
   left: 91.66666666666666%;
 }
-
 .col-xs-push-10 {
   left: 83.33333333333334%;
 }
-
 .col-xs-push-9 {
   left: 75%;
 }
-
 .col-xs-push-8 {
   left: 66.66666666666666%;
 }
-
 .col-xs-push-7 {
   left: 58.333333333333336%;
 }
-
 .col-xs-push-6 {
   left: 50%;
 }
-
 .col-xs-push-5 {
   left: 41.66666666666667%;
 }
-
 .col-xs-push-4 {
   left: 33.33333333333333%;
 }
-
 .col-xs-push-3 {
   left: 25%;
 }
-
 .col-xs-push-2 {
   left: 16.666666666666664%;
 }
-
 .col-xs-push-1 {
   left: 8.333333333333332%;
 }
-
 .col-xs-push-0 {
   left: 0;
 }
-
 .col-xs-offset-12 {
   margin-left: 100%;
 }
-
 .col-xs-offset-11 {
   margin-left: 91.66666666666666%;
 }
-
 .col-xs-offset-10 {
   margin-left: 83.33333333333334%;
 }
-
 .col-xs-offset-9 {
   margin-left: 75%;
 }
-
 .col-xs-offset-8 {
   margin-left: 66.66666666666666%;
 }
-
 .col-xs-offset-7 {
   margin-left: 58.333333333333336%;
 }
-
 .col-xs-offset-6 {
   margin-left: 50%;
 }
-
 .col-xs-offset-5 {
   margin-left: 41.66666666666667%;
 }
-
 .col-xs-offset-4 {
   margin-left: 33.33333333333333%;
 }
-
 .col-xs-offset-3 {
   margin-left: 25%;
 }
-
 .col-xs-offset-2 {
   margin-left: 16.666666666666664%;
 }
-
 .col-xs-offset-1 {
   margin-left: 8.333333333333332%;
 }
-
 .col-xs-offset-0 {
   margin-left: 0;
 }
-
 @media (min-width: 768px) {
-  .col-sm-1,
-  .col-sm-2,
-  .col-sm-3,
-  .col-sm-4,
-  .col-sm-5,
-  .col-sm-6,
-  .col-sm-7,
-  .col-sm-8,
-  .col-sm-9,
-  .col-sm-10,
-  .col-sm-11,
-  .col-sm-12 {
+  .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 {
     float: left;
   }
   .col-sm-12 {
@@ -1293,20 +1082,8 @@ pre code {
     margin-left: 0;
   }
 }
-
 @media (min-width: 992px) {
-  .col-md-1,
-  .col-md-2,
-  .col-md-3,
-  .col-md-4,
-  .col-md-5,
-  .col-md-6,
-  .col-md-7,
-  .col-md-8,
-  .col-md-9,
-  .col-md-10,
-  .col-md-11,
-  .col-md-12 {
+  .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 {
     float: left;
   }
   .col-md-12 {
@@ -1463,20 +1240,8 @@ pre code {
     margin-left: 0;
   }
 }
-
 @media (min-width: 1200px) {
-  .col-lg-1,
-  .col-lg-2,
-  .col-lg-3,
-  .col-lg-4,
-  .col-lg-5,
-  .col-lg-6,
-  .col-lg-7,
-  .col-lg-8,
-  .col-lg-9,
-  .col-lg-10,
-  .col-lg-11,
-  .col-lg-12 {
+  .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 {
     float: left;
   }
   .col-lg-12 {
@@ -1633,21 +1398,17 @@ pre code {
     margin-left: 0;
   }
 }
-
 table {
   max-width: 100%;
   background-color: transparent;
 }
-
 th {
   text-align: left;
 }
-
 .table {
   width: 100%;
   margin-bottom: 20px;
 }
-
 .table > thead > tr > th,
 .table > tbody > tr > th,
 .table > tfoot > tr > th,
@@ -1657,14 +1418,12 @@ th {
   padding: 8px;
   line-height: 1.428571429;
   vertical-align: top;
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
 }
-
 .table > thead > tr > th {
   vertical-align: bottom;
-  border-bottom: 2px solid #dddddd;
+  border-bottom: 2px solid #ddd;
 }
-
 .table > caption + thead > tr:first-child > th,
 .table > colgroup + thead > tr:first-child > th,
 .table > thead:first-child > tr:first-child > th,
@@ -1673,15 +1432,12 @@ th {
 .table > thead:first-child > tr:first-child > td {
   border-top: 0;
 }
-
 .table > tbody + tbody {
-  border-top: 2px solid #dddddd;
+  border-top: 2px solid #ddd;
 }
-
 .table .table {
-  background-color: #ffffff;
+  background-color: #fff;
 }
-
 .table-condensed > thead > tr > th,
 .table-condensed > tbody > tr > th,
 .table-condensed > tfoot > tr > th,
@@ -1690,128 +1446,149 @@ th {
 .table-condensed > tfoot > tr > td {
   padding: 5px;
 }
-
 .table-bordered {
-  border: 1px solid #dddddd;
+  border: 1px solid #ddd;
 }
-
 .table-bordered > thead > tr > th,
 .table-bordered > tbody > tr > th,
 .table-bordered > tfoot > tr > th,
 .table-bordered > thead > tr > td,
 .table-bordered > tbody > tr > td,
 .table-bordered > tfoot > tr > td {
-  border: 1px solid #dddddd;
+  border: 1px solid #ddd;
 }
-
 .table-bordered > thead > tr > th,
 .table-bordered > thead > tr > td {
   border-bottom-width: 2px;
 }
-
 .table-striped > tbody > tr:nth-child(odd) > td,
 .table-striped > tbody > tr:nth-child(odd) > th {
   background-color: #f9f9f9;
 }
-
 .table-hover > tbody > tr:hover > td,
 .table-hover > tbody > tr:hover > th {
   background-color: #f5f5f5;
 }
-
 table col[class*="col-"] {
   position: static;
   display: table-column;
   float: none;
 }
-
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   display: table-cell;
   float: none;
 }
-
-.table > thead > tr > .active,
-.table > tbody > tr > .active,
-.table > tfoot > tr > .active,
-.table > thead > .active > td,
-.table > tbody > .active > td,
-.table > tfoot > .active > td,
-.table > thead > .active > th,
-.table > tbody > .active > th,
-.table > tfoot > .active > th {
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
-
-.table-hover > tbody > tr > .active:hover,
-.table-hover > tbody > .active:hover > td,
-.table-hover > tbody > .active:hover > th {
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
   background-color: #e8e8e8;
 }
-
-.table > thead > tr > .success,
-.table > tbody > tr > .success,
-.table > tfoot > tr > .success,
-.table > thead > .success > td,
-.table > tbody > .success > td,
-.table > tfoot > .success > td,
-.table > thead > .success > th,
-.table > tbody > .success > th,
-.table > tfoot > .success > th {
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
   background-color: #dff0d8;
 }
-
-.table-hover > tbody > tr > .success:hover,
-.table-hover > tbody > .success:hover > td,
-.table-hover > tbody > .success:hover > th {
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-
-.table > thead > tr > .danger,
-.table > tbody > tr > .danger,
-.table > tfoot > tr > .danger,
-.table > thead > .danger > td,
-.table > tbody > .danger > td,
-.table > tfoot > .danger > td,
-.table > thead > .danger > th,
-.table > tbody > .danger > th,
-.table > tfoot > .danger > th {
-  background-color: #f2dede;
-}
-
-.table-hover > tbody > tr > .danger:hover,
-.table-hover > tbody > .danger:hover > td,
-.table-hover > tbody > .danger:hover > th {
-  background-color: #ebcccc;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-
-.table > thead > tr > .warning,
-.table > tbody > tr > .warning,
-.table > tfoot > tr > .warning,
-.table > thead > .warning > td,
-.table > tbody > .warning > td,
-.table > tfoot > .warning > td,
-.table > thead > .warning > th,
-.table > tbody > .warning > th,
-.table > tfoot > .warning > th {
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
   background-color: #fcf8e3;
 }
-
-.table-hover > tbody > tr > .warning:hover,
-.table-hover > tbody > .warning:hover > td,
-.table-hover > tbody > .warning:hover > th {
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
-
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
     margin-bottom: 15px;
     overflow-x: scroll;
     overflow-y: hidden;
-    border: 1px solid #dddddd;
-    -ms-overflow-style: -ms-autohiding-scrollbar;
     -webkit-overflow-scrolling: touch;
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+    border: 1px solid #ddd;
   }
   .table-responsive > .table {
     margin-bottom: 0;
@@ -1850,13 +1627,12 @@ table th[class*="col-"] {
     border-bottom: 0;
   }
 }
-
 fieldset {
+  min-width: 0;
   padding: 0;
   margin: 0;
   border: 0;
 }
-
 legend {
   display: block;
   width: 100%;
@@ -1864,47 +1640,38 @@ legend {
   margin-bottom: 20px;
   font-size: 21px;
   line-height: inherit;
-  color: #333333;
+  color: #333;
   border: 0;
   border-bottom: 1px solid #e5e5e5;
 }
-
 label {
   display: inline-block;
   margin-bottom: 5px;
   font-weight: bold;
 }
-
 input[type="search"] {
   -webkit-box-sizing: border-box;
      -moz-box-sizing: border-box;
           box-sizing: border-box;
 }
-
 input[type="radio"],
 input[type="checkbox"] {
   margin: 4px 0 0;
   margin-top: 1px \9;
   /* IE8-9 */
-
   line-height: normal;
 }
-
 input[type="file"] {
   display: block;
 }
-
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-
-select optgroup {
-  font-family: inherit;
-  font-size: inherit;
-  font-style: inherit;
-}
-
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
@@ -1912,21 +1679,13 @@ input[type="checkbox"]:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
-
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
-  color: #555555;
-  vertical-align: middle;
+  color: #555;
 }
-
 .form-control {
   display: block;
   width: 100%;
@@ -1934,57 +1693,51 @@ output {
   padding: 6px 12px;
   font-size: 14px;
   line-height: 1.428571429;
-  color: #555555;
-  vertical-align: middle;
-  background-color: #ffffff;
+  color: #555;
+  background-color: #fff;
   background-image: none;
-  border: 1px solid #cccccc;
+  border: 1px solid #ccc;
   border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
-          transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+          transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
-
 .form-control:focus {
   border-color: #66afe9;
   outline: 0;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+          box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
 }
-
 .form-control:-moz-placeholder {
-  color: #999999;
+  color: #999;
 }
-
 .form-control::-moz-placeholder {
-  color: #999999;
+  color: #999;
   opacity: 1;
 }
-
 .form-control:-ms-input-placeholder {
-  color: #999999;
+  color: #999;
 }
-
 .form-control::-webkit-input-placeholder {
-  color: #999999;
+  color: #999;
 }
-
 .form-control[disabled],
 .form-control[readonly],
 fieldset[disabled] .form-control {
   cursor: not-allowed;
-  background-color: #eeeeee;
+  background-color: #eee;
+  opacity: 1;
 }
-
 textarea.form-control {
   height: auto;
 }
-
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
-
 .radio,
 .checkbox {
   display: block;
@@ -1992,17 +1745,13 @@ textarea.form-control {
   padding-left: 20px;
   margin-top: 10px;
   margin-bottom: 10px;
-  vertical-align: middle;
 }
-
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
-
 .radio input[type="radio"],
 .radio-inline input[type="radio"],
 .checkbox input[type="checkbox"],
@@ -2010,12 +1759,10 @@ textarea.form-control {
   float: left;
   margin-left: -20px;
 }
-
 .radio + .radio,
 .checkbox + .checkbox {
   margin-top: -5px;
 }
-
 .radio-inline,
 .checkbox-inline {
   display: inline-block;
@@ -2025,13 +1772,11 @@ textarea.form-control {
   vertical-align: middle;
   cursor: pointer;
 }
-
 .radio-inline + .radio-inline,
 .checkbox-inline + .checkbox-inline {
   margin-top: 0;
   margin-left: 10px;
 }
-
 input[type="radio"][disabled],
 input[type="checkbox"][disabled],
 .radio[disabled],
@@ -2046,7 +1791,6 @@ fieldset[disabled] .checkbox,
 fieldset[disabled] .checkbox-inline {
   cursor: not-allowed;
 }
-
 .input-sm {
   height: 30px;
   padding: 5px 10px;
@@ -2054,16 +1798,14 @@ fieldset[disabled] .checkbox-inline {
   line-height: 1.5;
   border-radius: 3px;
 }
-
 select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
-
 .input-lg {
   height: 46px;
   padding: 10px 16px;
@@ -2071,43 +1813,82 @@ textarea.input-sm {
   line-height: 1.33;
   border-radius: 6px;
 }
-
 select.input-lg {
   height: 46px;
   line-height: 46px;
 }
-
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
-
-.has-warning .help-block,
-.has-warning .control-label,
-.has-warning .radio,
-.has-warning .checkbox,
-.has-warning .radio-inline,
-.has-warning .checkbox-inline {
-  color: #8a6d3b;
-}
-
-.has-warning .form-control {
-  border-color: #8a6d3b;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+.has-feedback {
+  position: relative;
 }
-
-.has-warning .form-control:focus {
-  border-color: #66512c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #c0a16b;
+.has-feedback .form-control {
+  padding-right: 42.5px;
+}
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  right: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #3c763d;
+}
+.has-success .form-control {
+  border-color: #3c763d;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-success .form-control:focus {
+  border-color: #2b542c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #67b168;
+}
+.has-success .input-group-addon {
+  color: #3c763d;
+  background-color: #dff0d8;
+  border-color: #3c763d;
+}
+.has-success .form-control-feedback {
+  color: #3c763d;
+}
+.has-warning .help-block,
+.has-warning .control-label,
+.has-warning .radio,
+.has-warning .checkbox,
+.has-warning .radio-inline,
+.has-warning .checkbox-inline {
+  color: #8a6d3b;
+}
+.has-warning .form-control {
+  border-color: #8a6d3b;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+}
+.has-warning .form-control:focus {
+  border-color: #66512c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #c0a16b;
 }
-
 .has-warning .input-group-addon {
   color: #8a6d3b;
   background-color: #fcf8e3;
   border-color: #8a6d3b;
 }
-
+.has-warning .form-control-feedback {
+  color: #8a6d3b;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
@@ -2116,63 +1897,33 @@ textarea.input-lg {
 .has-error .checkbox-inline {
   color: #a94442;
 }
-
 .has-error .form-control {
   border-color: #a94442;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
 }
-
 .has-error .form-control:focus {
   border-color: #843534;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ce8483;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 6px #ce8483;
 }
-
 .has-error .input-group-addon {
   color: #a94442;
   background-color: #f2dede;
   border-color: #a94442;
 }
-
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #3c763d;
-}
-
-.has-success .form-control {
-  border-color: #3c763d;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-
-.has-success .form-control:focus {
-  border-color: #2b542c;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #67b168;
-}
-
-.has-success .input-group-addon {
-  color: #3c763d;
-  background-color: #dff0d8;
-  border-color: #3c763d;
+.has-error .form-control-feedback {
+  color: #a94442;
 }
-
 .form-control-static {
   margin-bottom: 0;
 }
-
 .help-block {
   display: block;
   margin-top: 5px;
   margin-bottom: 10px;
   color: #737373;
 }
-
 @media (min-width: 768px) {
   .form-inline .form-group {
     display: inline-block;
@@ -2181,9 +1932,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
-  }
-  .form-inline select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -2191,14 +1945,17 @@ textarea.input-lg {
     padding-left: 0;
     margin-top: 0;
     margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
-
 .form-horizontal .control-label,
 .form-horizontal .radio,
 .form-horizontal .checkbox,
@@ -2208,47 +1965,26 @@ textarea.input-lg {
   margin-top: 0;
   margin-bottom: 0;
 }
-
 .form-horizontal .radio,
 .form-horizontal .checkbox {
   min-height: 27px;
 }
-
 .form-horizontal .form-group {
   margin-right: -15px;
   margin-left: -15px;
 }
-
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  display: table;
-  content: " ";
-}
-
-.form-horizontal .form-group:after {
-  clear: both;
-}
-
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  display: table;
-  content: " ";
-}
-
-.form-horizontal .form-group:after {
-  clear: both;
-}
-
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
-
 @media (min-width: 768px) {
   .form-horizontal .control-label {
     text-align: right;
   }
 }
-
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  right: 15px;
+}
 .btn {
   display: inline-block;
   padding: 6px 12px;
@@ -2260,69 +1996,61 @@ textarea.input-lg {
   white-space: nowrap;
   vertical-align: middle;
   cursor: pointer;
-  background-image: none;
-  border: 1px solid transparent;
-  border-radius: 4px;
   -webkit-user-select: none;
      -moz-user-select: none;
       -ms-user-select: none;
        -o-user-select: none;
           user-select: none;
+  background-image: none;
+  border: 1px solid transparent;
+  border-radius: 4px;
 }
-
 .btn:focus {
   outline: thin dotted;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-
 .btn:hover,
 .btn:focus {
-  color: #333333;
+  color: #333;
   text-decoration: none;
 }
-
 .btn:active,
 .btn.active {
   background-image: none;
   outline: 0;
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
-
 .btn.disabled,
 .btn[disabled],
 fieldset[disabled] .btn {
   pointer-events: none;
   cursor: not-allowed;
-  opacity: 0.65;
   filter: alpha(opacity=65);
   -webkit-box-shadow: none;
           box-shadow: none;
+  opacity: .65;
 }
-
 .btn-default {
-  color: #333333;
-  background-color: #ffffff;
-  border-color: #cccccc;
+  color: #333;
+  background-color: #fff;
+  border-color: #ccc;
 }
-
 .btn-default:hover,
 .btn-default:focus,
 .btn-default:active,
 .btn-default.active,
 .open .dropdown-toggle.btn-default {
-  color: #333333;
+  color: #333;
   background-color: #ebebeb;
   border-color: #adadad;
 }
-
 .btn-default:active,
 .btn-default.active,
 .open .dropdown-toggle.btn-default {
   background-image: none;
 }
-
 .btn-default.disabled,
 .btn-default[disabled],
 fieldset[disabled] .btn-default,
@@ -2338,37 +2066,32 @@ fieldset[disabled] .btn-default:active,
 .btn-default.disabled.active,
 .btn-default[disabled].active,
 fieldset[disabled] .btn-default.active {
-  background-color: #ffffff;
-  border-color: #cccccc;
+  background-color: #fff;
+  border-color: #ccc;
 }
-
 .btn-default .badge {
-  color: #ffffff;
-  background-color: #fff;
+  color: #fff;
+  background-color: #333;
 }
-
 .btn-primary {
-  color: #ffffff;
+  color: #fff;
   background-color: #428bca;
   border-color: #357ebd;
 }
-
 .btn-primary:hover,
 .btn-primary:focus,
 .btn-primary:active,
 .btn-primary.active,
 .open .dropdown-toggle.btn-primary {
-  color: #ffffff;
+  color: #fff;
   background-color: #3276b1;
   border-color: #285e8e;
 }
-
 .btn-primary:active,
 .btn-primary.active,
 .open .dropdown-toggle.btn-primary {
   background-image: none;
 }
-
 .btn-primary.disabled,
 .btn-primary[disabled],
 fieldset[disabled] .btn-primary,
@@ -2387,34 +2110,111 @@ fieldset[disabled] .btn-primary.active {
   background-color: #428bca;
   border-color: #357ebd;
 }
-
 .btn-primary .badge {
   color: #428bca;
   background-color: #fff;
 }
-
+.btn-success {
+  color: #fff;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
+  color: #fff;
+  background-color: #47a447;
+  border-color: #398439;
+}
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
+  background-image: none;
+}
+.btn-success.disabled,
+.btn-success[disabled],
+fieldset[disabled] .btn-success,
+.btn-success.disabled:hover,
+.btn-success[disabled]:hover,
+fieldset[disabled] .btn-success:hover,
+.btn-success.disabled:focus,
+.btn-success[disabled]:focus,
+fieldset[disabled] .btn-success:focus,
+.btn-success.disabled:active,
+.btn-success[disabled]:active,
+fieldset[disabled] .btn-success:active,
+.btn-success.disabled.active,
+.btn-success[disabled].active,
+fieldset[disabled] .btn-success.active {
+  background-color: #5cb85c;
+  border-color: #4cae4c;
+}
+.btn-success .badge {
+  color: #5cb85c;
+  background-color: #fff;
+}
+.btn-info {
+  color: #fff;
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+  color: #fff;
+  background-color: #39b3d7;
+  border-color: #269abc;
+}
+.btn-info:active,
+.btn-info.active,
+.open .dropdown-toggle.btn-info {
+  background-image: none;
+}
+.btn-info.disabled,
+.btn-info[disabled],
+fieldset[disabled] .btn-info,
+.btn-info.disabled:hover,
+.btn-info[disabled]:hover,
+fieldset[disabled] .btn-info:hover,
+.btn-info.disabled:focus,
+.btn-info[disabled]:focus,
+fieldset[disabled] .btn-info:focus,
+.btn-info.disabled:active,
+.btn-info[disabled]:active,
+fieldset[disabled] .btn-info:active,
+.btn-info.disabled.active,
+.btn-info[disabled].active,
+fieldset[disabled] .btn-info.active {
+  background-color: #5bc0de;
+  border-color: #46b8da;
+}
+.btn-info .badge {
+  color: #5bc0de;
+  background-color: #fff;
+}
 .btn-warning {
-  color: #ffffff;
+  color: #fff;
   background-color: #f0ad4e;
   border-color: #eea236;
 }
-
 .btn-warning:hover,
 .btn-warning:focus,
 .btn-warning:active,
 .btn-warning.active,
 .open .dropdown-toggle.btn-warning {
-  color: #ffffff;
+  color: #fff;
   background-color: #ed9c28;
   border-color: #d58512;
 }
-
 .btn-warning:active,
 .btn-warning.active,
 .open .dropdown-toggle.btn-warning {
   background-image: none;
 }
-
 .btn-warning.disabled,
 .btn-warning[disabled],
 fieldset[disabled] .btn-warning,
@@ -2433,34 +2233,29 @@ fieldset[disabled] .btn-warning.active {
   background-color: #f0ad4e;
   border-color: #eea236;
 }
-
 .btn-warning .badge {
   color: #f0ad4e;
   background-color: #fff;
 }
-
 .btn-danger {
-  color: #ffffff;
+  color: #fff;
   background-color: #d9534f;
   border-color: #d43f3a;
 }
-
 .btn-danger:hover,
 .btn-danger:focus,
 .btn-danger:active,
 .btn-danger.active,
 .open .dropdown-toggle.btn-danger {
-  color: #ffffff;
+  color: #fff;
   background-color: #d2322d;
   border-color: #ac2925;
 }
-
 .btn-danger:active,
 .btn-danger.active,
 .open .dropdown-toggle.btn-danger {
   background-image: none;
 }
-
 .btn-danger.disabled,
 .btn-danger[disabled],
 fieldset[disabled] .btn-danger,
@@ -2479,1028 +2274,714 @@ fieldset[disabled] .btn-danger.active {
   background-color: #d9534f;
   border-color: #d43f3a;
 }
-
 .btn-danger .badge {
   color: #d9534f;
   background-color: #fff;
 }
-
-.btn-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
+.btn-link {
+  font-weight: normal;
+  color: #428bca;
+  cursor: pointer;
+  border-radius: 0;
 }
-
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
-  color: #ffffff;
-  background-color: #47a447;
-  border-color: #398439;
+.btn-link,
+.btn-link:active,
+.btn-link[disabled],
+fieldset[disabled] .btn-link {
+  background-color: transparent;
+  -webkit-box-shadow: none;
+          box-shadow: none;
 }
-
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
-  background-image: none;
+.btn-link,
+.btn-link:hover,
+.btn-link:focus,
+.btn-link:active {
+  border-color: transparent;
 }
-
-.btn-success.disabled,
-.btn-success[disabled],
-fieldset[disabled] .btn-success,
-.btn-success.disabled:hover,
-.btn-success[disabled]:hover,
-fieldset[disabled] .btn-success:hover,
-.btn-success.disabled:focus,
-.btn-success[disabled]:focus,
-fieldset[disabled] .btn-success:focus,
-.btn-success.disabled:active,
-.btn-success[disabled]:active,
-fieldset[disabled] .btn-success:active,
-.btn-success.disabled.active,
-.btn-success[disabled].active,
-fieldset[disabled] .btn-success.active {
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-
-.btn-success .badge {
-  color: #5cb85c;
-  background-color: #fff;
-}
-
-.btn-info {
-  color: #ffffff;
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-
-.btn-info:hover,
-.btn-info:focus,
-.btn-info:active,
-.btn-info.active,
-.open .dropdown-toggle.btn-info {
-  color: #ffffff;
-  background-color: #39b3d7;
-  border-color: #269abc;
-}
-
-.btn-info:active,
-.btn-info.active,
-.open .dropdown-toggle.btn-info {
-  background-image: none;
-}
-
-.btn-info.disabled,
-.btn-info[disabled],
-fieldset[disabled] .btn-info,
-.btn-info.disabled:hover,
-.btn-info[disabled]:hover,
-fieldset[disabled] .btn-info:hover,
-.btn-info.disabled:focus,
-.btn-info[disabled]:focus,
-fieldset[disabled] .btn-info:focus,
-.btn-info.disabled:active,
-.btn-info[disabled]:active,
-fieldset[disabled] .btn-info:active,
-.btn-info.disabled.active,
-.btn-info[disabled].active,
-fieldset[disabled] .btn-info.active {
-  background-color: #5bc0de;
-  border-color: #46b8da;
-}
-
-.btn-info .badge {
-  color: #5bc0de;
-  background-color: #fff;
-}
-
-.btn-link {
-  font-weight: normal;
-  color: #428bca;
-  cursor: pointer;
-  border-radius: 0;
-}
-
-.btn-link,
-.btn-link:active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  -webkit-box-shadow: none;
-          box-shadow: none;
-}
-
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
-
 .btn-link:hover,
 .btn-link:focus {
   color: #2a6496;
   text-decoration: underline;
   background-color: transparent;
 }
-
 .btn-link[disabled]:hover,
 fieldset[disabled] .btn-link:hover,
 .btn-link[disabled]:focus,
 fieldset[disabled] .btn-link:focus {
-  color: #999999;
+  color: #999;
   text-decoration: none;
 }
-
 .btn-lg {
   padding: 10px 16px;
   font-size: 18px;
   line-height: 1.33;
   border-radius: 6px;
 }
-
 .btn-sm {
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
 }
-
 .btn-xs {
   padding: 1px 5px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
 }
-
 .btn-block {
   display: block;
   width: 100%;
   padding-right: 0;
   padding-left: 0;
 }
-
 .btn-block + .btn-block {
   margin-top: 5px;
 }
-
 input[type="submit"].btn-block,
 input[type="reset"].btn-block,
 input[type="button"].btn-block {
   width: 100%;
 }
-
 .fade {
   opacity: 0;
-  -webkit-transition: opacity 0.15s linear;
-          transition: opacity 0.15s linear;
+  -webkit-transition: opacity .15s linear;
+          transition: opacity .15s linear;
 }
-
 .fade.in {
   opacity: 1;
 }
-
 .collapse {
   display: none;
 }
-
 .collapse.in {
   display: block;
 }
-
 .collapsing {
   position: relative;
   height: 0;
   overflow: hidden;
-  -webkit-transition: height 0.35s ease;
-          transition: height 0.35s ease;
+  -webkit-transition: height .35s ease;
+          transition: height .35s ease;
 }
-
 @font-face {
   font-family: 'Glyphicons Halflings';
+
   src: url('../fonts/glyphicons-halflings-regular.eot');
-  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../fonts/glyphicons-halflings-regular.woff') format('woff'), url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
-
 .glyphicon {
   position: relative;
   top: 1px;
   display: inline-block;
   font-family: 'Glyphicons Halflings';
-  -webkit-font-smoothing: antialiased;
   font-style: normal;
   font-weight: normal;
   line-height: 1;
-  -moz-osx-font-smoothing: grayscale;
-}
 
-.glyphicon:empty {
-  width: 1em;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
 }
-
 .glyphicon-asterisk:before {
   content: "\2a";
 }
-
 .glyphicon-plus:before {
   content: "\2b";
 }
-
 .glyphicon-euro:before {
   content: "\20ac";
 }
-
 .glyphicon-minus:before {
   content: "\2212";
 }
-
 .glyphicon-cloud:before {
   content: "\2601";
 }
-
 .glyphicon-envelope:before {
   content: "\2709";
 }
-
 .glyphicon-pencil:before {
   content: "\270f";
 }
-
 .glyphicon-glass:before {
   content: "\e001";
 }
-
 .glyphicon-music:before {
   content: "\e002";
 }
-
 .glyphicon-search:before {
   content: "\e003";
 }
-
 .glyphicon-heart:before {
   content: "\e005";
 }
-
 .glyphicon-star:before {
   content: "\e006";
 }
-
 .glyphicon-star-empty:before {
   content: "\e007";
 }
-
 .glyphicon-user:before {
   content: "\e008";
 }
-
 .glyphicon-film:before {
   content: "\e009";
 }
-
 .glyphicon-th-large:before {
   content: "\e010";
 }
-
 .glyphicon-th:before {
   content: "\e011";
 }
-
 .glyphicon-th-list:before {
   content: "\e012";
 }
-
 .glyphicon-ok:before {
   content: "\e013";
 }
-
 .glyphicon-remove:before {
   content: "\e014";
 }
-
 .glyphicon-zoom-in:before {
   content: "\e015";
 }
-
 .glyphicon-zoom-out:before {
   content: "\e016";
 }
-
 .glyphicon-off:before {
   content: "\e017";
 }
-
 .glyphicon-signal:before {
   content: "\e018";
 }
-
 .glyphicon-cog:before {
   content: "\e019";
 }
-
 .glyphicon-trash:before {
   content: "\e020";
 }
-
 .glyphicon-home:before {
   content: "\e021";
 }
-
 .glyphicon-file:before {
   content: "\e022";
 }
-
 .glyphicon-time:before {
   content: "\e023";
 }
-
 .glyphicon-road:before {
   content: "\e024";
 }
-
 .glyphicon-download-alt:before {
   content: "\e025";
 }
-
 .glyphicon-download:before {
   content: "\e026";
 }
-
 .glyphicon-upload:before {
   content: "\e027";
 }
-
 .glyphicon-inbox:before {
   content: "\e028";
 }
-
 .glyphicon-play-circle:before {
   content: "\e029";
 }
-
 .glyphicon-repeat:before {
   content: "\e030";
 }
-
 .glyphicon-refresh:before {
   content: "\e031";
 }
-
 .glyphicon-list-alt:before {
   content: "\e032";
 }
-
 .glyphicon-lock:before {
   content: "\e033";
 }
-
 .glyphicon-flag:before {
   content: "\e034";
 }
-
 .glyphicon-headphones:before {
   content: "\e035";
 }
-
 .glyphicon-volume-off:before {
   content: "\e036";
 }
-
 .glyphicon-volume-down:before {
   content: "\e037";
 }
-
 .glyphicon-volume-up:before {
   content: "\e038";
 }
-
 .glyphicon-qrcode:before {
   content: "\e039";
 }
-
 .glyphicon-barcode:before {
   content: "\e040";
 }
-
 .glyphicon-tag:before {
   content: "\e041";
 }
-
 .glyphicon-tags:before {
   content: "\e042";
 }
-
 .glyphicon-book:before {
   content: "\e043";
 }
-
 .glyphicon-bookmark:before {
   content: "\e044";
 }
-
 .glyphicon-print:before {
   content: "\e045";
 }
-
 .glyphicon-camera:before {
   content: "\e046";
 }
-
 .glyphicon-font:before {
   content: "\e047";
 }
-
 .glyphicon-bold:before {
   content: "\e048";
 }
-
 .glyphicon-italic:before {
   content: "\e049";
 }
-
 .glyphicon-text-height:before {
   content: "\e050";
 }
-
 .glyphicon-text-width:before {
   content: "\e051";
 }
-
 .glyphicon-align-left:before {
   content: "\e052";
 }
-
 .glyphicon-align-center:before {
   content: "\e053";
 }
-
 .glyphicon-align-right:before {
   content: "\e054";
 }
-
 .glyphicon-align-justify:before {
   content: "\e055";
 }
-
 .glyphicon-list:before {
   content: "\e056";
 }
-
 .glyphicon-indent-left:before {
   content: "\e057";
 }
-
 .glyphicon-indent-right:before {
   content: "\e058";
 }
-
 .glyphicon-facetime-video:before {
   content: "\e059";
 }
-
 .glyphicon-picture:before {
   content: "\e060";
 }
-
 .glyphicon-map-marker:before {
   content: "\e062";
 }
-
 .glyphicon-adjust:before {
   content: "\e063";
 }
-
 .glyphicon-tint:before {
   content: "\e064";
 }
-
 .glyphicon-edit:before {
   content: "\e065";
 }
-
 .glyphicon-share:before {
   content: "\e066";
 }
-
 .glyphicon-check:before {
   content: "\e067";
 }
-
 .glyphicon-move:before {
   content: "\e068";
 }
-
 .glyphicon-step-backward:before {
   content: "\e069";
 }
-
 .glyphicon-fast-backward:before {
   content: "\e070";
 }
-
 .glyphicon-backward:before {
   content: "\e071";
 }
-
 .glyphicon-play:before {
   content: "\e072";
 }
-
 .glyphicon-pause:before {
   content: "\e073";
 }
-
 .glyphicon-stop:before {
   content: "\e074";
 }
-
 .glyphicon-forward:before {
   content: "\e075";
 }
-
 .glyphicon-fast-forward:before {
   content: "\e076";
 }
-
 .glyphicon-step-forward:before {
   content: "\e077";
 }
-
 .glyphicon-eject:before {
   content: "\e078";
 }
-
 .glyphicon-chevron-left:before {
   content: "\e079";
 }
-
 .glyphicon-chevron-right:before {
   content: "\e080";
 }
-
 .glyphicon-plus-sign:before {
   content: "\e081";
 }
-
 .glyphicon-minus-sign:before {
   content: "\e082";
 }
-
 .glyphicon-remove-sign:before {
   content: "\e083";
 }
-
 .glyphicon-ok-sign:before {
   content: "\e084";
 }
-
 .glyphicon-question-sign:before {
   content: "\e085";
 }
-
 .glyphicon-info-sign:before {
   content: "\e086";
 }
-
 .glyphicon-screenshot:before {
   content: "\e087";
 }
-
 .glyphicon-remove-circle:before {
   content: "\e088";
 }
-
 .glyphicon-ok-circle:before {
   content: "\e089";
 }
-
 .glyphicon-ban-circle:before {
   content: "\e090";
 }
-
 .glyphicon-arrow-left:before {
   content: "\e091";
 }
-
 .glyphicon-arrow-right:before {
   content: "\e092";
 }
-
 .glyphicon-arrow-up:before {
   content: "\e093";
 }
-
 .glyphicon-arrow-down:before {
   content: "\e094";
 }
-
 .glyphicon-share-alt:before {
   content: "\e095";
 }
-
 .glyphicon-resize-full:before {
   content: "\e096";
 }
-
 .glyphicon-resize-small:before {
   content: "\e097";
 }
-
 .glyphicon-exclamation-sign:before {
   content: "\e101";
 }
-
 .glyphicon-gift:before {
   content: "\e102";
 }
-
 .glyphicon-leaf:before {
   content: "\e103";
 }
-
 .glyphicon-fire:before {
   content: "\e104";
 }
-
 .glyphicon-eye-open:before {
   content: "\e105";
 }
-
 .glyphicon-eye-close:before {
   content: "\e106";
 }
-
 .glyphicon-warning-sign:before {
   content: "\e107";
 }
-
 .glyphicon-plane:before {
   content: "\e108";
 }
-
 .glyphicon-calendar:before {
   content: "\e109";
 }
-
 .glyphicon-random:before {
   content: "\e110";
 }
-
 .glyphicon-comment:before {
   content: "\e111";
 }
-
 .glyphicon-magnet:before {
   content: "\e112";
 }
-
 .glyphicon-chevron-up:before {
   content: "\e113";
 }
-
 .glyphicon-chevron-down:before {
   content: "\e114";
 }
-
 .glyphicon-retweet:before {
   content: "\e115";
 }
-
 .glyphicon-shopping-cart:before {
   content: "\e116";
 }
-
 .glyphicon-folder-close:before {
   content: "\e117";
 }
-
 .glyphicon-folder-open:before {
   content: "\e118";
 }
-
 .glyphicon-resize-vertical:before {
   content: "\e119";
 }
-
 .glyphicon-resize-horizontal:before {
   content: "\e120";
 }
-
 .glyphicon-hdd:before {
   content: "\e121";
 }
-
 .glyphicon-bullhorn:before {
   content: "\e122";
 }
-
 .glyphicon-bell:before {
   content: "\e123";
 }
-
 .glyphicon-certificate:before {
   content: "\e124";
 }
-
 .glyphicon-thumbs-up:before {
   content: "\e125";
 }
-
 .glyphicon-thumbs-down:before {
   content: "\e126";
 }
-
 .glyphicon-hand-right:before {
   content: "\e127";
 }
-
 .glyphicon-hand-left:before {
   content: "\e128";
 }
-
 .glyphicon-hand-up:before {
   content: "\e129";
 }
-
 .glyphicon-hand-down:before {
   content: "\e130";
 }
-
 .glyphicon-circle-arrow-right:before {
   content: "\e131";
 }
-
 .glyphicon-circle-arrow-left:before {
   content: "\e132";
 }
-
 .glyphicon-circle-arrow-up:before {
   content: "\e133";
 }
-
 .glyphicon-circle-arrow-down:before {
   content: "\e134";
 }
-
 .glyphicon-globe:before {
   content: "\e135";
 }
-
 .glyphicon-wrench:before {
   content: "\e136";
 }
-
 .glyphicon-tasks:before {
   content: "\e137";
 }
-
 .glyphicon-filter:before {
   content: "\e138";
 }
-
 .glyphicon-briefcase:before {
   content: "\e139";
 }
-
 .glyphicon-fullscreen:before {
   content: "\e140";
 }
-
 .glyphicon-dashboard:before {
   content: "\e141";
 }
-
 .glyphicon-paperclip:before {
   content: "\e142";
 }
-
 .glyphicon-heart-empty:before {
   content: "\e143";
 }
-
 .glyphicon-link:before {
   content: "\e144";
 }
-
 .glyphicon-phone:before {
   content: "\e145";
 }
-
 .glyphicon-pushpin:before {
   content: "\e146";
 }
-
 .glyphicon-usd:before {
   content: "\e148";
 }
-
 .glyphicon-gbp:before {
   content: "\e149";
 }
-
 .glyphicon-sort:before {
   content: "\e150";
 }
-
 .glyphicon-sort-by-alphabet:before {
   content: "\e151";
 }
-
 .glyphicon-sort-by-alphabet-alt:before {
   content: "\e152";
 }
-
 .glyphicon-sort-by-order:before {
   content: "\e153";
 }
-
 .glyphicon-sort-by-order-alt:before {
   content: "\e154";
 }
-
 .glyphicon-sort-by-attributes:before {
   content: "\e155";
 }
-
 .glyphicon-sort-by-attributes-alt:before {
   content: "\e156";
 }
-
 .glyphicon-unchecked:before {
   content: "\e157";
 }
-
 .glyphicon-expand:before {
   content: "\e158";
 }
-
 .glyphicon-collapse-down:before {
   content: "\e159";
 }
-
 .glyphicon-collapse-up:before {
   content: "\e160";
 }
-
 .glyphicon-log-in:before {
   content: "\e161";
 }
-
 .glyphicon-flash:before {
   content: "\e162";
 }
-
 .glyphicon-log-out:before {
   content: "\e163";
 }
-
 .glyphicon-new-window:before {
   content: "\e164";
 }
-
 .glyphicon-record:before {
   content: "\e165";
 }
-
 .glyphicon-save:before {
   content: "\e166";
 }
-
 .glyphicon-open:before {
   content: "\e167";
 }
-
 .glyphicon-saved:before {
   content: "\e168";
 }
-
 .glyphicon-import:before {
   content: "\e169";
 }
-
 .glyphicon-export:before {
   content: "\e170";
 }
-
 .glyphicon-send:before {
   content: "\e171";
 }
-
 .glyphicon-floppy-disk:before {
   content: "\e172";
 }
-
 .glyphicon-floppy-saved:before {
   content: "\e173";
 }
-
 .glyphicon-floppy-remove:before {
   content: "\e174";
 }
-
 .glyphicon-floppy-save:before {
   content: "\e175";
 }
-
 .glyphicon-floppy-open:before {
   content: "\e176";
 }
-
 .glyphicon-credit-card:before {
   content: "\e177";
 }
-
 .glyphicon-transfer:before {
   content: "\e178";
 }
-
 .glyphicon-cutlery:before {
   content: "\e179";
 }
-
 .glyphicon-header:before {
   content: "\e180";
 }
-
 .glyphicon-compressed:before {
   content: "\e181";
 }
-
 .glyphicon-earphone:before {
   content: "\e182";
 }
-
 .glyphicon-phone-alt:before {
   content: "\e183";
 }
-
 .glyphicon-tower:before {
   content: "\e184";
 }
-
 .glyphicon-stats:before {
   content: "\e185";
 }
-
 .glyphicon-sd-video:before {
   content: "\e186";
 }
-
 .glyphicon-hd-video:before {
   content: "\e187";
 }
-
 .glyphicon-subtitles:before {
   content: "\e188";
 }
-
 .glyphicon-sound-stereo:before {
   content: "\e189";
 }
-
 .glyphicon-sound-dolby:before {
   content: "\e190";
 }
-
 .glyphicon-sound-5-1:before {
   content: "\e191";
 }
-
 .glyphicon-sound-6-1:before {
   content: "\e192";
 }
-
 .glyphicon-sound-7-1:before {
   content: "\e193";
 }
-
 .glyphicon-copyright-mark:before {
   content: "\e194";
 }
-
 .glyphicon-registration-mark:before {
   content: "\e195";
 }
-
 .glyphicon-cloud-download:before {
   content: "\e197";
 }
-
 .glyphicon-cloud-upload:before {
   content: "\e198";
 }
-
 .glyphicon-tree-conifer:before {
   content: "\e199";
 }
-
 .glyphicon-tree-deciduous:before {
   content: "\e200";
 }
-
 .caret {
   display: inline-block;
   width: 0;
@@ -3511,15 +2992,12 @@ input[type="button"].btn-block {
   border-right: 4px solid transparent;
   border-left: 4px solid transparent;
 }
-
 .dropdown {
   position: relative;
 }
-
 .dropdown-toggle:focus {
   outline: 0;
 }
-
 .dropdown-menu {
   position: absolute;
   top: 100%;
@@ -3532,84 +3010,81 @@ input[type="button"].btn-block {
   margin: 2px 0 0;
   font-size: 14px;
   list-style: none;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 4px;
-  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
-          box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  background-color: #fff;
   background-clip: padding-box;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, .15);
+  border-radius: 4px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
+          box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
 }
-
 .dropdown-menu.pull-right {
   right: 0;
   left: auto;
 }
-
 .dropdown-menu .divider {
   height: 1px;
   margin: 9px 0;
   overflow: hidden;
   background-color: #e5e5e5;
 }
-
 .dropdown-menu > li > a {
   display: block;
   padding: 3px 20px;
   clear: both;
   font-weight: normal;
   line-height: 1.428571429;
-  color: #333333;
+  color: #333;
   white-space: nowrap;
 }
-
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
   color: #262626;
   text-decoration: none;
   background-color: #f5f5f5;
 }
-
 .dropdown-menu > .active > a,
 .dropdown-menu > .active > a:hover,
 .dropdown-menu > .active > a:focus {
-  color: #ffffff;
+  color: #fff;
   text-decoration: none;
   background-color: #428bca;
   outline: 0;
 }
-
 .dropdown-menu > .disabled > a,
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
-  color: #999999;
+  color: #999;
 }
-
 .dropdown-menu > .disabled > a:hover,
 .dropdown-menu > .disabled > a:focus {
   text-decoration: none;
   cursor: not-allowed;
   background-color: transparent;
   background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
 }
-
 .open > .dropdown-menu {
   display: block;
 }
-
 .open > a {
   outline: 0;
 }
-
+.dropdown-menu-right {
+  right: 0;
+  left: auto;
+}
+.dropdown-menu-left {
+  right: auto;
+  left: 0;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
   font-size: 12px;
   line-height: 1.428571429;
-  color: #999999;
+  color: #999;
 }
-
 .dropdown-backdrop {
   position: fixed;
   top: 0;
@@ -3618,46 +3093,43 @@ input[type="button"].btn-block {
   left: 0;
   z-index: 990;
 }
-
 .pull-right > .dropdown-menu {
   right: 0;
   left: auto;
 }
-
 .dropup .caret,
 .navbar-fixed-bottom .dropdown .caret {
+  content: "";
   border-top: 0;
   border-bottom: 4px solid;
-  content: "";
 }
-
 .dropup .dropdown-menu,
 .navbar-fixed-bottom .dropdown .dropdown-menu {
   top: auto;
   bottom: 100%;
   margin-bottom: 1px;
 }
-
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
     right: 0;
     left: auto;
   }
+  .navbar-right .dropdown-menu-left {
+    right: auto;
+    left: 0;
+  }
 }
-
 .btn-group,
 .btn-group-vertical {
   position: relative;
   display: inline-block;
   vertical-align: middle;
 }
-
 .btn-group > .btn,
 .btn-group-vertical > .btn {
   position: relative;
   float: left;
 }
-
 .btn-group > .btn:hover,
 .btn-group-vertical > .btn:hover,
 .btn-group > .btn:focus,
@@ -3668,147 +3140,106 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn.active {
   z-index: 2;
 }
-
 .btn-group > .btn:focus,
 .btn-group-vertical > .btn:focus {
   outline: none;
 }
-
 .btn-group .btn + .btn,
 .btn-group .btn + .btn-group,
 .btn-group .btn-group + .btn,
 .btn-group .btn-group + .btn-group {
   margin-left: -1px;
 }
-
-.btn-toolbar:before,
-.btn-toolbar:after {
-  display: table;
-  content: " ";
-}
-
-.btn-toolbar:after {
-  clear: both;
-}
-
-.btn-toolbar:before,
-.btn-toolbar:after {
-  display: table;
-  content: " ";
-}
-
-.btn-toolbar:after {
-  clear: both;
+.btn-toolbar {
+  margin-left: -5px;
 }
-
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: left;
 }
-
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-left: 5px;
 }
-
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
   border-radius: 0;
 }
-
 .btn-group > .btn:first-child {
   margin-left: 0;
 }
-
 .btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
-
 .btn-group > .btn:last-child:not(:first-child),
 .btn-group > .dropdown-toggle:not(:first-child) {
-  border-bottom-left-radius: 0;
   border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
-
 .btn-group > .btn-group {
   float: left;
 }
-
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-
 .btn-group > .btn-group:first-child > .btn:last-child,
 .btn-group > .btn-group:first-child > .dropdown-toggle {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
-
 .btn-group > .btn-group:last-child > .btn:first-child {
-  border-bottom-left-radius: 0;
   border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
-
 .btn-group .dropdown-toggle:active,
 .btn-group.open .dropdown-toggle {
   outline: 0;
 }
-
 .btn-group-xs > .btn {
   padding: 1px 5px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
 }
-
 .btn-group-sm > .btn {
   padding: 5px 10px;
   font-size: 12px;
   line-height: 1.5;
   border-radius: 3px;
 }
-
 .btn-group-lg > .btn {
   padding: 10px 16px;
   font-size: 18px;
   line-height: 1.33;
   border-radius: 6px;
 }
-
 .btn-group > .btn + .dropdown-toggle {
   padding-right: 8px;
   padding-left: 8px;
 }
-
 .btn-group > .btn-lg + .dropdown-toggle {
   padding-right: 12px;
   padding-left: 12px;
 }
-
 .btn-group.open .dropdown-toggle {
-  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-          box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
+          box-shadow: inset 0 3px 5px rgba(0, 0, 0, .125);
 }
-
 .btn-group.open .dropdown-toggle.btn-link {
   -webkit-box-shadow: none;
           box-shadow: none;
 }
-
 .btn .caret {
   margin-left: 0;
 }
-
 .btn-lg .caret {
   border-width: 5px 5px 0;
   border-bottom-width: 0;
 }
-
 .dropup .btn-lg .caret {
   border-width: 0 5px 5px;
 }
-
 .btn-group-vertical > .btn,
 .btn-group-vertical > .btn-group,
 .btn-group-vertical > .btn-group > .btn {
@@ -3817,31 +3248,9 @@ input[type="button"].btn-block {
   width: 100%;
   max-width: 100%;
 }
-
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  display: table;
-  content: " ";
-}
-
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  display: table;
-  content: " ";
-}
-
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
-
 .btn-group-vertical > .btn + .btn,
 .btn-group-vertical > .btn + .btn-group,
 .btn-group-vertical > .btn-group + .btn,
@@ -3849,78 +3258,65 @@ input[type="button"].btn-block {
   margin-top: -1px;
   margin-left: 0;
 }
-
 .btn-group-vertical > .btn:not(:first-child):not(:last-child) {
   border-radius: 0;
 }
-
 .btn-group-vertical > .btn:first-child:not(:last-child) {
   border-top-right-radius: 4px;
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-
 .btn-group-vertical > .btn:last-child:not(:first-child) {
+  border-top-left-radius: 0;
   border-top-right-radius: 0;
   border-bottom-left-radius: 4px;
-  border-top-left-radius: 0;
 }
-
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
-  border-top-right-radius: 0;
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
-
 .btn-group-justified {
   display: table;
   width: 100%;
-  border-collapse: separate;
   table-layout: fixed;
+  border-collapse: separate;
 }
-
 .btn-group-justified > .btn,
 .btn-group-justified > .btn-group {
   display: table-cell;
   float: none;
   width: 1%;
 }
-
 .btn-group-justified > .btn-group .btn {
   width: 100%;
 }
-
 [data-toggle="buttons"] > .btn > input[type="radio"],
 [data-toggle="buttons"] > .btn > input[type="checkbox"] {
   display: none;
 }
-
 .input-group {
   position: relative;
   display: table;
   border-collapse: separate;
 }
-
 .input-group[class*="col-"] {
   float: none;
   padding-right: 0;
   padding-left: 0;
 }
-
 .input-group .form-control {
+  float: left;
   width: 100%;
   margin-bottom: 0;
 }
-
 .input-group-lg > .form-control,
 .input-group-lg > .input-group-addon,
 .input-group-lg > .input-group-btn > .btn {
@@ -3930,20 +3326,20 @@ input[type="button"].btn-block {
   line-height: 1.33;
   border-radius: 6px;
 }
-
 select.input-group-lg > .form-control,
 select.input-group-lg > .input-group-addon,
 select.input-group-lg > .input-group-btn > .btn {
   height: 46px;
   line-height: 46px;
 }
-
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
-
 .input-group-sm > .form-control,
 .input-group-sm > .input-group-addon,
 .input-group-sm > .input-group-btn > .btn {
@@ -3953,242 +3349,195 @@ textarea.input-group-lg > .input-group-btn > .btn {
   line-height: 1.5;
   border-radius: 3px;
 }
-
 select.input-group-sm > .form-control,
 select.input-group-sm > .input-group-addon,
 select.input-group-sm > .input-group-btn > .btn {
   height: 30px;
   line-height: 30px;
 }
-
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
-
 .input-group-addon,
 .input-group-btn,
 .input-group .form-control {
   display: table-cell;
 }
-
 .input-group-addon:not(:first-child):not(:last-child),
 .input-group-btn:not(:first-child):not(:last-child),
 .input-group .form-control:not(:first-child):not(:last-child) {
   border-radius: 0;
 }
-
 .input-group-addon,
 .input-group-btn {
   width: 1%;
   white-space: nowrap;
   vertical-align: middle;
 }
-
 .input-group-addon {
   padding: 6px 12px;
   font-size: 14px;
   font-weight: normal;
   line-height: 1;
-  color: #555555;
+  color: #555;
   text-align: center;
-  background-color: #eeeeee;
-  border: 1px solid #cccccc;
+  background-color: #eee;
+  border: 1px solid #ccc;
   border-radius: 4px;
 }
-
 .input-group-addon.input-sm {
   padding: 5px 10px;
   font-size: 12px;
   border-radius: 3px;
 }
-
 .input-group-addon.input-lg {
   padding: 10px 16px;
   font-size: 18px;
   border-radius: 6px;
 }
-
 .input-group-addon input[type="radio"],
 .input-group-addon input[type="checkbox"] {
   margin-top: 0;
 }
-
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-top-right-radius: 0;
   border-bottom-right-radius: 0;
 }
-
 .input-group-addon:first-child {
   border-right: 0;
 }
-
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
-  border-bottom-left-radius: 0;
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
 }
-
 .input-group-addon:last-child {
   border-left: 0;
 }
-
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-
-.input-group-btn:first-child > .btn {
-  margin-right: -1px;
-}
-
-.input-group-btn:last-child > .btn {
-  margin-left: -1px;
-}
-
 .input-group-btn > .btn {
   position: relative;
 }
-
 .input-group-btn > .btn + .btn {
-  margin-left: -4px;
+  margin-left: -1px;
 }
-
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
-
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-left: -1px;
+}
 .nav {
   padding-left: 0;
   margin-bottom: 0;
   list-style: none;
 }
-
-.nav:before,
-.nav:after {
-  display: table;
-  content: " ";
-}
-
-.nav:after {
-  clear: both;
-}
-
-.nav:before,
-.nav:after {
-  display: table;
-  content: " ";
-}
-
-.nav:after {
-  clear: both;
-}
-
 .nav > li {
   position: relative;
   display: block;
 }
-
 .nav > li > a {
   position: relative;
   display: block;
   padding: 10px 15px;
 }
-
 .nav > li > a:hover,
 .nav > li > a:focus {
   text-decoration: none;
-  background-color: #eeeeee;
+  background-color: #eee;
 }
-
 .nav > li.disabled > a {
-  color: #999999;
+  color: #999;
 }
-
 .nav > li.disabled > a:hover,
 .nav > li.disabled > a:focus {
-  color: #999999;
+  color: #999;
   text-decoration: none;
   cursor: not-allowed;
   background-color: transparent;
 }
-
 .nav .open > a,
 .nav .open > a:hover,
 .nav .open > a:focus {
-  background-color: #eeeeee;
+  background-color: #eee;
   border-color: #428bca;
 }
-
 .nav .nav-divider {
   height: 1px;
   margin: 9px 0;
   overflow: hidden;
   background-color: #e5e5e5;
 }
-
 .nav > li > a > img {
   max-width: none;
 }
-
 .nav-tabs {
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid #ddd;
 }
-
 .nav-tabs > li {
   float: left;
   margin-bottom: -1px;
 }
-
 .nav-tabs > li > a {
   margin-right: 2px;
   line-height: 1.428571429;
   border: 1px solid transparent;
   border-radius: 4px 4px 0 0;
 }
-
 .nav-tabs > li > a:hover {
-  border-color: #eeeeee #eeeeee #dddddd;
+  border-color: #eee #eee #ddd;
 }
-
 .nav-tabs > li.active > a,
 .nav-tabs > li.active > a:hover,
 .nav-tabs > li.active > a:focus {
-  color: #555555;
+  color: #555;
   cursor: default;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
+  background-color: #fff;
+  border: 1px solid #ddd;
   border-bottom-color: transparent;
 }
-
 .nav-tabs.nav-justified {
   width: 100%;
   border-bottom: 0;
 }
-
 .nav-tabs.nav-justified > li {
   float: none;
 }
-
 .nav-tabs.nav-justified > li > a {
   margin-bottom: 5px;
   text-align: center;
 }
-
 .nav-tabs.nav-justified > .dropdown .dropdown-menu {
   top: auto;
   left: auto;
 }
-
 @media (min-width: 768px) {
   .nav-tabs.nav-justified > li {
     display: table-cell;
@@ -4198,76 +3547,62 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-bottom: 0;
   }
 }
-
 .nav-tabs.nav-justified > li > a {
   margin-right: 0;
   border-radius: 4px;
 }
-
 .nav-tabs.nav-justified > .active > a,
 .nav-tabs.nav-justified > .active > a:hover,
 .nav-tabs.nav-justified > .active > a:focus {
-  border: 1px solid #dddddd;
+  border: 1px solid #ddd;
 }
-
 @media (min-width: 768px) {
   .nav-tabs.nav-justified > li > a {
-    border-bottom: 1px solid #dddddd;
+    border-bottom: 1px solid #ddd;
     border-radius: 4px 4px 0 0;
   }
   .nav-tabs.nav-justified > .active > a,
   .nav-tabs.nav-justified > .active > a:hover,
   .nav-tabs.nav-justified > .active > a:focus {
-    border-bottom-color: #ffffff;
+    border-bottom-color: #fff;
   }
 }
-
 .nav-pills > li {
   float: left;
 }
-
 .nav-pills > li > a {
   border-radius: 4px;
 }
-
 .nav-pills > li + li {
   margin-left: 2px;
 }
-
 .nav-pills > li.active > a,
 .nav-pills > li.active > a:hover,
 .nav-pills > li.active > a:focus {
-  color: #ffffff;
+  color: #fff;
   background-color: #428bca;
 }
-
 .nav-stacked > li {
   float: none;
 }
-
 .nav-stacked > li + li {
   margin-top: 2px;
   margin-left: 0;
 }
-
 .nav-justified {
   width: 100%;
 }
-
 .nav-justified > li {
   float: none;
 }
-
 .nav-justified > li > a {
   margin-bottom: 5px;
   text-align: center;
 }
-
 .nav-justified > .dropdown .dropdown-menu {
   top: auto;
   left: auto;
 }
-
 @media (min-width: 768px) {
   .nav-justified > li {
     display: table-cell;
@@ -4277,141 +3612,68 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-bottom: 0;
   }
 }
-
 .nav-tabs-justified {
   border-bottom: 0;
 }
-
 .nav-tabs-justified > li > a {
   margin-right: 0;
   border-radius: 4px;
 }
-
 .nav-tabs-justified > .active > a,
 .nav-tabs-justified > .active > a:hover,
 .nav-tabs-justified > .active > a:focus {
-  border: 1px solid #dddddd;
+  border: 1px solid #ddd;
 }
-
 @media (min-width: 768px) {
   .nav-tabs-justified > li > a {
-    border-bottom: 1px solid #dddddd;
+    border-bottom: 1px solid #ddd;
     border-radius: 4px 4px 0 0;
   }
   .nav-tabs-justified > .active > a,
   .nav-tabs-justified > .active > a:hover,
   .nav-tabs-justified > .active > a:focus {
-    border-bottom-color: #ffffff;
+    border-bottom-color: #fff;
   }
 }
-
 .tab-content > .tab-pane {
   display: none;
 }
-
 .tab-content > .active {
   display: block;
 }
-
 .nav-tabs .dropdown-menu {
   margin-top: -1px;
-  border-top-right-radius: 0;
   border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
-
 .navbar {
   position: relative;
   min-height: 50px;
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-
-.navbar:before,
-.navbar:after {
-  display: table;
-  content: " ";
-}
-
-.navbar:after {
-  clear: both;
-}
-
-.navbar:before,
-.navbar:after {
-  display: table;
-  content: " ";
-}
-
-.navbar:after {
-  clear: both;
-}
-
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-
-.navbar-header:before,
-.navbar-header:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-header:after {
-  clear: both;
-}
-
-.navbar-header:before,
-.navbar-header:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-header:after {
-  clear: both;
-}
-
 @media (min-width: 768px) {
   .navbar-header {
     float: left;
   }
 }
-
 .navbar-collapse {
   max-height: 340px;
   padding-right: 15px;
   padding-left: 15px;
   overflow-x: visible;
-  border-top: 1px solid transparent;
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
+  border-top: 1px solid transparent;
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1);
 }
-
-.navbar-collapse:before,
-.navbar-collapse:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-collapse:after {
-  clear: both;
-}
-
-.navbar-collapse:before,
-.navbar-collapse:after {
-  display: table;
-  content: " ";
-}
-
-.navbar-collapse:after {
-  clear: both;
-}
-
 .navbar-collapse.in {
   overflow-y: auto;
 }
-
 @media (min-width: 768px) {
   .navbar-collapse {
     width: auto;
@@ -4434,32 +3696,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
     padding-left: 0;
   }
 }
-
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-right: -15px;
   margin-left: -15px;
 }
-
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-right: 0;
     margin-left: 0;
   }
 }
-
 .navbar-static-top {
   z-index: 1000;
   border-width: 0 0 1px;
 }
-
 @media (min-width: 768px) {
   .navbar-static-top {
     border-radius: 0;
   }
 }
-
 .navbar-fixed-top,
 .navbar-fixed-bottom {
   position: fixed;
@@ -4467,43 +3728,38 @@ textarea.input-group-sm > .input-group-btn > .btn {
   left: 0;
   z-index: 1030;
 }
-
 @media (min-width: 768px) {
   .navbar-fixed-top,
   .navbar-fixed-bottom {
     border-radius: 0;
   }
 }
-
 .navbar-fixed-top {
   top: 0;
   border-width: 0 0 1px;
 }
-
 .navbar-fixed-bottom {
   bottom: 0;
   margin-bottom: 0;
   border-width: 1px 0 0;
 }
-
 .navbar-brand {
   float: left;
+  height: 20px;
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
 }
-
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
-
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-left: -15px;
   }
 }
-
 .navbar-toggle {
   position: relative;
   float: right;
@@ -4516,34 +3772,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border: 1px solid transparent;
   border-radius: 4px;
 }
-
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
   height: 2px;
   border-radius: 1px;
 }
-
 .navbar-toggle .icon-bar + .icon-bar {
   margin-top: 4px;
 }
-
 @media (min-width: 768px) {
   .navbar-toggle {
     display: none;
   }
 }
-
 .navbar-nav {
   margin: 7.5px -15px;
 }
-
 .navbar-nav > li > a {
   padding-top: 10px;
   padding-bottom: 10px;
   line-height: 20px;
 }
-
 @media (max-width: 767px) {
   .navbar-nav .open .dropdown-menu {
     position: static;
@@ -4566,7 +3819,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
     background-image: none;
   }
 }
-
 @media (min-width: 768px) {
   .navbar-nav {
     float: left;
@@ -4583,7 +3835,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-right: -15px;
   }
 }
-
 @media (min-width: 768px) {
   .navbar-left {
     float: left !important;
@@ -4592,7 +3843,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
     float: right !important;
   }
 }
-
 .navbar-form {
   padding: 10px 15px;
   margin-top: 8px;
@@ -4601,10 +3851,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-left: -15px;
   border-top: 1px solid transparent;
   border-bottom: 1px solid transparent;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-          box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
+          box-shadow: inset 0 1px 0 rgba(255, 255, 255, .1), 0 1px 0 rgba(255, 255, 255, .1);
 }
-
 @media (min-width: 768px) {
   .navbar-form .form-group {
     display: inline-block;
@@ -4613,9 +3862,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
-  }
-  .navbar-form select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -4623,20 +3875,22 @@ textarea.input-group-sm > .input-group-btn > .btn {
     padding-left: 0;
     margin-top: 0;
     margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
-
 @media (max-width: 767px) {
   .navbar-form .form-group {
     margin-bottom: 5px;
   }
 }
-
 @media (min-width: 768px) {
   .navbar-form {
     width: auto;
@@ -4652,44 +3906,31 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-right: -15px;
   }
 }
-
 .navbar-nav > li > .dropdown-menu {
   margin-top: 0;
-  border-top-right-radius: 0;
   border-top-left-radius: 0;
+  border-top-right-radius: 0;
 }
-
 .navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  right: 0;
-  left: auto;
-}
-
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
 }
-
 .navbar-btn.btn-sm {
   margin-top: 10px;
   margin-bottom: 10px;
 }
-
 .navbar-btn.btn-xs {
   margin-top: 14px;
   margin-bottom: 14px;
 }
-
 .navbar-text {
   margin-top: 15px;
   margin-bottom: 15px;
 }
-
 @media (min-width: 768px) {
   .navbar-text {
     float: left;
@@ -4700,174 +3941,144 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-right: 0;
   }
 }
-
 .navbar-default {
   background-color: #f8f8f8;
   border-color: #e7e7e7;
 }
-
 .navbar-default .navbar-brand {
-  color: #777777;
+  color: #777;
 }
-
 .navbar-default .navbar-brand:hover,
 .navbar-default .navbar-brand:focus {
   color: #5e5e5e;
   background-color: transparent;
 }
-
 .navbar-default .navbar-text {
-  color: #777777;
+  color: #777;
 }
-
 .navbar-default .navbar-nav > li > a {
-  color: #777777;
+  color: #777;
 }
-
 .navbar-default .navbar-nav > li > a:hover,
 .navbar-default .navbar-nav > li > a:focus {
-  color: #333333;
+  color: #333;
   background-color: transparent;
 }
-
 .navbar-default .navbar-nav > .active > a,
 .navbar-default .navbar-nav > .active > a:hover,
 .navbar-default .navbar-nav > .active > a:focus {
-  color: #555555;
+  color: #555;
   background-color: #e7e7e7;
 }
-
 .navbar-default .navbar-nav > .disabled > a,
 .navbar-default .navbar-nav > .disabled > a:hover,
 .navbar-default .navbar-nav > .disabled > a:focus {
-  color: #cccccc;
+  color: #ccc;
   background-color: transparent;
 }
-
 .navbar-default .navbar-toggle {
-  border-color: #dddddd;
+  border-color: #ddd;
 }
-
 .navbar-default .navbar-toggle:hover,
 .navbar-default .navbar-toggle:focus {
-  background-color: #dddddd;
+  background-color: #ddd;
 }
-
 .navbar-default .navbar-toggle .icon-bar {
-  background-color: #cccccc;
+  background-color: #888;
 }
-
 .navbar-default .navbar-collapse,
 .navbar-default .navbar-form {
   border-color: #e7e7e7;
 }
-
 .navbar-default .navbar-nav > .open > a,
 .navbar-default .navbar-nav > .open > a:hover,
 .navbar-default .navbar-nav > .open > a:focus {
-  color: #555555;
+  color: #555;
   background-color: #e7e7e7;
 }
-
 @media (max-width: 767px) {
   .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #777777;
+    color: #777;
   }
   .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover,
   .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #333333;
+    color: #333;
     background-color: transparent;
   }
   .navbar-default .navbar-nav .open .dropdown-menu > .active > a,
   .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover,
   .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #555555;
+    color: #555;
     background-color: #e7e7e7;
   }
   .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a,
   .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:hover,
   .navbar-default .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #cccccc;
+    color: #ccc;
     background-color: transparent;
   }
 }
-
 .navbar-default .navbar-link {
-  color: #777777;
+  color: #777;
 }
-
 .navbar-default .navbar-link:hover {
-  color: #333333;
+  color: #333;
 }
-
 .navbar-inverse {
-  background-color: #222222;
+  background-color: #222;
   border-color: #080808;
 }
-
 .navbar-inverse .navbar-brand {
-  color: #999999;
+  color: #999;
 }
-
 .navbar-inverse .navbar-brand:hover,
 .navbar-inverse .navbar-brand:focus {
-  color: #ffffff;
+  color: #fff;
   background-color: transparent;
 }
-
 .navbar-inverse .navbar-text {
-  color: #999999;
+  color: #999;
 }
-
 .navbar-inverse .navbar-nav > li > a {
-  color: #999999;
+  color: #999;
 }
-
 .navbar-inverse .navbar-nav > li > a:hover,
 .navbar-inverse .navbar-nav > li > a:focus {
-  color: #ffffff;
+  color: #fff;
   background-color: transparent;
 }
-
 .navbar-inverse .navbar-nav > .active > a,
 .navbar-inverse .navbar-nav > .active > a:hover,
 .navbar-inverse .navbar-nav > .active > a:focus {
-  color: #ffffff;
+  color: #fff;
   background-color: #080808;
 }
-
 .navbar-inverse .navbar-nav > .disabled > a,
 .navbar-inverse .navbar-nav > .disabled > a:hover,
 .navbar-inverse .navbar-nav > .disabled > a:focus {
-  color: #444444;
+  color: #444;
   background-color: transparent;
 }
-
 .navbar-inverse .navbar-toggle {
-  border-color: #333333;
+  border-color: #333;
 }
-
 .navbar-inverse .navbar-toggle:hover,
 .navbar-inverse .navbar-toggle:focus {
-  background-color: #333333;
+  background-color: #333;
 }
-
 .navbar-inverse .navbar-toggle .icon-bar {
-  background-color: #ffffff;
+  background-color: #fff;
 }
-
 .navbar-inverse .navbar-collapse,
 .navbar-inverse .navbar-form {
   border-color: #101010;
 }
-
 .navbar-inverse .navbar-nav > .open > a,
 .navbar-inverse .navbar-nav > .open > a:hover,
 .navbar-inverse .navbar-nav > .open > a:focus {
-  color: #ffffff;
+  color: #fff;
   background-color: #080808;
 }
-
 @media (max-width: 767px) {
   .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
     border-color: #080808;
@@ -4876,35 +4087,32 @@ textarea.input-group-sm > .input-group-btn > .btn {
     background-color: #080808;
   }
   .navbar-inverse .navbar-nav .open .dropdown-menu > li > a {
-    color: #999999;
+    color: #999;
   }
   .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:hover,
   .navbar-inverse .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #ffffff;
+    color: #fff;
     background-color: transparent;
   }
   .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a,
   .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:hover,
   .navbar-inverse .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #ffffff;
+    color: #fff;
     background-color: #080808;
   }
   .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a,
   .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:hover,
   .navbar-inverse .navbar-nav .open .dropdown-menu > .disabled > a:focus {
-    color: #444444;
+    color: #444;
     background-color: transparent;
   }
 }
-
 .navbar-inverse .navbar-link {
-  color: #999999;
+  color: #999;
 }
-
 .navbar-inverse .navbar-link:hover {
-  color: #ffffff;
+  color: #fff;
 }
-
 .breadcrumb {
   padding: 8px 15px;
   margin-bottom: 20px;
@@ -4912,32 +4120,26 @@ textarea.input-group-sm > .input-group-btn > .btn {
   background-color: #f5f5f5;
   border-radius: 4px;
 }
-
 .breadcrumb > li {
   display: inline-block;
 }
-
 .breadcrumb > li + li:before {
   padding: 0 5px;
-  color: #cccccc;
+  color: #ccc;
   content: "/\00a0";
 }
-
 .breadcrumb > .active {
-  color: #999999;
+  color: #999;
 }
-
 .pagination {
   display: inline-block;
   padding-left: 0;
   margin: 20px 0;
   border-radius: 4px;
 }
-
 .pagination > li {
   display: inline;
 }
-
 .pagination > li > a,
 .pagination > li > span {
   position: relative;
@@ -4945,31 +4147,30 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   margin-left: -1px;
   line-height: 1.428571429;
+  color: #428bca;
   text-decoration: none;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
+  background-color: #fff;
+  border: 1px solid #ddd;
 }
-
 .pagination > li:first-child > a,
 .pagination > li:first-child > span {
   margin-left: 0;
-  border-bottom-left-radius: 4px;
   border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px;
 }
-
 .pagination > li:last-child > a,
 .pagination > li:last-child > span {
   border-top-right-radius: 4px;
   border-bottom-right-radius: 4px;
 }
-
 .pagination > li > a:hover,
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
-  background-color: #eeeeee;
+  color: #2a6496;
+  background-color: #eee;
+  border-color: #ddd;
 }
-
 .pagination > .active > a,
 .pagination > .active > span,
 .pagination > .active > a:hover,
@@ -4977,208 +4178,157 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > .active > a:focus,
 .pagination > .active > span:focus {
   z-index: 2;
-  color: #ffffff;
+  color: #fff;
   cursor: default;
   background-color: #428bca;
   border-color: #428bca;
 }
-
 .pagination > .disabled > span,
 .pagination > .disabled > span:hover,
 .pagination > .disabled > span:focus,
 .pagination > .disabled > a,
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
-  color: #999999;
+  color: #999;
   cursor: not-allowed;
-  background-color: #ffffff;
-  border-color: #dddddd;
+  background-color: #fff;
+  border-color: #ddd;
 }
-
 .pagination-lg > li > a,
 .pagination-lg > li > span {
   padding: 10px 16px;
   font-size: 18px;
 }
-
 .pagination-lg > li:first-child > a,
 .pagination-lg > li:first-child > span {
-  border-bottom-left-radius: 6px;
   border-top-left-radius: 6px;
+  border-bottom-left-radius: 6px;
 }
-
 .pagination-lg > li:last-child > a,
 .pagination-lg > li:last-child > span {
   border-top-right-radius: 6px;
   border-bottom-right-radius: 6px;
 }
-
 .pagination-sm > li > a,
 .pagination-sm > li > span {
   padding: 5px 10px;
   font-size: 12px;
 }
-
 .pagination-sm > li:first-child > a,
 .pagination-sm > li:first-child > span {
-  border-bottom-left-radius: 3px;
   border-top-left-radius: 3px;
+  border-bottom-left-radius: 3px;
 }
-
 .pagination-sm > li:last-child > a,
 .pagination-sm > li:last-child > span {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
 }
-
 .pager {
   padding-left: 0;
   margin: 20px 0;
   text-align: center;
   list-style: none;
 }
-
-.pager:before,
-.pager:after {
-  display: table;
-  content: " ";
-}
-
-.pager:after {
-  clear: both;
-}
-
-.pager:before,
-.pager:after {
-  display: table;
-  content: " ";
-}
-
-.pager:after {
-  clear: both;
-}
-
 .pager li {
   display: inline;
 }
-
 .pager li > a,
 .pager li > span {
   display: inline-block;
   padding: 5px 14px;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
+  background-color: #fff;
+  border: 1px solid #ddd;
   border-radius: 15px;
 }
-
 .pager li > a:hover,
 .pager li > a:focus {
   text-decoration: none;
-  background-color: #eeeeee;
+  background-color: #eee;
 }
-
 .pager .next > a,
 .pager .next > span {
   float: right;
 }
-
 .pager .previous > a,
 .pager .previous > span {
   float: left;
 }
-
 .pager .disabled > a,
 .pager .disabled > a:hover,
 .pager .disabled > a:focus,
 .pager .disabled > span {
-  color: #999999;
+  color: #999;
   cursor: not-allowed;
-  background-color: #ffffff;
+  background-color: #fff;
 }
-
 .label {
   display: inline;
   padding: .2em .6em .3em;
   font-size: 75%;
   font-weight: bold;
   line-height: 1;
-  color: #ffffff;
+  color: #fff;
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
   border-radius: .25em;
 }
-
 .label[href]:hover,
 .label[href]:focus {
-  color: #ffffff;
+  color: #fff;
   text-decoration: none;
   cursor: pointer;
 }
-
 .label:empty {
   display: none;
 }
-
 .btn .label {
   position: relative;
   top: -1px;
 }
-
 .label-default {
-  background-color: #999999;
+  background-color: #999;
 }
-
 .label-default[href]:hover,
 .label-default[href]:focus {
   background-color: #808080;
 }
-
 .label-primary {
   background-color: #428bca;
 }
-
 .label-primary[href]:hover,
 .label-primary[href]:focus {
   background-color: #3071a9;
 }
-
 .label-success {
   background-color: #5cb85c;
 }
-
 .label-success[href]:hover,
 .label-success[href]:focus {
   background-color: #449d44;
 }
-
 .label-info {
   background-color: #5bc0de;
 }
-
 .label-info[href]:hover,
 .label-info[href]:focus {
   background-color: #31b0d5;
 }
-
 .label-warning {
   background-color: #f0ad4e;
 }
-
 .label-warning[href]:hover,
 .label-warning[href]:focus {
   background-color: #ec971f;
 }
-
 .label-danger {
   background-color: #d9534f;
 }
-
 .label-danger[href]:hover,
 .label-danger[href]:focus {
   background-color: #c9302c;
 }
-
 .badge {
   display: inline-block;
   min-width: 10px;
@@ -5186,68 +4336,59 @@ textarea.input-group-sm > .input-group-btn > .btn {
   font-size: 12px;
   font-weight: bold;
   line-height: 1;
-  color: #ffffff;
+  color: #fff;
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
-  background-color: #999999;
+  background-color: #999;
   border-radius: 10px;
 }
-
 .badge:empty {
   display: none;
 }
-
 .btn .badge {
   position: relative;
   top: -1px;
 }
-
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
-  color: #ffffff;
+  color: #fff;
   text-decoration: none;
   cursor: pointer;
 }
-
 a.list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
   color: #428bca;
-  background-color: #ffffff;
+  background-color: #fff;
 }
-
 .nav-pills > li > a > .badge {
   margin-left: 3px;
 }
-
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
-  background-color: #eeeeee;
+  background-color: #eee;
 }
-
 .jumbotron h1,
 .jumbotron .h1 {
-  line-height: 1;
   color: inherit;
 }
-
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
-
 .container .jumbotron {
   border-radius: 6px;
 }
-
 .jumbotron .container {
   max-width: 100%;
 }
-
 @media screen and (min-width: 768px) {
   .jumbotron {
     padding-top: 48px;
@@ -5262,131 +4403,107 @@ a.list-group-item.active > .badge,
     font-size: 63px;
   }
 }
-
 .thumbnail {
   display: block;
   padding: 4px;
   margin-bottom: 20px;
   line-height: 1.428571429;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
+  background-color: #fff;
+  border: 1px solid #ddd;
   border-radius: 4px;
-  -webkit-transition: all 0.2s ease-in-out;
-          transition: all 0.2s ease-in-out;
+  -webkit-transition: all .2s ease-in-out;
+          transition: all .2s ease-in-out;
 }
-
 .thumbnail > img,
 .thumbnail a > img {
   display: block;
-  height: auto;
   max-width: 100%;
+  height: auto;
   margin-right: auto;
   margin-left: auto;
 }
-
 a.thumbnail:hover,
 a.thumbnail:focus,
 a.thumbnail.active {
   border-color: #428bca;
 }
-
 .thumbnail .caption {
   padding: 9px;
-  color: #333333;
+  color: #333;
 }
-
 .alert {
   padding: 15px;
   margin-bottom: 20px;
   border: 1px solid transparent;
   border-radius: 4px;
 }
-
 .alert h4 {
   margin-top: 0;
   color: inherit;
 }
-
 .alert .alert-link {
   font-weight: bold;
 }
-
 .alert > p,
 .alert > ul {
   margin-bottom: 0;
 }
-
 .alert > p + p {
   margin-top: 5px;
 }
-
 .alert-dismissable {
   padding-right: 35px;
 }
-
 .alert-dismissable .close {
   position: relative;
   top: -2px;
   right: -21px;
   color: inherit;
 }
-
 .alert-success {
   color: #3c763d;
   background-color: #dff0d8;
   border-color: #d6e9c6;
 }
-
 .alert-success hr {
   border-top-color: #c9e2b3;
 }
-
 .alert-success .alert-link {
   color: #2b542c;
 }
-
 .alert-info {
   color: #31708f;
   background-color: #d9edf7;
   border-color: #bce8f1;
 }
-
 .alert-info hr {
   border-top-color: #a6e1ec;
 }
-
 .alert-info .alert-link {
   color: #245269;
 }
-
 .alert-warning {
   color: #8a6d3b;
   background-color: #fcf8e3;
   border-color: #faebcc;
 }
-
 .alert-warning hr {
   border-top-color: #f7e1b5;
 }
-
 .alert-warning .alert-link {
   color: #66512c;
 }
-
 .alert-danger {
   color: #a94442;
   background-color: #f2dede;
   border-color: #ebccd1;
 }
-
 .alert-danger hr {
   border-top-color: #e4b9c0;
 }
-
 .alert-danger .alert-link {
   color: #843534;
 }
-
 @-webkit-keyframes progress-bar-stripes {
   from {
     background-position: 40px 0;
@@ -5395,7 +4512,6 @@ a.thumbnail.active {
     background-position: 0 0;
   }
 }
-
 @keyframes progress-bar-stripes {
   from {
     background-position: 40px 0;
@@ -5404,267 +4520,337 @@ a.thumbnail.active {
     background-position: 0 0;
   }
 }
-
 .progress {
   height: 20px;
   margin-bottom: 20px;
   overflow: hidden;
   background-color: #f5f5f5;
   border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-          box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
+          box-shadow: inset 0 1px 2px rgba(0, 0, 0, .1);
 }
-
 .progress-bar {
   float: left;
   width: 0;
   height: 100%;
   font-size: 12px;
   line-height: 20px;
-  color: #ffffff;
+  color: #fff;
   text-align: center;
   background-color: #428bca;
-  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-  -webkit-transition: width 0.6s ease;
-          transition: width 0.6s ease;
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+          box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .15);
+  -webkit-transition: width .6s ease;
+          transition: width .6s ease;
 }
-
 .progress-striped .progress-bar {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
   background-size: 40px 40px;
 }
-
 .progress.active .progress-bar {
   -webkit-animation: progress-bar-stripes 2s linear infinite;
           animation: progress-bar-stripes 2s linear infinite;
 }
-
 .progress-bar-success {
   background-color: #5cb85c;
 }
-
 .progress-striped .progress-bar-success {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
-
 .progress-bar-info {
   background-color: #5bc0de;
 }
-
 .progress-striped .progress-bar-info {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
-
 .progress-bar-warning {
   background-color: #f0ad4e;
 }
-
 .progress-striped .progress-bar-warning {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
-
 .progress-bar-danger {
   background-color: #d9534f;
 }
-
 .progress-striped .progress-bar-danger {
-  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
+  background-image:         linear-gradient(45deg, rgba(255, 255, 255, .15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, .15) 50%, rgba(255, 255, 255, .15) 75%, transparent 75%, transparent);
 }
-
 .media,
 .media-body {
   overflow: hidden;
   zoom: 1;
 }
-
 .media,
 .media .media {
   margin-top: 15px;
 }
-
 .media:first-child {
   margin-top: 0;
 }
-
 .media-object {
   display: block;
 }
-
 .media-heading {
   margin: 0 0 5px;
 }
-
 .media > .pull-left {
   margin-right: 10px;
 }
-
 .media > .pull-right {
   margin-left: 10px;
 }
-
 .media-list {
   padding-left: 0;
   list-style: none;
 }
-
 .list-group {
   padding-left: 0;
   margin-bottom: 20px;
 }
-
 .list-group-item {
   position: relative;
   display: block;
   padding: 10px 15px;
   margin-bottom: -1px;
-  background-color: #ffffff;
-  border: 1px solid #dddddd;
+  background-color: #fff;
+  border: 1px solid #ddd;
 }
-
 .list-group-item:first-child {
-  border-top-right-radius: 4px;
   border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
 }
-
 .list-group-item:last-child {
   margin-bottom: 0;
   border-bottom-right-radius: 4px;
   border-bottom-left-radius: 4px;
 }
-
 .list-group-item > .badge {
   float: right;
 }
-
 .list-group-item > .badge + .badge {
   margin-right: 5px;
 }
-
 a.list-group-item {
-  color: #555555;
+  color: #555;
 }
-
 a.list-group-item .list-group-item-heading {
-  color: #333333;
+  color: #333;
 }
-
 a.list-group-item:hover,
 a.list-group-item:focus {
   text-decoration: none;
   background-color: #f5f5f5;
 }
-
 a.list-group-item.active,
 a.list-group-item.active:hover,
 a.list-group-item.active:focus {
   z-index: 2;
-  color: #ffffff;
+  color: #fff;
   background-color: #428bca;
   border-color: #428bca;
 }
-
 a.list-group-item.active .list-group-item-heading,
 a.list-group-item.active:hover .list-group-item-heading,
 a.list-group-item.active:focus .list-group-item-heading {
   color: inherit;
 }
-
 a.list-group-item.active .list-group-item-text,
 a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #e1edf7;
 }
-
+.list-group-item-success {
+  color: #3c763d;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #3c763d;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #3c763d;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #3c763d;
+  border-color: #3c763d;
+}
+.list-group-item-info {
+  color: #31708f;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #31708f;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #31708f;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #31708f;
+  border-color: #31708f;
+}
+.list-group-item-warning {
+  color: #8a6d3b;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #8a6d3b;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #8a6d3b;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #8a6d3b;
+  border-color: #8a6d3b;
+}
+.list-group-item-danger {
+  color: #a94442;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #a94442;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #a94442;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #a94442;
+  border-color: #a94442;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
 }
-
 .list-group-item-text {
   margin-bottom: 0;
   line-height: 1.3;
 }
-
 .panel {
   margin-bottom: 20px;
-  background-color: #ffffff;
+  background-color: #fff;
   border: 1px solid transparent;
   border-radius: 4px;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: 0 1px 1px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: 0 1px 1px rgba(0, 0, 0, .05);
 }
-
 .panel-body {
   padding: 15px;
 }
-
-.panel-body:before,
-.panel-body:after {
-  display: table;
-  content: " ";
-}
-
-.panel-body:after {
-  clear: both;
-}
-
-.panel-body:before,
-.panel-body:after {
-  display: table;
-  content: " ";
-}
-
-.panel-body:after {
-  clear: both;
-}
-
 .panel > .list-group {
   margin-bottom: 0;
 }
-
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
-
 .panel > .list-group .list-group-item:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
+  border-top: 0;
 }
-
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
-
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
-
 .panel > .table,
 .panel > .table-responsive > .table {
   margin-bottom: 0;
 }
-
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-right-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
 }
-
-.panel > .table > tbody:first-child th,
-.panel > .table > tbody:first-child td {
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0;
 }
-
 .panel > .table-bordered,
 .panel > .table-responsive > .table-bordered {
   border: 0;
 }
-
 .panel > .table-bordered > thead > tr > th:first-child,
 .panel > .table-responsive > .table-bordered > thead > tr > th:first-child,
 .panel > .table-bordered > tbody > tr > th:first-child,
@@ -5679,7 +4865,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child {
   border-left: 0;
 }
-
 .panel > .table-bordered > thead > tr > th:last-child,
 .panel > .table-responsive > .table-bordered > thead > tr > th:last-child,
 .panel > .table-bordered > tbody > tr > th:last-child,
@@ -5694,7 +4879,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-right: 0;
 }
-
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -5709,176 +4907,142 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr:last-child > td {
   border-bottom: 0;
 }
-
 .panel > .table-responsive {
   margin-bottom: 0;
   border: 0;
 }
-
 .panel-heading {
   padding: 10px 15px;
   border-bottom: 1px solid transparent;
-  border-top-right-radius: 3px;
   border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
 }
-
 .panel-heading > .dropdown .dropdown-toggle {
   color: inherit;
 }
-
 .panel-title {
   margin-top: 0;
   margin-bottom: 0;
   font-size: 16px;
   color: inherit;
 }
-
 .panel-title > a {
   color: inherit;
 }
-
 .panel-footer {
   padding: 10px 15px;
   background-color: #f5f5f5;
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
-
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   overflow: hidden;
   border-radius: 4px;
 }
-
 .panel-group .panel + .panel {
   margin-top: 5px;
 }
-
 .panel-group .panel-heading {
   border-bottom: 0;
 }
-
 .panel-group .panel-heading + .panel-collapse .panel-body {
-  border-top: 1px solid #dddddd;
+  border-top: 1px solid #ddd;
 }
-
 .panel-group .panel-footer {
   border-top: 0;
 }
-
 .panel-group .panel-footer + .panel-collapse .panel-body {
-  border-bottom: 1px solid #dddddd;
+  border-bottom: 1px solid #ddd;
 }
-
 .panel-default {
-  border-color: #dddddd;
+  border-color: #ddd;
 }
-
 .panel-default > .panel-heading {
-  color: #333333;
+  color: #333;
   background-color: #f5f5f5;
-  border-color: #dddddd;
+  border-color: #ddd;
 }
-
 .panel-default > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #dddddd;
+  border-top-color: #ddd;
 }
-
 .panel-default > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #dddddd;
+  border-bottom-color: #ddd;
 }
-
 .panel-primary {
   border-color: #428bca;
 }
-
 .panel-primary > .panel-heading {
-  color: #ffffff;
+  color: #fff;
   background-color: #428bca;
   border-color: #428bca;
 }
-
 .panel-primary > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #428bca;
 }
-
 .panel-primary > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #428bca;
 }
-
 .panel-success {
   border-color: #d6e9c6;
 }
-
 .panel-success > .panel-heading {
   color: #3c763d;
   background-color: #dff0d8;
   border-color: #d6e9c6;
 }
-
 .panel-success > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #d6e9c6;
 }
-
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
-
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #31708f;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
-
 .panel-warning > .panel-heading {
   color: #8a6d3b;
   background-color: #fcf8e3;
   border-color: #faebcc;
 }
-
 .panel-warning > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #faebcc;
 }
-
 .panel-warning > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #faebcc;
 }
-
 .panel-danger {
   border-color: #ebccd1;
 }
-
 .panel-danger > .panel-heading {
   color: #a94442;
   background-color: #f2dede;
   border-color: #ebccd1;
 }
-
 .panel-danger > .panel-heading + .panel-collapse .panel-body {
   border-top-color: #ebccd1;
 }
-
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-
-.panel-info {
-  border-color: #bce8f1;
-}
-
-.panel-info > .panel-heading {
-  color: #31708f;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
-
 .well {
   min-height: 20px;
   padding: 19px;
@@ -5886,241 +5050,196 @@ a.list-group-item.active:focus .list-group-item-text {
   background-color: #f5f5f5;
   border: 1px solid #e3e3e3;
   border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05);
 }
-
 .well blockquote {
   border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
+  border-color: rgba(0, 0, 0, .15);
 }
-
 .well-lg {
   padding: 24px;
   border-radius: 6px;
 }
-
 .well-sm {
   padding: 9px;
   border-radius: 3px;
 }
-
 .close {
   float: right;
   font-size: 21px;
   font-weight: bold;
   line-height: 1;
-  color: #000000;
-  text-shadow: 0 1px 0 #ffffff;
-  opacity: 0.2;
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
   filter: alpha(opacity=20);
+  opacity: .2;
 }
-
 .close:hover,
 .close:focus {
-  color: #000000;
+  color: #000;
   text-decoration: none;
   cursor: pointer;
-  opacity: 0.5;
   filter: alpha(opacity=50);
+  opacity: .5;
 }
-
 button.close {
+  -webkit-appearance: none;
   padding: 0;
   cursor: pointer;
   background: transparent;
   border: 0;
-  -webkit-appearance: none;
 }
-
 .modal-open {
   overflow: hidden;
 }
-
 .modal {
   position: fixed;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1040;
+  z-index: 1050;
   display: none;
   overflow: auto;
   overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
-
 .modal.fade .modal-dialog {
+  -webkit-transition: -webkit-transform .3s ease-out;
+     -moz-transition:    -moz-transform .3s ease-out;
+       -o-transition:      -o-transform .3s ease-out;
+          transition:         transform .3s ease-out;
   -webkit-transform: translate(0, -25%);
       -ms-transform: translate(0, -25%);
           transform: translate(0, -25%);
-  -webkit-transition: -webkit-transform 0.3s ease-out;
-     -moz-transition: -moz-transform 0.3s ease-out;
-       -o-transition: -o-transform 0.3s ease-out;
-          transition: transform 0.3s ease-out;
 }
-
 .modal.in .modal-dialog {
   -webkit-transform: translate(0, 0);
       -ms-transform: translate(0, 0);
           transform: translate(0, 0);
 }
-
 .modal-dialog {
   position: relative;
-  z-index: 1050;
   width: auto;
   margin: 10px;
 }
-
 .modal-content {
   position: relative;
-  background-color: #ffffff;
-  border: 1px solid #999999;
-  border: 1px solid rgba(0, 0, 0, 0.2);
+  background-color: #fff;
+  background-clip: padding-box;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, .2);
   border-radius: 6px;
   outline: none;
-  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
-          box-shadow: 0 3px 9px rgba(0, 0, 0, 0.5);
-  background-clip: padding-box;
+  -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
+          box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
 }
-
 .modal-backdrop {
   position: fixed;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1030;
-  background-color: #000000;
+  z-index: 1040;
+  background-color: #000;
 }
-
 .modal-backdrop.fade {
-  opacity: 0;
   filter: alpha(opacity=0);
+  opacity: 0;
 }
-
 .modal-backdrop.in {
-  opacity: 0.5;
   filter: alpha(opacity=50);
+  opacity: .5;
 }
-
 .modal-header {
   min-height: 16.428571429px;
   padding: 15px;
   border-bottom: 1px solid #e5e5e5;
 }
-
 .modal-header .close {
   margin-top: -2px;
 }
-
 .modal-title {
   margin: 0;
   line-height: 1.428571429;
 }
-
 .modal-body {
   position: relative;
   padding: 20px;
 }
-
 .modal-footer {
   padding: 19px 20px 20px;
   margin-top: 15px;
   text-align: right;
   border-top: 1px solid #e5e5e5;
 }
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  content: " ";
+.modal-footer .btn + .btn {
+  margin-bottom: 0;
+  margin-left: 5px;
 }
-
-.modal-footer:after {
-  clear: both;
-}
-
-.modal-footer:before,
-.modal-footer:after {
-  display: table;
-  content: " ";
-}
-
-.modal-footer:after {
-  clear: both;
-}
-
-.modal-footer .btn + .btn {
-  margin-bottom: 0;
-  margin-left: 5px;
-}
-
 .modal-footer .btn-group .btn + .btn {
   margin-left: -1px;
 }
-
 .modal-footer .btn-block + .btn-block {
   margin-left: 0;
 }
-
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
     margin: 30px auto;
   }
   .modal-content {
-    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
-            box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+    -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+            box-shadow: 0 5px 15px rgba(0, 0, 0, .5);
+  }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
   }
 }
-
 .tooltip {
   position: absolute;
   z-index: 1030;
   display: block;
   font-size: 12px;
   line-height: 1.4;
-  opacity: 0;
-  filter: alpha(opacity=0);
   visibility: visible;
+  filter: alpha(opacity=0);
+  opacity: 0;
 }
-
 .tooltip.in {
-  opacity: 0.9;
   filter: alpha(opacity=90);
+  opacity: .9;
 }
-
 .tooltip.top {
   padding: 5px 0;
   margin-top: -3px;
 }
-
 .tooltip.right {
   padding: 0 5px;
   margin-left: 3px;
 }
-
 .tooltip.bottom {
   padding: 5px 0;
   margin-top: 3px;
 }
-
 .tooltip.left {
   padding: 0 5px;
   margin-left: -3px;
 }
-
 .tooltip-inner {
   max-width: 200px;
   padding: 3px 8px;
-  color: #ffffff;
+  color: #fff;
   text-align: center;
   text-decoration: none;
-  background-color: #000000;
+  background-color: #000;
   border-radius: 4px;
 }
-
 .tooltip-arrow {
   position: absolute;
   width: 0;
@@ -6128,67 +5247,58 @@ button.close {
   border-color: transparent;
   border-style: solid;
 }
-
 .tooltip.top .tooltip-arrow {
   bottom: 0;
   left: 50%;
   margin-left: -5px;
-  border-top-color: #000000;
   border-width: 5px 5px 0;
+  border-top-color: #000;
 }
-
 .tooltip.top-left .tooltip-arrow {
   bottom: 0;
   left: 5px;
-  border-top-color: #000000;
   border-width: 5px 5px 0;
+  border-top-color: #000;
 }
-
 .tooltip.top-right .tooltip-arrow {
   right: 5px;
   bottom: 0;
-  border-top-color: #000000;
   border-width: 5px 5px 0;
+  border-top-color: #000;
 }
-
 .tooltip.right .tooltip-arrow {
   top: 50%;
   left: 0;
   margin-top: -5px;
-  border-right-color: #000000;
   border-width: 5px 5px 5px 0;
+  border-right-color: #000;
 }
-
 .tooltip.left .tooltip-arrow {
   top: 50%;
   right: 0;
   margin-top: -5px;
-  border-left-color: #000000;
   border-width: 5px 0 5px 5px;
+  border-left-color: #000;
 }
-
 .tooltip.bottom .tooltip-arrow {
   top: 0;
   left: 50%;
   margin-left: -5px;
-  border-bottom-color: #000000;
   border-width: 0 5px 5px;
+  border-bottom-color: #000;
 }
-
 .tooltip.bottom-left .tooltip-arrow {
   top: 0;
   left: 5px;
-  border-bottom-color: #000000;
   border-width: 0 5px 5px;
+  border-bottom-color: #000;
 }
-
 .tooltip.bottom-right .tooltip-arrow {
   top: 0;
   right: 5px;
-  border-bottom-color: #000000;
   border-width: 0 5px 5px;
+  border-bottom-color: #000;
 }
-
 .popover {
   position: absolute;
   top: 0;
@@ -6199,31 +5309,26 @@ button.close {
   padding: 1px;
   text-align: left;
   white-space: normal;
-  background-color: #ffffff;
-  border: 1px solid #cccccc;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 6px;
-  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  background-color: #fff;
   background-clip: padding-box;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, .2);
+  border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, .2);
 }
-
 .popover.top {
   margin-top: -10px;
 }
-
 .popover.right {
   margin-left: 10px;
 }
-
 .popover.bottom {
   margin-top: 10px;
 }
-
 .popover.left {
   margin-left: -10px;
 }
-
 .popover-title {
   padding: 8px 14px;
   margin: 0;
@@ -6234,11 +5339,9 @@ button.close {
   border-bottom: 1px solid #ebebeb;
   border-radius: 5px 5px 0 0;
 }
-
 .popover-content {
   padding: 9px 14px;
 }
-
 .popover .arrow,
 .popover .arrow:after {
   position: absolute;
@@ -6248,147 +5351,124 @@ button.close {
   border-color: transparent;
   border-style: solid;
 }
-
 .popover .arrow {
   border-width: 11px;
 }
-
 .popover .arrow:after {
-  border-width: 10px;
   content: "";
+  border-width: 10px;
 }
-
 .popover.top .arrow {
   bottom: -11px;
   left: 50%;
   margin-left: -11px;
-  border-top-color: #999999;
-  border-top-color: rgba(0, 0, 0, 0.25);
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, .25);
   border-bottom-width: 0;
 }
-
 .popover.top .arrow:after {
   bottom: 1px;
   margin-left: -10px;
-  border-top-color: #ffffff;
-  border-bottom-width: 0;
   content: " ";
+  border-top-color: #fff;
+  border-bottom-width: 0;
 }
-
 .popover.right .arrow {
   top: 50%;
   left: -11px;
   margin-top: -11px;
-  border-right-color: #999999;
-  border-right-color: rgba(0, 0, 0, 0.25);
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, .25);
   border-left-width: 0;
 }
-
 .popover.right .arrow:after {
   bottom: -10px;
   left: 1px;
-  border-right-color: #ffffff;
-  border-left-width: 0;
   content: " ";
+  border-right-color: #fff;
+  border-left-width: 0;
 }
-
 .popover.bottom .arrow {
   top: -11px;
   left: 50%;
   margin-left: -11px;
-  border-bottom-color: #999999;
-  border-bottom-color: rgba(0, 0, 0, 0.25);
   border-top-width: 0;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, .25);
 }
-
 .popover.bottom .arrow:after {
   top: 1px;
   margin-left: -10px;
-  border-bottom-color: #ffffff;
-  border-top-width: 0;
   content: " ";
+  border-top-width: 0;
+  border-bottom-color: #fff;
 }
-
 .popover.left .arrow {
   top: 50%;
   right: -11px;
   margin-top: -11px;
-  border-left-color: #999999;
-  border-left-color: rgba(0, 0, 0, 0.25);
   border-right-width: 0;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, .25);
 }
-
 .popover.left .arrow:after {
   right: 1px;
   bottom: -10px;
-  border-left-color: #ffffff;
-  border-right-width: 0;
   content: " ";
+  border-right-width: 0;
+  border-left-color: #fff;
 }
-
 .carousel {
   position: relative;
 }
-
 .carousel-inner {
   position: relative;
   width: 100%;
   overflow: hidden;
 }
-
 .carousel-inner > .item {
   position: relative;
   display: none;
-  -webkit-transition: 0.6s ease-in-out left;
-          transition: 0.6s ease-in-out left;
+  -webkit-transition: .6s ease-in-out left;
+          transition: .6s ease-in-out left;
 }
-
 .carousel-inner > .item > img,
 .carousel-inner > .item > a > img {
   display: block;
-  height: auto;
   max-width: 100%;
+  height: auto;
   line-height: 1;
 }
-
 .carousel-inner > .active,
 .carousel-inner > .next,
 .carousel-inner > .prev {
   display: block;
 }
-
 .carousel-inner > .active {
   left: 0;
 }
-
 .carousel-inner > .next,
 .carousel-inner > .prev {
   position: absolute;
   top: 0;
   width: 100%;
 }
-
 .carousel-inner > .next {
   left: 100%;
 }
-
 .carousel-inner > .prev {
   left: -100%;
 }
-
 .carousel-inner > .next.left,
 .carousel-inner > .prev.right {
   left: 0;
 }
-
 .carousel-inner > .active.left {
   left: -100%;
 }
-
 .carousel-inner > .active.right {
   left: 100%;
 }
-
 .carousel-control {
   position: absolute;
   top: 0;
@@ -6396,38 +5476,34 @@ button.close {
   left: 0;
   width: 15%;
   font-size: 20px;
-  color: #ffffff;
+  color: #fff;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
-  opacity: 0.5;
+  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
   filter: alpha(opacity=50);
+  opacity: .5;
 }
-
 .carousel-control.left {
-  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0), color-stop(rgba(0, 0, 0, 0.0001) 100%));
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0, rgba(0, 0, 0, 0.0001) 100%);
-  background-repeat: repeat-x;
+  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .5) 0%), color-stop(rgba(0, 0, 0, .0001) 100%));
+  background-image:         linear-gradient(to right, rgba(0, 0, 0, .5) 0%, rgba(0, 0, 0, .0001) 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1);
+  background-repeat: repeat-x;
 }
-
 .carousel-control.right {
   right: 0;
   left: auto;
-  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0), color-stop(rgba(0, 0, 0, 0.5) 100%));
-  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0, rgba(0, 0, 0, 0.5) 100%);
-  background-repeat: repeat-x;
+  background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, .0001) 0%), color-stop(rgba(0, 0, 0, .5) 100%));
+  background-image:         linear-gradient(to right, rgba(0, 0, 0, .0001) 0%, rgba(0, 0, 0, .5) 100%);
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1);
+  background-repeat: repeat-x;
 }
-
 .carousel-control:hover,
 .carousel-control:focus {
-  color: #ffffff;
+  color: #fff;
   text-decoration: none;
-  outline: none;
-  opacity: 0.9;
   filter: alpha(opacity=90);
+  outline: none;
+  opacity: .9;
 }
-
 .carousel-control .icon-prev,
 .carousel-control .icon-next,
 .carousel-control .glyphicon-chevron-left,
@@ -6437,17 +5513,14 @@ button.close {
   z-index: 5;
   display: inline-block;
 }
-
 .carousel-control .icon-prev,
 .carousel-control .glyphicon-chevron-left {
   left: 50%;
 }
-
 .carousel-control .icon-next,
 .carousel-control .glyphicon-chevron-right {
   right: 50%;
 }
-
 .carousel-control .icon-prev,
 .carousel-control .icon-next {
   width: 20px;
@@ -6456,15 +5529,12 @@ button.close {
   margin-left: -10px;
   font-family: serif;
 }
-
 .carousel-control .icon-prev:before {
   content: '\2039';
 }
-
 .carousel-control .icon-next:before {
   content: '\203a';
 }
-
 .carousel-indicators {
   position: absolute;
   bottom: 10px;
@@ -6476,7 +5546,6 @@ button.close {
   text-align: center;
   list-style: none;
 }
-
 .carousel-indicators li {
   display: inline-block;
   width: 10px;
@@ -6486,17 +5555,15 @@ button.close {
   cursor: pointer;
   background-color: #000 \9;
   background-color: rgba(0, 0, 0, 0);
-  border: 1px solid #ffffff;
+  border: 1px solid #fff;
   border-radius: 10px;
 }
-
 .carousel-indicators .active {
   width: 12px;
   height: 12px;
   margin: 0;
-  background-color: #ffffff;
+  background-color: #fff;
 }
-
 .carousel-caption {
   position: absolute;
   right: 15%;
@@ -6505,15 +5572,13 @@ button.close {
   z-index: 10;
   padding-top: 20px;
   padding-bottom: 20px;
-  color: #ffffff;
+  color: #fff;
   text-align: center;
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.6);
+  text-shadow: 0 1px 2px rgba(0, 0, 0, .6);
 }
-
 .carousel-caption .btn {
   text-shadow: none;
 }
-
 @media screen and (min-width: 768px) {
   .carousel-control .glyphicons-chevron-left,
   .carousel-control .glyphicons-chevron-right,
@@ -6534,43 +5599,73 @@ button.close {
     bottom: 20px;
   }
 }
-
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   display: table;
   content: " ";
 }
-
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
-
 .center-block {
   display: block;
   margin-right: auto;
   margin-left: auto;
 }
-
 .pull-right {
   float: right !important;
 }
-
 .pull-left {
   float: left !important;
 }
-
 .hide {
   display: none !important;
 }
-
 .show {
   display: block !important;
 }
-
 .invisible {
   visibility: hidden;
 }
-
 .text-hide {
   font: 0/0 a;
   color: transparent;
@@ -6578,27 +5673,22 @@ button.close {
   background-color: transparent;
   border: 0;
 }
-
 .hidden {
   display: none !important;
   visibility: hidden !important;
 }
-
 .affix {
   position: fixed;
 }
-
 @-ms-viewport {
   width: device-width;
 }
-
 .visible-xs,
 tr.visible-xs,
 th.visible-xs,
 td.visible-xs {
   display: none !important;
 }
-
 @media (max-width: 767px) {
   .visible-xs {
     display: block !important;
@@ -6614,78 +5704,12 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  table.visible-xs.visible-sm {
-    display: table;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  table.visible-xs.visible-md {
-    display: table;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  table.visible-xs.visible-lg {
-    display: table;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
-
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  table.visible-sm.visible-xs {
-    display: table;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
-
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
@@ -6701,78 +5725,12 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  table.visible-sm.visible-md {
-    display: table;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  table.visible-sm.visible-lg {
-    display: table;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
-
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  table.visible-md.visible-xs {
-    display: table;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  table.visible-md.visible-sm {
-    display: table;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
-
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
@@ -6788,78 +5746,12 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  table.visible-md.visible-lg {
-    display: table;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
-
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  table.visible-lg.visible-xs {
-    display: table;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  table.visible-lg.visible-sm {
-    display: table;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  table.visible-lg.visible-md {
-    display: table;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
-
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
@@ -6875,24 +5767,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-
-.hidden-xs {
-  display: block !important;
-}
-
-table.hidden-xs {
-  display: table;
-}
-
-tr.hidden-xs {
-  display: table-row !important;
-}
-
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
-
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -6901,60 +5775,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-
-.hidden-sm {
-  display: block !important;
-}
-
-table.hidden-sm {
-  display: table;
-}
-
-tr.hidden-sm {
-  display: table-row !important;
-}
-
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
-
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -6963,60 +5783,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-
-.hidden-md {
-  display: block !important;
-}
-
-table.hidden-md {
-  display: table;
-}
-
-tr.hidden-md {
-  display: table-row !important;
-}
-
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
-
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -7025,60 +5791,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-
-.hidden-lg {
-  display: block !important;
-}
-
-table.hidden-lg {
-  display: table;
-}
-
-tr.hidden-lg {
-  display: table-row !important;
-}
-
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
-
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -7087,14 +5799,12 @@ td.hidden-lg {
     display: none !important;
   }
 }
-
 .visible-print,
 tr.visible-print,
 th.visible-print,
 td.visible-print {
   display: none !important;
 }
-
 @media print {
   .visible-print {
     display: block !important;
@@ -7109,10 +5819,13 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
   td.hidden-print {
     display: none !important;
   }
-}
\ No newline at end of file
+}
+/*# sourceMappingURL=bootstrap.css.map */
diff --git a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.css.map b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.css.map
new file mode 100644
index 0000000..e1836ba
--- /dev/null
+++ b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.css.map
@@ -0,0 +1 @@
+{"version":3,"sources":["less/normalize.less","less/print.less","less/scaffolding.less","less/mixins.less","less/variables.less","less/type.less","less/code.less","less/grid.less","less/tables.less","less/forms.less","less/buttons.less","less/component-animations.less","less/glyphicons.less","less/dropdowns.less","less/button-groups.less","less/input-groups.less","less/navs.less","less/navbar.less","less/utilities.less","less/breadcrumbs.less","less/pagination.less","less/pager.less","less/labels.less","less/badges.less","less/jumbotron.less","less/thumbnails.less","less/alerts.less","less/progress-bars.less","less/media.less","less/list-group.less","less/panels.less","less/wells.less","less/close.less","less/modals.less","less/tooltip.less","less/popovers.less","less/carousel.less","less/responsive-utilities.less"],"names":[],"mappings":";AAQA;EACE,uBAAA;EACA,0BAAA;EACA,8BAAA;;AAOF;EACE,SAAA;;AAUF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACE,cAAA;;AAQF;AACA;AACA;AACA;EACE,qBAAA;EACA,wBAAA;;AAQF,KAAK,IAAI;EACP,aAAA;EACA,SAAA;;AAQF;AACA;EACE,aAAA;;AAUF;EACE,uBAAA;;AAOF,CAAC;AACD,CAAC;EACC,UAAA;;AAUF,IAAI;EACF,yBAAA;;AAOF;AACA;EACE,iBAAA;;AAOF;EACE,kBAAA;;AAQF;EACE,cAAA;EACA,gBAAA;;AAOF;EACE,gBAAA;EACA,WAAA;;AAOF;EACE,cAAA;;AAOF;AACA;EACE,cAAA;EACA,cAAA;EACA,kBAAA;EACA,wBAAA;;AAGF;EACE,WAAA;;AAGF;EACE,eAAA;;AAUF;EACE,SAAA;;AAOF,GAAG,IAAI;EACL,gBAAA;;AAUF;EACE,gBAAA;;AAOF;EACE,4BAAA;EACA,uBAAA;EACA,SAAA;;AAOF;EACE,cAAA;;AAOF;AACA;AACA;AACA;EACE,iCAAA;EACA,cAAA;;AAkBF;AACA;AACA;AACA;AACA;EACE,cAAA;EACA,aAAA;EACA,SAAA;;AAOF;EACE,iBAAA;;AAUF;AACA;EACE,oBAAA;;AAWF;AACA,IAAK,MAAK;AACV,KAAK;AACL,KAAK;EACH,0BAAA;EACA,eAAA;;AAOF,MAAM;AACN,IAAK,MAAK;EACR,eAAA;;AAOF,MAAM;AACN,KAAK;EACH,SAAA;EACA,UAAA;;AAQF;EACE,mBAAA;;AAWF,KAAK;AACL,KAAK;EACH,sBAAA;EACA,UAAA;;AASF,KAAK,eAAe;AACpB,KAAK,eAAe;EAClB,YAAA;;AASF,KAAK;EACH,6BAAA;EACA,4BAAA;EACA,+BAAA;EACA,uBAAA;;AASF,KAAK,eAAe;AACpB,KAAK,eAAe;EAClB,wBAAA;;AAOF;EACE,yBAAA;EACA,aAAA;EACA,8BAAA;;AAQF;EACE,SAAA;EACA,UAAA;;AAOF;EACE,cAAA;;AAQF;EACE,iBAAA;;AAUF;EACE,yBAAA;EACA,iBAAA;;AAGF;AACA;EACE,UAAA;;AChUF;EA9FE;IACE,4BAAA;IACA,sBAAA;IACA,kCAAA;IACA,2BAAA;;EAGF;EACA,CAAC;IACC,0BAAA;;EAGF,CAAC,MAAM;IACL,SAAS,KAAK,WAAW,GAAzB;;EAGF,IAAI,OAAO;IACT,SAAS,KAAK,YAAY,GAA1B;;EAIF,CAAC,qBAAqB;EACtB,CAAC,WAAW;IACV,SAAS,EAAT;;EAGF;EACA;IACE,sBAAA;IACA,wBAAA;;EAGF;IACE,2BAAA;;EAGF;EACA;IACE,wBAAA;;EAGF;IACE,0BAAA;;EAGF;EACA;EACA;IACE,UAAA;IACA,SAAA;;EAGF;EACA;IACE,uBAAA;;EAKF;IACE,2BAAA;;EAIF;IACE,aAAA;;EAEF,MACE;EADF,MAEE;IACE,iCAAA;;EAGJ,IAEE;EADF,OAAQ,OACN;IACE,iCAAA;;EAGJ;IACE,sBAAA;;EAGF;IACE,oCAAA;;EAEF,eACE;EADF,eAEE;IACE,iCAAA;;;ACtFN;EC0OE,8BAAA;EACG,2BAAA;EACK,sBAAA;;ADzOV,CAAC;AACD,CAAC;ECsOC,8BAAA;EACG,2BAAA;EACK,sBAAA;;ADjOV;EACE,gBAAA;EACA,6CAAA;;AAGF;EACE,aEcwB,8CFdxB;EACA,eAAA;EACA,wBAAA;EACA,cAAA;EACA,yBAAA;;AAIF;AACA;AACA;AACA;EACE,oBAAA;EACA,kBAAA;EACA,oBAAA;;AAMF;EACE,cAAA;EACA,qBAAA;;AAEA,CAAC;AACD,CAAC;EACC,cAAA;EACA,0BAAA;;AAGF,CAAC;ECzBD,oBAAA;EAEA,0CAAA;EACA,oBAAA;;ADiCF;EACE,SAAA;;AAMF;EACE,sBAAA;;AAIF;ECiTE,cAAA;EACA,eAAA;EACA,YAAA;;AD9SF;EACE,kBAAA;;AAMF;EACE,YAAA;EACA,wBAAA;EACA,yBAAA;EACA,yBAAA;EACA,kBAAA;EC+BA,wCAAA;EACQ,gCAAA;EAgQR,qBAAA;EACA,eAAA;EACA,YAAA;;AD1RF;EACE,kBAAA;;AAMF;EACE,gBAAA;EACA,mBAAA;EACA,SAAA;EACA,6BAAA;;AAQF;EACE,kBAAA;EACA,UAAA;EACA,WAAA;EACA,YAAA;EACA,UAAA;EACA,gBAAA;EACA,MAAM,gBAAN;EACA,SAAA;;AG5HF;AAAI;AAAI;AAAI;AAAI;AAAI;AACpB;AAAK;AAAK;AAAK;AAAK;AAAK;EACvB,oBAAA;EACA,gBAAA;EACA,gBAAA;EACA,cAAA;;AALF,EAOE;AAPE,EAOF;AAPM,EAON;AAPU,EAOV;AAPc,EAOd;AAPkB,EAOlB;AANF,GAME;AANG,GAMH;AANQ,GAMR;AANa,GAMb;AANkB,GAMlB;AANuB,GAMvB;AAPF,EAQE;AARE,EAQF;AARM,EAQN;AARU,EAQV;AARc,EAQd;AARkB,EAQlB;AAPF,GAOE;AAPG,GAOH;AAPQ,GAOR;AAPa,GAOb;AAPkB,GAOlB;AAPuB,GAOvB;EACE,mBAAA;EACA,cAAA;EACA,cAAA;;AAIJ;AAAI;AACJ;AAAI;AACJ;AAAI;EACF,gBAAA;EACA,mBAAA;;AAJF,EAME;AANE,GAMF;AALF,EAKE;AALE,GAKF;AAJF,EAIE;AAJE,GAIF;AANF,EAOE;AAPE,GAOF;AANF,EAME;AANE,GAMF;AALF,EAKE;AALE,GAKF;EACE,cAAA;;AAGJ;AAAI;AACJ;AAAI;AACJ;AAAI;EACF,gBAAA;EACA,mBAAA;;AAJF,EAME;AANE,GAMF;AALF,EAKE;AALE,GAKF;AAJF,EAIE;AAJE,GAIF;AANF,EAOE;AAPE,GAOF;AANF,EAME;AANE,GAMF;AALF,EAKE;AALE,GAKF;EACE,cAAA;;AAIJ;AAAI;EAAM,eAAA;;AACV;AAAI;EAAM,eAAA;;AACV;AAAI;EAAM,eAAA;;AACV;AAAI;EAAM,eAAA;;AACV;AAAI;EAAM,eAAA;;AACV;AAAI;EAAM,eAAA;;AAMV;EACE,gBAAA;;AAGF;EACE,mBAAA;EACA,eAAA;EACA,gBAAA;EACA,gBAAA;;AAKF,QAHqC;EAGrC;IAFI,eAAA;;;AASJ;AACA;EAAU,cAAA;;AAGV;EAAU,kBAAA;;AAGV;EAAuB,gBAAA;;AACvB;EAAuB,iBAAA;;AACvB;EAAuB,kBAAA;;AACvB;EAAuB,mBAAA;;AAGvB;EACE,cAAA;;AAEF;EFsfE,cAAA;;AACA,CAAC,aAAC;EACA,cAAA;;AErfJ;EFmfE,cAAA;;AACA,CAAC,aAAC;EACA,cAAA;;AElfJ;EFgfE,cAAA;;AACA,CAAC,UAAC;EACA,cAAA;;AE/eJ;EF6eE,cAAA;;AACA,CAAC,aAAC;EACA,cAAA;;AE5eJ;EF0eE,cAAA;;AACA,CAAC,YAAC;EACA,cAAA;;AEreJ;EAGE,WAAA;EFudA,yBAAA;;AACA,CAAC,WAAC;EACA,yBAAA;;AEtdJ;EFodE,yBAAA;;AACA,CAAC,WAAC;EACA,yBAAA;;AEndJ;EFidE,yBAAA;;AACA,CAAC,QAAC;EACA,yBAAA;;AEhdJ;EF8cE,yBAAA;;AACA,CAAC,WAAC;EACA,yBAAA;;AE7cJ;EF2cE,yBAAA;;AACA,CAAC,UAAC;EACA,yBAAA;;AErcJ;EACE,mBAAA;EACA,mBAAA;EACA,gCAAA;;AAQF;AACA;EACE,aAAA;EACA,mBAAA;;AAHF,EAIE;AAHF,EAGE;AAJF,EAKE;AAJF,EAIE;EACE,gBAAA;;AAOJ;EACE,eAAA;EACA,gBAAA;;AAIF;EALE,eAAA;EACA,gBAAA;;AAIF,YAGE;EACE,qBAAA;EACA,iBAAA;EACA,kBAAA;;AAEA,YALF,KAKG;EACC,eAAA;;AAMN;EACE,aAAA;EACA,mBAAA;;AAEF;AACA;EACE,wBAAA;;AAEF;EACE,iBAAA;;AAEF;EACE,cAAA;;AAwBF,QAhB2C;EACzC,cACE;IACE,WAAA;IACA,YAAA;IACA,WAAA;IACA,iBAAA;IF5IJ,gBAAA;IACA,uBAAA;IACA,mBAAA;;EEqIA,cAQE;IACE,kBAAA;;;AAUN,IAAI;AAEJ,IAAI;EACF,YAAA;EACA,iCAAA;;AAEF;EACE,cAAA;EACA,yBAAA;;AAIF;EACE,kBAAA;EACA,gBAAA;EACA,iBAAA;EACA,8BAAA;;AAKE,UAHF,EAGG;AAAD,UAFF,GAEG;AAAD,UADF,GACG;EACC,gBAAA;;AAVN,UAgBE;AAhBF,UAiBE;AAjBF,UAkBE;EACE,cAAA;EACA,cAAA;EACA,wBAAA;EACA,cAAA;;AAEA,UARF,OAQG;AAAD,UAPF,MAOG;AAAD,UANF,OAMG;EACC,SAAS,aAAT;;AAQN;AACA,UAAU;EACR,mBAAA;EACA,eAAA;EACA,+BAAA;EACA,cAAA;EACA,iBAAA;;AAME,mBAHF,OAGG;AAAD,UAXM,WAQR,OAGG;AAAD,mBAFF,MAEG;AAAD,UAXM,WASR,MAEG;AAAD,mBADF,OACG;AAAD,UAXM,WAUR,OACG;EAAU,SAAS,EAAT;;AACX,mBAJF,OAIG;AAAD,UAZM,WAQR,OAIG;AAAD,mBAHF,MAGG;AAAD,UAZM,WASR,MAGG;AAAD,mBAFF,OAEG;AAAD,UAZM,WAUR,OAEG;EACC,SAAS,aAAT;;AAMN,UAAU;AACV,UAAU;EACR,SAAS,EAAT;;AAIF;EACE,mBAAA;EACA,kBAAA;EACA,wBAAA;;AChSF;AACA;AACA;AACA;EACE,sCFkCiD,wBElCjD;;AAIF;EACE,gBAAA;EACA,cAAA;EACA,cAAA;EACA,yBAAA;EACA,mBAAA;EACA,kBAAA;;AAIF;EACE,gBAAA;EACA,cAAA;EACA,cAAA;EACA,yBAAA;EACA,kBAAA;EACA,8CAAA;;AAIF;EACE,cAAA;EACA,cAAA;EACA,gBAAA;EACA,eAAA;EACA,wBAAA;EACA,qBAAA;EACA,qBAAA;EACA,cAAA;EACA,yBAAA;EACA,yBAAA;EACA,kBAAA;;AAXF,GAcE;EACE,UAAA;EACA,kBAAA;EACA,cAAA;EACA,qBAAA;EACA,6BAAA;EACA,gBAAA;;AAKJ;EACE,iBAAA;EACA,kBAAA;;ACpDF;EJ0nBE,kBAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;;AIvnBA,QAHmC;EAGnC;IAFE,YAAA;;;AAKF,QAHmC;EAGnC;IAFE,YAAA;;;AAKJ,QAHqC;EAGrC;IAFI,aAAA;;;AAUJ;EJsmBE,kBAAA;EACA,iBAAA;EACA,kBAAA;EACA,mBAAA;;AIhmBF;EJsmBE,kBAAA;EACA,mBAAA;;AAqIE;EACE,kBAAA;EAEA,eAAA;EAEA,kBAAA;EACA,mBAAA;;AAgBF;EACE,WAAA;;AAOJ,KAAK,EAAQ,CAAC;EACZ,WAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,yBAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,yBAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,UAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,yBAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,0BAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,UAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,yBAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,yBAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,UAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,0BAAA;;AADF,KAAK,EAAQ,CAAC;EACZ,yBAAA;;AASF,KAAK,EAAQ,MAAM;EACjB,WAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,UAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,0BAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,UAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,UAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,0BAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,SAAA;;AANF,KAAK,EAAQ,MAAM;EACjB,UAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,wBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,wBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,SAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,wBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,SAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,wBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,wBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,SAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,yBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,wBAAA;;AADF,KAAK,EAAQ,MAAM;EACjB,QAAA;;AASF,KAAK,EAAQ,QAAQ;EACnB,iBAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,+BAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,+BAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,gBAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,+BAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,gCAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,gBAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,+BAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,+BAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,gBAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,gCAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,+BAAA;;AADF,KAAK,EAAQ,QAAQ;EACnB,eAAA;;AIpvBJ,QATmC;EJquB/B;IACE,WAAA;;EAOJ,KAAK,EAAQ,CAAC;IACZ,WAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,0BAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,0BAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EASF,KAAK,EAAQ,MAAM;IACjB,WAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,0BAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,0BAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EANF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,QAAA;;EASF,KAAK,EAAQ,QAAQ;IACnB,iBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gCAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gCAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,eAAA;;;AIvuBJ,QATmC;EJwtB/B;IACE,WAAA;;EAOJ,KAAK,EAAQ,CAAC;IACZ,WAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,0BAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,0BAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EASF,KAAK,EAAQ,MAAM;IACjB,WAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,0BAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,0BAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EANF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,QAAA;;EASF,KAAK,EAAQ,QAAQ;IACnB,iBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gCAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gCAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,eAAA;;;AI5tBJ,QAPmC;EJ2sB/B;IACE,WAAA;;EAOJ,KAAK,EAAQ,CAAC;IACZ,WAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,0BAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,UAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,0BAAA;;EADF,KAAK,EAAQ,CAAC;IACZ,yBAAA;;EASF,KAAK,EAAQ,MAAM;IACjB,WAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,0BAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,0BAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EANF,KAAK,EAAQ,MAAM;IACjB,UAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,SAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,yBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,wBAAA;;EADF,KAAK,EAAQ,MAAM;IACjB,QAAA;;EASF,KAAK,EAAQ,QAAQ;IACnB,iBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gCAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gBAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,gCAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,+BAAA;;EADF,KAAK,EAAQ,QAAQ;IACnB,eAAA;;;AK3zBJ;EACE,eAAA;EACA,6BAAA;;AAEF;EACE,gBAAA;;AAMF;EACE,WAAA;EACA,mBAAA;;AAFF,MAIE,QAGE,KACE;AARN,MAKE,QAEE,KACE;AARN,MAME,QACE,KACE;AARN,MAIE,QAGE,KAEE;AATN,MAKE,QAEE,KAEE;AATN,MAME,QACE,KAEE;EACE,YAAA;EACA,wBAAA;EACA,mBAAA;EACA,6BAAA;;AAbR,MAkBE,QAAQ,KAAK;EACX,sBAAA;EACA,gCAAA;;AApBJ,MAuBE,UAAU,QAGR,KAAI,YACF;AA3BN,MAwBE,WAAW,QAET,KAAI,YACF;AA3BN,MAyBE,QAAO,YACL,KAAI,YACF;AA3BN,MAuBE,UAAU,QAGR,KAAI,YAEF;AA5BN,MAwBE,WAAW,QAET,KAAI,YAEF;AA5BN,MAyBE,QAAO,YACL,KAAI,YAEF;EACE,aAAA;;AA7BR,MAkCE,QAAQ;EACN,6BAAA;;AAnCJ,MAuCE;EACE,yBAAA;;AAOJ,gBACE,QAGE,KACE;AALN,gBAEE,QAEE,KACE;AALN,gBAGE,QACE,KACE;AALN,gBACE,QAGE,KAEE;AANN,gBAEE,QAEE,KAEE;AANN,gBAGE,QACE,KAEE;EACE,YAAA;;AAWR;EACE,yBAAA;;AADF,eAEE,QAGE,KACE;AANN,eAGE,QAEE,KACE;AANN,eAIE,QACE,KACE;AANN,eAEE,QAGE,KAEE;AAPN,eAGE,QAEE,KAEE;AAPN,eAIE,QACE,KAEE;EACE,yBAAA;;AARR,eAYE,QAAQ,KACN;AAbJ,eAYE,QAAQ,KAEN;EACE,wBAAA;;AAUN,cACE,QAAQ,KAAI,UAAU,KACpB;AAFJ,cACE,QAAQ,KAAI,UAAU,KAEpB;EACE,yBAAA;;AAUN,YACE,QAAQ,KAAI,MACV;AAFJ,YACE,QAAQ,KAAI,MAEV;EACE,yBAAA;;AAUN,KAAM,IAAG;EACP,gBAAA;EACA,WAAA;EACA,qBAAA;;AAKE,KAFF,GAEG;AAAD,KADF,GACG;EACC,gBAAA;EACA,WAAA;EACA,mBAAA;;AL4SJ,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AADP,MAAO,QAAQ,KACb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAIb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AACL,MALK,QAAQ,KAKZ,CAAC,MAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,MAAS;AAAX,MAHK,QAAQ,KAGZ,CAAC,MAAS;AACX,MANK,QAAQ,KAMZ,CAAC,MAAS;AAAX,MALK,QAAQ,KAKZ,CAAC,MAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,MAAS;EACT,yBAAA;;AAMJ,YAAa,QAAQ,KACnB,KAAI,CAAC,MAAQ;AADf,YAAa,QAAQ,KAEnB,KAAI,CAAC,MAAQ;AACb,YAHW,QAAQ,KAGlB,CAAC,MAAQ,MAAO;AACjB,YAJW,QAAQ,KAIlB,CAAC,MAAQ,MAAO;EACf,yBAAA;;AAlBJ,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AADP,MAAO,QAAQ,KACb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAIb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AACL,MALK,QAAQ,KAKZ,CAAC,OAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,OAAS;AAAX,MAHK,QAAQ,KAGZ,CAAC,OAAS;AACX,MANK,QAAQ,KAMZ,CAAC,OAAS;AAAX,MALK,QAAQ,KAKZ,CAAC,OAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,OAAS;EACT,yBAAA;;AAMJ,YAAa,QAAQ,KACnB,KAAI,CAAC,OAAQ;AADf,YAAa,QAAQ,KAEnB,KAAI,CAAC,OAAQ;AACb,YAHW,QAAQ,KAGlB,CAAC,OAAQ,MAAO;AACjB,YAJW,QAAQ,KAIlB,CAAC,OAAQ,MAAO;EACf,yBAAA;;AAlBJ,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AADP,MAAO,QAAQ,KACb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAIb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AACL,MALK,QAAQ,KAKZ,CAAC,IAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,IAAS;AAAX,MAHK,QAAQ,KAGZ,CAAC,IAAS;AACX,MANK,QAAQ,KAMZ,CAAC,IAAS;AAAX,MALK,QAAQ,KAKZ,CAAC,IAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,IAAS;EACT,yBAAA;;AAMJ,YAAa,QAAQ,KACnB,KAAI,CAAC,IAAQ;AADf,YAAa,QAAQ,KAEnB,KAAI,CAAC,IAAQ;AACb,YAHW,QAAQ,KAGlB,CAAC,IAAQ,MAAO;AACjB,YAJW,QAAQ,KAIlB,CAAC,IAAQ,MAAO;EACf,yBAAA;;AAlBJ,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AADP,MAAO,QAAQ,KACb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAIb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AACL,MALK,QAAQ,KAKZ,CAAC,OAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,OAAS;AAAX,MAHK,QAAQ,KAGZ,CAAC,OAAS;AACX,MANK,QAAQ,KAMZ,CAAC,OAAS;AAAX,MALK,QAAQ,KAKZ,CAAC,OAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,OAAS;EACT,yBAAA;;AAMJ,YAAa,QAAQ,KACnB,KAAI,CAAC,OAAQ;AADf,YAAa,QAAQ,KAEnB,KAAI,CAAC,OAAQ;AACb,YAHW,QAAQ,KAGlB,CAAC,OAAQ,MAAO;AACjB,YAJW,QAAQ,KAIlB,CAAC,OAAQ,MAAO;EACf,yBAAA;;AAlBJ,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AADP,MAAO,QAAQ,KACb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAIb,KAAI,CAAC;AAHP,MAAO,QAAQ,KAGb,KAAI,CAAC;AAFP,MAAO,QAAQ,KAEb,KAAI,CAAC;AACL,MALK,QAAQ,KAKZ,CAAC,MAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,MAAS;AAAX,MAHK,QAAQ,KAGZ,CAAC,MAAS;AACX,MANK,QAAQ,KAMZ,CAAC,MAAS;AAAX,MALK,QAAQ,KAKZ,CAAC,MAAS;AAAX,MAJK,QAAQ,KAIZ,CAAC,MAAS;EACT,yBAAA;;AAMJ,YAAa,QAAQ,KACnB,KAAI,CAAC,MAAQ;AADf,YAAa,QAAQ,KAEnB,KAAI,CAAC,MAAQ;AACb,YAHW,QAAQ,KAGlB,CAAC,MAAQ,MAAO;AACjB,YAJW,QAAQ,KAIlB,CAAC,MAAQ,MAAO;EACf,yBAAA;;AKtON,QA/DmC;EACjC;IACE,WAAA;IACA,mBAAA;IACA,kBAAA;IACA,kBAAA;IACA,4CAAA;IACA,yBAAA;IACA,iCAAA;;EAPF,iBAUE;IACE,gBAAA;;EAXJ,iBAUE,SAIE,QAGE,KACE;EAlBR,iBAUE,SAKE,QAEE,KACE;EAlBR,iBAUE,SAME,QACE,KACE;EAlBR,iBAUE,SAIE,QAGE,KAEE;EAnBR,iBAUE,SAKE,QAEE,KAEE;EAnBR,iBAUE,SAME,QACE,KAEE;IACE,mBAAA;;EApBV,iBA2BE;IACE,SAAA;;EA5BJ,iBA2BE,kBAIE,QAGE,KACE,KAAI;EAnCZ,iBA2BE,kBAKE,QAEE,KACE,KAAI;EAnCZ,iBA2BE,kBAME,QACE,KACE,KAAI;EAnCZ,iBA2BE,kBAIE,QAGE,KAEE,KAAI;EApCZ,iBA2BE,kBAKE,QAEE,KAEE,KAAI;EApCZ,iBA2BE,kBAME,QACE,KAEE,KAAI;IACF,cAAA;;EArCV,iBA2BE,kBAIE,QAGE,KAKE,KAAI;EAvCZ,iBA2BE,kBAKE,QAEE,KAKE,KAAI;EAvCZ,iBA2BE,kBAME,QACE,KAKE,KAAI;EAvCZ,iBA2BE,kBAIE,QAGE,KAME,KAAI;EAxCZ,iBA2BE,kBAKE,QAEE,KAME,KAAI;EAxCZ,iBA2BE,kBAME,QACE,KAME,KAAI;IACF,eAAA;;EAzCV,iBA2BE,kBAsBE,QAEE,KAAI,WACF;EApDR,iBA2BE,kBAuBE,QACE,KAAI,WACF;EApDR,iBA2BE,kBAsBE,QAEE,KAAI,WAEF;EArDR,iBA2BE,kBAuBE,QACE,KAAI,WAEF;IACE,gBAAA;;;ACxNZ;EACE,UAAA;EACA,SAAA;EACA,SAAA;EAIA,YAAA;;AAGF;EACE,cAAA;EACA,WAAA;EACA,UAAA;EACA,mBAAA;EACA,eAAA;EACA,oBAAA;EACA,cAAA;EACA,SAAA;EACA,gCAAA;;AAGF;EACE,qBAAA;EACA,kBAAA;EACA,iBAAA;;AAWF,KAAK;ENuMH,8BAAA;EACG,2BAAA;EACK,sBAAA;;AMpMV,KAAK;AACL,KAAK;EACH,eAAA;EACA,kBAAA;;EACA,mBAAA;;AAIF,KAAK;EACH,cAAA;;AAIF,KAAK;EACH,cAAA;EACA,WAAA;;AAIF,MAAM;AACN,MAAM;EACJ,YAAA;;AAIF,KAAK,aAAa;AAClB,KAAK,cAAc;AACnB,KAAK,iBAAiB;EN7CpB,oBAAA;EAEA,0CAAA;EACA,oBAAA;;AM+CF;EACE,cAAA;EACA,gBAAA;EACA,eAAA;EACA,wBAAA;EACA,cAAA;;AA0BF;EACE,cAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,eAAA;EACA,wBAAA;EACA,cAAA;EACA,yBAAA;EACA,sBAAA;EACA,yBAAA;EACA,kBAAA;ENFA,wDAAA;EACQ,gDAAA;EAKR,8EAAA;EACQ,sEAAA;;AA+vBR,aAAC;EACC,qBAAA;EACA,UAAA;EAxwBF,sFAAA;EACQ,8EAAA;;AAnER,aAAC;EAA+B,cAAA;;AAChC,aAAC;EAA+B,cAAA;EACA,UAAA;;AAChC,aAAC;EAA+B,cAAA;;AAChC,aAAC;EAA+B,cAAA;;AM8EhC,aAAC;AACD,aAAC;AACD,QAAQ,UAAW;EACjB,mBAAA;EACA,yBAAA;EACA,UAAA;;AAIF,QAAQ;EACN,YAAA;;AAQJ,KAAK;EACH,iBAAA;;AASF;EACE,mBAAA;;AAQF;AACA;EACE,cAAA;EACA,gBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;;AANF,MAOE;AANF,SAME;EACE,eAAA;EACA,mBAAA;EACA,eAAA;;AAGJ,MAAO,MAAK;AACZ,aAAc,MAAK;AACnB,SAAU,MAAK;AACf,gBAAiB,MAAK;EACpB,WAAA;EACA,kBAAA;;AAEF,MAAO;AACP,SAAU;EACR,gBAAA;;AAIF;AACA;EACE,qBAAA;EACA,kBAAA;EACA,gBAAA;EACA,sBAAA;EACA,mBAAA;EACA,eAAA;;AAEF,aAAc;AACd,gBAAiB;EACf,aAAA;EACA,iBAAA;;AAYA,KANG,cAMF;AAAD,KALG,iBAKF;AAAD,MAAC;AAAD,aAAC;AAAD,SAAC;AAAD,gBAAC;AACD,QAAQ,UAAW,MAPhB;AAOH,QAAQ,UAAW,MANhB;AAMH,QAAQ,UAAW;AAAnB,QAAQ,UAAW;AAAnB,QAAQ,UAAW;AAAnB,QAAQ,UAAW;EACjB,mBAAA;;AAUJ;ENiqBE,YAAA;EACA,iBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AAEA,MAAM;EACJ,YAAA;EACA,iBAAA;;AAGF,QAAQ;AACR,MAAM,UAAU;EACd,YAAA;;AM1qBJ;EN6pBE,YAAA;EACA,kBAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;;AAEA,MAAM;EACJ,YAAA;EACA,iBAAA;;AAGF,QAAQ;AACR,MAAM,UAAU;EACd,YAAA;;AMjqBJ;EAEE,kBAAA;;AAFF,aAKE;EACE,qBAAA;;AANJ,aAUE;EACE,kBAAA;EACA,SAAA;EACA,QAAA;EACA,cAAA;EACA,WAAA;EACA,YAAA;EACA,iBAAA;EACA,kBAAA;;AAKJ,YNkkBE;AMlkBF,YNmkBE;AMnkBF,YNokBE;AMpkBF,YNqkBE;AMrkBF,YNskBE;AMtkBF,YNukBE;EACE,cAAA;;AMxkBJ,YN2kBE;EACE,qBAAA;EAnuBF,wDAAA;EACQ,gDAAA;;AAouBN,YAHF,cAGG;EACC,qBAAA;EAtuBJ,yEAAA;EACQ,iEAAA;;AMsJV,YNqlBE;EACE,cAAA;EACA,qBAAA;EACA,yBAAA;;AMxlBJ,YN2lBE;EACE,cAAA;;AMzlBJ,YN+jBE;AM/jBF,YNgkBE;AMhkBF,YNikBE;AMjkBF,YNkkBE;AMlkBF,YNmkBE;AMnkBF,YNokBE;EACE,cAAA;;AMrkBJ,YNwkBE;EACE,qBAAA;EAnuBF,wDAAA;EACQ,gDAAA;;AAouBN,YAHF,cAGG;EACC,qBAAA;EAtuBJ,yEAAA;EACQ,iEAAA;;AMyJV,YNklBE;EACE,cAAA;EACA,qBAAA;EACA,yBAAA;;AMrlBJ,YNwlBE;EACE,cAAA;;AMtlBJ,UN4jBE;AM5jBF,UN6jBE;AM7jBF,UN8jBE;AM9jBF,UN+jBE;AM/jBF,UNgkBE;AMhkBF,UNikBE;EACE,cAAA;;AMlkBJ,UNqkBE;EACE,qBAAA;EAnuBF,wDAAA;EACQ,gDAAA;;AAouBN,UAHF,cAGG;EACC,qBAAA;EAtuBJ,yEAAA;EACQ,iEAAA;;AM4JV,UN+kBE;EACE,cAAA;EACA,qBAAA;EACA,yBAAA;;AMllBJ,UNqlBE;EACE,cAAA;;AM5kBJ;EACE,gBAAA;;AASF;EACE,cAAA;EACA,eAAA;EACA,mBAAA;EACA,cAAA;;AAgEF,QA7CqC;EA6CrC,YA3CI;IACE,qBAAA;IACA,gBAAA;IACA,sBAAA;;EAwCN,YApCI;IACE,qBAAA;IACA,WAAA;IACA,sBAAA;;EAiCN,YA9BI;IACE,gBAAA;IACA,sBAAA;;EA4BN,YAtBI;EAsBJ,YArBI;IACE,qBAAA;IACA,aAAA;IACA,gBAAA;IACA,eAAA;IACA,sBAAA;;EAgBN,YAdI,OAAO,MAAK;EAchB,YAbI,UAAU,MAAK;IACb,WAAA;IACA,cAAA;;EAWN,YAJI,cAAc;IACZ,MAAA;;;AAWN,gBAGE;AAHF,gBAIE;AAJF,gBAKE;AALF,gBAME;AANF,gBAOE;EACE,aAAA;EACA,gBAAA;EACA,gBAAA;;AAVJ,gBAcE;AAdF,gBAeE;EACE,gBAAA;;AAhBJ,gBAoBE;ENiQA,kBAAA;EACA,mBAAA;;AMtRF,gBAwBE;EACE,gBAAA;;AAUF,QANmC;EAMnC,gBALE;IACE,iBAAA;;;AA/BN,gBAuCE,cAAc;EACZ,MAAA;EACA,WAAA;;ACxZJ;EACE,qBAAA;EACA,gBAAA;EACA,mBAAA;EACA,kBAAA;EACA,sBAAA;EACA,eAAA;EACA,sBAAA;EACA,6BAAA;EACA,mBAAA;EP4gBA,iBAAA;EACA,eAAA;EACA,wBAAA;EACA,kBAAA;EApSA,yBAAA;EACG,sBAAA;EACC,qBAAA;EACC,oBAAA;EACG,iBAAA;;AO3OR,IAAC;EPWD,oBAAA;EAEA,0CAAA;EACA,oBAAA;;AOVA,IAAC;AACD,IAAC;EACC,cAAA;EACA,qBAAA;;AAGF,IAAC;AACD,IAAC;EACC,UAAA;EACA,sBAAA;EPwFF,wDAAA;EACQ,gDAAA;;AOrFR,IAAC;AACD,IAAC;AACD,QAAQ,UAAW;EACjB,mBAAA;EACA,oBAAA;EPqPF,aAAA;EAGA,yBAAA;EAxKA,wBAAA;EACQ,gBAAA;;AOvEV;EPicE,cAAA;EACA,yBAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;AACD,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,cAAA;EACA,yBAAA;EACI,qBAAA;;AAEN,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,sBAAA;;AAKA,YAHD;AAGC,YAFD;AAEC,QADM,UAAW;AAEjB,YAJD,SAIE;AAAD,YAHD,UAGE;AAAD,QAFM,UAAW,aAEhB;AACD,YALD,SAKE;AAAD,YAJD,UAIE;AAAD,QAHM,UAAW,aAGhB;AACD,YAND,SAME;AAAD,YALD,UAKE;AAAD,QAJM,UAAW,aAIhB;AACD,YAPD,SAOE;AAAD,YAND,UAME;AAAD,QALM,UAAW,aAKhB;EACC,yBAAA;EACI,qBAAA;;AO5dV,YPgeE;EACE,cAAA;EACA,yBAAA;;AO/dJ;EP8bE,cAAA;EACA,yBAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;AACD,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,cAAA;EACA,yBAAA;EACI,qBAAA;;AAEN,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,sBAAA;;AAKA,YAHD;AAGC,YAFD;AAEC,QADM,UAAW;AAEjB,YAJD,SAIE;AAAD,YAHD,UAGE;AAAD,QAFM,UAAW,aAEhB;AACD,YALD,SAKE;AAAD,YAJD,UAIE;AAAD,QAHM,UAAW,aAGhB;AACD,YAND,SAME;AAAD,YALD,UAKE;AAAD,QAJM,UAAW,aAIhB;AACD,YAPD,SAOE;AAAD,YAND,UAME;AAAD,QALM,UAAW,aAKhB;EACC,yBAAA;EACI,qBAAA;;AOzdV,YP6dE;EACE,cAAA;EACA,yBAAA;;AO3dJ;EP0bE,cAAA;EACA,yBAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;AACD,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,cAAA;EACA,yBAAA;EACI,qBAAA;;AAEN,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,sBAAA;;AAKA,YAHD;AAGC,YAFD;AAEC,QADM,UAAW;AAEjB,YAJD,SAIE;AAAD,YAHD,UAGE;AAAD,QAFM,UAAW,aAEhB;AACD,YALD,SAKE;AAAD,YAJD,UAIE;AAAD,QAHM,UAAW,aAGhB;AACD,YAND,SAME;AAAD,YALD,UAKE;AAAD,QAJM,UAAW,aAIhB;AACD,YAPD,SAOE;AAAD,YAND,UAME;AAAD,QALM,UAAW,aAKhB;EACC,yBAAA;EACI,qBAAA;;AOrdV,YPydE;EACE,cAAA;EACA,yBAAA;;AOvdJ;EPsbE,cAAA;EACA,yBAAA;EACA,qBAAA;;AAEA,SAAC;AACD,SAAC;AACD,SAAC;AACD,SAAC;AACD,KAAM,iBAAgB;EACpB,cAAA;EACA,yBAAA;EACI,qBAAA;;AAEN,SAAC;AACD,SAAC;AACD,KAAM,iBAAgB;EACpB,sBAAA;;AAKA,SAHD;AAGC,SAFD;AAEC,QADM,UAAW;AAEjB,SAJD,SAIE;AAAD,SAHD,UAGE;AAAD,QAFM,UAAW,UAEhB;AACD,SALD,SAKE;AAAD,SAJD,UAIE;AAAD,QAHM,UAAW,UAGhB;AACD,SAND,SAME;AAAD,SALD,UAKE;AAAD,QAJM,UAAW,UAIhB;AACD,SAPD,SAOE;AAAD,SAND,UAME;AAAD,QALM,UAAW,UAKhB;EACC,yBAAA;EACI,qBAAA;;AOjdV,SPqdE;EACE,cAAA;EACA,yBAAA;;AOndJ;EPkbE,cAAA;EACA,yBAAA;EACA,qBAAA;;AAEA,YAAC;AACD,YAAC;AACD,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,cAAA;EACA,yBAAA;EACI,qBAAA;;AAEN,YAAC;AACD,YAAC;AACD,KAAM,iBAAgB;EACpB,sBAAA;;AAKA,YAHD;AAGC,YAFD;AAEC,QADM,UAAW;AAEjB,YAJD,SAIE;AAAD,YAHD,UAGE;AAAD,QAFM,UAAW,aAEhB;AACD,YALD,SAKE;AAAD,YAJD,UAIE;AAAD,QAHM,UAAW,aAGhB;AACD,YAND,SAME;AAAD,YALD,UAKE;AAAD,QAJM,UAAW,aAIhB;AACD,YAPD,SAOE;AAAD,YAND,UAME;AAAD,QALM,UAAW,aAKhB;EACC,yBAAA;EACI,qBAAA;;AO7cV,YPidE;EACE,cAAA;EACA,yBAAA;;AO/cJ;EP8aE,cAAA;EACA,yBAAA;EACA,qBAAA;;AAEA,WAAC;AACD,WAAC;AACD,WAAC;AACD,WAAC;AACD,KAAM,iBAAgB;EACpB,cAAA;EACA,yBAAA;EACI,qBAAA;;AAEN,WAAC;AACD,WAAC;AACD,KAAM,iBAAgB;EACpB,sBAAA;;AAKA,WAHD;AAGC,WAFD;AAEC,QADM,UAAW;AAEjB,WAJD,SAIE;AAAD,WAHD,UAGE;AAAD,QAFM,UAAW,YAEhB;AACD,WALD,SAKE;AAAD,WAJD,UAIE;AAAD,QAHM,UAAW,YAGhB;AACD,WAND,SAME;AAAD,WALD,UAKE;AAAD,QAJM,UAAW,YAIhB;AACD,WAPD,SAOE;AAAD,WAND,UAME;AAAD,QALM,UAAW,YAKhB;EACC,yBAAA;EACI,qBAAA;;AOzcV,WP6cE;EACE,cAAA;EACA,yBAAA;;AOtcJ;EACE,cAAA;EACA,mBAAA;EACA,eAAA;EACA,gBAAA;;AAEA;AACA,SAAC;AACD,SAAC;AACD,QAAQ,UAAW;EACjB,6BAAA;EPgCF,wBAAA;EACQ,gBAAA;;AO9BR;AACA,SAAC;AACD,SAAC;AACD,SAAC;EACC,yBAAA;;AAEF,SAAC;AACD,SAAC;EACC,cAAA;EACA,0BAAA;EACA,6BAAA;;AAIA,SAFD,UAEE;AAAD,QADM,UAAW,UAChB;AACD,SAHD,UAGE;AAAD,QAFM,UAAW,UAEhB;EACC,cAAA;EACA,qBAAA;;AASN;EPsaE,kBAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;;AOraF;EPkaE,iBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AOjaF;EP8ZE,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AOzZF;EACE,cAAA;EACA,WAAA;EACA,eAAA;EACA,gBAAA;;AAIF,UAAW;EACT,eAAA;;AAOA,KAHG,eAGF;AAAD,KAFG,cAEF;AAAD,KADG,eACF;EACC,WAAA;;AC/IJ;EACE,UAAA;ERsHA,wCAAA;EACQ,gCAAA;;AQrHR,KAAC;EACC,UAAA;;AAIJ;EACE,aAAA;;AACA,SAAC;EACC,cAAA;;AAGJ;EACE,kBAAA;EACA,SAAA;EACA,gBAAA;ERsGA,qCAAA;EACQ,6BAAA;;ASvHV;EACE,aAAa,sBAAb;EACA,qDAAA;EACA,2TAAA;;AAOF;EACE,kBAAA;EACA,QAAA;EACA,qBAAA;EACA,aAAa,sBAAb;EACA,kBAAA;EACA,mBAAA;EACA,cAAA;EACA,mCAAA;EACA,kCAAA;;AAIkC,mBAAC;EAAU,SAAS,KAAT;;AACX,eAAC;EAAU,SAAS,KAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,aAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,aAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,cAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,cAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,cAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,yBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,2BAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,0BAAC;EAAU,SAAS,OAAT;;AACX,4BAAC;EAAU,SAAS,OAAT;;AACX,cAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,6BAAC;EAAU,SAAS,OAAT;;AACX,4BAAC;EAAU,SAAS,OAAT;;AACX,0BAAC;EAAU,SAAS,OAAT;;AACX,4BAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,cAAC;EAAU,SAAS,OAAT;;AACX,cAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,2BAAC;EAAU,SAAS,OAAT;;AACX,+BAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,4BAAC;EAAU,SAAS,OAAT;;AACX,6BAAC;EAAU,SAAS,OAAT;;AACX,iCAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,eAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,wBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,kBAAC;EAAU,SAAS,OAAT;;AACX,iBAAC;EAAU,SAAS,OAAT;;AACX,qBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,gBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,mBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,sBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,oBAAC;EAAU,SAAS,OAAT;;AACX,yBAAC;EAAU,SAAS,OAAT;;AACX,4BAAC;EAAU,SAAS,OAAT;;AACX,yBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,uBAAC;EAAU,SAAS,OAAT;;AACX,yBAAC;EAAU,SAAS,OAAT;;AClO/C;EACE,qBAAA;EACA,QAAA;EACA,SAAA;EACA,gBAAA;EACA,sBAAA;EACA,qBAAA;EACA,mCAAA;EACA,kCAAA;;AAIF;EACE,kBAAA;;AAIF,gBAAgB;EACd,UAAA;;AAIF;EACE,kBAAA;EACA,SAAA;EACA,OAAA;EACA,aAAA;EACA,aAAA;EACA,WAAA;EACA,gBAAA;EACA,cAAA;EACA,eAAA;EACA,gBAAA;EACA,eAAA;EACA,yBAAA;EACA,yBAAA;EACA,qCAAA;EACA,kBAAA;EV+EA,mDAAA;EACQ,2CAAA;EU9ER,4BAAA;;AAKA,cAAC;EACC,QAAA;EACA,UAAA;;AAxBJ,cA4BE;EVsVA,WAAA;EACA,aAAA;EACA,gBAAA;EACA,yBAAA;;AUrXF,cAiCE,KAAK;EACH,cAAA;EACA,iBAAA;EACA,WAAA;EACA,mBAAA;EACA,wBAAA;EACA,cAAA;EACA,mBAAA;;AAMF,cADa,KAAK,IACjB;AACD,cAFa,KAAK,IAEjB;EACC,qBAAA;EACA,cAAA;EACA,yBAAA;;AAMF,cADa,UAAU;AAEvB,cAFa,UAAU,IAEtB;AACD,cAHa,UAAU,IAGtB;EACC,cAAA;EACA,qBAAA;EACA,UAAA;EACA,yBAAA;;AASF,cADa,YAAY;AAEzB,cAFa,YAAY,IAExB;AACD,cAHa,YAAY,IAGxB;EACC,cAAA;;AAKF,cADa,YAAY,IACxB;AACD,cAFa,YAAY,IAExB;EACC,qBAAA;EACA,6BAAA;EACA,sBAAA;EVoPF,mEAAA;EUlPE,mBAAA;;AAKJ,KAEE;EACE,cAAA;;AAHJ,KAOE;EACE,UAAA;;AAQJ;EACE,UAAA;EACA,QAAA;;AAQF;EACE,OAAA;EACA,WAAA;;AAIF;EACE,cAAA;EACA,iBAAA;EACA,eAAA;EACA,wBAAA;EACA,cAAA;;AAIF;EACE,eAAA;EACA,OAAA;EACA,QAAA;EACA,SAAA;EACA,MAAA;EACA,YAAA;;AAIF,WAAY;EACV,QAAA;EACA,UAAA;;AAQF,OAGE;AAFF,oBAAqB,UAEnB;EACE,aAAA;EACA,wBAAA;EACA,SAAS,EAAT;;AANJ,OASE;AARF,oBAAqB,UAQnB;EACE,SAAA;EACA,YAAA;EACA,kBAAA;;AAsBJ,QAb2C;EACzC,aACE;IAnEF,UAAA;IACA,QAAA;;EAiEA,aAME;IA9DF,OAAA;IACA,WAAA;;;AC7IF;AACA;EACE,kBAAA;EACA,qBAAA;EACA,sBAAA;;AAJF,UAKE;AAJF,mBAIE;EACE,kBAAA;EACA,WAAA;;AAEA,UAJF,OAIG;AAAD,mBAJF,OAIG;AACD,UALF,OAKG;AAAD,mBALF,OAKG;AACD,UANF,OAMG;AAAD,mBANF,OAMG;AACD,UAPF,OAOG;AAAD,mBAPF,OAOG;EACC,UAAA;;AAEF,UAVF,OAUG;AAAD,mBAVF,OAUG;EAEC,aAAA;;AAMN,UACE,KAAK;AADP,UAEE,KAAK;AAFP,UAGE,WAAW;AAHb,UAIE,WAAW;EACT,iBAAA;;AAKJ;EACE,iBAAA;;AADF,YAIE;AAJF,YAKE;EACE,WAAA;;AANJ,YAQE;AARF,YASE;AATF,YAUE;EACE,gBAAA;;AAIJ,UAAW,OAAM,IAAI,cAAc,IAAI,aAAa,IAAI;EACtD,gBAAA;;AAIF,UAAW,OAAM;EACf,cAAA;;AACA,UAFS,OAAM,YAEd,IAAI,aAAa,IAAI;EX4CtB,6BAAA;EACG,0BAAA;;AWxCL,UAAW,OAAM,WAAW,IAAI;AAChC,UAAW,mBAAkB,IAAI;EX8C/B,4BAAA;EACG,yBAAA;;AW1CL,UAAW;EACT,WAAA;;AAEF,UAAW,aAAY,IAAI,cAAc,IAAI,aAAc;EACzD,gBAAA;;AAEF,UAAW,aAAY,YACrB,OAAM;AADR,UAAW,aAAY,YAErB;EXyBA,6BAAA;EACG,0BAAA;;AWtBL,UAAW,aAAY,WAAY,OAAM;EX6BvC,4BAAA;EACG,yBAAA;;AWzBL,UAAW,iBAAgB;AAC3B,UAAU,KAAM;EACd,UAAA;;AAQF,aAAc;EX2bZ,gBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AW7bF,aAAc;EX0bZ,iBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AW5bF,aAAc;EXybZ,kBAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;;AWrbF,UAAW,OAAO;EAChB,iBAAA;EACA,kBAAA;;AAEF,UAAW,UAAU;EACnB,kBAAA;EACA,mBAAA;;AAKF,UAAU,KAAM;EXId,wDAAA;EACQ,gDAAA;;AWDR,UAJQ,KAAM,iBAIb;EXAD,wBAAA;EACQ,gBAAA;;AWMV,IAAK;EACH,cAAA;;AAGF,OAAQ;EACN,uBAAA;EACA,sBAAA;;AAGF,OAAQ,QAAQ;EACd,uBAAA;;AAOF,mBACE;AADF,mBAEE;AAFF,mBAGE,aAAa;EACX,cAAA;EACA,WAAA;EACA,WAAA;EACA,eAAA;;AAPJ,mBAWE,aAEE;EACE,WAAA;;AAdN,mBAkBE,OAAO;AAlBT,mBAmBE,OAAO;AAnBT,mBAoBE,aAAa;AApBf,mBAqBE,aAAa;EACX,gBAAA;EACA,cAAA;;AAKF,mBADkB,OACjB,IAAI,cAAc,IAAI;EACrB,gBAAA;;AAEF,mBAJkB,OAIjB,YAAY,IAAI;EACf,4BAAA;EXtEF,6BAAA;EACC,4BAAA;;AWwED,mBARkB,OAQjB,WAAW,IAAI;EACd,8BAAA;EXlFF,0BAAA;EACC,yBAAA;;AWqFH,mBAAoB,aAAY,IAAI,cAAc,IAAI,aAAc;EAClE,gBAAA;;AAEF,mBAAoB,aAAY,YAAY,IAAI,aAC9C,OAAM;AADR,mBAAoB,aAAY,YAAY,IAAI,aAE9C;EXnFA,6BAAA;EACC,4BAAA;;AWsFH,mBAAoB,aAAY,WAAW,IAAI,cAAe,OAAM;EX/FlE,0BAAA;EACC,yBAAA;;AWuGH;EACE,cAAA;EACA,WAAA;EACA,mBAAA;EACA,yBAAA;;AAJF,oBAKE;AALF,oBAME;EACE,WAAA;EACA,mBAAA;EACA,SAAA;;AATJ,oBAWE,aAAa;EACX,WAAA;;AAMJ,uBAAwB,OAAO,QAAO;AACtC,uBAAwB,OAAO,QAAO;EACpC,aAAA;;AC1NF;EACE,kBAAA;EACA,cAAA;EACA,yBAAA;;AAGA,YAAC;EACC,WAAA;EACA,eAAA;EACA,gBAAA;;AATJ,YAYE;EAIE,WAAA;EAEA,WAAA;EACA,gBAAA;;AASJ,eAAgB;AAChB,eAAgB;AAChB,eAAgB,mBAAmB;EZ02BjC,YAAA;EACA,kBAAA;EACA,eAAA;EACA,iBAAA;EACA,kBAAA;;AAEA,MAAM,eYl3BQ;AZk3Bd,MAAM,eYj3BQ;AZi3Bd,MAAM,eYh3BQ,mBAAmB;EZi3B/B,YAAA;EACA,iBAAA;;AAGF,QAAQ,eYv3BM;AZu3Bd,QAAQ,eYt3BM;AZs3Bd,QAAQ,eYr3BM,mBAAmB;AZs3BjC,MAAM,UAAU,eYx3BF;AZw3Bd,MAAM,UAAU,eYv3BF;AZu3Bd,MAAM,UAAU,eYt3BF,mBAAmB;EZu3B/B,YAAA;;AYt3BJ,eAAgB;AAChB,eAAgB;AAChB,eAAgB,mBAAmB;EZu2BjC,YAAA;EACA,iBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AAEA,MAAM,eY/2BQ;AZ+2Bd,MAAM,eY92BQ;AZ82Bd,MAAM,eY72BQ,mBAAmB;EZ82B/B,YAAA;EACA,iBAAA;;AAGF,QAAQ,eYp3BM;AZo3Bd,QAAQ,eYn3BM;AZm3Bd,QAAQ,eYl3BM,mBAAmB;AZm3BjC,MAAM,UAAU,eYr3BF;AZq3Bd,MAAM,UAAU,eYp3BF;AZo3Bd,MAAM,UAAU,eYn3BF,mBAAmB;EZo3B/B,YAAA;;AY/2BJ;AACA;AACA,YAAa;EACX,mBAAA;;AAEA,kBAAC,IAAI,cAAc,IAAI;AAAvB,gBAAC,IAAI,cAAc,IAAI;AAAvB,YAHW,cAGV,IAAI,cAAc,IAAI;EACrB,gBAAA;;AAIJ;AACA;EACE,SAAA;EACA,mBAAA;EACA,sBAAA;;AAKF;EACE,iBAAA;EACA,eAAA;EACA,mBAAA;EACA,cAAA;EACA,cAAA;EACA,kBAAA;EACA,yBAAA;EACA,yBAAA;EACA,kBAAA;;AAGA,kBAAC;EACC,iBAAA;EACA,eAAA;EACA,kBAAA;;AAEF,kBAAC;EACC,kBAAA;EACA,eAAA;EACA,kBAAA;;AApBJ,kBAwBE,MAAK;AAxBP,kBAyBE,MAAK;EACH,aAAA;;AAKJ,YAAa,cAAa;AAC1B,kBAAkB;AAClB,gBAAgB,YAAa;AAC7B,gBAAgB,YAAa,aAAa;AAC1C,gBAAgB,YAAa;AAC7B,gBAAgB,WAAY,OAAM,IAAI,aAAa,IAAI;AACvD,gBAAgB,WAAY,aAAY,IAAI,aAAc;EZIxD,6BAAA;EACG,0BAAA;;AYFL,kBAAkB;EAChB,eAAA;;AAEF,YAAa,cAAa;AAC1B,kBAAkB;AAClB,gBAAgB,WAAY;AAC5B,gBAAgB,WAAY,aAAa;AACzC,gBAAgB,WAAY;AAC5B,gBAAgB,YAAa,OAAM,IAAI;AACvC,gBAAgB,YAAa,aAAY,IAAI,cAAe;EZA1D,4BAAA;EACG,yBAAA;;AYEL,kBAAkB;EAChB,cAAA;;AAKF;EACE,kBAAA;EAGA,YAAA;EACA,mBAAA;;AALF,gBASE;EACE,kBAAA;;AAVJ,gBASE,OAEE;EACE,iBAAA;;AAGF,gBANF,OAMG;AACD,gBAPF,OAOG;AACD,gBARF,OAQG;EACC,UAAA;;AAKJ,gBAAC,YACC;AADF,gBAAC,YAEC;EACE,kBAAA;;AAGJ,gBAAC,WACC;AADF,gBAAC,WAEC;EACE,iBAAA;;ACjJN;EACE,gBAAA;EACA,eAAA;EACA,gBAAA;;AAHF,IAME;EACE,kBAAA;EACA,cAAA;;AARJ,IAME,KAIE;EACE,kBAAA;EACA,cAAA;EACA,kBAAA;;AACA,IARJ,KAIE,IAIG;AACD,IATJ,KAIE,IAKG;EACC,qBAAA;EACA,yBAAA;;AAKJ,IAhBF,KAgBG,SAAU;EACT,cAAA;;AAEA,IAnBJ,KAgBG,SAAU,IAGR;AACD,IApBJ,KAgBG,SAAU,IAIR;EACC,cAAA;EACA,qBAAA;EACA,6BAAA;EACA,mBAAA;;AAOJ,IADF,MAAM;AAEJ,IAFF,MAAM,IAEH;AACD,IAHF,MAAM,IAGH;EACC,yBAAA;EACA,qBAAA;;AAzCN,IAkDE;EboVA,WAAA;EACA,aAAA;EACA,gBAAA;EACA,yBAAA;;AazYF,IAyDE,KAAK,IAAI;EACP,eAAA;;AASJ;EACE,gCAAA;;AADF,SAEE;EACE,WAAA;EAEA,mBAAA;;AALJ,SAEE,KAME;EACE,iBAAA;EACA,wBAAA;EACA,6BAAA;EACA,0BAAA;;AACA,SAXJ,KAME,IAKG;EACC,qCAAA;;AAMF,SAlBJ,KAiBG,OAAQ;AAEP,SAnBJ,KAiBG,OAAQ,IAEN;AACD,SApBJ,KAiBG,OAAQ,IAGN;EACC,cAAA;EACA,yBAAA;EACA,yBAAA;EACA,gCAAA;EACA,eAAA;;AAKN,SAAC;EAqDD,WAAA;EA8BA,gBAAA;;AAnFA,SAAC,cAuDD;EACE,WAAA;;AAxDF,SAAC,cAuDD,KAEG;EACC,kBAAA;EACA,kBAAA;;AA3DJ,SAAC,cA+DD,YAAY;EACV,SAAA;EACA,UAAA;;AAYJ,QATqC;EASrC,SA7EG,cAqEC;IACE,mBAAA;IACA,SAAA;;EAMN,SA7EG,cAqEC,KAGE;IACE,gBAAA;;;AAzEN,SAAC,cAqFD,KAAK;EAEH,eAAA;EACA,kBAAA;;AAxFF,SAAC,cA2FD,UAAU;AA3FV,SAAC,cA4FD,UAAU,IAAG;AA5Fb,SAAC,cA6FD,UAAU,IAAG;EACX,yBAAA;;AAcJ,QAXqC;EAWrC,SA5GG,cAkGC,KAAK;IACH,gCAAA;IACA,0BAAA;;EAQN,SA5GG,cAsGC,UAAU;EAMd,SA5GG,cAuGC,UAAU,IAAG;EAKjB,SA5GG,cAwGC,UAAU,IAAG;IACX,4BAAA;;;AAhGN,UACE;EACE,WAAA;;AAFJ,UACE,KAIE;EACE,kBAAA;;AANN,UACE,KAOE;EACE,gBAAA;;AAKA,UAbJ,KAYG,OAAQ;AAEP,UAdJ,KAYG,OAAQ,IAEN;AACD,UAfJ,KAYG,OAAQ,IAGN;EACC,cAAA;EACA,yBAAA;;AAQR,YACE;EACE,WAAA;;AAFJ,YACE,KAEE;EACE,eAAA;EACA,cAAA;;AAYN;EACE,WAAA;;AADF,cAGE;EACE,WAAA;;AAJJ,cAGE,KAEG;EACC,kBAAA;EACA,kBAAA;;AAPN,cAWE,YAAY;EACV,SAAA;EACA,UAAA;;AAYJ,QATqC;EASrC,cARI;IACE,mBAAA;IACA,SAAA;;EAMN,cARI,KAGE;IACE,gBAAA;;;AASR;EACE,gBAAA;;AADF,mBAGE,KAAK;EAEH,eAAA;EACA,kBAAA;;AANJ,mBASE,UAAU;AATZ,mBAUE,UAAU,IAAG;AAVf,mBAWE,UAAU,IAAG;EACX,yBAAA;;AAcJ,QAXqC;EAWrC,mBAVI,KAAK;IACH,gCAAA;IACA,0BAAA;;EAQN,mBANI,UAAU;EAMd,mBALI,UAAU,IAAG;EAKjB,mBAJI,UAAU,IAAG;IACX,4BAAA;;;AAUN,YACE;EACE,aAAA;;AAFJ,YAIE;EACE,cAAA;;AASJ,SAAU;EAER,gBAAA;Eb1IA,0BAAA;EACC,yBAAA;;Ac3FH;EACE,kBAAA;EACA,gBAAA;EACA,mBAAA;EACA,6BAAA;;AAQF,QAH6C;EAG7C;IAFI,kBAAA;;;AAgBJ,QAH6C;EAG7C;IAFI,WAAA;;;AAeJ;EACE,iBAAA;EACA,mBAAA;EACA,mBAAA;EACA,kBAAA;EACA,iCAAA;EACA,kDAAA;EAEA,iCAAA;;AAEA,gBAAC;EACC,gBAAA;;AA4BJ,QAzB6C;EAyB7C;IAxBI,WAAA;IACA,aAAA;IACA,gBAAA;;EAEA,gBAAC;IACC,yBAAA;IACA,uBAAA;IACA,iBAAA;IACA,4BAAA;;EAGF,gBAAC;IACC,mBAAA;;EAKF,iBAAkB;EAClB,kBAAmB;EACnB,oBAAqB;IACnB,eAAA;IACA,gBAAA;;;AAUN,UAEE;AADF,gBACE;AAFF,UAGE;AAFF,gBAEE;EACE,mBAAA;EACA,kBAAA;;AAMF,QAJ6C;EAI7C,UATA;EASA,gBATA;EASA,UARA;EAQA,gBARA;IAKI,eAAA;IACA,cAAA;;;AAaN;EACE,aAAA;EACA,qBAAA;;AAKF,QAH6C;EAG7C;IAFI,gBAAA;;;AAKJ;AACA;EACE,eAAA;EACA,QAAA;EACA,OAAA;EACA,aAAA;;AAMF,QAH6C;EAG7C;EAAA;IAFI,gBAAA;;;AAGJ;EACE,MAAA;EACA,qBAAA;;AAEF;EACE,SAAA;EACA,gBAAA;EACA,qBAAA;;AAMF;EACE,WAAA;EACA,kBAAA;EACA,eAAA;EACA,iBAAA;EACA,YAAA;;AAEA,aAAC;AACD,aAAC;EACC,qBAAA;;AASJ,QAN6C;EACzC,OAAQ,aAAa;EACrB,OAAQ,mBAAmB;IACzB,kBAAA;;;AAWN;EACE,kBAAA;EACA,YAAA;EACA,kBAAA;EACA,iBAAA;EdwaA,eAAA;EACA,kBAAA;EcvaA,6BAAA;EACA,sBAAA;EACA,6BAAA;EACA,kBAAA;;AAIA,cAAC;EACC,aAAA;;AAdJ,cAkBE;EACE,cAAA;EACA,WAAA;EACA,WAAA;EACA,kBAAA;;AAtBJ,cAwBE,UAAU;EACR,eAAA;;AAMJ,QAH6C;EAG7C;IAFI,aAAA;;;AAUJ;EACE,mBAAA;;AADF,WAGE,KAAK;EACH,iBAAA;EACA,oBAAA;EACA,iBAAA;;AA2BF,QAxB+C;EAwB/C,WAtBE,MAAM;IACJ,gBAAA;IACA,WAAA;IACA,WAAA;IACA,aAAA;IACA,6BAAA;IACA,SAAA;IACA,gBAAA;;EAeJ,WAtBE,MAAM,eAQJ,KAAK;EAcT,WAtBE,MAAM,eASJ;IACE,0BAAA;;EAYN,WAtBE,MAAM,eAYJ,KAAK;IACH,iBAAA;;EACA,WAdJ,MAAM,eAYJ,KAAK,IAEF;EACD,WAfJ,MAAM,eAYJ,KAAK,IAGF;IACC,sBAAA;;;AAuBV,QAhB6C;EAgB7C;IAfI,WAAA;IACA,SAAA;;EAcJ,WAZI;IACE,WAAA;;EAWN,WAZI,KAEE;IACE,iBAAA;IACA,oBAAA;;EAIJ,WAAC,aAAa;IACZ,mBAAA;;;AAkBN,QAN2C;EACzC;ICnQA,sBAAA;;EDoQA;ICvQA,uBAAA;;;ADgRF;EACE,kBAAA;EACA,mBAAA;EACA,kBAAA;EACA,iCAAA;EACA,oCAAA;Ed1KA,4FAAA;EACQ,oFAAA;EAmeR,eAAA;EACA,kBAAA;;AMhPF,QA7CqC;EA6CrC,YA3CI;IACE,qBAAA;IACA,gBAAA;IACA,sBAAA;;EAwCN,YApCI;IACE,qBAAA;IACA,WAAA;IACA,sBAAA;;EAiCN,YA9BI;IACE,gBAAA;IACA,sBAAA;;EA4BN,YAtBI;EAsBJ,YArBI;IACE,qBAAA;IACA,aAAA;IACA,gBAAA;IACA,eAAA;IACA,sBAAA;;EAgBN,YAdI,OAAO,MAAK;EAchB,YAbI,UAAU,MAAK;IACb,WAAA;IACA,cAAA;;EAWN,YAJI,cAAc;IACZ,MAAA;;;AQ7DJ,QAHiD;EAGjD,YAJA;IAEI,kBAAA;;;AAsBN,QAd6C;EAc7C;IAbI,WAAA;IACA,SAAA;IACA,cAAA;IACA,eAAA;IACA,cAAA;IACA,iBAAA;IdjMF,wBAAA;IACQ,gBAAA;;EcoMN,YAAC,aAAa;IACZ,mBAAA;;;AASN,WAAY,KAAK;EACf,aAAA;EdtOA,0BAAA;EACC,yBAAA;;AcyOH,oBAAqB,YAAY,KAAK;EdlOpC,6BAAA;EACC,4BAAA;;Ac0OH;EduQE,eAAA;EACA,kBAAA;;AcrQA,WAAC;EdoQD,gBAAA;EACA,mBAAA;;AclQA,WAAC;EdiQD,gBAAA;EACA,mBAAA;;AcxPF;EduPE,gBAAA;EACA,mBAAA;;Ac3OF,QAV6C;EAU7C;IATI,WAAA;IACA,iBAAA;IACA,kBAAA;;EAGA,YAAC,aAAa;IACZ,eAAA;;;AASN;EACE,yBAAA;EACA,qBAAA;;AAFF,eAIE;EACE,cAAA;;AACA,eAFF,cAEG;AACD,eAHF,cAGG;EACC,cAAA;EACA,6BAAA;;AATN,eAaE;EACE,cAAA;;AAdJ,eAiBE,YACE,KAAK;EACH,cAAA;;AAEA,eAJJ,YACE,KAAK,IAGF;AACD,eALJ,YACE,KAAK,IAIF;EACC,cAAA;EACA,6BAAA;;AAIF,eAXJ,YAUE,UAAU;AAER,eAZJ,YAUE,UAAU,IAEP;AACD,eAbJ,YAUE,UAAU,IAGP;EACC,cAAA;EACA,yBAAA;;AAIF,eAnBJ,YAkBE,YAAY;AAEV,eApBJ,YAkBE,YAAY,IAET;AACD,eArBJ,YAkBE,YAAY,IAGT;EACC,cAAA;EACA,6BAAA;;AAxCR,eA6CE;EACE,qBAAA;;AACA,eAFF,eAEG;AACD,eAHF,eAGG;EACC,yBAAA;;AAjDN,eA6CE,eAME;EACE,yBAAA;;AApDN,eAwDE;AAxDF,eAyDE;EACE,qBAAA;;AAOE,eAHJ,YAEE,QAAQ;AAEN,eAJJ,YAEE,QAAQ,IAEL;AACD,eALJ,YAEE,QAAQ,IAGL;EACC,yBAAA;EACA,cAAA;;AAiCN,QA7BiD;EA6BjD,eAxCA,YAaI,MAAM,eACJ,KAAK;IACH,cAAA;;EACA,eAhBR,YAaI,MAAM,eACJ,KAAK,IAEF;EACD,eAjBR,YAaI,MAAM,eACJ,KAAK,IAGF;IACC,cAAA;IACA,6BAAA;;EAIF,eAvBR,YAaI,MAAM,eASJ,UAAU;EAER,eAxBR,YAaI,MAAM,eASJ,UAAU,IAEP;EACD,eAzBR,YAaI,MAAM,eASJ,UAAU,IAGP;IACC,cAAA;IACA,yBAAA;;EAIF,eA/BR,YAaI,MAAM,eAiBJ,YAAY;EAEV,eAhCR,YAaI,MAAM,eAiBJ,YAAY,IAET;EACD,eAjCR,YAaI,MAAM,eAiBJ,YAAY,IAGT;IACC,cAAA;IACA,6BAAA;;;AAjGZ,eA6GE;EACE,cAAA;;AACA,eAFF,aAEG;EACC,cAAA;;AAQN;EACE,yBAAA;EACA,qBAAA;;AAFF,eAIE;EACE,cAAA;;AACA,eAFF,cAEG;AACD,eAHF,cAGG;EACC,cAAA;EACA,6BAAA;;AATN,eAaE;EACE,cAAA;;AAdJ,eAiBE,YACE,KAAK;EACH,cAAA;;AAEA,eAJJ,YACE,KAAK,IAGF;AACD,eALJ,YACE,KAAK,IAIF;EACC,cAAA;EACA,6BAAA;;AAIF,eAXJ,YAUE,UAAU;AAER,eAZJ,YAUE,UAAU,IAEP;AACD,eAbJ,YAUE,UAAU,IAGP;EACC,cAAA;EACA,yBAAA;;AAIF,eAnBJ,YAkBE,YAAY;AAEV,eApBJ,YAkBE,YAAY,IAET;AACD,eArBJ,YAkBE,YAAY,IAGT;EACC,cAAA;EACA,6BAAA;;AAxCR,eA8CE;EACE,qBAAA;;AACA,eAFF,eAEG;AACD,eAHF,eAGG;EACC,yBAAA;;AAlDN,eA8CE,eAME;EACE,yBAAA;;AArDN,eAyDE;AAzDF,eA0DE;EACE,qBAAA;;AAME,eAFJ,YACE,QAAQ;AAEN,eAHJ,YACE,QAAQ,IAEL;AACD,eAJJ,YACE,QAAQ,IAGL;EACC,yBAAA;EACA,cAAA;;AAuCN,QAnCiD;EAmCjD,eA7CA,YAYI,MAAM,eACJ;IACE,qBAAA;;EA+BR,eA7CA,YAYI,MAAM,eAIJ;IACE,yBAAA;;EA4BR,eA7CA,YAYI,MAAM,eAOJ,KAAK;IACH,cAAA;;EACA,eArBR,YAYI,MAAM,eAOJ,KAAK,IAEF;EACD,eAtBR,YAYI,MAAM,eAOJ,KAAK,IAGF;IACC,cAAA;IACA,6BAAA;;EAIF,eA5BR,YAYI,MAAM,eAeJ,UAAU;EAER,eA7BR,YAYI,MAAM,eAeJ,UAAU,IAEP;EACD,eA9BR,YAYI,MAAM,eAeJ,UAAU,IAGP;IACC,cAAA;IACA,yBAAA;;EAIF,eApCR,YAYI,MAAM,eAuBJ,YAAY;EAEV,eArCR,YAYI,MAAM,eAuBJ,YAAY,IAET;EACD,eAtCR,YAYI,MAAM,eAuBJ,YAAY,IAGT;IACC,cAAA;IACA,6BAAA;;;AAvGZ,eA8GE;EACE,cAAA;;AACA,eAFF,aAEG;EACC,cAAA;;AE9lBN;EACE,iBAAA;EACA,mBAAA;EACA,gBAAA;EACA,yBAAA;EACA,kBAAA;;AALF,WAOE;EACE,qBAAA;;AARJ,WAOE,KAGE,KAAI;EACF,SAAS,QAAT;EACA,cAAA;EACA,cAAA;;AAbN,WAiBE;EACE,cAAA;;ACpBJ;EACE,qBAAA;EACA,eAAA;EACA,cAAA;EACA,kBAAA;;AAJF,WAME;EACE,eAAA;;AAPJ,WAME,KAEE;AARJ,WAME,KAGE;EACE,kBAAA;EACA,WAAA;EACA,iBAAA;EACA,wBAAA;EACA,qBAAA;EACA,cAAA;EACA,yBAAA;EACA,yBAAA;EACA,iBAAA;;AAEF,WAdF,KAcG,YACC;AADF,WAdF,KAcG,YAEC;EACE,cAAA;EjBsFN,8BAAA;EACG,2BAAA;;AiBnFD,WArBF,KAqBG,WACC;AADF,WArBF,KAqBG,WAEC;EjBwEJ,+BAAA;EACG,4BAAA;;AiBjED,WAFF,KAAK,IAEF;AAAD,WADF,KAAK,OACF;AACD,WAHF,KAAK,IAGF;AAAD,WAFF,KAAK,OAEF;EACC,cAAA;EACA,yBAAA;EACA,qBAAA;;AAMF,WAFF,UAAU;AAER,WADF,UAAU;AAER,WAHF,UAAU,IAGP;AAAD,WAFF,UAAU,OAEP;AACD,WAJF,UAAU,IAIP;AAAD,WAHF,UAAU,OAGP;EACC,UAAA;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;EACA,eAAA;;AAtDN,WA0DE,YACE;AA3DJ,WA0DE,YAEE,OAAM;AA5DV,WA0DE,YAGE,OAAM;AA7DV,WA0DE,YAIE;AA9DJ,WA0DE,YAKE,IAAG;AA/DP,WA0DE,YAME,IAAG;EACD,cAAA;EACA,yBAAA;EACA,qBAAA;EACA,mBAAA;;AASN,cjBsdE,KACE;AiBvdJ,cjBsdE,KAEE;EACE,kBAAA;EACA,eAAA;;AAEF,cANF,KAMG,YACC;AADF,cANF,KAMG,YAEC;EA9bJ,8BAAA;EACG,2BAAA;;AAicD,cAZF,KAYG,WACC;AADF,cAZF,KAYG,WAEC;EA5cJ,+BAAA;EACG,4BAAA;;AiBpBL,cjBidE,KACE;AiBldJ,cjBidE,KAEE;EACE,iBAAA;EACA,eAAA;;AAEF,cANF,KAMG,YACC;AADF,cANF,KAMG,YAEC;EA9bJ,8BAAA;EACG,2BAAA;;AAicD,cAZF,KAYG,WACC;AADF,cAZF,KAYG,WAEC;EA5cJ,+BAAA;EACG,4BAAA;;AkBpGL;EACE,eAAA;EACA,cAAA;EACA,gBAAA;EACA,kBAAA;;AAJF,MAME;EACE,eAAA;;AAPJ,MAME,GAEE;AARJ,MAME,GAGE;EACE,qBAAA;EACA,iBAAA;EACA,yBAAA;EACA,yBAAA;EACA,mBAAA;;AAdN,MAME,GAWE,IAAG;AAjBP,MAME,GAYE,IAAG;EACD,qBAAA;EACA,yBAAA;;AApBN,MAwBE,MACE;AAzBJ,MAwBE,MAEE;EACE,YAAA;;AA3BN,MA+BE,UACE;AAhCJ,MA+BE,UAEE;EACE,WAAA;;AAlCN,MAsCE,UACE;AAvCJ,MAsCE,UAEE,IAAG;AAxCP,MAsCE,UAGE,IAAG;AAzCP,MAsCE,UAIE;EACE,cAAA;EACA,yBAAA;EACA,mBAAA;;AC9CN;EACE,eAAA;EACA,uBAAA;EACA,cAAA;EACA,iBAAA;EACA,cAAA;EACA,cAAA;EACA,kBAAA;EACA,mBAAA;EACA,wBAAA;EACA,oBAAA;;AAIE,MADD,MACE;AACD,MAFD,MAEE;EACC,cAAA;EACA,qBAAA;EACA,eAAA;;AAKJ,MAAC;EACC,aAAA;;AAIF,IAAK;EACH,kBAAA;EACA,SAAA;;AAOJ;EnBqhBE,yBAAA;;AAEE,cADD,MACE;AACD,cAFD,MAEE;EACC,yBAAA;;AmBrhBN;EnBihBE,yBAAA;;AAEE,cADD,MACE;AACD,cAFD,MAEE;EACC,yBAAA;;AmBjhBN;EnB6gBE,yBAAA;;AAEE,cADD,MACE;AACD,cAFD,MAEE;EACC,yBAAA;;AmB7gBN;EnBygBE,yBAAA;;AAEE,WADD,MACE;AACD,WAFD,MAEE;EACC,yBAAA;;AmBzgBN;EnBqgBE,yBAAA;;AAEE,cADD,MACE;AACD,cAFD,MAEE;EACC,yBAAA;;AmBrgBN;EnBigBE,yBAAA;;AAEE,aADD,MACE;AACD,aAFD,MAEE;EACC,yBAAA;;AoB5jBN;EACE,qBAAA;EACA,eAAA;EACA,gBAAA;EACA,eAAA;EACA,iBAAA;EACA,cAAA;EACA,cAAA;EACA,wBAAA;EACA,mBAAA;EACA,kBAAA;EACA,yBAAA;EACA,mBAAA;;AAGA,MAAC;EACC,aAAA;;AAIF,IAAK;EACH,kBAAA;EACA,SAAA;;AAEF,OAAQ;EACN,MAAA;EACA,gBAAA;;AAMF,CADD,MACE;AACD,CAFD,MAEE;EACC,cAAA;EACA,qBAAA;EACA,eAAA;;AAKJ,CAAC,gBAAgB,OAAQ;AACzB,UAAW,UAAU,IAAI;EACvB,cAAA;EACA,yBAAA;;AAEF,UAAW,KAAK,IAAI;EAClB,gBAAA;;AChDF;EACE,aAAA;EACA,mBAAA;EACA,cAAA;EACA,yBAAA;;AAJF,UAME;AANF,UAOE;EACE,cAAA;;AARJ,UAUE;EACE,mBAAA;EACA,eAAA;EACA,gBAAA;;AAGF,UAAW;EACT,kBAAA;;AAjBJ,UAoBE;EACE,eAAA;;AAiBJ,mBAdgD;EAchD;IAbI,iBAAA;IACA,oBAAA;;EAEA,UAAW;IACT,kBAAA;IACA,mBAAA;;EAQN,UALI;EAKJ,UAJI;IACE,eAAA;;;AClCN;EACE,cAAA;EACA,YAAA;EACA,mBAAA;EACA,wBAAA;EACA,yBAAA;EACA,yBAAA;EACA,kBAAA;EtBmHA,wCAAA;EACQ,gCAAA;;AsB3HV,UAUE;AAVF,UAWE,EAAE;EtBgXF,cAAA;EACA,eAAA;EACA,YAAA;EsBhXE,iBAAA;EACA,kBAAA;;AAIF,CAAC,UAAC;AACF,CAAC,UAAC;AACF,CAAC,UAAC;EACA,qBAAA;;AArBJ,UAyBE;EACE,YAAA;EACA,cAAA;;ACzBJ;EACE,aAAA;EACA,mBAAA;EACA,6BAAA;EACA,kBAAA;;AAJF,MAOE;EACE,aAAA;EAEA,cAAA;;AAVJ,MAaE;EACE,iBAAA;;AAdJ,MAkBE;AAlBF,MAmBE;EACE,gBAAA;;AApBJ,MAsBE,IAAI;EACF,eAAA;;AAQJ;EACC,mBAAA;;AADD,kBAIE;EACE,kBAAA;EACA,SAAA;EACA,YAAA;EACA,cAAA;;AAQJ;EvBqXE,yBAAA;EACA,qBAAA;EACA,cAAA;;AuBvXF,cvByXE;EACE,yBAAA;;AuB1XJ,cvB4XE;EACE,cAAA;;AuB1XJ;EvBkXE,yBAAA;EACA,qBAAA;EACA,cAAA;;AuBpXF,WvBsXE;EACE,yBAAA;;AuBvXJ,WvByXE;EACE,cAAA;;AuBvXJ;EvB+WE,yBAAA;EACA,qBAAA;EACA,cAAA;;AuBjXF,cvBmXE;EACE,yBAAA;;AuBpXJ,cvBsXE;EACE,cAAA;;AuBpXJ;EvB4WE,yBAAA;EACA,qBAAA;EACA,cAAA;;AuB9WF,avBgXE;EACE,yBAAA;;AuBjXJ,avBmXE;EACE,cAAA;;AwB3aJ;EACE;IAAQ,2BAAA;;EACR;IAAQ,wBAAA;;;AAIV;EACE;IAAQ,2BAAA;;EACR;IAAQ,wBAAA;;;AASV;EACE,gBAAA;EACA,YAAA;EACA,mBAAA;EACA,yBAAA;EACA,kBAAA;ExB2FA,sDAAA;EACQ,8CAAA;;AwBvFV;EACE,WAAA;EACA,SAAA;EACA,YAAA;EACA,eAAA;EACA,iBAAA;EACA,cAAA;EACA,kBAAA;EACA,yBAAA;ExB8EA,sDAAA;EACQ,8CAAA;EAKR,mCAAA;EACQ,2BAAA;;AwB/EV,iBAAkB;ExBuSd,kBAAkB,2LAAlB;EACA,kBAAkB,mLAAlB;EwBtSF,0BAAA;;AAIF,SAAS,OAAQ;ExBqJf,0DAAA;EACQ,kDAAA;;AwB7IV;ExBoiBE,yBAAA;;AACA,iBAAkB;EA7QhB,kBAAkB,2LAAlB;EACA,kBAAkB,mLAAlB;;AwBrRJ;ExBgiBE,yBAAA;;AACA,iBAAkB;EA7QhB,kBAAkB,2LAAlB;EACA,kBAAkB,mLAAlB;;AwBjRJ;ExB4hBE,yBAAA;;AACA,iBAAkB;EA7QhB,kBAAkB,2LAAlB;EACA,kBAAkB,mLAAlB;;AwB7QJ;ExBwhBE,yBAAA;;AACA,iBAAkB;EA7QhB,kBAAkB,2LAAlB;EACA,kBAAkB,mLAAlB;;AyBjVJ;AACA;EACE,gBAAA;EACA,OAAA;;AAIF;AACA,MAAO;EACL,gBAAA;;AAEF,MAAM;EACJ,aAAA;;AAIF;EACE,cAAA;;AAIF;EACE,eAAA;;AAOF,MACE;EACE,kBAAA;;AAFJ,MAIE;EACE,iBAAA;;AASJ;EACE,eAAA;EACA,gBAAA;;AC7CF;EAEE,mBAAA;EACA,eAAA;;AAQF;EACE,kBAAA;EACA,cAAA;EACA,kBAAA;EAEA,mBAAA;EACA,yBAAA;EACA,yBAAA;;AAGA,gBAAC;E1BsED,4BAAA;EACC,2BAAA;;A0BpED,gBAAC;EACC,gBAAA;E1B0EF,+BAAA;EACC,8BAAA;;A0BzFH,gBAmBE;EACE,YAAA;;AApBJ,gBAsBE,SAAS;EACP,iBAAA;;AAUJ,CAAC;EACC,cAAA;;AADF,CAAC,gBAGC;EACE,cAAA;;AAIF,CARD,gBAQE;AACD,CATD,gBASE;EACC,qBAAA;EACA,yBAAA;;AAIF,CAfD,gBAeE;AACD,CAhBD,gBAgBE,OAAO;AACR,CAjBD,gBAiBE,OAAO;EACN,UAAA;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;;AANF,CAfD,gBAeE,OASC;AARF,CAhBD,gBAgBE,OAAO,MAQN;AAPF,CAjBD,gBAiBE,OAAO,MAON;EACE,cAAA;;AAVJ,CAfD,gBAeE,OAYC;AAXF,CAhBD,gBAgBE,OAAO,MAWN;AAVF,CAjBD,gBAiBE,OAAO,MAUN;EACE,cAAA;;A1BsYJ,iBAAiB;EACf,cAAA;EACA,yBAAA;;AAEA,CAAC,iBAJc;EAKb,cAAA;;AADF,CAAC,iBAJc,OAOb;EAA2B,cAAA;;AAE3B,CALD,iBAJc,OASZ;AACD,CAND,iBAJc,OAUZ;EACC,cAAA;EACA,yBAAA;;AAEF,CAVD,iBAJc,OAcZ;AACD,CAXD,iBAJc,OAeZ,OAAO;AACR,CAZD,iBAJc,OAgBZ,OAAO;EACN,WAAA;EACA,yBAAA;EACA,qBAAA;;AAnBN,iBAAiB;EACf,cAAA;EACA,yBAAA;;AAEA,CAAC,iBAJc;EAKb,cAAA;;AADF,CAAC,iBAJc,IAOb;EAA2B,cAAA;;AAE3B,CALD,iBAJc,IASZ;AACD,CAND,iBAJc,IAUZ;EACC,cAAA;EACA,yBAAA;;AAEF,CAVD,iBAJc,IAcZ;AACD,CAXD,iBAJc,IAeZ,OAAO;AACR,CAZD,iBAJc,IAgBZ,OAAO;EACN,WAAA;EACA,yBAAA;EACA,qBAAA;;AAnBN,iBAAiB;EACf,cAAA;EACA,yBAAA;;AAEA,CAAC,iBAJc;EAKb,cAAA;;AADF,CAAC,iBAJc,OAOb;EAA2B,cAAA;;AAE3B,CALD,iBAJc,OASZ;AACD,CAND,iBAJc,OAUZ;EACC,cAAA;EACA,yBAAA;;AAEF,CAVD,iBAJc,OAcZ;AACD,CAXD,iBAJc,OAeZ,OAAO;AACR,CAZD,iBAJc,OAgBZ,OAAO;EACN,WAAA;EACA,yBAAA;EACA,qBAAA;;AAnBN,iBAAiB;EACf,cAAA;EACA,yBAAA;;AAEA,CAAC,iBAJc;EAKb,cAAA;;AADF,CAAC,iBAJc,MAOb;EAA2B,cAAA;;AAE3B,CALD,iBAJc,MASZ;AACD,CAND,iBAJc,MAUZ;EACC,cAAA;EACA,yBAAA;;AAEF,CAVD,iBAJc,MAcZ;AACD,CAXD,iBAJc,MAeZ,OAAO;AACR,CAZD,iBAJc,MAgBZ,OAAO;EACN,WAAA;EACA,yBAAA;EACA,qBAAA;;A0BpYR;EACE,aAAA;EACA,kBAAA;;AAEF;EACE,gBAAA;EACA,gBAAA;;ACtGF;EACE,mBAAA;EACA,yBAAA;EACA,6BAAA;EACA,kBAAA;E3BgHA,iDAAA;EACQ,yCAAA;;A2B5GV;EACE,aAAA;;AAUF,MACE;EACE,gBAAA;;AAFJ,MACE,cAEE;EACE,mBAAA;EACA,gBAAA;;AACA,MALJ,cAEE,iBAGG;EACC,aAAA;;AAEF,MARJ,cAEE,iBAMG;EACC,gBAAA;;AAIJ,MAbF,cAaG,YACC,iBAAgB;E3B2DpB,4BAAA;EACC,2BAAA;;A2BvDC,MAnBF,cAmBG,WACC,iBAAgB;E3B6DpB,+BAAA;EACC,8BAAA;;A2BvDH,cAAe,cACb,iBAAgB;EACd,mBAAA;;AAUJ,MACE;AADF,MAEE,oBAAoB;EAClB,gBAAA;;AAHJ,MAME,SAAQ,YAEN,QAAO,YAEL,KAAI,YACF,GAAE;AAXV,MAOE,oBAAmB,YAAa,SAAQ,YACtC,QAAO,YAEL,KAAI,YACF,GAAE;AAXV,MAME,SAAQ,YAGN,QAAO,YACL,KAAI,YACF,GAAE;AAXV,MAOE,oBAAmB,YAAa,SAAQ,YAEtC,QAAO,YACL,KAAI,YACF,GAAE;AAXV,MAME,SAAQ,YAEN,QAAO,YAEL,KAAI,YAEF,GAAE;AAZV,MAOE,oBAAmB,YAAa,SAAQ,YACtC,QAAO,YAEL,KAAI,YAEF,GAAE;AAZV,MAME,SAAQ,YAGN,QAAO,YACL,KAAI,YAEF,GAAE;AAZV,MAOE,oBAAmB,YAAa,SAAQ,YAEtC,QAAO,YACL,KAAI,YAEF,GAAE;EACA,2BAAA;;AAbV,MAME,SAAQ,YAEN,QAAO,YAEL,KAAI,YAKF,GAAE;AAfV,MAOE,oBAAmB,YAAa,SAAQ,YACtC,QAAO,YAEL,KAAI,YAKF,GAAE;AAfV,MAME,SAAQ,YAGN,QAAO,YACL,KAAI,YAKF,GAAE;AAfV,MAOE,oBAAmB,YAAa,SAAQ,YAEtC,QAAO,YACL,KAAI,YAKF,GAAE;AAfV,MAME,SAAQ,YAEN,QAAO,YAEL,KAAI,YAMF,GAAE;AAhBV,MAOE,oBAAmB,YAAa,SAAQ,YACtC,QAAO,YAEL,KAAI,YAMF,GAAE;AAhBV,MAME,SAAQ,YAGN,QAAO,YACL,KAAI,YAMF,GAAE;AAhBV,MAOE,oBAAmB,YAAa,SAAQ,YAEtC,QAAO,YACL,KAAI,YAMF,GAAE;EACA,4BAAA;;AAjBV,MAuBE,SAAQ,WAEN,QAAO,WAEL,KAAI,WACF,GAAE;AA5BV,MAwBE,oBAAmB,WAAY,SAAQ,WACrC,QAAO,WAEL,KAAI,WACF,GAAE;AA5BV,MAuBE,SAAQ,WAGN,QAAO,WACL,KAAI,WACF,GAAE;AA5BV,MAwBE,oBAAmB,WAAY,SAAQ,WAErC,QAAO,WACL,KAAI,WACF,GAAE;AA5BV,MAuBE,SAAQ,WAEN,QAAO,WAEL,KAAI,WAEF,GAAE;AA7BV,MAwBE,oBAAmB,WAAY,SAAQ,WACrC,QAAO,WAEL,KAAI,WAEF,GAAE;AA7BV,MAuBE,SAAQ,WAGN,QAAO,WACL,KAAI,WAEF,GAAE;AA7BV,MAwBE,oBAAmB,WAAY,SAAQ,WAErC,QAAO,WACL,KAAI,WAEF,GAAE;EACA,8BAAA;;AA9BV,MAuBE,SAAQ,WAEN,QAAO,WAEL,KAAI,WAKF,GAAE;AAhCV,MAwBE,oBAAmB,WAAY,SAAQ,WACrC,QAAO,WAEL,KAAI,WAKF,GAAE;AAhCV,MAuBE,SAAQ,WAGN,QAAO,WACL,KAAI,WAKF,GAAE;AAhCV,MAwBE,oBAAmB,WAAY,SAAQ,WAErC,QAAO,WACL,KAAI,WAKF,GAAE;AAhCV,MAuBE,SAAQ,WAEN,QAAO,WAEL,KAAI,WAMF,GAAE;AAjCV,MAwBE,oBAAmB,WAAY,SAAQ,WACrC,QAAO,WAEL,KAAI,WAMF,GAAE;AAjCV,MAuBE,SAAQ,WAGN,QAAO,WACL,KAAI,WAMF,GAAE;AAjCV,MAwBE,oBAAmB,WAAY,SAAQ,WAErC,QAAO,WACL,KAAI,WAMF,GAAE;EACA,+BAAA;;AAlCV,MAuCE,cAAc;AAvChB,MAwCE,cAAc;EACZ,6BAAA;;AAzCJ,MA2CE,SAAS,QAAO,YAAa,KAAI,YAAa;AA3ChD,MA4CE,SAAS,QAAO,YAAa,KAAI,YAAa;EAC5C,aAAA;;AA7CJ,MA+CE;AA/CF,MAgDE,oBAAoB;EAClB,SAAA;;AAjDJ,MA+CE,kBAGE,QAGE,KACE,KAAI;AAtDZ,MAgDE,oBAAoB,kBAElB,QAGE,KACE,KAAI;AAtDZ,MA+CE,kBAIE,QAEE,KACE,KAAI;AAtDZ,MAgDE,oBAAoB,kBAGlB,QAEE,KACE,KAAI;AAtDZ,MA+CE,kBAKE,QACE,KACE,KAAI;AAtDZ,MAgDE,oBAAoB,kBAIlB,QACE,KACE,KAAI;AAtDZ,MA+CE,kBAGE,QAGE,KAEE,KAAI;AAvDZ,MAgDE,oBAAoB,kBAElB,QAGE,KAEE,KAAI;AAvDZ,MA+CE,kBAIE,QAEE,KAEE,KAAI;AAvDZ,MAgDE,oBAAoB,kBAGlB,QAEE,KAEE,KAAI;AAvDZ,MA+CE,kBAKE,QACE,KAEE,KAAI;AAvDZ,MAgDE,oBAAoB,kBAIlB,QACE,KAEE,KAAI;EACF,cAAA;;AAxDV,MA+CE,kBAGE,QAGE,KAKE,KAAI;AA1DZ,MAgDE,oBAAoB,kBAElB,QAGE,KAKE,KAAI;AA1DZ,MA+CE,kBAIE,QAEE,KAKE,KAAI;AA1DZ,MAgDE,oBAAoB,kBAGlB,QAEE,KAKE,KAAI;AA1DZ,MA+CE,kBAKE,QACE,KAKE,KAAI;AA1DZ,MAgDE,oBAAoB,kBAIlB,QACE,KAKE,KAAI;AA1DZ,MA+CE,kBAGE,QAGE,KAME,KAAI;AA3DZ,MAgDE,oBAAoB,kBAElB,QAGE,KAME,KAAI;AA3DZ,MA+CE,kBAIE,QAEE,KAME,KAAI;AA3DZ,MAgDE,oBAAoB,kBAGlB,QAEE,KAME,KAAI;AA3DZ,MA+CE,kBAKE,QACE,KAME,KAAI;AA3DZ,MAgDE,oBAAoB,kBAIlB,QACE,KAME,KAAI;EACF,eAAA;;AAEF,MAfN,kBAGE,QAGE,KASG,YAAa;AAAd,MAdN,oBAAoB,kBAElB,QAGE,KASG,YAAa;AAAd,MAfN,kBAIE,QAEE,KASG,YAAa;AAAd,MAdN,oBAAoB,kBAGlB,QAEE,KASG,YAAa;AAAd,MAfN,kBAKE,QACE,KASG,YAAa;AAAd,MAdN,oBAAoB,kBAIlB,QACE,KASG,YAAa;AACd,MAhBN,kBAGE,QAGE,KAUG,YAAa;AAAd,MAfN,oBAAoB,kBAElB,QAGE,KAUG,YAAa;AAAd,MAhBN,kBAIE,QAEE,KAUG,YAAa;AAAd,MAfN,oBAAoB,kBAGlB,QAEE,KAUG,YAAa;AAAd,MAhBN,kBAKE,QACE,KAUG,YAAa;AAAd,MAfN,oBAAoB,kBAIlB,QACE,KAUG,YAAa;EACZ,aAAA;;AAEF,MAnBN,kBAGE,QAGE,KAaG,WAAY;AAAb,MAlBN,oBAAoB,kBAElB,QAGE,KAaG,WAAY;AAAb,MAnBN,kBAIE,QAEE,KAaG,WAAY;AAAb,MAlBN,oBAAoB,kBAGlB,QAEE,KAaG,WAAY;AAAb,MAnBN,kBAKE,QACE,KAaG,WAAY;AAAb,MAlBN,oBAAoB,kBAIlB,QACE,KAaG,WAAY;AACb,MApBN,kBAGE,QAGE,KAcG,WAAY;AAAb,MAnBN,oBAAoB,kBAElB,QAGE,KAcG,WAAY;AAAb,MApBN,kBAIE,QAEE,KAcG,WAAY;AAAb,MAnBN,oBAAoB,kBAGlB,QAEE,KAcG,WAAY;AAAb,MApBN,kBAKE,QACE,KAcG,WAAY;AAAb,MAnBN,oBAAoB,kBAIlB,QACE,KAcG,WAAY;EACX,gBAAA;;AApEV,MAyEE;EACE,SAAA;EACA,gBAAA;;AAMJ;EACE,kBAAA;EACA,oCAAA;E3BjDA,4BAAA;EACC,2BAAA;;A2B8CH,cAKE,YAAY;EACV,cAAA;;AAKJ;EACE,aAAA;EACA,gBAAA;EACA,eAAA;EACA,cAAA;;AAJF,YAME;EACE,cAAA;;AAKJ;EACE,kBAAA;EACA,yBAAA;EACA,6BAAA;E3BjEA,+BAAA;EACC,8BAAA;;A2B0EH;EACE,mBAAA;;AADF,YAIE;EACE,gBAAA;EACA,kBAAA;EACA,gBAAA;;AAPJ,YAIE,OAIE;EACE,eAAA;;AATN,YAaE;EACE,gBAAA;;AAdJ,YAaE,eAEE,kBAAkB;EAChB,6BAAA;;AAhBN,YAmBE;EACE,aAAA;;AApBJ,YAmBE,cAEE,kBAAkB;EAChB,gCAAA;;AAON;E3BmME,qBAAA;;AAEA,cAAE;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;;AAHF,cAAE,iBAKA,kBAAkB;EAChB,yBAAA;;AAGJ,cAAE,gBACA,kBAAkB;EAChB,4BAAA;;A2B7MN;E3BgME,qBAAA;;AAEA,cAAE;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;;AAHF,cAAE,iBAKA,kBAAkB;EAChB,yBAAA;;AAGJ,cAAE,gBACA,kBAAkB;EAChB,4BAAA;;A2B1MN;E3B6LE,qBAAA;;AAEA,cAAE;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;;AAHF,cAAE,iBAKA,kBAAkB;EAChB,yBAAA;;AAGJ,cAAE,gBACA,kBAAkB;EAChB,4BAAA;;A2BvMN;E3B0LE,qBAAA;;AAEA,WAAE;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;;AAHF,WAAE,iBAKA,kBAAkB;EAChB,yBAAA;;AAGJ,WAAE,gBACA,kBAAkB;EAChB,4BAAA;;A2BpMN;E3BuLE,qBAAA;;AAEA,cAAE;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;;AAHF,cAAE,iBAKA,kBAAkB;EAChB,yBAAA;;AAGJ,cAAE,gBACA,kBAAkB;EAChB,4BAAA;;A2BjMN;E3BoLE,qBAAA;;AAEA,aAAE;EACA,cAAA;EACA,yBAAA;EACA,qBAAA;;AAHF,aAAE,iBAKA,kBAAkB;EAChB,yBAAA;;AAGJ,aAAE,gBACA,kBAAkB;EAChB,4BAAA;;A4B9ZN;EACE,gBAAA;EACA,aAAA;EACA,mBAAA;EACA,yBAAA;EACA,yBAAA;EACA,kBAAA;E5B8GA,uDAAA;EACQ,+CAAA;;A4BrHV,KAQE;EACE,kBAAA;EACA,iCAAA;;AAKJ;EACE,aAAA;EACA,kBAAA;;AAEF;EACE,YAAA;EACA,kBAAA;;ACtBF;EACE,YAAA;EACA,eAAA;EACA,iBAAA;EACA,cAAA;EACA,cAAA;EACA,4BAAA;E7BoRA,YAAA;EAGA,yBAAA;;A6BpRA,MAAC;AACD,MAAC;EACC,cAAA;EACA,qBAAA;EACA,eAAA;E7B6QF,YAAA;EAGA,yBAAA;;A6BzQA,MAAM;EACJ,UAAA;EACA,eAAA;EACA,uBAAA;EACA,SAAA;EACA,wBAAA;;ACpBJ;EACE,gBAAA;;AAIF;EACE,aAAA;EACA,cAAA;EACA,kBAAA;EACA,eAAA;EACA,MAAA;EACA,QAAA;EACA,SAAA;EACA,OAAA;EACA,aAAA;EACA,iCAAA;EAIA,UAAA;;AAGA,MAAC,KAAM;E9BkIP,mBAAmB,kBAAnB;EACI,eAAe,kBAAf;EACI,WAAW,kBAAX;EApBR,mDAAA;EACG,6CAAA;EACE,yCAAA;EACG,mCAAA;;A8B/GR,MAAC,GAAI;E9B8HL,mBAAmB,eAAnB;EACI,eAAe,eAAf;EACI,WAAW,eAAX;;A8B5HV;EACE,kBAAA;EACA,WAAA;EACA,YAAA;;AAIF;EACE,kBAAA;EACA,yBAAA;EACA,yBAAA;EACA,oCAAA;EACA,kBAAA;E9BsEA,gDAAA;EACQ,wCAAA;E8BrER,4BAAA;EAEA,aAAA;;AAIF;EACE,eAAA;EACA,MAAA;EACA,QAAA;EACA,SAAA;EACA,OAAA;EACA,aAAA;EACA,yBAAA;;AAEA,eAAC;E9B0ND,UAAA;EAGA,wBAAA;;A8B5NA,eAAC;E9ByND,YAAA;EAGA,yBAAA;;A8BvNF;EACE,aAAA;EACA,gCAAA;EACA,0BAAA;;AAGF,aAAc;EACZ,gBAAA;;AAIF;EACE,SAAA;EACA,wBAAA;;AAKF;EACE,kBAAA;EACA,aAAA;;AAIF;EACE,gBAAA;EACA,uBAAA;EACA,iBAAA;EACA,6BAAA;;AAJF,aAQE,KAAK;EACH,gBAAA;EACA,gBAAA;;AAVJ,aAaE,WAAW,KAAK;EACd,iBAAA;;AAdJ,aAiBE,WAAW;EACT,cAAA;;AAqBJ,QAhBmC;EAGjC;IACE,YAAA;IACA,iBAAA;;EAEF;I9BPA,iDAAA;IACQ,yCAAA;;E8BWR;IAAY,YAAA;;EACZ;IAAY,YAAA;;;ACjId;EACE,kBAAA;EACA,aAAA;EACA,cAAA;EACA,mBAAA;EACA,eAAA;EACA,gBAAA;E/BmRA,UAAA;EAGA,wBAAA;;A+BnRA,QAAC;E/BgRD,YAAA;EAGA,yBAAA;;A+BlRA,QAAC;EAAU,gBAAA;EAAmB,cAAA;;AAC9B,QAAC;EAAU,gBAAA;EAAmB,cAAA;;AAC9B,QAAC;EAAU,eAAA;EAAmB,cAAA;;AAC9B,QAAC;EAAU,iBAAA;EAAmB,cAAA;;AAIhC;EACE,gBAAA;EACA,gBAAA;EACA,cAAA;EACA,kBAAA;EACA,qBAAA;EACA,yBAAA;EACA,kBAAA;;AAIF;EACE,kBAAA;EACA,QAAA;EACA,SAAA;EACA,yBAAA;EACA,mBAAA;;AAGA,QAAC,IAAK;EACJ,SAAA;EACA,SAAA;EACA,iBAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,QAAC,SAAU;EACT,SAAA;EACA,SAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,QAAC,UAAW;EACV,SAAA;EACA,UAAA;EACA,uBAAA;EACA,yBAAA;;AAEF,QAAC,MAAO;EACN,QAAA;EACA,OAAA;EACA,gBAAA;EACA,2BAAA;EACA,2BAAA;;AAEF,QAAC,KAAM;EACL,QAAA;EACA,QAAA;EACA,gBAAA;EACA,2BAAA;EACA,0BAAA;;AAEF,QAAC,OAAQ;EACP,MAAA;EACA,SAAA;EACA,iBAAA;EACA,uBAAA;EACA,4BAAA;;AAEF,QAAC,YAAa;EACZ,MAAA;EACA,SAAA;EACA,uBAAA;EACA,4BAAA;;AAEF,QAAC,aAAc;EACb,MAAA;EACA,UAAA;EACA,uBAAA;EACA,4BAAA;;ACvFJ;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,aAAA;EACA,aAAA;EACA,gBAAA;EACA,YAAA;EACA,gBAAA;EACA,yBAAA;EACA,4BAAA;EACA,yBAAA;EACA,oCAAA;EACA,kBAAA;EhCwGA,iDAAA;EACQ,yCAAA;EgCrGR,mBAAA;;AAGA,QAAC;EAAW,iBAAA;;AACZ,QAAC;EAAW,iBAAA;;AACZ,QAAC;EAAW,gBAAA;;AACZ,QAAC;EAAW,kBAAA;;AAGd;EACE,SAAA;EACA,iBAAA;EACA,eAAA;EACA,mBAAA;EACA,iBAAA;EACA,yBAAA;EACA,gCAAA;EACA,0BAAA;;AAGF;EACE,iBAAA;;AAQA,QADO;AAEP,QAFO,OAEN;EACC,kBAAA;EACA,cAAA;EACA,QAAA;EACA,SAAA;EACA,yBAAA;EACA,mBAAA;;AAGJ,QAAS;EACP,kBAAA;;AAEF,QAAS,OAAM;EACb,kBAAA;EACA,SAAS,EAAT;;AAIA,QAAC,IAAK;EACJ,SAAA;EACA,kBAAA;EACA,sBAAA;EACA,yBAAA;EACA,qCAAA;EACA,aAAA;;AACA,QAPD,IAAK,OAOH;EACC,SAAS,GAAT;EACA,WAAA;EACA,kBAAA;EACA,sBAAA;EACA,yBAAA;;AAGJ,QAAC,MAAO;EACN,QAAA;EACA,WAAA;EACA,iBAAA;EACA,oBAAA;EACA,2BAAA;EACA,uCAAA;;AACA,QAPD,MAAO,OAOL;EACC,SAAS,GAAT;EACA,SAAA;EACA,aAAA;EACA,oBAAA;EACA,2BAAA;;AAGJ,QAAC,OAAQ;EACP,SAAA;EACA,kBAAA;EACA,mBAAA;EACA,4BAAA;EACA,wCAAA;EACA,UAAA;;AACA,QAPD,OAAQ,OAON;EACC,SAAS,GAAT;EACA,QAAA;EACA,kBAAA;EACA,mBAAA;EACA,4BAAA;;AAIJ,QAAC,KAAM;EACL,QAAA;EACA,YAAA;EACA,iBAAA;EACA,qBAAA;EACA,0BAAA;EACA,sCAAA;;AACA,QAPD,KAAM,OAOJ;EACC,SAAS,GAAT;EACA,UAAA;EACA,qBAAA;EACA,0BAAA;EACA,aAAA;;AC1HN;EACE,kBAAA;;AAGF;EACE,kBAAA;EACA,gBAAA;EACA,WAAA;;AAHF,eAKE;EACE,aAAA;EACA,kBAAA;EjC+GF,yCAAA;EACQ,iCAAA;;AiCvHV,eAKE,QAME;AAXJ,eAKE,QAOE,IAAI;EjC2WN,cAAA;EACA,eAAA;EACA,YAAA;EiC3WI,cAAA;;AAdN,eAkBE;AAlBF,eAmBE;AAnBF,eAoBE;EAAU,cAAA;;AApBZ,eAsBE;EACE,OAAA;;AAvBJ,eA0BE;AA1BF,eA2BE;EACE,kBAAA;EACA,MAAA;EACA,WAAA;;AA9BJ,eAiCE;EACE,UAAA;;AAlCJ,eAoCE;EACE,WAAA;;AArCJ,eAuCE,QAAO;AAvCT,eAwCE,QAAO;EACL,OAAA;;AAzCJ,eA4CE,UAAS;EACP,WAAA;;AA7CJ,eA+CE,UAAS;EACP,UAAA;;AAQJ;EACE,kBAAA;EACA,MAAA;EACA,OAAA;EACA,SAAA;EACA,UAAA;EjCwNA,YAAA;EAGA,yBAAA;EiCzNA,eAAA;EACA,cAAA;EACA,kBAAA;EACA,yCAAA;;AAKA,iBAAC;EjCgOC,kBAAkB,8BAA8B,mCAAyC,uCAAzF;EACA,kBAAmB,4EAAnB;EACA,2BAAA;EACA,sHAAA;;AiChOF,iBAAC;EACC,UAAA;EACA,QAAA;EjC2NA,kBAAkB,8BAA8B,sCAAyC,oCAAzF;EACA,kBAAmB,4EAAnB;EACA,2BAAA;EACA,sHAAA;;AiCzNF,iBAAC;AACD,iBAAC;EACC,aAAA;EACA,cAAA;EACA,qBAAA;EjCgMF,YAAA;EAGA,yBAAA;;AiChOF,iBAkCE;AAlCF,iBAmCE;AAnCF,iBAoCE;AApCF,iBAqCE;EACE,kBAAA;EACA,QAAA;EACA,UAAA;EACA,qBAAA;;AAzCJ,iBA2CE;AA3CF,iBA4CE;EACE,SAAA;;AA7CJ,iBA+CE;AA/CF,iBAgDE;EACE,UAAA;;AAjDJ,iBAmDE;AAnDF,iBAoDE;EACE,WAAA;EACA,YAAA;EACA,iBAAA;EACA,kBAAA;EACA,kBAAA;;AAIA,iBADF,WACG;EACC,SAAS,OAAT;;AAIF,iBADF,WACG;EACC,SAAS,OAAT;;AAUN;EACE,kBAAA;EACA,YAAA;EACA,SAAA;EACA,WAAA;EACA,UAAA;EACA,iBAAA;EACA,eAAA;EACA,gBAAA;EACA,kBAAA;;AATF,oBAWE;EACE,qBAAA;EACA,WAAA;EACA,YAAA;EACA,WAAA;EACA,mBAAA;EACA,yBAAA;EACA,mBAAA;EACA,eAAA;EAUA,yBAAA;EACA,kCAAA;;AA9BJ,oBAgCE;EACE,SAAA;EACA,WAAA;EACA,YAAA;EACA,yBAAA;;AAOJ;EACE,kBAAA;EACA,SAAA;EACA,UAAA;EACA,YAAA;EACA,WAAA;EACA,iBAAA;EACA,oBAAA;EACA,cAAA;EACA,kBAAA;EACA,yCAAA;;AACA,iBAAE;EACA,iBAAA;;AAkCJ,mBA5B8C;EAG5C,iBACE;EADF,iBAEE;EAFF,iBAGE;EAHF,iBAIE;IACE,WAAA;IACA,YAAA;IACA,iBAAA;IACA,kBAAA;IACA,eAAA;;EAKJ;IACE,SAAA;IACA,UAAA;IACA,oBAAA;;EAIF;IACE,YAAA;;;AjClNF,SAAC;AACD,SAAC;AIXH,UJUG;AIVH,UJWG;AISH,gBJVG;AIUH,gBJTG;AIkBH,IJnBG;AImBH,IJlBG;AMmWH,gBAoBE,YNxXC;AMoWH,gBAoBE,YNvXC;AWkBH,YXnBG;AWmBH,YXlBG;AW8HH,mBAWE,aX1IC;AW+HH,mBAWE,aXzIC;AaZH,IbWG;AaXH,IbYG;AcVH,OdSG;AcTH,OdUG;AcUH,cdXG;AcWH,cdVG;Ac6BH,gBd9BG;Ac8BH,gBd7BG;AkBfH,MlBcG;AkBdH,MlBeG;A2BLH,W3BIG;A2BJH,W3BKG;A8B+EH,a9BhFG;A8BgFH,a9B/EG;EACC,SAAS,GAAT;EACA,cAAA;;AAEF,SAAC;AIfH,UJeG;AIKH,gBJLG;AIcH,IJdG;AM+VH,gBAoBE,YNnXC;AWcH,YXdG;AW0HH,mBAWE,aXrIC;AahBH,IbgBG;AcdH,OdcG;AcMH,cdNG;AcyBH,gBdzBG;AkBnBH,MlBmBG;A2BTH,W3BSG;A8B2EH,a9B3EG;EACC,WAAA;;AedJ;Ef6BE,cAAA;EACA,iBAAA;EACA,kBAAA;;Ae5BF;EACE,uBAAA;;AAEF;EACE,sBAAA;;AAQF;EACE,wBAAA;;AAEF;EACE,yBAAA;;AAEF;EACE,kBAAA;;AAEF;Ef+CE,WAAA;EACA,kBAAA;EACA,iBAAA;EACA,6BAAA;EACA,SAAA;;Ae1CF;EACE,wBAAA;EACA,6BAAA;;AAOF;EACE,eAAA;;AmBnCF;EACE,mBAAA;;AlCmmBE;AACF,EAAE;AACF,EAAE;AACF,EAAE;EAAI,wBAAA;;AkC3lBR,QAHqC;EAGrC;IlCglBE,yBAAA;;EACA,KAAK;IAAK,cAAA;;EACV,EAAE;IAAQ,kBAAA;;EACV,EAAE;EACF,EAAE;IAAQ,mBAAA;;;AAIR;AACF,EAAE;AACF,EAAE;AACF,EAAE;EAAI,wBAAA;;AkCplBR,QAHqC,uBAAgC;EAGrE;IlCykBE,yBAAA;;EACA,KAAK;IAAK,cAAA;;EACV,EAAE;IAAQ,kBAAA;;EACV,EAAE;EACF,EAAE;IAAQ,mBAAA;;;AAIR;AACF,EAAE;AACF,EAAE;AACF,EAAE;EAAI,wBAAA;;AkC7kBR,QAHqC,uBAAgC;EAGrE;IlCkkBE,yBAAA;;EACA,KAAK;IAAK,cAAA;;EACV,EAAE;IAAQ,kBAAA;;EACV,EAAE;EACF,EAAE;IAAQ,mBAAA;;;AAIR;AACF,EAAE;AACF,EAAE;AACF,EAAE;EAAI,wBAAA;;AkCtkBR,QAHqC;EAGrC;IlC2jBE,yBAAA;;EACA,KAAK;IAAK,cAAA;;EACV,EAAE;IAAQ,kBAAA;;EACV,EAAE;EACF,EAAE;IAAQ,mBAAA;;;AkCzjBZ,QAHqC;ElCgkBjC;EACF,EAAE;EACF,EAAE;EACF,EAAE;IAAI,wBAAA;;;AkC3jBR,QAHqC,uBAAgC;ElC2jBjE;EACF,EAAE;EACF,EAAE;EACF,EAAE;IAAI,wBAAA;;;AkCtjBR,QAHqC,uBAAgC;ElCsjBjE;EACF,EAAE;EACF,EAAE;EACF,EAAE;IAAI,wBAAA;;;AkCjjBR,QAHqC;ElCijBjC;EACF,EAAE;EACF,EAAE;EACF,EAAE;IAAI,wBAAA;;;AAHJ;AACF,EAAE;AACF,EAAE;AACF,EAAE;EAAI,wBAAA;;AkCpiBR;EAAA;IlCyhBE,yBAAA;;EACA,KAAK;IAAK,cAAA;;EACV,EAAE;IAAQ,kBAAA;;EACV,EAAE;EACF,EAAE;IAAQ,mBAAA;;;AkCvhBZ;ElC2hBI;EACF,EAAE;EACF,EAAE;EACF,EAAE;IAAI,wBAAA","sourcesContent":["/*! normalize.css v3.0.0 | MIT License | git.io/normalize */\n\n//\n// 1. Set default font family to sans-serif.\n// 2. Prevent iOS text size adjust after orientation change, without disabling\n//    user zoom.\n//\n\nhtml {\n  font-family: sans-serif; // 1\n  -ms-text-size-adjust: 100%; // 2\n  -webkit-text-size-adjust: 100%; // 2\n}\n\n//\n// Remove default margin.\n//\n\nbody {\n  margin: 0;\n}\n\n// HTML5 display definitions\n// ==========================================================================\n\n//\n// Correct `block` display not defined in IE 8/9.\n//\n\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmain,\nnav,\nsection,\nsummary {\n  display: block;\n}\n\n//\n// 1. Correct `inline-block` display not defined in IE 8/9.\n// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.\n//\n\naudio,\ncanvas,\nprogress,\nvideo {\n  display: inline-block; // 1\n  vertical-align: baseline; // 2\n}\n\n//\n// Prevent modern browsers from displaying `audio` without controls.\n// Remove excess height in iOS 5 devices.\n//\n\naudio:not([controls]) {\n  display: none;\n  height: 0;\n}\n\n//\n// Address `[hidden]` styling not present in IE 8/9.\n// Hide the `template` element in IE, Safari, and Firefox < 22.\n//\n\n[hidden],\ntemplate {\n  display: none;\n}\n\n// Links\n// ==========================================================================\n\n//\n// Remove the gray background color from active links in IE 10.\n//\n\na {\n  background: transparent;\n}\n\n//\n// Improve readability when focused and also mouse hovered in all browsers.\n//\n\na:active,\na:hover {\n  outline: 0;\n}\n\n// Text-level semantics\n// ==========================================================================\n\n//\n// Address styling not present in IE 8/9, Safari 5, and Chrome.\n//\n\nabbr[title] {\n  border-bottom: 1px dotted;\n}\n\n//\n// Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.\n//\n\nb,\nstrong {\n  font-weight: bold;\n}\n\n//\n// Address styling not present in Safari 5 and Chrome.\n//\n\ndfn {\n  font-style: italic;\n}\n\n//\n// Address variable `h1` font-size and margin within `section` and `article`\n// contexts in Firefox 4+, Safari 5, and Chrome.\n//\n\nh1 {\n  font-size: 2em;\n  margin: 0.67em 0;\n}\n\n//\n// Address styling not present in IE 8/9.\n//\n\nmark {\n  background: #ff0;\n  color: #000;\n}\n\n//\n// Address inconsistent and variable font size in all browsers.\n//\n\nsmall {\n  font-size: 80%;\n}\n\n//\n// Prevent `sub` and `sup` affecting `line-height` in all browsers.\n//\n\nsub,\nsup {\n  font-size: 75%;\n  line-height: 0;\n  position: relative;\n  vertical-align: baseline;\n}\n\nsup {\n  top: -0.5em;\n}\n\nsub {\n  bottom: -0.25em;\n}\n\n// Embedded content\n// ==========================================================================\n\n//\n// Remove border when inside `a` element in IE 8/9.\n//\n\nimg {\n  border: 0;\n}\n\n//\n// Correct overflow displayed oddly in IE 9.\n//\n\nsvg:not(:root) {\n  overflow: hidden;\n}\n\n// Grouping content\n// ==========================================================================\n\n//\n// Address margin not present in IE 8/9 and Safari 5.\n//\n\nfigure {\n  margin: 1em 40px;\n}\n\n//\n// Address differences between Firefox and other browsers.\n//\n\nhr {\n  -moz-box-sizing: content-box;\n  box-sizing: content-box;\n  height: 0;\n}\n\n//\n// Contain overflow in all browsers.\n//\n\npre {\n  overflow: auto;\n}\n\n//\n// Address odd `em`-unit font size rendering in all browsers.\n//\n\ncode,\nkbd,\npre,\nsamp {\n  font-family: monospace, monospace;\n  font-size: 1em;\n}\n\n// Forms\n// ==========================================================================\n\n//\n// Known limitation: by default, Chrome and Safari on OS X allow very limited\n// styling of `select`, unless a `border` property is set.\n//\n\n//\n// 1. Correct color not being inherited.\n//    Known issue: affects color of disabled elements.\n// 2. Correct font properties not being inherited.\n// 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.\n//\n\nbutton,\ninput,\noptgroup,\nselect,\ntextarea {\n  color: inherit; // 1\n  font: inherit; // 2\n  margin: 0; // 3\n}\n\n//\n// Address `overflow` set to `hidden` in IE 8/9/10.\n//\n\nbutton {\n  overflow: visible;\n}\n\n//\n// Address inconsistent `text-transform` inheritance for `button` and `select`.\n// All other form control elements do not inherit `text-transform` values.\n// Correct `button` style inheritance in Firefox, IE 8+, and Opera\n// Correct `select` style inheritance in Firefox.\n//\n\nbutton,\nselect {\n  text-transform: none;\n}\n\n//\n// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`\n//    and `video` controls.\n// 2. Correct inability to style clickable `input` types in iOS.\n// 3. Improve usability and consistency of cursor style between image-type\n//    `input` and others.\n//\n\nbutton,\nhtml input[type=\"button\"], // 1\ninput[type=\"reset\"],\ninput[type=\"submit\"] {\n  -webkit-appearance: button; // 2\n  cursor: pointer; // 3\n}\n\n//\n// Re-set default cursor for disabled elements.\n//\n\nbutton[disabled],\nhtml input[disabled] {\n  cursor: default;\n}\n\n//\n// Remove inner padding and border in Firefox 4+.\n//\n\nbutton::-moz-focus-inner,\ninput::-moz-focus-inner {\n  border: 0;\n  padding: 0;\n}\n\n//\n// Address Firefox 4+ setting `line-height` on `input` using `!important` in\n// the UA stylesheet.\n//\n\ninput {\n  line-height: normal;\n}\n\n//\n// It's recommended that you don't attempt to style these elements.\n// Firefox's implementation doesn't respect box-sizing, padding, or width.\n//\n// 1. Address box sizing set to `content-box` in IE 8/9/10.\n// 2. Remove excess padding in IE 8/9/10.\n//\n\ninput[type=\"checkbox\"],\ninput[type=\"radio\"] {\n  box-sizing: border-box; // 1\n  padding: 0; // 2\n}\n\n//\n// Fix the cursor style for Chrome's increment/decrement buttons. For certain\n// `font-size` values of the `input`, it causes the cursor style of the\n// decrement button to change from `default` to `text`.\n//\n\ninput[type=\"number\"]::-webkit-inner-spin-button,\ninput[type=\"number\"]::-webkit-outer-spin-button {\n  height: auto;\n}\n\n//\n// 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.\n// 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome\n//    (include `-moz` to future-proof).\n//\n\ninput[type=\"search\"] {\n  -webkit-appearance: textfield; // 1\n  -moz-box-sizing: content-box;\n  -webkit-box-sizing: content-box; // 2\n  box-sizing: content-box;\n}\n\n//\n// Remove inner padding and search cancel button in Safari and Chrome on OS X.\n// Safari (but not Chrome) clips the cancel button when the search input has\n// padding (and `textfield` appearance).\n//\n\ninput[type=\"search\"]::-webkit-search-cancel-button,\ninput[type=\"search\"]::-webkit-search-decoration {\n  -webkit-appearance: none;\n}\n\n//\n// Define consistent border, margin, and padding.\n//\n\nfieldset {\n  border: 1px solid #c0c0c0;\n  margin: 0 2px;\n  padding: 0.35em 0.625em 0.75em;\n}\n\n//\n// 1. Correct `color` not being inherited in IE 8/9.\n// 2. Remove padding so people aren't caught out if they zero out fieldsets.\n//\n\nlegend {\n  border: 0; // 1\n  padding: 0; // 2\n}\n\n//\n// Remove default vertical scrollbar in IE 8/9.\n//\n\ntextarea {\n  overflow: auto;\n}\n\n//\n// Don't inherit the `font-weight` (applied by a rule above).\n// NOTE: the default cannot safely be changed in Chrome and Safari on OS X.\n//\n\noptgroup {\n  font-weight: bold;\n}\n\n// Tables\n// ==========================================================================\n\n//\n// Remove most spacing between table cells.\n//\n\ntable {\n  border-collapse: collapse;\n  border-spacing: 0;\n}\n\ntd,\nth {\n  padding: 0;\n}","//\n// Basic print styles\n// --------------------------------------------------\n// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css\n\n@media print {\n\n  * {\n    text-shadow: none !important;\n    color: #000 !important; // Black prints faster: h5bp.com/s\n    background: transparent !important;\n    box-shadow: none !important;\n  }\n\n  a,\n  a:visited {\n    text-decoration: underline;\n  }\n\n  a[href]:after {\n    content: \" (\" attr(href) \")\";\n  }\n\n  abbr[title]:after {\n    content: \" (\" attr(title) \")\";\n  }\n\n  // Don't show links for images, or javascript/internal links\n  a[href^=\"javascript:\"]:after,\n  a[href^=\"#\"]:after {\n    content: \"\";\n  }\n\n  pre,\n  blockquote {\n    border: 1px solid #999;\n    page-break-inside: avoid;\n  }\n\n  thead {\n    display: table-header-group; // h5bp.com/t\n  }\n\n  tr,\n  img {\n    page-break-inside: avoid;\n  }\n\n  img {\n    max-width: 100% !important;\n  }\n\n  p,\n  h2,\n  h3 {\n    orphans: 3;\n    widows: 3;\n  }\n\n  h2,\n  h3 {\n    page-break-after: avoid;\n  }\n\n  // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245\n  // Once fixed, we can just straight up remove this.\n  select {\n    background: #fff !important;\n  }\n\n  // Bootstrap components\n  .navbar {\n    display: none;\n  }\n  .table {\n    td,\n    th {\n      background-color: #fff !important;\n    }\n  }\n  .btn,\n  .dropup > .btn {\n    > .caret {\n      border-top-color: #000 !important;\n    }\n  }\n  .label {\n    border: 1px solid #000;\n  }\n\n  .table {\n    border-collapse: collapse !important;\n  }\n  .table-bordered {\n    th,\n    td {\n      border: 1px solid #ddd !important;\n    }\n  }\n\n}\n","//\n// Scaffolding\n// --------------------------------------------------\n\n\n// Reset the box-sizing\n//\n// Heads up! This reset may cause conflicts with some third-party widgets.\n// For recommendations on resolving such conflicts, see\n// http://getbootstrap.com/getting-started/#third-box-sizing\n* {\n  .box-sizing(border-box);\n}\n*:before,\n*:after {\n  .box-sizing(border-box);\n}\n\n\n// Body reset\n\nhtml {\n  font-size: 62.5%;\n  -webkit-tap-highlight-color: rgba(0,0,0,0);\n}\n\nbody {\n  font-family: @font-family-base;\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @text-color;\n  background-color: @body-bg;\n}\n\n// Reset fonts for relevant elements\ninput,\nbutton,\nselect,\ntextarea {\n  font-family: inherit;\n  font-size: inherit;\n  line-height: inherit;\n}\n\n\n// Links\n\na {\n  color: @link-color;\n  text-decoration: none;\n\n  &:hover,\n  &:focus {\n    color: @link-hover-color;\n    text-decoration: underline;\n  }\n\n  &:focus {\n    .tab-focus();\n  }\n}\n\n\n// Figures\n//\n// We reset this here because previously Normalize had no `figure` margins. This\n// ensures we don't break anyone's use of the element.\n\nfigure {\n  margin: 0;\n}\n\n\n// Images\n\nimg {\n  vertical-align: middle;\n}\n\n// Responsive images (ensure images don't scale beyond their parents)\n.img-responsive {\n  .img-responsive();\n}\n\n// Rounded corners\n.img-rounded {\n  border-radius: @border-radius-large;\n}\n\n// Image thumbnails\n//\n// Heads up! This is mixin-ed into thumbnails.less for `.thumbnail`.\n.img-thumbnail {\n  padding: @thumbnail-padding;\n  line-height: @line-height-base;\n  background-color: @thumbnail-bg;\n  border: 1px solid @thumbnail-border;\n  border-radius: @thumbnail-border-radius;\n  .transition(all .2s ease-in-out);\n\n  // Keep them at most 100% wide\n  .img-responsive(inline-block);\n}\n\n// Perfect circle\n.img-circle {\n  border-radius: 50%; // set radius in percents\n}\n\n\n// Horizontal rules\n\nhr {\n  margin-top:    @line-height-computed;\n  margin-bottom: @line-height-computed;\n  border: 0;\n  border-top: 1px solid @hr-border;\n}\n\n\n// Only display content to screen readers\n//\n// See: http://a11yproject.com/posts/how-to-hide-content/\n\n.sr-only {\n  position: absolute;\n  width: 1px;\n  height: 1px;\n  margin: -1px;\n  padding: 0;\n  overflow: hidden;\n  clip: rect(0,0,0,0);\n  border: 0;\n}\n","//\n// Mixins\n// --------------------------------------------------\n\n\n// Utilities\n// -------------------------\n\n// Clearfix\n// Source: http://nicolasgallagher.com/micro-clearfix-hack/\n//\n// For modern browsers\n// 1. The space content is one way to avoid an Opera bug when the\n//    contenteditable attribute is included anywhere else in the document.\n//    Otherwise it causes space to appear at the top and bottom of elements\n//    that are clearfixed.\n// 2. The use of `table` rather than `block` is only necessary if using\n//    `:before` to contain the top-margins of child elements.\n.clearfix() {\n  &:before,\n  &:after {\n    content: \" \"; // 1\n    display: table; // 2\n  }\n  &:after {\n    clear: both;\n  }\n}\n\n// WebKit-style focus\n.tab-focus() {\n  // Default\n  outline: thin dotted;\n  // WebKit\n  outline: 5px auto -webkit-focus-ring-color;\n  outline-offset: -2px;\n}\n\n// Center-align a block level element\n.center-block() {\n  display: block;\n  margin-left: auto;\n  margin-right: auto;\n}\n\n// Sizing shortcuts\n.size(@width; @height) {\n  width: @width;\n  height: @height;\n}\n.square(@size) {\n  .size(@size; @size);\n}\n\n// Placeholder text\n.placeholder(@color: @input-color-placeholder) {\n  &:-moz-placeholder            { color: @color; } // Firefox 4-18\n  &::-moz-placeholder           { color: @color;   // Firefox 19+\n                                  opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526\n  &:-ms-input-placeholder       { color: @color; } // Internet Explorer 10+\n  &::-webkit-input-placeholder  { color: @color; } // Safari and Chrome\n}\n\n// Text overflow\n// Requires inline-block or block for proper styling\n.text-overflow() {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}\n\n// CSS image replacement\n//\n// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for\n// mixins being reused as classes with the same name, this doesn't hold up. As\n// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`. Note\n// that we cannot chain the mixins together in Less, so they are repeated.\n//\n// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757\n\n// Deprecated as of v3.0.1 (will be removed in v4)\n.hide-text() {\n  font: ~\"0/0\" a;\n  color: transparent;\n  text-shadow: none;\n  background-color: transparent;\n  border: 0;\n}\n// New mixin to use as of v3.0.1\n.text-hide() {\n  .hide-text();\n}\n\n\n\n// CSS3 PROPERTIES\n// --------------------------------------------------\n\n// Single side border-radius\n.border-top-radius(@radius) {\n  border-top-right-radius: @radius;\n   border-top-left-radius: @radius;\n}\n.border-right-radius(@radius) {\n  border-bottom-right-radius: @radius;\n     border-top-right-radius: @radius;\n}\n.border-bottom-radius(@radius) {\n  border-bottom-right-radius: @radius;\n   border-bottom-left-radius: @radius;\n}\n.border-left-radius(@radius) {\n  border-bottom-left-radius: @radius;\n     border-top-left-radius: @radius;\n}\n\n// Drop shadows\n//\n// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's\n//   supported browsers that have box shadow capabilities now support the\n//   standard `box-shadow` property.\n.box-shadow(@shadow) {\n  -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1\n          box-shadow: @shadow;\n}\n\n// Transitions\n.transition(@transition) {\n  -webkit-transition: @transition;\n          transition: @transition;\n}\n.transition-property(@transition-property) {\n  -webkit-transition-property: @transition-property;\n          transition-property: @transition-property;\n}\n.transition-delay(@transition-delay) {\n  -webkit-transition-delay: @transition-delay;\n          transition-delay: @transition-delay;\n}\n.transition-duration(@transition-duration) {\n  -webkit-transition-duration: @transition-duration;\n          transition-duration: @transition-duration;\n}\n.transition-transform(@transition) {\n  -webkit-transition: -webkit-transform @transition;\n     -moz-transition: -moz-transform @transition;\n       -o-transition: -o-transform @transition;\n          transition: transform @transition;\n}\n\n// Transformations\n.rotate(@degrees) {\n  -webkit-transform: rotate(@degrees);\n      -ms-transform: rotate(@degrees); // IE9 only\n          transform: rotate(@degrees);\n}\n.scale(@ratio; @ratio-y...) {\n  -webkit-transform: scale(@ratio, @ratio-y);\n      -ms-transform: scale(@ratio, @ratio-y); // IE9 only\n          transform: scale(@ratio, @ratio-y);\n}\n.translate(@x; @y) {\n  -webkit-transform: translate(@x, @y);\n      -ms-transform: translate(@x, @y); // IE9 only\n          transform: translate(@x, @y);\n}\n.skew(@x; @y) {\n  -webkit-transform: skew(@x, @y);\n      -ms-transform: skewX(@x) skewY(@y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+\n          transform: skew(@x, @y);\n}\n.translate3d(@x; @y; @z) {\n  -webkit-transform: translate3d(@x, @y, @z);\n          transform: translate3d(@x, @y, @z);\n}\n\n.rotateX(@degrees) {\n  -webkit-transform: rotateX(@degrees);\n      -ms-transform: rotateX(@degrees); // IE9 only\n          transform: rotateX(@degrees);\n}\n.rotateY(@degrees) {\n  -webkit-transform: rotateY(@degrees);\n      -ms-transform: rotateY(@degrees); // IE9 only\n          transform: rotateY(@degrees);\n}\n.perspective(@perspective) {\n  -webkit-perspective: @perspective;\n     -moz-perspective: @perspective;\n          perspective: @perspective;\n}\n.perspective-origin(@perspective) {\n  -webkit-perspective-origin: @perspective;\n     -moz-perspective-origin: @perspective;\n          perspective-origin: @perspective;\n}\n.transform-origin(@origin) {\n  -webkit-transform-origin: @origin;\n     -moz-transform-origin: @origin;\n      -ms-transform-origin: @origin; // IE9 only\n          transform-origin: @origin;\n}\n\n// Animations\n.animation(@animation) {\n  -webkit-animation: @animation;\n          animation: @animation;\n}\n.animation-name(@name) {\n  -webkit-animation-name: @name;\n          animation-name: @name;\n}\n.animation-duration(@duration) {\n  -webkit-animation-duration: @duration;\n          animation-duration: @duration;\n}\n.animation-timing-function(@timing-function) {\n  -webkit-animation-timing-function: @timing-function;\n          animation-timing-function: @timing-function;\n}\n.animation-delay(@delay) {\n  -webkit-animation-delay: @delay;\n          animation-delay: @delay;\n}\n.animation-iteration-count(@iteration-count) {\n  -webkit-animation-iteration-count: @iteration-count;\n          animation-iteration-count: @iteration-count;\n}\n.animation-direction(@direction) {\n  -webkit-animation-direction: @direction;\n          animation-direction: @direction;\n}\n\n// Backface visibility\n// Prevent browsers from flickering when using CSS 3D transforms.\n// Default value is `visible`, but can be changed to `hidden`\n.backface-visibility(@visibility){\n  -webkit-backface-visibility: @visibility;\n     -moz-backface-visibility: @visibility;\n          backface-visibility: @visibility;\n}\n\n// Box sizing\n.box-sizing(@boxmodel) {\n  -webkit-box-sizing: @boxmodel;\n     -moz-box-sizing: @boxmodel;\n          box-sizing: @boxmodel;\n}\n\n// User select\n// For selecting text on the page\n.user-select(@select) {\n  -webkit-user-select: @select;\n     -moz-user-select: @select;\n      -ms-user-select: @select; // IE10+\n       -o-user-select: @select;\n          user-select: @select;\n}\n\n// Resize anything\n.resizable(@direction) {\n  resize: @direction; // Options: horizontal, vertical, both\n  overflow: auto; // Safari fix\n}\n\n// CSS3 Content Columns\n.content-columns(@column-count; @column-gap: @grid-gutter-width) {\n  -webkit-column-count: @column-count;\n     -moz-column-count: @column-count;\n          column-count: @column-count;\n  -webkit-column-gap: @column-gap;\n     -moz-column-gap: @column-gap;\n          column-gap: @column-gap;\n}\n\n// Optional hyphenation\n.hyphens(@mode: auto) {\n  word-wrap: break-word;\n  -webkit-hyphens: @mode;\n     -moz-hyphens: @mode;\n      -ms-hyphens: @mode; // IE10+\n       -o-hyphens: @mode;\n          hyphens: @mode;\n}\n\n// Opacity\n.opacity(@opacity) {\n  opacity: @opacity;\n  // IE8 filter\n  @opacity-ie: (@opacity * 100);\n  filter: ~\"alpha(opacity=@{opacity-ie})\";\n}\n\n\n\n// GRADIENTS\n// --------------------------------------------------\n\n#gradient {\n\n  // Horizontal gradient, from left to right\n  //\n  // Creates two color stops, start and end, by specifying a color and position for each color stop.\n  // Color stops are not available in IE9 and below.\n  .horizontal(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n    background-image: -webkit-linear-gradient(left, color-stop(@start-color @start-percent), color-stop(@end-color @end-percent)); // Safari 5.1-6, Chrome 10+\n    background-image:  linear-gradient(to right, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n    background-repeat: repeat-x;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down\n  }\n\n  // Vertical gradient, from top to bottom\n  //\n  // Creates two color stops, start and end, by specifying a color and position for each color stop.\n  // Color stops are not available in IE9 and below.\n  .vertical(@start-color: #555; @end-color: #333; @start-percent: 0%; @end-percent: 100%) {\n    background-image: -webkit-linear-gradient(top, @start-color @start-percent, @end-color @end-percent);  // Safari 5.1-6, Chrome 10+\n    background-image: linear-gradient(to bottom, @start-color @start-percent, @end-color @end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n    background-repeat: repeat-x;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down\n  }\n\n  .directional(@start-color: #555; @end-color: #333; @deg: 45deg) {\n    background-repeat: repeat-x;\n    background-image: -webkit-linear-gradient(@deg, @start-color, @end-color); // Safari 5.1-6, Chrome 10+\n    background-image: linear-gradient(@deg, @start-color, @end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+\n  }\n  .horizontal-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n    background-image: -webkit-linear-gradient(left, @start-color, @mid-color @color-stop, @end-color);\n    background-image: linear-gradient(to right, @start-color, @mid-color @color-stop, @end-color);\n    background-repeat: no-repeat;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n  }\n  .vertical-three-colors(@start-color: #00b3ee; @mid-color: #7a43b6; @color-stop: 50%; @end-color: #c3325f) {\n    background-image: -webkit-linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n    background-image: linear-gradient(@start-color, @mid-color @color-stop, @end-color);\n    background-repeat: no-repeat;\n    filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)\",argb(@start-color),argb(@end-color))); // IE9 and down, gets no color-stop at all for proper fallback\n  }\n  .radial(@inner-color: #555; @outer-color: #333) {\n    background-image: -webkit-radial-gradient(circle, @inner-color, @outer-color);\n    background-image: radial-gradient(circle, @inner-color, @outer-color);\n    background-repeat: no-repeat;\n  }\n  .striped(@color: rgba(255,255,255,.15); @angle: 45deg) {\n    background-image: -webkit-linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n    background-image: linear-gradient(@angle, @color 25%, transparent 25%, transparent 50%, @color 50%, @color 75%, transparent 75%, transparent);\n  }\n}\n\n// Reset filters for IE\n//\n// When you need to remove a gradient background, do not forget to use this to reset\n// the IE filter for IE9 and below.\n.reset-filter() {\n  filter: e(%(\"progid:DXImageTransform.Microsoft.gradient(enabled = false)\"));\n}\n\n\n\n// Retina images\n//\n// Short retina mixin for setting background-image and -size\n\n.img-retina(@file-1x; @file-2x; @width-1x; @height-1x) {\n  background-image: url(\"@{file-1x}\");\n\n  @media\n  only screen and (-webkit-min-device-pixel-ratio: 2),\n  only screen and (   min--moz-device-pixel-ratio: 2),\n  only screen and (     -o-min-device-pixel-ratio: 2/1),\n  only screen and (        min-device-pixel-ratio: 2),\n  only screen and (                min-resolution: 192dpi),\n  only screen and (                min-resolution: 2dppx) {\n    background-image: url(\"@{file-2x}\");\n    background-size: @width-1x @height-1x;\n  }\n}\n\n\n// Responsive image\n//\n// Keep images from scaling beyond the width of their parents.\n\n.img-responsive(@display: block) {\n  display: @display;\n  max-width: 100%; // Part 1: Set a maximum relative to the parent\n  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching\n}\n\n\n// COMPONENT MIXINS\n// --------------------------------------------------\n\n// Horizontal dividers\n// -------------------------\n// Dividers (basically an hr) within dropdowns and nav lists\n.nav-divider(@color: #e5e5e5) {\n  height: 1px;\n  margin: ((@line-height-computed / 2) - 1) 0;\n  overflow: hidden;\n  background-color: @color;\n}\n\n// Panels\n// -------------------------\n.panel-variant(@border; @heading-text-color; @heading-bg-color; @heading-border) {\n  border-color: @border;\n\n  & > .panel-heading {\n    color: @heading-text-color;\n    background-color: @heading-bg-color;\n    border-color: @heading-border;\n\n    + .panel-collapse .panel-body {\n      border-top-color: @border;\n    }\n  }\n  & > .panel-footer {\n    + .panel-collapse .panel-body {\n      border-bottom-color: @border;\n    }\n  }\n}\n\n// Alerts\n// -------------------------\n.alert-variant(@background; @border; @text-color) {\n  background-color: @background;\n  border-color: @border;\n  color: @text-color;\n\n  hr {\n    border-top-color: darken(@border, 5%);\n  }\n  .alert-link {\n    color: darken(@text-color, 10%);\n  }\n}\n\n// Tables\n// -------------------------\n.table-row-variant(@state; @background) {\n  // Exact selectors below required to override `.table-striped` and prevent\n  // inheritance to nested tables.\n  .table > thead > tr,\n  .table > tbody > tr,\n  .table > tfoot > tr {\n    > td.@{state},\n    > th.@{state},\n    &.@{state} > td,\n    &.@{state} > th {\n      background-color: @background;\n    }\n  }\n\n  // Hover states for `.table-hover`\n  // Note: this is not available for cells or rows within `thead` or `tfoot`.\n  .table-hover > tbody > tr {\n    > td.@{state}:hover,\n    > th.@{state}:hover,\n    &.@{state}:hover > td,\n    &.@{state}:hover > th {\n      background-color: darken(@background, 5%);\n    }\n  }\n}\n\n// List Groups\n// -------------------------\n.list-group-item-variant(@state; @background; @color) {\n  .list-group-item-@{state} {\n    color: @color;\n    background-color: @background;\n\n    a& {\n      color: @color;\n\n      .list-group-item-heading { color: inherit; }\n\n      &:hover,\n      &:focus {\n        color: @color;\n        background-color: darken(@background, 5%);\n      }\n      &.active,\n      &.active:hover,\n      &.active:focus {\n        color: #fff;\n        background-color: @color;\n        border-color: @color;\n      }\n    }\n  }\n}\n\n// Button variants\n// -------------------------\n// Easily pump out default styles, as well as :hover, :focus, :active,\n// and disabled options for all buttons\n.button-variant(@color; @background; @border) {\n  color: @color;\n  background-color: @background;\n  border-color: @border;\n\n  &:hover,\n  &:focus,\n  &:active,\n  &.active,\n  .open .dropdown-toggle& {\n    color: @color;\n    background-color: darken(@background, 8%);\n        border-color: darken(@border, 12%);\n  }\n  &:active,\n  &.active,\n  .open .dropdown-toggle& {\n    background-image: none;\n  }\n  &.disabled,\n  &[disabled],\n  fieldset[disabled] & {\n    &,\n    &:hover,\n    &:focus,\n    &:active,\n    &.active {\n      background-color: @background;\n          border-color: @border;\n    }\n  }\n\n  .badge {\n    color: @background;\n    background-color: @color;\n  }\n}\n\n// Button sizes\n// -------------------------\n.button-size(@padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n  padding: @padding-vertical @padding-horizontal;\n  font-size: @font-size;\n  line-height: @line-height;\n  border-radius: @border-radius;\n}\n\n// Pagination\n// -------------------------\n.pagination-size(@padding-vertical; @padding-horizontal; @font-size; @border-radius) {\n  > li {\n    > a,\n    > span {\n      padding: @padding-vertical @padding-horizontal;\n      font-size: @font-size;\n    }\n    &:first-child {\n      > a,\n      > span {\n        .border-left-radius(@border-radius);\n      }\n    }\n    &:last-child {\n      > a,\n      > span {\n        .border-right-radius(@border-radius);\n      }\n    }\n  }\n}\n\n// Labels\n// -------------------------\n.label-variant(@color) {\n  background-color: @color;\n  &[href] {\n    &:hover,\n    &:focus {\n      background-color: darken(@color, 10%);\n    }\n  }\n}\n\n// Contextual backgrounds\n// -------------------------\n.bg-variant(@color) {\n  background-color: @color;\n  a&:hover {\n    background-color: darken(@color, 10%);\n  }\n}\n\n// Typography\n// -------------------------\n.text-emphasis-variant(@color) {\n  color: @color;\n  a&:hover {\n    color: darken(@color, 10%);\n  }\n}\n\n// Navbar vertical align\n// -------------------------\n// Vertically center elements in the navbar.\n// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.\n.navbar-vertical-align(@element-height) {\n  margin-top: ((@navbar-height - @element-height) / 2);\n  margin-bottom: ((@navbar-height - @element-height) / 2);\n}\n\n// Progress bars\n// -------------------------\n.progress-bar-variant(@color) {\n  background-color: @color;\n  .progress-striped & {\n    #gradient > .striped();\n  }\n}\n\n// Responsive utilities\n// -------------------------\n// More easily include all the states for responsive-utilities.less.\n.responsive-visibility() {\n  display: block !important;\n  table&  { display: table; }\n  tr&     { display: table-row !important; }\n  th&,\n  td&     { display: table-cell !important; }\n}\n\n.responsive-invisibility() {\n    &,\n  tr&,\n  th&,\n  td& { display: none !important; }\n}\n\n\n// Grid System\n// -----------\n\n// Centered container element\n.container-fixed() {\n  margin-right: auto;\n  margin-left: auto;\n  padding-left:  (@grid-gutter-width / 2);\n  padding-right: (@grid-gutter-width / 2);\n  &:extend(.clearfix all);\n}\n\n// Creates a wrapper for a series of columns\n.make-row(@gutter: @grid-gutter-width) {\n  margin-left:  (@gutter / -2);\n  margin-right: (@gutter / -2);\n  &:extend(.clearfix all);\n}\n\n// Generate the extra small columns\n.make-xs-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  float: left;\n  width: percentage((@columns / @grid-columns));\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n}\n.make-xs-column-offset(@columns) {\n  @media (min-width: @screen-xs-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-xs-column-push(@columns) {\n  @media (min-width: @screen-xs-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-xs-column-pull(@columns) {\n  @media (min-width: @screen-xs-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Generate the small columns\n.make-sm-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-sm-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-offset(@columns) {\n  @media (min-width: @screen-sm-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-push(@columns) {\n  @media (min-width: @screen-sm-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-sm-column-pull(@columns) {\n  @media (min-width: @screen-sm-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Generate the medium columns\n.make-md-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-md-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-offset(@columns) {\n  @media (min-width: @screen-md-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-push(@columns) {\n  @media (min-width: @screen-md-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-md-column-pull(@columns) {\n  @media (min-width: @screen-md-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Generate the large columns\n.make-lg-column(@columns; @gutter: @grid-gutter-width) {\n  position: relative;\n  min-height: 1px;\n  padding-left:  (@gutter / 2);\n  padding-right: (@gutter / 2);\n\n  @media (min-width: @screen-lg-min) {\n    float: left;\n    width: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-offset(@columns) {\n  @media (min-width: @screen-lg-min) {\n    margin-left: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-push(@columns) {\n  @media (min-width: @screen-lg-min) {\n    left: percentage((@columns / @grid-columns));\n  }\n}\n.make-lg-column-pull(@columns) {\n  @media (min-width: @screen-lg-min) {\n    right: percentage((@columns / @grid-columns));\n  }\n}\n\n\n// Framework grid generation\n//\n// Used only by Bootstrap to generate the correct number of grid classes given\n// any value of `@grid-columns`.\n\n.make-grid-columns() {\n  // Common styles for all sizes of grid columns, widths 1-12\n  .col(@index) when (@index = 1) { // initial\n    @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n    .col((@index + 1), @item);\n  }\n  .col(@index, @list) when (@index =< @grid-columns) { // general; \"=<\" isn't a typo\n    @item: ~\".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}\";\n    .col((@index + 1), ~\"@{list}, @{item}\");\n  }\n  .col(@index, @list) when (@index > @grid-columns) { // terminal\n    @{list} {\n      position: relative;\n      // Prevent columns from collapsing when empty\n      min-height: 1px;\n      // Inner gutter via padding\n      padding-left:  (@grid-gutter-width / 2);\n      padding-right: (@grid-gutter-width / 2);\n    }\n  }\n  .col(1); // kickstart it\n}\n\n.make-grid-columns-float(@class) {\n  .col(@index) when (@index = 1) { // initial\n    @item: ~\".col-@{class}-@{index}\";\n    .col((@index + 1), @item);\n  }\n  .col(@index, @list) when (@index =< @grid-columns) { // general\n    @item: ~\".col-@{class}-@{index}\";\n    .col((@index + 1), ~\"@{list}, @{item}\");\n  }\n  .col(@index, @list) when (@index > @grid-columns) { // terminal\n    @{list} {\n      float: left;\n    }\n  }\n  .col(1); // kickstart it\n}\n\n.calc-grid(@index, @class, @type) when (@type = width) and (@index > 0) {\n  .col-@{class}-@{index} {\n    width: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid(@index, @class, @type) when (@type = push) {\n  .col-@{class}-push-@{index} {\n    left: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid(@index, @class, @type) when (@type = pull) {\n  .col-@{class}-pull-@{index} {\n    right: percentage((@index / @grid-columns));\n  }\n}\n.calc-grid(@index, @class, @type) when (@type = offset) {\n  .col-@{class}-offset-@{index} {\n    margin-left: percentage((@index / @grid-columns));\n  }\n}\n\n// Basic looping in LESS\n.make-grid(@index, @class, @type) when (@index >= 0) {\n  .calc-grid(@index, @class, @type);\n  // next iteration\n  .make-grid((@index - 1), @class, @type);\n}\n\n\n// Form validation states\n//\n// Used in forms.less to generate the form validation CSS for warnings, errors,\n// and successes.\n\n.form-control-validation(@text-color: #555; @border-color: #ccc; @background-color: #f5f5f5) {\n  // Color the label and help text\n  .help-block,\n  .control-label,\n  .radio,\n  .checkbox,\n  .radio-inline,\n  .checkbox-inline  {\n    color: @text-color;\n  }\n  // Set the border and box shadow on specific inputs to match\n  .form-control {\n    border-color: @border-color;\n    .box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work\n    &:focus {\n      border-color: darken(@border-color, 10%);\n      @shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@border-color, 20%);\n      .box-shadow(@shadow);\n    }\n  }\n  // Set validation states also for addons\n  .input-group-addon {\n    color: @text-color;\n    border-color: @border-color;\n    background-color: @background-color;\n  }\n  // Optional feedback icon\n  .form-control-feedback {\n    color: @text-color;\n  }\n}\n\n// Form control focus state\n//\n// Generate a customized focus state and for any input with the specified color,\n// which defaults to the `@input-focus-border` variable.\n//\n// We highly encourage you to not customize the default value, but instead use\n// this to tweak colors on an as-needed basis. This aesthetic change is based on\n// WebKit's default styles, but applicable to a wider range of browsers. Its\n// usability and accessibility should be taken into account with any change.\n//\n// Example usage: change the default blue border and shadow to white for better\n// contrast against a dark gray background.\n\n.form-control-focus(@color: @input-border-focus) {\n  @color-rgba: rgba(red(@color), green(@color), blue(@color), .6);\n  &:focus {\n    border-color: @color;\n    outline: 0;\n    .box-shadow(~\"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px @{color-rgba}\");\n  }\n}\n\n// Form control sizing\n//\n// Relative text size, padding, and border-radii changes for form controls. For\n// horizontal sizing, wrap controls in the predefined grid classes. `<select>`\n// element gets special love because it's special, and that's a fact!\n\n.input-size(@input-height; @padding-vertical; @padding-horizontal; @font-size; @line-height; @border-radius) {\n  height: @input-height;\n  padding: @padding-vertical @padding-horizontal;\n  font-size: @font-size;\n  line-height: @line-height;\n  border-radius: @border-radius;\n\n  select& {\n    height: @input-height;\n    line-height: @input-height;\n  }\n\n  textarea&,\n  select[multiple]& {\n    height: auto;\n  }\n}\n","//\n// Variables\n// --------------------------------------------------\n\n\n//== Colors\n//\n//## Gray and brand colors for use across Bootstrap.\n\n@gray-darker:            lighten(#000, 13.5%); // #222\n@gray-dark:              lighten(#000, 20%);   // #333\n@gray:                   lighten(#000, 33.5%); // #555\n@gray-light:             lighten(#000, 60%);   // #999\n@gray-lighter:           lighten(#000, 93.5%); // #eee\n\n@brand-primary:         #428bca;\n@brand-success:         #5cb85c;\n@brand-info:            #5bc0de;\n@brand-warning:         #f0ad4e;\n@brand-danger:          #d9534f;\n\n\n//== Scaffolding\n//\n// ## Settings for some of the most global styles.\n\n//** Background color for `<body>`.\n@body-bg:               #fff;\n//** Global text color on `<body>`.\n@text-color:            @gray-dark;\n\n//** Global textual link color.\n@link-color:            @brand-primary;\n//** Link hover color set via `darken()` function.\n@link-hover-color:      darken(@link-color, 15%);\n\n\n//== Typography\n//\n//## Font, line-height, and color for body text, headings, and more.\n\n@font-family-sans-serif:  \"Helvetica Neue\", Helvetica, Arial, sans-serif;\n@font-family-serif:       Georgia, \"Times New Roman\", Times, serif;\n//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.\n@font-family-monospace:   Menlo, Monaco, Consolas, \"Courier New\", monospace;\n@font-family-base:        @font-family-sans-serif;\n\n@font-size-base:          14px;\n@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px\n@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px\n\n@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px\n@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px\n@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px\n@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px\n@font-size-h5:            @font-size-base;\n@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px\n\n//** Unit-less `line-height` for use in components like buttons.\n@line-height-base:        1.428571429; // 20/14\n//** Computed \"line-height\" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.\n@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px\n\n//** By default, this inherits from the `<body>`.\n@headings-font-family:    inherit;\n@headings-font-weight:    500;\n@headings-line-height:    1.1;\n@headings-color:          inherit;\n\n\n//-- Iconography\n//\n//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.\n\n@icon-font-path:          \"../fonts/\";\n@icon-font-name:          \"glyphicons-halflings-regular\";\n@icon-font-svg-id:\t\t\t\t\"glyphicons_halflingsregular\";\n\n//== Components\n//\n//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).\n\n@padding-base-vertical:     6px;\n@padding-base-horizontal:   12px;\n\n@padding-large-vertical:    10px;\n@padding-large-horizontal:  16px;\n\n@padding-small-vertical:    5px;\n@padding-small-horizontal:  10px;\n\n@padding-xs-vertical:       1px;\n@padding-xs-horizontal:     5px;\n\n@line-height-large:         1.33;\n@line-height-small:         1.5;\n\n@border-radius-base:        4px;\n@border-radius-large:       6px;\n@border-radius-small:       3px;\n\n//** Global color for active items (e.g., navs or dropdowns).\n@component-active-color:    #fff;\n//** Global background color for active items (e.g., navs or dropdowns).\n@component-active-bg:       @brand-primary;\n\n//** Width of the `border` for generating carets that indicator dropdowns.\n@caret-width-base:          4px;\n//** Carets increase slightly in size for larger components.\n@caret-width-large:         5px;\n\n\n//== Tables\n//\n//## Customizes the `.table` component with basic values, each used across all table variations.\n\n//** Padding for `<th>`s and `<td>`s.\n@table-cell-padding:            8px;\n//** Padding for cells in `.table-condensed`.\n@table-condensed-cell-padding:  5px;\n\n//** Default background color used for all tables.\n@table-bg:                      transparent;\n//** Background color used for `.table-striped`.\n@table-bg-accent:               #f9f9f9;\n//** Background color used for `.table-hover`.\n@table-bg-hover:                #f5f5f5;\n@table-bg-active:               @table-bg-hover;\n\n//** Border color for table and cell borders.\n@table-border-color:            #ddd;\n\n\n//== Buttons\n//\n//## For each of Bootstrap's buttons, define text, background and border color.\n\n@btn-font-weight:                normal;\n\n@btn-default-color:              #333;\n@btn-default-bg:                 #fff;\n@btn-default-border:             #ccc;\n\n@btn-primary-color:              #fff;\n@btn-primary-bg:                 @brand-primary;\n@btn-primary-border:             darken(@btn-primary-bg, 5%);\n\n@btn-success-color:              #fff;\n@btn-success-bg:                 @brand-success;\n@btn-success-border:             darken(@btn-success-bg, 5%);\n\n@btn-info-color:                 #fff;\n@btn-info-bg:                    @brand-info;\n@btn-info-border:                darken(@btn-info-bg, 5%);\n\n@btn-warning-color:              #fff;\n@btn-warning-bg:                 @brand-warning;\n@btn-warning-border:             darken(@btn-warning-bg, 5%);\n\n@btn-danger-color:               #fff;\n@btn-danger-bg:                  @brand-danger;\n@btn-danger-border:              darken(@btn-danger-bg, 5%);\n\n@btn-link-disabled-color:        @gray-light;\n\n\n//== Forms\n//\n//##\n\n//** `<input>` background color\n@input-bg:                       #fff;\n//** `<input disabled>` background color\n@input-bg-disabled:              @gray-lighter;\n\n//** Text color for `<input>`s\n@input-color:                    @gray;\n//** `<input>` border color\n@input-border:                   #ccc;\n//** `<input>` border radius\n@input-border-radius:            @border-radius-base;\n//** Border color for inputs on focus\n@input-border-focus:             #66afe9;\n\n//** Placeholder text color\n@input-color-placeholder:        @gray-light;\n\n//** Default `.form-control` height\n@input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);\n//** Large `.form-control` height\n@input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);\n//** Small `.form-control` height\n@input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);\n\n@legend-color:                   @gray-dark;\n@legend-border-color:            #e5e5e5;\n\n//** Background color for textual input addons\n@input-group-addon-bg:           @gray-lighter;\n//** Border color for textual input addons\n@input-group-addon-border-color: @input-border;\n\n\n//== Dropdowns\n//\n//## Dropdown menu container and contents.\n\n//** Background for the dropdown menu.\n@dropdown-bg:                    #fff;\n//** Dropdown menu `border-color`.\n@dropdown-border:                rgba(0,0,0,.15);\n//** Dropdown menu `border-color` **for IE8**.\n@dropdown-fallback-border:       #ccc;\n//** Divider color for between dropdown items.\n@dropdown-divider-bg:            #e5e5e5;\n\n//** Dropdown link text color.\n@dropdown-link-color:            @gray-dark;\n//** Hover color for dropdown links.\n@dropdown-link-hover-color:      darken(@gray-dark, 5%);\n//** Hover background for dropdown links.\n@dropdown-link-hover-bg:         #f5f5f5;\n\n//** Active dropdown menu item text color.\n@dropdown-link-active-color:     @component-active-color;\n//** Active dropdown menu item background color.\n@dropdown-link-active-bg:        @component-active-bg;\n\n//** Disabled dropdown menu item background color.\n@dropdown-link-disabled-color:   @gray-light;\n\n//** Text color for headers within dropdown menus.\n@dropdown-header-color:          @gray-light;\n\n// Note: Deprecated @dropdown-caret-color as of v3.1.0\n@dropdown-caret-color:           #000;\n\n\n//-- Z-index master list\n//\n// Warning: Avoid customizing these values. They're used for a bird's eye view\n// of components dependent on the z-axis and are designed to all work together.\n//\n// Note: These variables are not generated into the Customizer.\n\n@zindex-navbar:            1000;\n@zindex-dropdown:          1000;\n@zindex-popover:           1010;\n@zindex-tooltip:           1030;\n@zindex-navbar-fixed:      1030;\n@zindex-modal-background:  1040;\n@zindex-modal:             1050;\n\n\n//== Media queries breakpoints\n//\n//## Define the breakpoints at which your layout will change, adapting to different screen sizes.\n\n// Extra small screen / phone\n// Note: Deprecated @screen-xs and @screen-phone as of v3.0.1\n@screen-xs:                  480px;\n@screen-xs-min:              @screen-xs;\n@screen-phone:               @screen-xs-min;\n\n// Small screen / tablet\n// Note: Deprecated @screen-sm and @screen-tablet as of v3.0.1\n@screen-sm:                  768px;\n@screen-sm-min:              @screen-sm;\n@screen-tablet:              @screen-sm-min;\n\n// Medium screen / desktop\n// Note: Deprecated @screen-md and @screen-desktop as of v3.0.1\n@screen-md:                  992px;\n@screen-md-min:              @screen-md;\n@screen-desktop:             @screen-md-min;\n\n// Large screen / wide desktop\n// Note: Deprecated @screen-lg and @screen-lg-desktop as of v3.0.1\n@screen-lg:                  1200px;\n@screen-lg-min:              @screen-lg;\n@screen-lg-desktop:          @screen-lg-min;\n\n// So media queries don't overlap when required, provide a maximum\n@screen-xs-max:              (@screen-sm-min - 1);\n@screen-sm-max:              (@screen-md-min - 1);\n@screen-md-max:              (@screen-lg-min - 1);\n\n\n//== Grid system\n//\n//## Define your custom responsive grid.\n\n//** Number of columns in the grid.\n@grid-columns:              12;\n//** Padding between columns. Gets divided in half for the left and right.\n@grid-gutter-width:         30px;\n// Navbar collapse\n//** Point at which the navbar becomes uncollapsed.\n@grid-float-breakpoint:     @screen-sm-min;\n//** Point at which the navbar begins collapsing.\n@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);\n\n\n//== Navbar\n//\n//##\n\n// Basics of a navbar\n@navbar-height:                    50px;\n@navbar-margin-bottom:             @line-height-computed;\n@navbar-border-radius:             @border-radius-base;\n@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));\n@navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);\n@navbar-collapse-max-height:       340px;\n\n@navbar-default-color:             #777;\n@navbar-default-bg:                #f8f8f8;\n@navbar-default-border:            darken(@navbar-default-bg, 6.5%);\n\n// Navbar links\n@navbar-default-link-color:                #777;\n@navbar-default-link-hover-color:          #333;\n@navbar-default-link-hover-bg:             transparent;\n@navbar-default-link-active-color:         #555;\n@navbar-default-link-active-bg:            darken(@navbar-default-bg, 6.5%);\n@navbar-default-link-disabled-color:       #ccc;\n@navbar-default-link-disabled-bg:          transparent;\n\n// Navbar brand label\n@navbar-default-brand-color:               @navbar-default-link-color;\n@navbar-default-brand-hover-color:         darken(@navbar-default-brand-color, 10%);\n@navbar-default-brand-hover-bg:            transparent;\n\n// Navbar toggle\n@navbar-default-toggle-hover-bg:           #ddd;\n@navbar-default-toggle-icon-bar-bg:        #888;\n@navbar-default-toggle-border-color:       #ddd;\n\n\n// Inverted navbar\n// Reset inverted navbar basics\n@navbar-inverse-color:                      @gray-light;\n@navbar-inverse-bg:                         #222;\n@navbar-inverse-border:                     darken(@navbar-inverse-bg, 10%);\n\n// Inverted navbar links\n@navbar-inverse-link-color:                 @gray-light;\n@navbar-inverse-link-hover-color:           #fff;\n@navbar-inverse-link-hover-bg:              transparent;\n@navbar-inverse-link-active-color:          @navbar-inverse-link-hover-color;\n@navbar-inverse-link-active-bg:             darken(@navbar-inverse-bg, 10%);\n@navbar-inverse-link-disabled-color:        #444;\n@navbar-inverse-link-disabled-bg:           transparent;\n\n// Inverted navbar brand label\n@navbar-inverse-brand-color:                @navbar-inverse-link-color;\n@navbar-inverse-brand-hover-color:          #fff;\n@navbar-inverse-brand-hover-bg:             transparent;\n\n// Inverted navbar toggle\n@navbar-inverse-toggle-hover-bg:            #333;\n@navbar-inverse-toggle-icon-bar-bg:         #fff;\n@navbar-inverse-toggle-border-color:        #333;\n\n\n//== Navs\n//\n//##\n\n//=== Shared nav styles\n@nav-link-padding:                          10px 15px;\n@nav-link-hover-bg:                         @gray-lighter;\n\n@nav-disabled-link-color:                   @gray-light;\n@nav-disabled-link-hover-color:             @gray-light;\n\n@nav-open-link-hover-color:                 #fff;\n\n//== Tabs\n@nav-tabs-border-color:                     #ddd;\n\n@nav-tabs-link-hover-border-color:          @gray-lighter;\n\n@nav-tabs-active-link-hover-bg:             @body-bg;\n@nav-tabs-active-link-hover-color:          @gray;\n@nav-tabs-active-link-hover-border-color:   #ddd;\n\n@nav-tabs-justified-link-border-color:            #ddd;\n@nav-tabs-justified-active-link-border-color:     @body-bg;\n\n//== Pills\n@nav-pills-border-radius:                   @border-radius-base;\n@nav-pills-active-link-hover-bg:            @component-active-bg;\n@nav-pills-active-link-hover-color:         @component-active-color;\n\n\n//== Pagination\n//\n//##\n\n@pagination-color:                     @link-color;\n@pagination-bg:                        #fff;\n@pagination-border:                    #ddd;\n\n@pagination-hover-color:               @link-hover-color;\n@pagination-hover-bg:                  @gray-lighter;\n@pagination-hover-border:              #ddd;\n\n@pagination-active-color:              #fff;\n@pagination-active-bg:                 @brand-primary;\n@pagination-active-border:             @brand-primary;\n\n@pagination-disabled-color:            @gray-light;\n@pagination-disabled-bg:               #fff;\n@pagination-disabled-border:           #ddd;\n\n\n//== Pager\n//\n//##\n\n@pager-bg:                             @pagination-bg;\n@pager-border:                         @pagination-border;\n@pager-border-radius:                  15px;\n\n@pager-hover-bg:                       @pagination-hover-bg;\n\n@pager-active-bg:                      @pagination-active-bg;\n@pager-active-color:                   @pagination-active-color;\n\n@pager-disabled-color:                 @pagination-disabled-color;\n\n\n//== Jumbotron\n//\n//##\n\n@jumbotron-padding:              30px;\n@jumbotron-color:                inherit;\n@jumbotron-bg:                   @gray-lighter;\n@jumbotron-heading-color:        inherit;\n@jumbotron-font-size:            ceil((@font-size-base * 1.5));\n\n\n//== Form states and alerts\n//\n//## Define colors for form feedback states and, by default, alerts.\n\n@state-success-text:             #3c763d;\n@state-success-bg:               #dff0d8;\n@state-success-border:           darken(spin(@state-success-bg, -10), 5%);\n\n@state-info-text:                #31708f;\n@state-info-bg:                  #d9edf7;\n@state-info-border:              darken(spin(@state-info-bg, -10), 7%);\n\n@state-warning-text:             #8a6d3b;\n@state-warning-bg:               #fcf8e3;\n@state-warning-border:           darken(spin(@state-warning-bg, -10), 5%);\n\n@state-danger-text:              #a94442;\n@state-danger-bg:                #f2dede;\n@state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);\n\n\n//== Tooltips\n//\n//##\n\n//** Tooltip max width\n@tooltip-max-width:           200px;\n//** Tooltip text color\n@tooltip-color:               #fff;\n//** Tooltip background color\n@tooltip-bg:                  #000;\n@tooltip-opacity:             .9;\n\n//** Tooltip arrow width\n@tooltip-arrow-width:         5px;\n//** Tooltip arrow color\n@tooltip-arrow-color:         @tooltip-bg;\n\n\n//== Popovers\n//\n//##\n\n//** Popover body background color\n@popover-bg:                          #fff;\n//** Popover maximum width\n@popover-max-width:                   276px;\n//** Popover border color\n@popover-border-color:                rgba(0,0,0,.2);\n//** Popover fallback border color\n@popover-fallback-border-color:       #ccc;\n\n//** Popover title background color\n@popover-title-bg:                    darken(@popover-bg, 3%);\n\n//** Popover arrow width\n@popover-arrow-width:                 10px;\n//** Popover arrow color\n@popover-arrow-color:                 #fff;\n\n//** Popover outer arrow width\n@popover-arrow-outer-width:           (@popover-arrow-width + 1);\n//** Popover outer arrow color\n@popover-arrow-outer-color:           rgba(0,0,0,.25);\n//** Popover outer arrow fallback color\n@popover-arrow-outer-fallback-color:  #999;\n\n\n//== Labels\n//\n//##\n\n//** Default label background color\n@label-default-bg:            @gray-light;\n//** Primary label background color\n@label-primary-bg:            @brand-primary;\n//** Success label background color\n@label-success-bg:            @brand-success;\n//** Info label background color\n@label-info-bg:               @brand-info;\n//** Warning label background color\n@label-warning-bg:            @brand-warning;\n//** Danger label background color\n@label-danger-bg:             @brand-danger;\n\n//** Default label text color\n@label-color:                 #fff;\n//** Default text color of a linked label\n@label-link-hover-color:      #fff;\n\n\n//== Modals\n//\n//##\n\n//** Padding applied to the modal body\n@modal-inner-padding:         20px;\n\n//** Padding applied to the modal title\n@modal-title-padding:         15px;\n//** Modal title line-height\n@modal-title-line-height:     @line-height-base;\n\n//** Background color of modal content area\n@modal-content-bg:                             #fff;\n//** Modal content border color\n@modal-content-border-color:                   rgba(0,0,0,.2);\n//** Modal content border color **for IE8**\n@modal-content-fallback-border-color:          #999;\n\n//** Modal backdrop background color\n@modal-backdrop-bg:           #000;\n//** Modal backdrop opacity\n@modal-backdrop-opacity:      .5;\n//** Modal header border color\n@modal-header-border-color:   #e5e5e5;\n//** Modal footer border color\n@modal-footer-border-color:   @modal-header-border-color;\n\n@modal-lg:                    900px;\n@modal-md:                    600px;\n@modal-sm:                    300px;\n\n\n//== Alerts\n//\n//## Define alert colors, border radius, and padding.\n\n@alert-padding:               15px;\n@alert-border-radius:         @border-radius-base;\n@alert-link-font-weight:      bold;\n\n@alert-success-bg:            @state-success-bg;\n@alert-success-text:          @state-success-text;\n@alert-success-border:        @state-success-border;\n\n@alert-info-bg:               @state-info-bg;\n@alert-info-text:             @state-info-text;\n@alert-info-border:           @state-info-border;\n\n@alert-warning-bg:            @state-warning-bg;\n@alert-warning-text:          @state-warning-text;\n@alert-warning-border:        @state-warning-border;\n\n@alert-danger-bg:             @state-danger-bg;\n@alert-danger-text:           @state-danger-text;\n@alert-danger-border:         @state-danger-border;\n\n\n//== Progress bars\n//\n//##\n\n//** Background color of the whole progress component\n@progress-bg:                 #f5f5f5;\n//** Progress bar text color\n@progress-bar-color:          #fff;\n\n//** Default progress bar color\n@progress-bar-bg:             @brand-primary;\n//** Success progress bar color\n@progress-bar-success-bg:     @brand-success;\n//** Warning progress bar color\n@progress-bar-warning-bg:     @brand-warning;\n//** Danger progress bar color\n@progress-bar-danger-bg:      @brand-danger;\n//** Info progress bar color\n@progress-bar-info-bg:        @brand-info;\n\n\n//== List group\n//\n//##\n\n//** Background color on `.list-group-item`\n@list-group-bg:                 #fff;\n//** `.list-group-item` border color\n@list-group-border:             #ddd;\n//** List group border radius\n@list-group-border-radius:      @border-radius-base;\n\n//** Background color of single list elements on hover\n@list-group-hover-bg:           #f5f5f5;\n//** Text color of active list elements\n@list-group-active-color:       @component-active-color;\n//** Background color of active list elements\n@list-group-active-bg:          @component-active-bg;\n//** Border color of active list elements\n@list-group-active-border:      @list-group-active-bg;\n@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);\n\n@list-group-link-color:         #555;\n@list-group-link-heading-color: #333;\n\n\n//== Panels\n//\n//##\n\n@panel-bg:                    #fff;\n@panel-body-padding:          15px;\n@panel-border-radius:         @border-radius-base;\n\n//** Border color for elements within panels\n@panel-inner-border:          #ddd;\n@panel-footer-bg:             #f5f5f5;\n\n@panel-default-text:          @gray-dark;\n@panel-default-border:        #ddd;\n@panel-default-heading-bg:    #f5f5f5;\n\n@panel-primary-text:          #fff;\n@panel-primary-border:        @brand-primary;\n@panel-primary-heading-bg:    @brand-primary;\n\n@panel-success-text:          @state-success-text;\n@panel-success-border:        @state-success-border;\n@panel-success-heading-bg:    @state-success-bg;\n\n@panel-info-text:             @state-info-text;\n@panel-info-border:           @state-info-border;\n@panel-info-heading-bg:       @state-info-bg;\n\n@panel-warning-text:          @state-warning-text;\n@panel-warning-border:        @state-warning-border;\n@panel-warning-heading-bg:    @state-warning-bg;\n\n@panel-danger-text:           @state-danger-text;\n@panel-danger-border:         @state-danger-border;\n@panel-danger-heading-bg:     @state-danger-bg;\n\n\n//== Thumbnails\n//\n//##\n\n//** Padding around the thumbnail image\n@thumbnail-padding:           4px;\n//** Thumbnail background color\n@thumbnail-bg:                @body-bg;\n//** Thumbnail border color\n@thumbnail-border:            #ddd;\n//** Thumbnail border radius\n@thumbnail-border-radius:     @border-radius-base;\n\n//** Custom text color for thumbnail captions\n@thumbnail-caption-color:     @text-color;\n//** Padding around the thumbnail caption\n@thumbnail-caption-padding:   9px;\n\n\n//== Wells\n//\n//##\n\n@well-bg:                     #f5f5f5;\n@well-border:                 darken(@well-bg, 7%);\n\n\n//== Badges\n//\n//##\n\n@badge-color:                 #fff;\n//** Linked badge text color on hover\n@badge-link-hover-color:      #fff;\n@badge-bg:                    @gray-light;\n\n//** Badge text color in active nav link\n@badge-active-color:          @link-color;\n//** Badge background color in active nav link\n@badge-active-bg:             #fff;\n\n@badge-font-weight:           bold;\n@badge-line-height:           1;\n@badge-border-radius:         10px;\n\n\n//== Breadcrumbs\n//\n//##\n\n@breadcrumb-padding-vertical:   8px;\n@breadcrumb-padding-horizontal: 15px;\n//** Breadcrumb background color\n@breadcrumb-bg:                 #f5f5f5;\n//** Breadcrumb text color\n@breadcrumb-color:              #ccc;\n//** Text color of current page in the breadcrumb\n@breadcrumb-active-color:       @gray-light;\n//** Textual separator for between breadcrumb elements\n@breadcrumb-separator:          \"/\";\n\n\n//== Carousel\n//\n//##\n\n@carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);\n\n@carousel-control-color:                      #fff;\n@carousel-control-width:                      15%;\n@carousel-control-opacity:                    .5;\n@carousel-control-font-size:                  20px;\n\n@carousel-indicator-active-bg:                #fff;\n@carousel-indicator-border-color:             #fff;\n\n@carousel-caption-color:                      #fff;\n\n\n//== Close\n//\n//##\n\n@close-font-weight:           bold;\n@close-color:                 #000;\n@close-text-shadow:           0 1px 0 #fff;\n\n\n//== Code\n//\n//##\n\n@code-color:                  #c7254e;\n@code-bg:                     #f9f2f4;\n\n@kbd-color:                   #fff;\n@kbd-bg:                      #333;\n\n@pre-bg:                      #f5f5f5;\n@pre-color:                   @gray-dark;\n@pre-border-color:            #ccc;\n@pre-scrollable-max-height:   340px;\n\n\n//== Type\n//\n//##\n\n//** Text muted color\n@text-muted:                  @gray-light;\n//** Abbreviations and acronyms border color\n@abbr-border-color:           @gray-light;\n//** Headings small color\n@headings-small-color:        @gray-light;\n//** Blockquote small color\n@blockquote-small-color:      @gray-light;\n//** Blockquote border color\n@blockquote-border-color:     @gray-lighter;\n//** Page header border color\n@page-header-border-color:    @gray-lighter;\n\n\n//== Miscellaneous\n//\n//##\n\n//** Horizontal line color.\n@hr-border:                   @gray-lighter;\n\n//** Horizontal offset for forms and lists.\n@component-offset-horizontal: 180px;\n\n\n//== Container sizes\n//\n//## Define the maximum width of `.container` for different screen sizes.\n\n// Small screen / tablet\n@container-tablet:             ((720px + @grid-gutter-width));\n//** For `@screen-sm-min` and up.\n@container-sm:                 @container-tablet;\n\n// Medium screen / desktop\n@container-desktop:            ((940px + @grid-gutter-width));\n//** For `@screen-md-min` and up.\n@container-md:                 @container-desktop;\n\n// Large screen / wide desktop\n@container-large-desktop:      ((1140px + @grid-gutter-width));\n//** For `@screen-lg-min` and up.\n@container-lg:                 @container-large-desktop;\n","//\n// Typography\n// --------------------------------------------------\n\n\n// Headings\n// -------------------------\n\nh1, h2, h3, h4, h5, h6,\n.h1, .h2, .h3, .h4, .h5, .h6 {\n  font-family: @headings-font-family;\n  font-weight: @headings-font-weight;\n  line-height: @headings-line-height;\n  color: @headings-color;\n\n  small,\n  .small {\n    font-weight: normal;\n    line-height: 1;\n    color: @headings-small-color;\n  }\n}\n\nh1, .h1,\nh2, .h2,\nh3, .h3 {\n  margin-top: @line-height-computed;\n  margin-bottom: (@line-height-computed / 2);\n\n  small,\n  .small {\n    font-size: 65%;\n  }\n}\nh4, .h4,\nh5, .h5,\nh6, .h6 {\n  margin-top: (@line-height-computed / 2);\n  margin-bottom: (@line-height-computed / 2);\n\n  small,\n  .small {\n    font-size: 75%;\n  }\n}\n\nh1, .h1 { font-size: @font-size-h1; }\nh2, .h2 { font-size: @font-size-h2; }\nh3, .h3 { font-size: @font-size-h3; }\nh4, .h4 { font-size: @font-size-h4; }\nh5, .h5 { font-size: @font-size-h5; }\nh6, .h6 { font-size: @font-size-h6; }\n\n\n// Body text\n// -------------------------\n\np {\n  margin: 0 0 (@line-height-computed / 2);\n}\n\n.lead {\n  margin-bottom: @line-height-computed;\n  font-size: floor((@font-size-base * 1.15));\n  font-weight: 200;\n  line-height: 1.4;\n\n  @media (min-width: @screen-sm-min) {\n    font-size: (@font-size-base * 1.5);\n  }\n}\n\n\n// Emphasis & misc\n// -------------------------\n\n// Ex: 14px base font * 85% = about 12px\nsmall,\n.small  { font-size: 85%; }\n\n// Undo browser default styling\ncite    { font-style: normal; }\n\n// Alignment\n.text-left           { text-align: left; }\n.text-right          { text-align: right; }\n.text-center         { text-align: center; }\n.text-justify        { text-align: justify; }\n\n// Contextual colors\n.text-muted {\n  color: @text-muted;\n}\n.text-primary {\n  .text-emphasis-variant(@brand-primary);\n}\n.text-success {\n  .text-emphasis-variant(@state-success-text);\n}\n.text-info {\n  .text-emphasis-variant(@state-info-text);\n}\n.text-warning {\n  .text-emphasis-variant(@state-warning-text);\n}\n.text-danger {\n  .text-emphasis-variant(@state-danger-text);\n}\n\n// Contextual backgrounds\n// For now we'll leave these alongside the text classes until v4 when we can\n// safely shift things around (per SemVer rules).\n.bg-primary {\n  // Given the contrast here, this is the only class to have its color inverted\n  // automatically.\n  color: #fff;\n  .bg-variant(@brand-primary);\n}\n.bg-success {\n  .bg-variant(@state-success-bg);\n}\n.bg-info {\n  .bg-variant(@state-info-bg);\n}\n.bg-warning {\n  .bg-variant(@state-warning-bg);\n}\n.bg-danger {\n  .bg-variant(@state-danger-bg);\n}\n\n\n// Page header\n// -------------------------\n\n.page-header {\n  padding-bottom: ((@line-height-computed / 2) - 1);\n  margin: (@line-height-computed * 2) 0 @line-height-computed;\n  border-bottom: 1px solid @page-header-border-color;\n}\n\n\n// Lists\n// --------------------------------------------------\n\n// Unordered and Ordered lists\nul,\nol {\n  margin-top: 0;\n  margin-bottom: (@line-height-computed / 2);\n  ul,\n  ol {\n    margin-bottom: 0;\n  }\n}\n\n// List options\n\n// Unstyled keeps list items block level, just removes default browser padding and list-style\n.list-unstyled {\n  padding-left: 0;\n  list-style: none;\n}\n\n// Inline turns list items into inline-block\n.list-inline {\n  .list-unstyled();\n\n  > li {\n    display: inline-block;\n    padding-left: 5px;\n    padding-right: 5px;\n\n    &:first-child {\n      padding-left: 0;\n    }\n  }\n}\n\n// Description Lists\ndl {\n  margin-top: 0; // Remove browser default\n  margin-bottom: @line-height-computed;\n}\ndt,\ndd {\n  line-height: @line-height-base;\n}\ndt {\n  font-weight: bold;\n}\ndd {\n  margin-left: 0; // Undo browser default\n}\n\n// Horizontal description lists\n//\n// Defaults to being stacked without any of the below styles applied, until the\n// grid breakpoint is reached (default of ~768px).\n\n@media (min-width: @grid-float-breakpoint) {\n  .dl-horizontal {\n    dt {\n      float: left;\n      width: (@component-offset-horizontal - 20);\n      clear: left;\n      text-align: right;\n      .text-overflow();\n    }\n    dd {\n      margin-left: @component-offset-horizontal;\n      &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present\n    }\n  }\n}\n\n// MISC\n// ----\n\n// Abbreviations and acronyms\nabbr[title],\n// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257\nabbr[data-original-title] {\n  cursor: help;\n  border-bottom: 1px dotted @abbr-border-color;\n}\n.initialism {\n  font-size: 90%;\n  text-transform: uppercase;\n}\n\n// Blockquotes\nblockquote {\n  padding: (@line-height-computed / 2) @line-height-computed;\n  margin: 0 0 @line-height-computed;\n  font-size: (@font-size-base * 1.25);\n  border-left: 5px solid @blockquote-border-color;\n\n  p,\n  ul,\n  ol {\n    &:last-child {\n      margin-bottom: 0;\n    }\n  }\n\n  // Note: Deprecated small and .small as of v3.1.0\n  // Context: https://github.com/twbs/bootstrap/issues/11660\n  footer,\n  small,\n  .small {\n    display: block;\n    font-size: 80%; // back to default font-size\n    line-height: @line-height-base;\n    color: @blockquote-small-color;\n\n    &:before {\n      content: '\\2014 \\00A0'; // em dash, nbsp\n    }\n  }\n}\n\n// Opposite alignment of blockquote\n//\n// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.\n.blockquote-reverse,\nblockquote.pull-right {\n  padding-right: 15px;\n  padding-left: 0;\n  border-right: 5px solid @blockquote-border-color;\n  border-left: 0;\n  text-align: right;\n\n  // Account for citation\n  footer,\n  small,\n  .small {\n    &:before { content: ''; }\n    &:after {\n      content: '\\00A0 \\2014'; // nbsp, em dash\n    }\n  }\n}\n\n// Quotes\nblockquote:before,\nblockquote:after {\n  content: \"\";\n}\n\n// Addresses\naddress {\n  margin-bottom: @line-height-computed;\n  font-style: normal;\n  line-height: @line-height-base;\n}\n","//\n// Code (inline and block)\n// --------------------------------------------------\n\n\n// Inline and block code styles\ncode,\nkbd,\npre,\nsamp {\n  font-family: @font-family-monospace;\n}\n\n// Inline code\ncode {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: @code-color;\n  background-color: @code-bg;\n  white-space: nowrap;\n  border-radius: @border-radius-base;\n}\n\n// User input typically entered via keyboard\nkbd {\n  padding: 2px 4px;\n  font-size: 90%;\n  color: @kbd-color;\n  background-color: @kbd-bg;\n  border-radius: @border-radius-small;\n  box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);\n}\n\n// Blocks of code\npre {\n  display: block;\n  padding: ((@line-height-computed - 1) / 2);\n  margin: 0 0 (@line-height-computed / 2);\n  font-size: (@font-size-base - 1); // 14px to 13px\n  line-height: @line-height-base;\n  word-break: break-all;\n  word-wrap: break-word;\n  color: @pre-color;\n  background-color: @pre-bg;\n  border: 1px solid @pre-border-color;\n  border-radius: @border-radius-base;\n\n  // Account for some code outputs that place code tags in pre tags\n  code {\n    padding: 0;\n    font-size: inherit;\n    color: inherit;\n    white-space: pre-wrap;\n    background-color: transparent;\n    border-radius: 0;\n  }\n}\n\n// Enable scrollable blocks of code\n.pre-scrollable {\n  max-height: @pre-scrollable-max-height;\n  overflow-y: scroll;\n}\n","//\n// Grid system\n// --------------------------------------------------\n\n\n// Container widths\n//\n// Set the container width, and override it for fixed navbars in media queries.\n\n.container {\n  .container-fixed();\n\n  @media (min-width: @screen-sm-min) {\n    width: @container-sm;\n  }\n  @media (min-width: @screen-md-min) {\n    width: @container-md;\n  }\n  @media (min-width: @screen-lg-min) {\n    width: @container-lg;\n  }\n}\n\n\n// Fluid container\n//\n// Utilizes the mixin meant for fixed width containers, but without any defined\n// width for fluid, full width layouts.\n\n.container-fluid {\n  .container-fixed();\n}\n\n\n// Row\n//\n// Rows contain and clear the floats of your columns.\n\n.row {\n  .make-row();\n}\n\n\n// Columns\n//\n// Common styles for small and large grid columns\n\n.make-grid-columns();\n\n\n// Extra small grid\n//\n// Columns, offsets, pushes, and pulls for extra small devices like\n// smartphones.\n\n.make-grid-columns-float(xs);\n.make-grid(@grid-columns, xs, width);\n.make-grid(@grid-columns, xs, pull);\n.make-grid(@grid-columns, xs, push);\n.make-grid(@grid-columns, xs, offset);\n\n\n// Small grid\n//\n// Columns, offsets, pushes, and pulls for the small device range, from phones\n// to tablets.\n\n@media (min-width: @screen-sm-min) {\n  .make-grid-columns-float(sm);\n  .make-grid(@grid-columns, sm, width);\n  .make-grid(@grid-columns, sm, pull);\n  .make-grid(@grid-columns, sm, push);\n  .make-grid(@grid-columns, sm, offset);\n}\n\n\n// Medium grid\n//\n// Columns, offsets, pushes, and pulls for the desktop device range.\n\n@media (min-width: @screen-md-min) {\n  .make-grid-columns-float(md);\n  .make-grid(@grid-columns, md, width);\n  .make-grid(@grid-columns, md, pull);\n  .make-grid(@grid-columns, md, push);\n  .make-grid(@grid-columns, md, offset);\n}\n\n\n// Large grid\n//\n// Columns, offsets, pushes, and pulls for the large desktop device range.\n\n@media (min-width: @screen-lg-min) {\n  .make-grid-columns-float(lg);\n  .make-grid(@grid-columns, lg, width);\n  .make-grid(@grid-columns, lg, pull);\n  .make-grid(@grid-columns, lg, push);\n  .make-grid(@grid-columns, lg, offset);\n}\n","//\n// Tables\n// --------------------------------------------------\n\n\ntable {\n  max-width: 100%;\n  background-color: @table-bg;\n}\nth {\n  text-align: left;\n}\n\n\n// Baseline styles\n\n.table {\n  width: 100%;\n  margin-bottom: @line-height-computed;\n  // Cells\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        padding: @table-cell-padding;\n        line-height: @line-height-base;\n        vertical-align: top;\n        border-top: 1px solid @table-border-color;\n      }\n    }\n  }\n  // Bottom align for column headings\n  > thead > tr > th {\n    vertical-align: bottom;\n    border-bottom: 2px solid @table-border-color;\n  }\n  // Remove top border from thead by default\n  > caption + thead,\n  > colgroup + thead,\n  > thead:first-child {\n    > tr:first-child {\n      > th,\n      > td {\n        border-top: 0;\n      }\n    }\n  }\n  // Account for multiple tbody instances\n  > tbody + tbody {\n    border-top: 2px solid @table-border-color;\n  }\n\n  // Nesting\n  .table {\n    background-color: @body-bg;\n  }\n}\n\n\n// Condensed table w/ half padding\n\n.table-condensed {\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        padding: @table-condensed-cell-padding;\n      }\n    }\n  }\n}\n\n\n// Bordered version\n//\n// Add borders all around the table and between all the columns.\n\n.table-bordered {\n  border: 1px solid @table-border-color;\n  > thead,\n  > tbody,\n  > tfoot {\n    > tr {\n      > th,\n      > td {\n        border: 1px solid @table-border-color;\n      }\n    }\n  }\n  > thead > tr {\n    > th,\n    > td {\n      border-bottom-width: 2px;\n    }\n  }\n}\n\n\n// Zebra-striping\n//\n// Default zebra-stripe styles (alternating gray and transparent backgrounds)\n\n.table-striped {\n  > tbody > tr:nth-child(odd) {\n    > td,\n    > th {\n      background-color: @table-bg-accent;\n    }\n  }\n}\n\n\n// Hover effect\n//\n// Placed here since it has to come after the potential zebra striping\n\n.table-hover {\n  > tbody > tr:hover {\n    > td,\n    > th {\n      background-color: @table-bg-hover;\n    }\n  }\n}\n\n\n// Table cell sizing\n//\n// Reset default table behavior\n\ntable col[class*=\"col-\"] {\n  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)\n  float: none;\n  display: table-column;\n}\ntable {\n  td,\n  th {\n    &[class*=\"col-\"] {\n      position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)\n      float: none;\n      display: table-cell;\n    }\n  }\n}\n\n\n// Table backgrounds\n//\n// Exact selectors below required to override `.table-striped` and prevent\n// inheritance to nested tables.\n\n// Generate the contextual variants\n.table-row-variant(active; @table-bg-active);\n.table-row-variant(success; @state-success-bg);\n.table-row-variant(info; @state-info-bg);\n.table-row-variant(warning; @state-warning-bg);\n.table-row-variant(danger; @state-danger-bg);\n\n\n// Responsive tables\n//\n// Wrap your tables in `.table-responsive` and we'll make them mobile friendly\n// by enabling horizontal scrolling. Only applies <768px. Everything above that\n// will display normally.\n\n@media (max-width: @screen-xs-max) {\n  .table-responsive {\n    width: 100%;\n    margin-bottom: (@line-height-computed * 0.75);\n    overflow-y: hidden;\n    overflow-x: scroll;\n    -ms-overflow-style: -ms-autohiding-scrollbar;\n    border: 1px solid @table-border-color;\n    -webkit-overflow-scrolling: touch;\n\n    // Tighten up spacing\n    > .table {\n      margin-bottom: 0;\n\n      // Ensure the content doesn't wrap\n      > thead,\n      > tbody,\n      > tfoot {\n        > tr {\n          > th,\n          > td {\n            white-space: nowrap;\n          }\n        }\n      }\n    }\n\n    // Special overrides for the bordered tables\n    > .table-bordered {\n      border: 0;\n\n      // Nuke the appropriate borders so that the parent can handle them\n      > thead,\n      > tbody,\n      > tfoot {\n        > tr {\n          > th:first-child,\n          > td:first-child {\n            border-left: 0;\n          }\n          > th:last-child,\n          > td:last-child {\n            border-right: 0;\n          }\n        }\n      }\n\n      // Only nuke the last row's bottom-border in `tbody` and `tfoot` since\n      // chances are there will be only one `tr` in a `thead` and that would\n      // remove the border altogether.\n      > tbody,\n      > tfoot {\n        > tr:last-child {\n          > th,\n          > td {\n            border-bottom: 0;\n          }\n        }\n      }\n\n    }\n  }\n}\n","//\n// Forms\n// --------------------------------------------------\n\n\n// Normalize non-controls\n//\n// Restyle and baseline non-control form elements.\n\nfieldset {\n  padding: 0;\n  margin: 0;\n  border: 0;\n  // Chrome and Firefox set a `min-width: -webkit-min-content;` on fieldsets,\n  // so we reset that to ensure it behaves more like a standard block element.\n  // See https://github.com/twbs/bootstrap/issues/12359.\n  min-width: 0;\n}\n\nlegend {\n  display: block;\n  width: 100%;\n  padding: 0;\n  margin-bottom: @line-height-computed;\n  font-size: (@font-size-base * 1.5);\n  line-height: inherit;\n  color: @legend-color;\n  border: 0;\n  border-bottom: 1px solid @legend-border-color;\n}\n\nlabel {\n  display: inline-block;\n  margin-bottom: 5px;\n  font-weight: bold;\n}\n\n\n// Normalize form controls\n//\n// While most of our form styles require extra classes, some basic normalization\n// is required to ensure optimum display with or without those classes to better\n// address browser inconsistencies.\n\n// Override content-box in Normalize (* isn't specific enough)\ninput[type=\"search\"] {\n  .box-sizing(border-box);\n}\n\n// Position radios and checkboxes better\ninput[type=\"radio\"],\ninput[type=\"checkbox\"] {\n  margin: 4px 0 0;\n  margin-top: 1px \\9; /* IE8-9 */\n  line-height: normal;\n}\n\n// Set the height of file controls to match text inputs\ninput[type=\"file\"] {\n  display: block;\n}\n\n// Make range inputs behave like textual form controls\ninput[type=\"range\"] {\n  display: block;\n  width: 100%;\n}\n\n// Make multiple select elements height not fixed\nselect[multiple],\nselect[size] {\n  height: auto;\n}\n\n// Focus for file, radio, and checkbox\ninput[type=\"file\"]:focus,\ninput[type=\"radio\"]:focus,\ninput[type=\"checkbox\"]:focus {\n  .tab-focus();\n}\n\n// Adjust output element\noutput {\n  display: block;\n  padding-top: (@padding-base-vertical + 1);\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @input-color;\n}\n\n\n// Common form controls\n//\n// Shared size and type resets for form controls. Apply `.form-control` to any\n// of the following form controls:\n//\n// select\n// textarea\n// input[type=\"text\"]\n// input[type=\"password\"]\n// input[type=\"datetime\"]\n// input[type=\"datetime-local\"]\n// input[type=\"date\"]\n// input[type=\"month\"]\n// input[type=\"time\"]\n// input[type=\"week\"]\n// input[type=\"number\"]\n// input[type=\"email\"]\n// input[type=\"url\"]\n// input[type=\"search\"]\n// input[type=\"tel\"]\n// input[type=\"color\"]\n\n.form-control {\n  display: block;\n  width: 100%;\n  height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)\n  padding: @padding-base-vertical @padding-base-horizontal;\n  font-size: @font-size-base;\n  line-height: @line-height-base;\n  color: @input-color;\n  background-color: @input-bg;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid @input-border;\n  border-radius: @input-border-radius;\n  .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));\n  .transition(~\"border-color ease-in-out .15s, box-shadow ease-in-out .15s\");\n\n  // Customize the `:focus` state to imitate native WebKit styles.\n  .form-control-focus();\n\n  // Placeholder\n  .placeholder();\n\n  // Disabled and read-only inputs\n  // Note: HTML5 says that controls under a fieldset > legend:first-child won't\n  // be disabled if the fieldset is disabled. Due to implementation difficulty,\n  // we don't honor that edge case; we style them as disabled anyway.\n  &[disabled],\n  &[readonly],\n  fieldset[disabled] & {\n    cursor: not-allowed;\n    background-color: @input-bg-disabled;\n    opacity: 1; // iOS fix for unreadable disabled content\n  }\n\n  // Reset height for `textarea`s\n  textarea& {\n    height: auto;\n  }\n}\n\n// Special styles for iOS date input\n//\n// In Mobile Safari, date inputs require a pixel line-height that matches the\n// given height of the input.\ninput[type=\"date\"] {\n  line-height: @input-height-base;\n}\n\n\n// Form groups\n//\n// Designed to help with the organization and spacing of vertical forms. For\n// horizontal forms, use the predefined grid classes.\n\n.form-group {\n  margin-bottom: 15px;\n}\n\n\n// Checkboxes and radios\n//\n// Indent the labels to position radios/checkboxes as hanging controls.\n\n.radio,\n.checkbox {\n  display: block;\n  min-height: @line-height-computed; // clear the floating input if there is no label text\n  margin-top: 10px;\n  margin-bottom: 10px;\n  padding-left: 20px;\n  label {\n    display: inline;\n    font-weight: normal;\n    cursor: pointer;\n  }\n}\n.radio input[type=\"radio\"],\n.radio-inline input[type=\"radio\"],\n.checkbox input[type=\"checkbox\"],\n.checkbox-inline input[type=\"checkbox\"] {\n  float: left;\n  margin-left: -20px;\n}\n.radio + .radio,\n.checkbox + .checkbox {\n  margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing\n}\n\n// Radios and checkboxes on same line\n.radio-inline,\n.checkbox-inline {\n  display: inline-block;\n  padding-left: 20px;\n  margin-bottom: 0;\n  vertical-align: middle;\n  font-weight: normal;\n  cursor: pointer;\n}\n.radio-inline + .radio-inline,\n.checkbox-inline + .checkbox-inline {\n  margin-top: 0;\n  margin-left: 10px; // space out consecutive inline controls\n}\n\n// Apply same disabled cursor tweak as for inputs\n//\n// Note: Neither radios nor checkboxes can be readonly.\ninput[type=\"radio\"],\ninput[type=\"checkbox\"],\n.radio,\n.radio-inline,\n.checkbox,\n.checkbox-inline {\n  &[disabled],\n  fieldset[disabled] & {\n    cursor: not-allowed;\n  }\n}\n\n\n// Form control sizing\n//\n// Build on `.form-control` with modifier classes to decrease or increase the\n// height and font-size of form controls.\n\n.input-sm {\n  .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n\n.input-lg {\n  .input-size(@input-height-large; @padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);\n}\n\n\n// Form control feedback states\n//\n// Apply contextual and semantic states to individual form controls.\n\n.has-feedback {\n  // Enable absolute positioning\n  position: relative;\n\n  // Ensure icons don't overlap text\n  .form-control {\n    padding-right: (@input-height-base * 1.25);\n  }\n\n  // Feedback icon (requires .glyphicon classes)\n  .form-control-feedback {\n    position: absolute;\n    top: (@line-height-computed + 5); // Height of the `label` and its margin\n    right: 0;\n    display: block;\n    width: @input-height-base;\n    height: @input-height-base;\n    line-height: @input-height-base;\n    text-align: center;\n  }\n}\n\n// Feedback states\n.has-success {\n  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);\n}\n.has-warning {\n  .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);\n}\n.has-error {\n  .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);\n}\n\n\n// Static form control text\n//\n// Apply class to a `p` element to make any string of text align with labels in\n// a horizontal form layout.\n\n.form-control-static {\n  margin-bottom: 0; // Remove default margin from `p`\n}\n\n\n// Help text\n//\n// Apply to any element you wish to create light text for placement immediately\n// below a form control. Use for general help, formatting, or instructional text.\n\n.help-block {\n  display: block; // account for any element using help-block\n  margin-top: 5px;\n  margin-bottom: 10px;\n  color: lighten(@text-color, 25%); // lighten the text some for contrast\n}\n\n\n\n// Inline forms\n//\n// Make forms appear inline(-block) by adding the `.form-inline` class. Inline\n// forms begin stacked on extra small (mobile) devices and then go inline when\n// viewports reach <768px.\n//\n// Requires wrapping inputs and labels with `.form-group` for proper display of\n// default HTML form controls and our custom form controls (e.g., input groups).\n//\n// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.\n\n.form-inline {\n\n  // Kick in the inline\n  @media (min-width: @screen-sm-min) {\n    // Inline-block all the things for \"inline\"\n    .form-group {\n      display: inline-block;\n      margin-bottom: 0;\n      vertical-align: middle;\n    }\n\n    // In navbar-form, allow folks to *not* use `.form-group`\n    .form-control {\n      display: inline-block;\n      width: auto; // Prevent labels from stacking above inputs in `.form-group`\n      vertical-align: middle;\n    }\n\n    .control-label {\n      margin-bottom: 0;\n      vertical-align: middle;\n    }\n\n    // Remove default margin on radios/checkboxes that were used for stacking, and\n    // then undo the floating of radios and checkboxes to match (which also avoids\n    // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).\n    .radio,\n    .checkbox {\n      display: inline-block;\n      margin-top: 0;\n      margin-bottom: 0;\n      padding-left: 0;\n      vertical-align: middle;\n    }\n    .radio input[type=\"radio\"],\n    .checkbox input[type=\"checkbox\"] {\n      float: none;\n      margin-left: 0;\n    }\n\n    // Validation states\n    //\n    // Reposition the icon because it's now within a grid column and columns have\n    // `position: relative;` on them. Also accounts for the grid gutter padding.\n    .has-feedback .form-control-feedback {\n      top: 0;\n    }\n  }\n}\n\n\n// Horizontal forms\n//\n// Horizontal forms are built on grid classes and allow you to create forms with\n// labels on the left and inputs on the right.\n\n.form-horizontal {\n\n  // Consistent vertical alignment of labels, radios, and checkboxes\n  .control-label,\n  .radio,\n  .checkbox,\n  .radio-inline,\n  .checkbox-inline {\n    margin-top: 0;\n    margin-bottom: 0;\n    padding-top: (@padding-base-vertical + 1); // Default padding plus a border\n  }\n  // Account for padding we're adding to ensure the alignment and of help text\n  // and other content below items\n  .radio,\n  .checkbox {\n    min-height: (@line-height-computed + (@padding-base-vertical + 1));\n  }\n\n  // Make form groups behave like rows\n  .form-group {\n    .make-row();\n  }\n\n  .form-control-static {\n    padding-top: (@padding-base-vertical + 1);\n  }\n\n  // Only right align form labels here when the columns stop stacking\n  @media (min-width: @screen-sm-min) {\n    .control-label {\n      text-align: right;\n    }\n  }\n\n  // Validation states\n  //\n  // Reposition the icon because it's now within a grid column and columns have\n  // `position: relative;` on them. Also accounts for the grid gutter padding.\n  .has-feedback .form-control-feedback {\n    top: 0;\n    right: (@grid-gutter-width / 2);\n  }\n}\n","//\n// Buttons\n// --------------------------------------------------\n\n\n// Base styles\n// --------------------------------------------------\n\n.btn {\n  display: inline-block;\n  margin-bottom: 0; // For input.btn\n  font-weight: @btn-font-weight;\n  text-align: center;\n  vertical-align: middle;\n  cursor: pointer;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid transparent;\n  white-space: nowrap;\n  .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);\n  .user-select(none);\n\n  &:focus {\n    .tab-focus();\n  }\n\n  &:hover,\n  &:focus {\n    color: @btn-default-color;\n    text-decoration: none;\n  }\n\n  &:active,\n  &.active {\n    outline: 0;\n    background-image: none;\n    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n  }\n\n  &.disabled,\n  &[disabled],\n  fieldset[disabled] & {\n    cursor: not-allowed;\n    pointer-events: none; // Future-proof disabling of clicks\n    .opacity(.65);\n    .box-shadow(none);\n  }\n}\n\n\n// Alternate buttons\n// --------------------------------------------------\n\n.btn-default {\n  .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border);\n}\n.btn-primary {\n  .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);\n}\n// Success appears as green\n.btn-success {\n  .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);\n}\n// Info appears as blue-green\n.btn-info {\n  .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);\n}\n// Warning appears as orange\n.btn-warning {\n  .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);\n}\n// Danger and error appear as red\n.btn-danger {\n  .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);\n}\n\n\n// Link buttons\n// -------------------------\n\n// Make a button look and behave like a link\n.btn-link {\n  color: @link-color;\n  font-weight: normal;\n  cursor: pointer;\n  border-radius: 0;\n\n  &,\n  &:active,\n  &[disabled],\n  fieldset[disabled] & {\n    background-color: transparent;\n    .box-shadow(none);\n  }\n  &,\n  &:hover,\n  &:focus,\n  &:active {\n    border-color: transparent;\n  }\n  &:hover,\n  &:focus {\n    color: @link-hover-color;\n    text-decoration: underline;\n    background-color: transparent;\n  }\n  &[disabled],\n  fieldset[disabled] & {\n    &:hover,\n    &:focus {\n      color: @btn-link-disabled-color;\n      text-decoration: none;\n    }\n  }\n}\n\n\n// Button Sizes\n// --------------------------------------------------\n\n.btn-lg {\n  // line-height: ensure even-numbered height of button next to large input\n  .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);\n}\n.btn-sm {\n  // line-height: ensure proper height of button next to small input\n  .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n.btn-xs {\n  .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);\n}\n\n\n// Block button\n// --------------------------------------------------\n\n.btn-block {\n  display: block;\n  width: 100%;\n  padding-left: 0;\n  padding-right: 0;\n}\n\n// Vertically space out multiple block buttons\n.btn-block + .btn-block {\n  margin-top: 5px;\n}\n\n// Specificity overrides\ninput[type=\"submit\"],\ninput[type=\"reset\"],\ninput[type=\"button\"] {\n  &.btn-block {\n    width: 100%;\n  }\n}\n","//\n// Component animations\n// --------------------------------------------------\n\n// Heads up!\n//\n// We don't use the `.opacity()` mixin here since it causes a bug with text\n// fields in IE7-8. Source: https://github.com/twitter/bootstrap/pull/3552.\n\n.fade {\n  opacity: 0;\n  .transition(opacity .15s linear);\n  &.in {\n    opacity: 1;\n  }\n}\n\n.collapse {\n  display: none;\n  &.in {\n    display: block;\n  }\n}\n.collapsing {\n  position: relative;\n  height: 0;\n  overflow: hidden;\n  .transition(height .35s ease);\n}\n","//\n// Glyphicons for Bootstrap\n//\n// Since icons are fonts, they can be placed anywhere text is placed and are\n// thus automatically sized to match the surrounding child. To use, create an\n// inline element with the appropriate classes, like so:\n//\n// <a href=\"#\"><span class=\"glyphicon glyphicon-star\"></span> Star</a>\n\n// Import the fonts\n@font-face {\n  font-family: 'Glyphicons Halflings';\n  src: ~\"url('@{icon-font-path}@{icon-font-name}.eot')\";\n  src: ~\"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')\",\n       ~\"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')\",\n       ~\"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')\",\n       ~\"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')\";\n}\n\n// Catchall baseclass\n.glyphicon {\n  position: relative;\n  top: 1px;\n  display: inline-block;\n  font-family: 'Glyphicons Halflings';\n  font-style: normal;\n  font-weight: normal;\n  line-height: 1;\n  -webkit-font-smoothing: antialiased;\n  -moz-osx-font-smoothing: grayscale;\n}\n\n// Individual icons\n.glyphicon-asterisk               { &:before { content: \"\\2a\"; } }\n.glyphicon-plus                   { &:before { content: \"\\2b\"; } }\n.glyphicon-euro                   { &:before { content: \"\\20ac\"; } }\n.glyphicon-minus                  { &:before { content: \"\\2212\"; } }\n.glyphicon-cloud                  { &:before { content: \"\\2601\"; } }\n.glyphicon-envelope               { &:before { content: \"\\2709\"; } }\n.glyphicon-pencil                 { &:before { content: \"\\270f\"; } }\n.glyphicon-glass                  { &:before { content: \"\\e001\"; } }\n.glyphicon-music                  { &:before { content: \"\\e002\"; } }\n.glyphicon-search                 { &:before { content: \"\\e003\"; } }\n.glyphicon-heart                  { &:before { content: \"\\e005\"; } }\n.glyphicon-star                   { &:before { content: \"\\e006\"; } }\n.glyphicon-star-empty             { &:before { content: \"\\e007\"; } }\n.glyphicon-user                   { &:before { content: \"\\e008\"; } }\n.glyphicon-film                   { &:before { content: \"\\e009\"; } }\n.glyphicon-th-large               { &:before { content: \"\\e010\"; } }\n.glyphicon-th                     { &:before { content: \"\\e011\"; } }\n.glyphicon-th-list                { &:before { content: \"\\e012\"; } }\n.glyphicon-ok                     { &:before { content: \"\\e013\"; } }\n.glyphicon-remove                 { &:before { content: \"\\e014\"; } }\n.glyphicon-zoom-in                { &:before { content: \"\\e015\"; } }\n.glyphicon-zoom-out               { &:before { content: \"\\e016\"; } }\n.glyphicon-off                    { &:before { content: \"\\e017\"; } }\n.glyphicon-signal                 { &:before { content: \"\\e018\"; } }\n.glyphicon-cog                    { &:before { content: \"\\e019\"; } }\n.glyphicon-trash                  { &:before { content: \"\\e020\"; } }\n.glyphicon-home                   { &:before { content: \"\\e021\"; } }\n.glyphicon-file                   { &:before { content: \"\\e022\"; } }\n.glyphicon-time                   { &:before { content: \"\\e023\"; } }\n.glyphicon-road                   { &:before { content: \"\\e024\"; } }\n.glyphicon-download-alt           { &:before { content: \"\\e025\"; } }\n.glyphicon-download               { &:before { content: \"\\e026\"; } }\n.glyphicon-upload                 { &:before { content: \"\\e027\"; } }\n.glyphicon-inbox                  { &:before { content: \"\\e028\"; } }\n.glyphicon-play-circle            { &:before { content: \"\\e029\"; } }\n.glyphicon-repeat                 { &:before { content: \"\\e030\"; } }\n.glyphicon-refresh                { &:before { content: \"\\e031\"; } }\n.glyphicon-list-alt               { &:before { content: \"\\e032\"; } }\n.glyphicon-lock                   { &:before { content: \"\\e033\"; } }\n.glyphicon-flag                   { &:before { content: \"\\e034\"; } }\n.glyphicon-headphones             { &:before { content: \"\\e035\"; } }\n.glyphicon-volume-off             { &:before { content: \"\\e036\"; } }\n.glyphicon-volume-down            { &:before { content: \"\\e037\"; } }\n.glyphicon-volume-up              { &:before { content: \"\\e038\"; } }\n.glyphicon-qrcode                 { &:before { content: \"\\e039\"; } }\n.glyphicon-barcode                { &:before { content: \"\\e040\"; } }\n.glyphicon-tag                    { &:before { content: \"\\e041\"; } }\n.glyphicon-tags                   { &:before { content: \"\\e042\"; } }\n.glyphicon-book                   { &:before { content: \"\\e043\"; } }\n.glyphicon-bookmark               { &:before { content: \"\\e044\"; } }\n.glyphicon-print                  { &:before { content: \"\\e045\"; } }\n.glyphicon-camera                 { &:before { content: \"\\e046\"; } }\n.glyphicon-font                   { &:before { content: \"\\e047\"; } }\n.glyphicon-bold                   { &:before { content: \"\\e048\"; } }\n.glyphicon-italic                 { &:before { content: \"\\e049\"; } }\n.glyphicon-text-height            { &:before { content: \"\\e050\"; } }\n.glyphicon-text-width             { &:before { content: \"\\e051\"; } }\n.glyphicon-align-left             { &:before { content: \"\\e052\"; } }\n.glyphicon-align-center           { &:before { content: \"\\e053\"; } }\n.glyphicon-align-right            { &:before { content: \"\\e054\"; } }\n.glyphicon-align-justify          { &:before { content: \"\\e055\"; } }\n.glyphicon-list                   { &:before { content: \"\\e056\"; } }\n.glyphicon-indent-left            { &:before { content: \"\\e057\"; } }\n.glyphicon-indent-right           { &:before { content: \"\\e058\"; } }\n.glyphicon-facetime-video         { &:before { content: \"\\e059\"; } }\n.glyphicon-picture                { &:before { content: \"\\e060\"; } }\n.glyphicon-map-marker             { &:before { content: \"\\e062\"; } }\n.glyphicon-adjust                 { &:before { content: \"\\e063\"; } }\n.glyphicon-tint                   { &:before { content: \"\\e064\"; } }\n.glyphicon-edit                   { &:before { content: \"\\e065\"; } }\n.glyphicon-share                  { &:before { content: \"\\e066\"; } }\n.glyphicon-check                  { &:before { content: \"\\e067\"; } }\n.glyphicon-move                   { &:before { content: \"\\e068\"; } }\n.glyphicon-step-backward          { &:before { content: \"\\e069\"; } }\n.glyphicon-fast-backward          { &:before { content: \"\\e070\"; } }\n.glyphicon-backward               { &:before { content: \"\\e071\"; } }\n.glyphicon-play                   { &:before { content: \"\\e072\"; } }\n.glyphicon-pause                  { &:before { content: \"\\e073\"; } }\n.glyphicon-stop                   { &:before { content: \"\\e074\"; } }\n.glyphicon-forward                { &:before { content: \"\\e075\"; } }\n.glyphicon-fast-forward           { &:before { content: \"\\e076\"; } }\n.glyphicon-step-forward           { &:before { content: \"\\e077\"; } }\n.glyphicon-eject                  { &:before { content: \"\\e078\"; } }\n.glyphicon-chevron-left           { &:before { content: \"\\e079\"; } }\n.glyphicon-chevron-right          { &:before { content: \"\\e080\"; } }\n.glyphicon-plus-sign              { &:before { content: \"\\e081\"; } }\n.glyphicon-minus-sign             { &:before { content: \"\\e082\"; } }\n.glyphicon-remove-sign            { &:before { content: \"\\e083\"; } }\n.glyphicon-ok-sign                { &:before { content: \"\\e084\"; } }\n.glyphicon-question-sign          { &:before { content: \"\\e085\"; } }\n.glyphicon-info-sign              { &:before { content: \"\\e086\"; } }\n.glyphicon-screenshot             { &:before { content: \"\\e087\"; } }\n.glyphicon-remove-circle          { &:before { content: \"\\e088\"; } }\n.glyphicon-ok-circle              { &:before { content: \"\\e089\"; } }\n.glyphicon-ban-circle             { &:before { content: \"\\e090\"; } }\n.glyphicon-arrow-left             { &:before { content: \"\\e091\"; } }\n.glyphicon-arrow-right            { &:before { content: \"\\e092\"; } }\n.glyphicon-arrow-up               { &:before { content: \"\\e093\"; } }\n.glyphicon-arrow-down             { &:before { content: \"\\e094\"; } }\n.glyphicon-share-alt              { &:before { content: \"\\e095\"; } }\n.glyphicon-resize-full            { &:before { content: \"\\e096\"; } }\n.glyphicon-resize-small           { &:before { content: \"\\e097\"; } }\n.glyphicon-exclamation-sign       { &:before { content: \"\\e101\"; } }\n.glyphicon-gift                   { &:before { content: \"\\e102\"; } }\n.glyphicon-leaf                   { &:before { content: \"\\e103\"; } }\n.glyphicon-fire                   { &:before { content: \"\\e104\"; } }\n.glyphicon-eye-open               { &:before { content: \"\\e105\"; } }\n.glyphicon-eye-close              { &:before { content: \"\\e106\"; } }\n.glyphicon-warning-sign           { &:before { content: \"\\e107\"; } }\n.glyphicon-plane                  { &:before { content: \"\\e108\"; } }\n.glyphicon-calendar               { &:before { content: \"\\e109\"; } }\n.glyphicon-random                 { &:before { content: \"\\e110\"; } }\n.glyphicon-comment                { &:before { content: \"\\e111\"; } }\n.glyphicon-magnet                 { &:before { content: \"\\e112\"; } }\n.glyphicon-chevron-up             { &:before { content: \"\\e113\"; } }\n.glyphicon-chevron-down           { &:before { content: \"\\e114\"; } }\n.glyphicon-retweet                { &:before { content: \"\\e115\"; } }\n.glyphicon-shopping-cart          { &:before { content: \"\\e116\"; } }\n.glyphicon-folder-close           { &:before { content: \"\\e117\"; } }\n.glyphicon-folder-open            { &:before { content: \"\\e118\"; } }\n.glyphicon-resize-vertical        { &:before { content: \"\\e119\"; } }\n.glyphicon-resize-horizontal      { &:before { content: \"\\e120\"; } }\n.glyphicon-hdd                    { &:before { content: \"\\e121\"; } }\n.glyphicon-bullhorn               { &:before { content: \"\\e122\"; } }\n.glyphicon-bell                   { &:before { content: \"\\e123\"; } }\n.glyphicon-certificate            { &:before { content: \"\\e124\"; } }\n.glyphicon-thumbs-up              { &:before { content: \"\\e125\"; } }\n.glyphicon-thumbs-down            { &:before { content: \"\\e126\"; } }\n.glyphicon-hand-right             { &:before { content: \"\\e127\"; } }\n.glyphicon-hand-left              { &:before { content: \"\\e128\"; } }\n.glyphicon-hand-up                { &:before { content: \"\\e129\"; } }\n.glyphicon-hand-down              { &:before { content: \"\\e130\"; } }\n.glyphicon-circle-arrow-right     { &:before { content: \"\\e131\"; } }\n.glyphicon-circle-arrow-left      { &:before { content: \"\\e132\"; } }\n.glyphicon-circle-arrow-up        { &:before { content: \"\\e133\"; } }\n.glyphicon-circle-arrow-down      { &:before { content: \"\\e134\"; } }\n.glyphicon-globe                  { &:before { content: \"\\e135\"; } }\n.glyphicon-wrench                 { &:before { content: \"\\e136\"; } }\n.glyphicon-tasks                  { &:before { content: \"\\e137\"; } }\n.glyphicon-filter                 { &:before { content: \"\\e138\"; } }\n.glyphicon-briefcase              { &:before { content: \"\\e139\"; } }\n.glyphicon-fullscreen             { &:before { content: \"\\e140\"; } }\n.glyphicon-dashboard              { &:before { content: \"\\e141\"; } }\n.glyphicon-paperclip              { &:before { content: \"\\e142\"; } }\n.glyphicon-heart-empty            { &:before { content: \"\\e143\"; } }\n.glyphicon-link                   { &:before { content: \"\\e144\"; } }\n.glyphicon-phone                  { &:before { content: \"\\e145\"; } }\n.glyphicon-pushpin                { &:before { content: \"\\e146\"; } }\n.glyphicon-usd                    { &:before { content: \"\\e148\"; } }\n.glyphicon-gbp                    { &:before { content: \"\\e149\"; } }\n.glyphicon-sort                   { &:before { content: \"\\e150\"; } }\n.glyphicon-sort-by-alphabet       { &:before { content: \"\\e151\"; } }\n.glyphicon-sort-by-alphabet-alt   { &:before { content: \"\\e152\"; } }\n.glyphicon-sort-by-order          { &:before { content: \"\\e153\"; } }\n.glyphicon-sort-by-order-alt      { &:before { content: \"\\e154\"; } }\n.glyphicon-sort-by-attributes     { &:before { content: \"\\e155\"; } }\n.glyphicon-sort-by-attributes-alt { &:before { content: \"\\e156\"; } }\n.glyphicon-unchecked              { &:before { content: \"\\e157\"; } }\n.glyphicon-expand                 { &:before { content: \"\\e158\"; } }\n.glyphicon-collapse-down          { &:before { content: \"\\e159\"; } }\n.glyphicon-collapse-up            { &:before { content: \"\\e160\"; } }\n.glyphicon-log-in                 { &:before { content: \"\\e161\"; } }\n.glyphicon-flash                  { &:before { content: \"\\e162\"; } }\n.glyphicon-log-out                { &:before { content: \"\\e163\"; } }\n.glyphicon-new-window             { &:before { content: \"\\e164\"; } }\n.glyphicon-record                 { &:before { content: \"\\e165\"; } }\n.glyphicon-save                   { &:before { content: \"\\e166\"; } }\n.glyphicon-open                   { &:before { content: \"\\e167\"; } }\n.glyphicon-saved                  { &:before { content: \"\\e168\"; } }\n.glyphicon-import                 { &:before { content: \"\\e169\"; } }\n.glyphicon-export                 { &:before { content: \"\\e170\"; } }\n.glyphicon-send                   { &:before { content: \"\\e171\"; } }\n.glyphicon-floppy-disk            { &:before { content: \"\\e172\"; } }\n.glyphicon-floppy-saved           { &:before { content: \"\\e173\"; } }\n.glyphicon-floppy-remove          { &:before { content: \"\\e174\"; } }\n.glyphicon-floppy-save            { &:before { content: \"\\e175\"; } }\n.glyphicon-floppy-open            { &:before { content: \"\\e176\"; } }\n.glyphicon-credit-card            { &:before { content: \"\\e177\"; } }\n.glyphicon-transfer               { &:before { content: \"\\e178\"; } }\n.glyphicon-cutlery                { &:before { content: \"\\e179\"; } }\n.glyphicon-header                 { &:before { content: \"\\e180\"; } }\n.glyphicon-compressed             { &:before { content: \"\\e181\"; } }\n.glyphicon-earphone               { &:before { content: \"\\e182\"; } }\n.glyphicon-phone-alt              { &:before { content: \"\\e183\"; } }\n.glyphicon-tower                  { &:before { content: \"\\e184\"; } }\n.glyphicon-stats                  { &:before { content: \"\\e185\"; } }\n.glyphicon-sd-video               { &:before { content: \"\\e186\"; } }\n.glyphicon-hd-video               { &:before { content: \"\\e187\"; } }\n.glyphicon-subtitles              { &:before { content: \"\\e188\"; } }\n.glyphicon-sound-stereo           { &:before { content: \"\\e189\"; } }\n.glyphicon-sound-dolby            { &:before { content: \"\\e190\"; } }\n.glyphicon-sound-5-1              { &:before { content: \"\\e191\"; } }\n.glyphicon-sound-6-1              { &:before { content: \"\\e192\"; } }\n.glyphicon-sound-7-1              { &:before { content: \"\\e193\"; } }\n.glyphicon-copyright-mark         { &:before { content: \"\\e194\"; } }\n.glyphicon-registration-mark      { &:before { content: \"\\e195\"; } }\n.glyphicon-cloud-download         { &:before { content: \"\\e197\"; } }\n.glyphicon-cloud-upload           { &:before { content: \"\\e198\"; } }\n.glyphicon-tree-conifer           { &:before { content: \"\\e199\"; } }\n.glyphicon-tree-deciduous         { &:before { content: \"\\e200\"; } }\n","//\n// Dropdown menus\n// --------------------------------------------------\n\n\n// Dropdown arrow/caret\n.caret {\n  display: inline-block;\n  width: 0;\n  height: 0;\n  margin-left: 2px;\n  vertical-align: middle;\n  border-top:   @caret-width-base solid;\n  border-right: @caret-width-base solid transparent;\n  border-left:  @caret-width-base solid transparent;\n}\n\n// The dropdown wrapper (div)\n.dropdown {\n  position: relative;\n}\n\n// Prevent the focus on the dropdown toggle when closing dropdowns\n.dropdown-toggle:focus {\n  outline: 0;\n}\n\n// The dropdown menu (ul)\n.dropdown-menu {\n  position: absolute;\n  top: 100%;\n  left: 0;\n  z-index: @zindex-dropdown;\n  display: none; // none by default, but block on \"open\" of the menu\n  float: left;\n  min-width: 160px;\n  padding: 5px 0;\n  margin: 2px 0 0; // override default ul\n  list-style: none;\n  font-size: @font-size-base;\n  background-color: @dropdown-bg;\n  border: 1px solid @dropdown-fallback-border; // IE8 fallback\n  border: 1px solid @dropdown-border;\n  border-radius: @border-radius-base;\n  .box-shadow(0 6px 12px rgba(0,0,0,.175));\n  background-clip: padding-box;\n\n  // Aligns the dropdown menu to right\n  //\n  // Deprecated as of 3.1.0 in favor of `.dropdown-menu-[dir]`\n  &.pull-right {\n    right: 0;\n    left: auto;\n  }\n\n  // Dividers (basically an hr) within the dropdown\n  .divider {\n    .nav-divider(@dropdown-divider-bg);\n  }\n\n  // Links within the dropdown menu\n  > li > a {\n    display: block;\n    padding: 3px 20px;\n    clear: both;\n    font-weight: normal;\n    line-height: @line-height-base;\n    color: @dropdown-link-color;\n    white-space: nowrap; // prevent links from randomly breaking onto new lines\n  }\n}\n\n// Hover/Focus state\n.dropdown-menu > li > a {\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    color: @dropdown-link-hover-color;\n    background-color: @dropdown-link-hover-bg;\n  }\n}\n\n// Active state\n.dropdown-menu > .active > a {\n  &,\n  &:hover,\n  &:focus {\n    color: @dropdown-link-active-color;\n    text-decoration: none;\n    outline: 0;\n    background-color: @dropdown-link-active-bg;\n  }\n}\n\n// Disabled state\n//\n// Gray out text and ensure the hover/focus state remains gray\n\n.dropdown-menu > .disabled > a {\n  &,\n  &:hover,\n  &:focus {\n    color: @dropdown-link-disabled-color;\n  }\n}\n// Nuke hover/focus effects\n.dropdown-menu > .disabled > a {\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    background-color: transparent;\n    background-image: none; // Remove CSS gradient\n    .reset-filter();\n    cursor: not-allowed;\n  }\n}\n\n// Open state for the dropdown\n.open {\n  // Show the menu\n  > .dropdown-menu {\n    display: block;\n  }\n\n  // Remove the outline when :focus is triggered\n  > a {\n    outline: 0;\n  }\n}\n\n// Menu positioning\n//\n// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown\n// menu with the parent.\n.dropdown-menu-right {\n  left: auto; // Reset the default from `.dropdown-menu`\n  right: 0;\n}\n// With v3, we enabled auto-flipping if you have a dropdown within a right\n// aligned nav component. To enable the undoing of that, we provide an override\n// to restore the default dropdown menu alignment.\n//\n// This is only for left-aligning a dropdown menu within a `.navbar-right` or\n// `.pull-right` nav component.\n.dropdown-menu-left {\n  left: 0;\n  right: auto;\n}\n\n// Dropdown section headers\n.dropdown-header {\n  display: block;\n  padding: 3px 20px;\n  font-size: @font-size-small;\n  line-height: @line-height-base;\n  color: @dropdown-header-color;\n}\n\n// Backdrop to catch body clicks on mobile, etc.\n.dropdown-backdrop {\n  position: fixed;\n  left: 0;\n  right: 0;\n  bottom: 0;\n  top: 0;\n  z-index: (@zindex-dropdown - 10);\n}\n\n// Right aligned dropdowns\n.pull-right > .dropdown-menu {\n  right: 0;\n  left: auto;\n}\n\n// Allow for dropdowns to go bottom up (aka, dropup-menu)\n//\n// Just add .dropup after the standard .dropdown class and you're set, bro.\n// TODO: abstract this so that the navbar fixed styles are not placed here?\n\n.dropup,\n.navbar-fixed-bottom .dropdown {\n  // Reverse the caret\n  .caret {\n    border-top: 0;\n    border-bottom: @caret-width-base solid;\n    content: \"\";\n  }\n  // Different positioning for bottom up menu\n  .dropdown-menu {\n    top: auto;\n    bottom: 100%;\n    margin-bottom: 1px;\n  }\n}\n\n\n// Component alignment\n//\n// Reiterate per navbar.less and the modified component alignment there.\n\n@media (min-width: @grid-float-breakpoint) {\n  .navbar-right {\n    .dropdown-menu {\n      .dropdown-menu-right();\n    }\n    // Necessary for overrides of the default right aligned menu.\n    // Will remove come v4 in all likelihood.\n    .dropdown-menu-left {\n      .dropdown-menu-left();\n    }\n  }\n}\n\n","//\n// Button groups\n// --------------------------------------------------\n\n// Make the div behave like a button\n.btn-group,\n.btn-group-vertical {\n  position: relative;\n  display: inline-block;\n  vertical-align: middle; // match .btn alignment given font-size hack above\n  > .btn {\n    position: relative;\n    float: left;\n    // Bring the \"active\" button to the front\n    &:hover,\n    &:focus,\n    &:active,\n    &.active {\n      z-index: 2;\n    }\n    &:focus {\n      // Remove focus outline when dropdown JS adds it after closing the menu\n      outline: none;\n    }\n  }\n}\n\n// Prevent double borders when buttons are next to each other\n.btn-group {\n  .btn + .btn,\n  .btn + .btn-group,\n  .btn-group + .btn,\n  .btn-group + .btn-group {\n    margin-left: -1px;\n  }\n}\n\n// Optional: Group multiple button groups together for a toolbar\n.btn-toolbar {\n  margin-left: -5px; // Offset the first child's margin\n  &:extend(.clearfix all);\n\n  .btn-group,\n  .input-group {\n    float: left;\n  }\n  > .btn,\n  > .btn-group,\n  > .input-group {\n    margin-left: 5px;\n  }\n}\n\n.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {\n  border-radius: 0;\n}\n\n// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match\n.btn-group > .btn:first-child {\n  margin-left: 0;\n  &:not(:last-child):not(.dropdown-toggle) {\n    .border-right-radius(0);\n  }\n}\n// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it\n.btn-group > .btn:last-child:not(:first-child),\n.btn-group > .dropdown-toggle:not(:first-child) {\n  .border-left-radius(0);\n}\n\n// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)\n.btn-group > .btn-group {\n  float: left;\n}\n.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group > .btn-group:first-child {\n  > .btn:last-child,\n  > .dropdown-toggle {\n    .border-right-radius(0);\n  }\n}\n.btn-group > .btn-group:last-child > .btn:first-child {\n  .border-left-radius(0);\n}\n\n// On active and open, don't show outline\n.btn-group .dropdown-toggle:active,\n.btn-group.open .dropdown-toggle {\n  outline: 0;\n}\n\n\n// Sizing\n//\n// Remix the default button sizing classes into new ones for easier manipulation.\n\n.btn-group-xs > .btn { .btn-xs(); }\n.btn-group-sm > .btn { .btn-sm(); }\n.btn-group-lg > .btn { .btn-lg(); }\n\n\n// Split button dropdowns\n// ----------------------\n\n// Give the line between buttons some depth\n.btn-group > .btn + .dropdown-toggle {\n  padding-left: 8px;\n  padding-right: 8px;\n}\n.btn-group > .btn-lg + .dropdown-toggle {\n  padding-left: 12px;\n  padding-right: 12px;\n}\n\n// The clickable button for toggling the menu\n// Remove the gradient and set the same inset shadow as the :active state\n.btn-group.open .dropdown-toggle {\n  .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));\n\n  // Show no shadow for `.btn-link` since it has no other button styles.\n  &.btn-link {\n    .box-shadow(none);\n  }\n}\n\n\n// Reposition the caret\n.btn .caret {\n  margin-left: 0;\n}\n// Carets in other button sizes\n.btn-lg .caret {\n  border-width: @caret-width-large @caret-width-large 0;\n  border-bottom-width: 0;\n}\n// Upside down carets for .dropup\n.dropup .btn-lg .caret {\n  border-width: 0 @caret-width-large @caret-width-large;\n}\n\n\n// Vertical button groups\n// ----------------------\n\n.btn-group-vertical {\n  > .btn,\n  > .btn-group,\n  > .btn-group > .btn {\n    display: block;\n    float: none;\n    width: 100%;\n    max-width: 100%;\n  }\n\n  // Clear floats so dropdown menus can be properly placed\n  > .btn-group {\n    &:extend(.clearfix all);\n    > .btn {\n      float: none;\n    }\n  }\n\n  > .btn + .btn,\n  > .btn + .btn-group,\n  > .btn-group + .btn,\n  > .btn-group + .btn-group {\n    margin-top: -1px;\n    margin-left: 0;\n  }\n}\n\n.btn-group-vertical > .btn {\n  &:not(:first-child):not(:last-child) {\n    border-radius: 0;\n  }\n  &:first-child:not(:last-child) {\n    border-top-right-radius: @border-radius-base;\n    .border-bottom-radius(0);\n  }\n  &:last-child:not(:first-child) {\n    border-bottom-left-radius: @border-radius-base;\n    .border-top-radius(0);\n  }\n}\n.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {\n  border-radius: 0;\n}\n.btn-group-vertical > .btn-group:first-child:not(:last-child) {\n  > .btn:last-child,\n  > .dropdown-toggle {\n    .border-bottom-radius(0);\n  }\n}\n.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {\n  .border-top-radius(0);\n}\n\n\n\n// Justified button groups\n// ----------------------\n\n.btn-group-justified {\n  display: table;\n  width: 100%;\n  table-layout: fixed;\n  border-collapse: separate;\n  > .btn,\n  > .btn-group {\n    float: none;\n    display: table-cell;\n    width: 1%;\n  }\n  > .btn-group .btn {\n    width: 100%;\n  }\n}\n\n\n// Checkbox and radio options\n[data-toggle=\"buttons\"] > .btn > input[type=\"radio\"],\n[data-toggle=\"buttons\"] > .btn > input[type=\"checkbox\"] {\n  display: none;\n}\n","//\n// Input groups\n// --------------------------------------------------\n\n// Base styles\n// -------------------------\n.input-group {\n  position: relative; // For dropdowns\n  display: table;\n  border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table\n\n  // Undo padding and float of grid classes\n  &[class*=\"col-\"] {\n    float: none;\n    padding-left: 0;\n    padding-right: 0;\n  }\n\n  .form-control {\n    // IE9 fubars the placeholder attribute in text inputs and the arrows on\n    // select elements in input groups. To fix it, we float the input. Details:\n    // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855\n    float: left;\n\n    width: 100%;\n    margin-bottom: 0;\n  }\n}\n\n// Sizing options\n//\n// Remix the default form control sizing classes into new ones for easier\n// manipulation.\n\n.input-group-lg > .form-control,\n.input-group-lg > .input-group-addon,\n.input-group-lg > .input-group-btn > .btn { .input-lg(); }\n.input-group-sm > .form-control,\n.input-group-sm > .input-group-addon,\n.input-group-sm > .input-group-btn > .btn { .input-sm(); }\n\n\n// Display as table-cell\n// -------------------------\n.input-group-addon,\n.input-group-btn,\n.input-group .form-control {\n  display: table-cell;\n\n  &:not(:first-child):not(:last-child) {\n    border-radius: 0;\n  }\n}\n// Addon and addon wrapper for buttons\n.input-group-addon,\n.input-group-btn {\n  width: 1%;\n  white-space: nowrap;\n  vertical-align: middle; // Match the inputs\n}\n\n// Text input groups\n// -------------------------\n.input-group-addon {\n  padding: @padding-base-vertical @padding-base-horizontal;\n  font-size: @font-size-base;\n  font-weight: normal;\n  line-height: 1;\n  color: @input-color;\n  text-align: center;\n  background-color: @input-group-addon-bg;\n  border: 1px solid @input-group-addon-border-color;\n  border-radius: @border-radius-base;\n\n  // Sizing\n  &.input-sm {\n    padding: @padding-small-vertical @padding-small-horizontal;\n    font-size: @font-size-small;\n    border-radius: @border-radius-small;\n  }\n  &.input-lg {\n    padding: @padding-large-vertical @padding-large-horizontal;\n    font-size: @font-size-large;\n    border-radius: @border-radius-large;\n  }\n\n  // Nuke default margins from checkboxes and radios to vertically center within.\n  input[type=\"radio\"],\n  input[type=\"checkbox\"] {\n    margin-top: 0;\n  }\n}\n\n// Reset rounded corners\n.input-group .form-control:first-child,\n.input-group-addon:first-child,\n.input-group-btn:first-child > .btn,\n.input-group-btn:first-child > .btn-group > .btn,\n.input-group-btn:first-child > .dropdown-toggle,\n.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),\n.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {\n  .border-right-radius(0);\n}\n.input-group-addon:first-child {\n  border-right: 0;\n}\n.input-group .form-control:last-child,\n.input-group-addon:last-child,\n.input-group-btn:last-child > .btn,\n.input-group-btn:last-child > .btn-group > .btn,\n.input-group-btn:last-child > .dropdown-toggle,\n.input-group-btn:first-child > .btn:not(:first-child),\n.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {\n  .border-left-radius(0);\n}\n.input-group-addon:last-child {\n  border-left: 0;\n}\n\n// Button input groups\n// -------------------------\n.input-group-btn {\n  position: relative;\n  // Jankily prevent input button groups from wrapping with `white-space` and\n  // `font-size` in combination with `inline-block` on buttons.\n  font-size: 0;\n  white-space: nowrap;\n\n  // Negative margin for spacing, position for bringing hovered/focused/actived\n  // element above the siblings.\n  > .btn {\n    position: relative;\n    + .btn {\n      margin-left: -1px;\n    }\n    // Bring the \"active\" button to the front\n    &:hover,\n    &:focus,\n    &:active {\n      z-index: 2;\n    }\n  }\n\n  // Negative margin to only have a 1px border between the two\n  &:first-child {\n    > .btn,\n    > .btn-group {\n      margin-right: -1px;\n    }\n  }\n  &:last-child {\n    > .btn,\n    > .btn-group {\n      margin-left: -1px;\n    }\n  }\n}\n","//\n// Navs\n// --------------------------------------------------\n\n\n// Base class\n// --------------------------------------------------\n\n.nav {\n  margin-bottom: 0;\n  padding-left: 0; // Override default ul/ol\n  list-style: none;\n  &:extend(.clearfix all);\n\n  > li {\n    position: relative;\n    display: block;\n\n    > a {\n      position: relative;\n      display: block;\n      padding: @nav-link-padding;\n      &:hover,\n      &:focus {\n        text-decoration: none;\n        background-color: @nav-link-hover-bg;\n      }\n    }\n\n    // Disabled state sets text to gray and nukes hover/tab effects\n    &.disabled > a {\n      color: @nav-disabled-link-color;\n\n      &:hover,\n      &:focus {\n        color: @nav-disabled-link-hover-color;\n        text-decoration: none;\n        background-color: transparent;\n        cursor: not-allowed;\n      }\n    }\n  }\n\n  // Open dropdowns\n  .open > a {\n    &,\n    &:hover,\n    &:focus {\n      background-color: @nav-link-hover-bg;\n      border-color: @link-color;\n    }\n  }\n\n  // Nav dividers (deprecated with v3.0.1)\n  //\n  // This should have been removed in v3 with the dropping of `.nav-list`, but\n  // we missed it. We don't currently support this anywhere, but in the interest\n  // of maintaining backward compatibility in case you use it, it's deprecated.\n  .nav-divider {\n    .nav-divider();\n  }\n\n  // Prevent IE8 from misplacing imgs\n  //\n  // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989\n  > li > a > img {\n    max-width: none;\n  }\n}\n\n\n// Tabs\n// -------------------------\n\n// Give the tabs something to sit on\n.nav-tabs {\n  border-bottom: 1px solid @nav-tabs-border-color;\n  > li {\n    float: left;\n    // Make the list-items overlay the bottom border\n    margin-bottom: -1px;\n\n    // Actual tabs (as links)\n    > a {\n      margin-right: 2px;\n      line-height: @line-height-base;\n      border: 1px solid transparent;\n      border-radius: @border-radius-base @border-radius-base 0 0;\n      &:hover {\n        border-color: @nav-tabs-link-hover-border-color @nav-tabs-link-hover-border-color @nav-tabs-border-color;\n      }\n    }\n\n    // Active state, and its :hover to override normal :hover\n    &.active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @nav-tabs-active-link-hover-color;\n        background-color: @nav-tabs-active-link-hover-bg;\n        border: 1px solid @nav-tabs-active-link-hover-border-color;\n        border-bottom-color: transparent;\n        cursor: default;\n      }\n    }\n  }\n  // pulling this in mainly for less shorthand\n  &.nav-justified {\n    .nav-justified();\n    .nav-tabs-justified();\n  }\n}\n\n\n// Pills\n// -------------------------\n.nav-pills {\n  > li {\n    float: left;\n\n    // Links rendered as pills\n    > a {\n      border-radius: @nav-pills-border-radius;\n    }\n    + li {\n      margin-left: 2px;\n    }\n\n    // Active state\n    &.active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @nav-pills-active-link-hover-color;\n        background-color: @nav-pills-active-link-hover-bg;\n      }\n    }\n  }\n}\n\n\n// Stacked pills\n.nav-stacked {\n  > li {\n    float: none;\n    + li {\n      margin-top: 2px;\n      margin-left: 0; // no need for this gap between nav items\n    }\n  }\n}\n\n\n// Nav variations\n// --------------------------------------------------\n\n// Justified nav links\n// -------------------------\n\n.nav-justified {\n  width: 100%;\n\n  > li {\n    float: none;\n     > a {\n      text-align: center;\n      margin-bottom: 5px;\n    }\n  }\n\n  > .dropdown .dropdown-menu {\n    top: auto;\n    left: auto;\n  }\n\n  @media (min-width: @screen-sm-min) {\n    > li {\n      display: table-cell;\n      width: 1%;\n      > a {\n        margin-bottom: 0;\n      }\n    }\n  }\n}\n\n// Move borders to anchors instead of bottom of list\n//\n// Mixin for adding on top the shared `.nav-justified` styles for our tabs\n.nav-tabs-justified {\n  border-bottom: 0;\n\n  > li > a {\n    // Override margin from .nav-tabs\n    margin-right: 0;\n    border-radius: @border-radius-base;\n  }\n\n  > .active > a,\n  > .active > a:hover,\n  > .active > a:focus {\n    border: 1px solid @nav-tabs-justified-link-border-color;\n  }\n\n  @media (min-width: @screen-sm-min) {\n    > li > a {\n      border-bottom: 1px solid @nav-tabs-justified-link-border-color;\n      border-radius: @border-radius-base @border-radius-base 0 0;\n    }\n    > .active > a,\n    > .active > a:hover,\n    > .active > a:focus {\n      border-bottom-color: @nav-tabs-justified-active-link-border-color;\n    }\n  }\n}\n\n\n// Tabbable tabs\n// -------------------------\n\n// Hide tabbable panes to start, show them when `.active`\n.tab-content {\n  > .tab-pane {\n    display: none;\n  }\n  > .active {\n    display: block;\n  }\n}\n\n\n// Dropdowns\n// -------------------------\n\n// Specific dropdowns\n.nav-tabs .dropdown-menu {\n  // make dropdown border overlap tab border\n  margin-top: -1px;\n  // Remove the top rounded corners here since there is a hard edge above the menu\n  .border-top-radius(0);\n}\n","//\n// Navbars\n// --------------------------------------------------\n\n\n// Wrapper and base class\n//\n// Provide a static navbar from which we expand to create full-width, fixed, and\n// other navbar variations.\n\n.navbar {\n  position: relative;\n  min-height: @navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)\n  margin-bottom: @navbar-margin-bottom;\n  border: 1px solid transparent;\n\n  // Prevent floats from breaking the navbar\n  &:extend(.clearfix all);\n\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: @navbar-border-radius;\n  }\n}\n\n\n// Navbar heading\n//\n// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy\n// styling of responsive aspects.\n\n.navbar-header {\n  &:extend(.clearfix all);\n\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n  }\n}\n\n\n// Navbar collapse (body)\n//\n// Group your navbar content into this for easy collapsing and expanding across\n// various device sizes. By default, this content is collapsed when <768px, but\n// will expand past that for a horizontal display.\n//\n// To start (on mobile devices) the navbar links, forms, and buttons are stacked\n// vertically and include a `max-height` to overflow in case you have too much\n// content for the user's viewport.\n\n.navbar-collapse {\n  max-height: @navbar-collapse-max-height;\n  overflow-x: visible;\n  padding-right: @navbar-padding-horizontal;\n  padding-left:  @navbar-padding-horizontal;\n  border-top: 1px solid transparent;\n  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);\n  &:extend(.clearfix all);\n  -webkit-overflow-scrolling: touch;\n\n  &.in {\n    overflow-y: auto;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    width: auto;\n    border-top: 0;\n    box-shadow: none;\n\n    &.collapse {\n      display: block !important;\n      height: auto !important;\n      padding-bottom: 0; // Override default setting\n      overflow: visible !important;\n    }\n\n    &.in {\n      overflow-y: visible;\n    }\n\n    // Undo the collapse side padding for navbars with containers to ensure\n    // alignment of right-aligned contents.\n    .navbar-fixed-top &,\n    .navbar-static-top &,\n    .navbar-fixed-bottom & {\n      padding-left: 0;\n      padding-right: 0;\n    }\n  }\n}\n\n\n// Both navbar header and collapse\n//\n// When a container is present, change the behavior of the header and collapse.\n\n.container,\n.container-fluid {\n  > .navbar-header,\n  > .navbar-collapse {\n    margin-right: -@navbar-padding-horizontal;\n    margin-left:  -@navbar-padding-horizontal;\n\n    @media (min-width: @grid-float-breakpoint) {\n      margin-right: 0;\n      margin-left:  0;\n    }\n  }\n}\n\n\n//\n// Navbar alignment options\n//\n// Display the navbar across the entirety of the page or fixed it to the top or\n// bottom of the page.\n\n// Static top (unfixed, but 100% wide) navbar\n.navbar-static-top {\n  z-index: @zindex-navbar;\n  border-width: 0 0 1px;\n\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: 0;\n  }\n}\n\n// Fix the top/bottom navbars when screen real estate supports it\n.navbar-fixed-top,\n.navbar-fixed-bottom {\n  position: fixed;\n  right: 0;\n  left: 0;\n  z-index: @zindex-navbar-fixed;\n\n  // Undo the rounded corners\n  @media (min-width: @grid-float-breakpoint) {\n    border-radius: 0;\n  }\n}\n.navbar-fixed-top {\n  top: 0;\n  border-width: 0 0 1px;\n}\n.navbar-fixed-bottom {\n  bottom: 0;\n  margin-bottom: 0; // override .navbar defaults\n  border-width: 1px 0 0;\n}\n\n\n// Brand/project name\n\n.navbar-brand {\n  float: left;\n  padding: @navbar-padding-vertical @navbar-padding-horizontal;\n  font-size: @font-size-large;\n  line-height: @line-height-computed;\n  height: @line-height-computed;\n\n  &:hover,\n  &:focus {\n    text-decoration: none;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    .navbar > .container &,\n    .navbar > .container-fluid & {\n      margin-left: -@navbar-padding-horizontal;\n    }\n  }\n}\n\n\n// Navbar toggle\n//\n// Custom button for toggling the `.navbar-collapse`, powered by the collapse\n// JavaScript plugin.\n\n.navbar-toggle {\n  position: relative;\n  float: right;\n  margin-right: @navbar-padding-horizontal;\n  padding: 9px 10px;\n  .navbar-vertical-align(34px);\n  background-color: transparent;\n  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214\n  border: 1px solid transparent;\n  border-radius: @border-radius-base;\n\n  // We remove the `outline` here, but later compensate by attaching `:hover`\n  // styles to `:focus`.\n  &:focus {\n    outline: none;\n  }\n\n  // Bars\n  .icon-bar {\n    display: block;\n    width: 22px;\n    height: 2px;\n    border-radius: 1px;\n  }\n  .icon-bar + .icon-bar {\n    margin-top: 4px;\n  }\n\n  @media (min-width: @grid-float-breakpoint) {\n    display: none;\n  }\n}\n\n\n// Navbar nav links\n//\n// Builds on top of the `.nav` components with its own modifier class to make\n// the nav the full height of the horizontal nav (above 768px).\n\n.navbar-nav {\n  margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;\n\n  > li > a {\n    padding-top:    10px;\n    padding-bottom: 10px;\n    line-height: @line-height-computed;\n  }\n\n  @media (max-width: @grid-float-breakpoint-max) {\n    // Dropdowns get custom display when collapsed\n    .open .dropdown-menu {\n      position: static;\n      float: none;\n      width: auto;\n      margin-top: 0;\n      background-color: transparent;\n      border: 0;\n      box-shadow: none;\n      > li > a,\n      .dropdown-header {\n        padding: 5px 15px 5px 25px;\n      }\n      > li > a {\n        line-height: @line-height-computed;\n        &:hover,\n        &:focus {\n          background-image: none;\n        }\n      }\n    }\n  }\n\n  // Uncollapse the nav\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n    margin: 0;\n\n    > li {\n      float: left;\n      > a {\n        padding-top:    @navbar-padding-vertical;\n        padding-bottom: @navbar-padding-vertical;\n      }\n    }\n\n    &.navbar-right:last-child {\n      margin-right: -@navbar-padding-horizontal;\n    }\n  }\n}\n\n\n// Component alignment\n//\n// Repurpose the pull utilities as their own navbar utilities to avoid specificity\n// issues with parents and chaining. Only do this when the navbar is uncollapsed\n// though so that navbar contents properly stack and align in mobile.\n\n@media (min-width: @grid-float-breakpoint) {\n  .navbar-left  { .pull-left(); }\n  .navbar-right { .pull-right(); }\n}\n\n\n// Navbar form\n//\n// Extension of the `.form-inline` with some extra flavor for optimum display in\n// our navbars.\n\n.navbar-form {\n  margin-left: -@navbar-padding-horizontal;\n  margin-right: -@navbar-padding-horizontal;\n  padding: 10px @navbar-padding-horizontal;\n  border-top: 1px solid transparent;\n  border-bottom: 1px solid transparent;\n  @shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);\n  .box-shadow(@shadow);\n\n  // Mixin behavior for optimum display\n  .form-inline();\n\n  .form-group {\n    @media (max-width: @grid-float-breakpoint-max) {\n      margin-bottom: 5px;\n    }\n  }\n\n  // Vertically center in expanded, horizontal navbar\n  .navbar-vertical-align(@input-height-base);\n\n  // Undo 100% width for pull classes\n  @media (min-width: @grid-float-breakpoint) {\n    width: auto;\n    border: 0;\n    margin-left: 0;\n    margin-right: 0;\n    padding-top: 0;\n    padding-bottom: 0;\n    .box-shadow(none);\n\n    // Outdent the form if last child to line up with content down the page\n    &.navbar-right:last-child {\n      margin-right: -@navbar-padding-horizontal;\n    }\n  }\n}\n\n\n// Dropdown menus\n\n// Menu position and menu carets\n.navbar-nav > li > .dropdown-menu {\n  margin-top: 0;\n  .border-top-radius(0);\n}\n// Menu position and menu caret support for dropups via extra dropup class\n.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {\n  .border-bottom-radius(0);\n}\n\n\n// Buttons in navbars\n//\n// Vertically center a button within a navbar (when *not* in a form).\n\n.navbar-btn {\n  .navbar-vertical-align(@input-height-base);\n\n  &.btn-sm {\n    .navbar-vertical-align(@input-height-small);\n  }\n  &.btn-xs {\n    .navbar-vertical-align(22);\n  }\n}\n\n\n// Text in navbars\n//\n// Add a class to make any element properly align itself vertically within the navbars.\n\n.navbar-text {\n  .navbar-vertical-align(@line-height-computed);\n\n  @media (min-width: @grid-float-breakpoint) {\n    float: left;\n    margin-left: @navbar-padding-horizontal;\n    margin-right: @navbar-padding-horizontal;\n\n    // Outdent the form if last child to line up with content down the page\n    &.navbar-right:last-child {\n      margin-right: 0;\n    }\n  }\n}\n\n// Alternate navbars\n// --------------------------------------------------\n\n// Default navbar\n.navbar-default {\n  background-color: @navbar-default-bg;\n  border-color: @navbar-default-border;\n\n  .navbar-brand {\n    color: @navbar-default-brand-color;\n    &:hover,\n    &:focus {\n      color: @navbar-default-brand-hover-color;\n      background-color: @navbar-default-brand-hover-bg;\n    }\n  }\n\n  .navbar-text {\n    color: @navbar-default-color;\n  }\n\n  .navbar-nav {\n    > li > a {\n      color: @navbar-default-link-color;\n\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-hover-color;\n        background-color: @navbar-default-link-hover-bg;\n      }\n    }\n    > .active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-active-color;\n        background-color: @navbar-default-link-active-bg;\n      }\n    }\n    > .disabled > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-default-link-disabled-color;\n        background-color: @navbar-default-link-disabled-bg;\n      }\n    }\n  }\n\n  .navbar-toggle {\n    border-color: @navbar-default-toggle-border-color;\n    &:hover,\n    &:focus {\n      background-color: @navbar-default-toggle-hover-bg;\n    }\n    .icon-bar {\n      background-color: @navbar-default-toggle-icon-bar-bg;\n    }\n  }\n\n  .navbar-collapse,\n  .navbar-form {\n    border-color: @navbar-default-border;\n  }\n\n  // Dropdown menu items\n  .navbar-nav {\n    // Remove background color from open dropdown\n    > .open > a {\n      &,\n      &:hover,\n      &:focus {\n        background-color: @navbar-default-link-active-bg;\n        color: @navbar-default-link-active-color;\n      }\n    }\n\n    @media (max-width: @grid-float-breakpoint-max) {\n      // Dropdowns get custom display when collapsed\n      .open .dropdown-menu {\n        > li > a {\n          color: @navbar-default-link-color;\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-hover-color;\n            background-color: @navbar-default-link-hover-bg;\n          }\n        }\n        > .active > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-active-color;\n            background-color: @navbar-default-link-active-bg;\n          }\n        }\n        > .disabled > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-default-link-disabled-color;\n            background-color: @navbar-default-link-disabled-bg;\n          }\n        }\n      }\n    }\n  }\n\n\n  // Links in navbars\n  //\n  // Add a class to ensure links outside the navbar nav are colored correctly.\n\n  .navbar-link {\n    color: @navbar-default-link-color;\n    &:hover {\n      color: @navbar-default-link-hover-color;\n    }\n  }\n\n}\n\n// Inverse navbar\n\n.navbar-inverse {\n  background-color: @navbar-inverse-bg;\n  border-color: @navbar-inverse-border;\n\n  .navbar-brand {\n    color: @navbar-inverse-brand-color;\n    &:hover,\n    &:focus {\n      color: @navbar-inverse-brand-hover-color;\n      background-color: @navbar-inverse-brand-hover-bg;\n    }\n  }\n\n  .navbar-text {\n    color: @navbar-inverse-color;\n  }\n\n  .navbar-nav {\n    > li > a {\n      color: @navbar-inverse-link-color;\n\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-hover-color;\n        background-color: @navbar-inverse-link-hover-bg;\n      }\n    }\n    > .active > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-active-color;\n        background-color: @navbar-inverse-link-active-bg;\n      }\n    }\n    > .disabled > a {\n      &,\n      &:hover,\n      &:focus {\n        color: @navbar-inverse-link-disabled-color;\n        background-color: @navbar-inverse-link-disabled-bg;\n      }\n    }\n  }\n\n  // Darken the responsive nav toggle\n  .navbar-toggle {\n    border-color: @navbar-inverse-toggle-border-color;\n    &:hover,\n    &:focus {\n      background-color: @navbar-inverse-toggle-hover-bg;\n    }\n    .icon-bar {\n      background-color: @navbar-inverse-toggle-icon-bar-bg;\n    }\n  }\n\n  .navbar-collapse,\n  .navbar-form {\n    border-color: darken(@navbar-inverse-bg, 7%);\n  }\n\n  // Dropdowns\n  .navbar-nav {\n    > .open > a {\n      &,\n      &:hover,\n      &:focus {\n        background-color: @navbar-inverse-link-active-bg;\n        color: @navbar-inverse-link-active-color;\n      }\n    }\n\n    @media (max-width: @grid-float-breakpoint-max) {\n      // Dropdowns get custom display\n      .open .dropdown-menu {\n        > .dropdown-header {\n          border-color: @navbar-inverse-border;\n        }\n        .divider {\n          background-color: @navbar-inverse-border;\n        }\n        > li > a {\n          color: @navbar-inverse-link-color;\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-hover-color;\n            background-color: @navbar-inverse-link-hover-bg;\n          }\n        }\n        > .active > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-active-color;\n            background-color: @navbar-inverse-link-active-bg;\n          }\n        }\n        > .disabled > a {\n          &,\n          &:hover,\n          &:focus {\n            color: @navbar-inverse-link-disabled-color;\n            background-color: @navbar-inverse-link-disabled-bg;\n          }\n        }\n      }\n    }\n  }\n\n  .navbar-link {\n    color: @navbar-inverse-link-color;\n    &:hover {\n      color: @navbar-inverse-link-hover-color;\n    }\n  }\n\n}\n","//\n// Utility classes\n// --------------------------------------------------\n\n\n// Floats\n// -------------------------\n\n.clearfix {\n  .clearfix();\n}\n.center-block {\n  .center-block();\n}\n.pull-right {\n  float: right !important;\n}\n.pull-left {\n  float: left !important;\n}\n\n\n// Toggling content\n// -------------------------\n\n// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1\n.hide {\n  display: none !important;\n}\n.show {\n  display: block !important;\n}\n.invisible {\n  visibility: hidden;\n}\n.text-hide {\n  .text-hide();\n}\n\n\n// Hide from screenreaders and browsers\n//\n// Credit: HTML5 Boilerplate\n\n.hidden {\n  display: none !important;\n  visibility: hidden !important;\n}\n\n\n// For Affix plugin\n// -------------------------\n\n.affix {\n  position: fixed;\n}\n","//\n// Breadcrumbs\n// --------------------------------------------------\n\n\n.breadcrumb {\n  padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;\n  margin-bottom: @line-height-computed;\n  list-style: none;\n  background-color: @breadcrumb-bg;\n  border-radius: @border-radius-base;\n\n  > li {\n    display: inline-block;\n\n    + li:before {\n      content: \"@{breadcrumb-separator}\\00a0\"; // Unicode space added since inline-block means non-collapsing white-space\n      padding: 0 5px;\n      color: @breadcrumb-color;\n    }\n  }\n\n  > .active {\n    color: @breadcrumb-active-color;\n  }\n}\n","//\n// Pagination (multiple pages)\n// --------------------------------------------------\n.pagination {\n  display: inline-block;\n  padding-left: 0;\n  margin: @line-height-computed 0;\n  border-radius: @border-radius-base;\n\n  > li {\n    display: inline; // Remove list-style and block-level defaults\n    > a,\n    > span {\n      position: relative;\n      float: left; // Collapse white-space\n      padding: @padding-base-vertical @padding-base-horizontal;\n      line-height: @line-height-base;\n      text-decoration: none;\n      color: @pagination-color;\n      background-color: @pagination-bg;\n      border: 1px solid @pagination-border;\n      margin-left: -1px;\n    }\n    &:first-child {\n      > a,\n      > span {\n        margin-left: 0;\n        .border-left-radius(@border-radius-base);\n      }\n    }\n    &:last-child {\n      > a,\n      > span {\n        .border-right-radius(@border-radius-base);\n      }\n    }\n  }\n\n  > li > a,\n  > li > span {\n    &:hover,\n    &:focus {\n      color: @pagination-hover-color;\n      background-color: @pagination-hover-bg;\n      border-color: @pagination-hover-border;\n    }\n  }\n\n  > .active > a,\n  > .active > span {\n    &,\n    &:hover,\n    &:focus {\n      z-index: 2;\n      color: @pagination-active-color;\n      background-color: @pagination-active-bg;\n      border-color: @pagination-active-border;\n      cursor: default;\n    }\n  }\n\n  > .disabled {\n    > span,\n    > span:hover,\n    > span:focus,\n    > a,\n    > a:hover,\n    > a:focus {\n      color: @pagination-disabled-color;\n      background-color: @pagination-disabled-bg;\n      border-color: @pagination-disabled-border;\n      cursor: not-allowed;\n    }\n  }\n}\n\n// Sizing\n// --------------------------------------------------\n\n// Large\n.pagination-lg {\n  .pagination-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @border-radius-large);\n}\n\n// Small\n.pagination-sm {\n  .pagination-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @border-radius-small);\n}\n","//\n// Pager pagination\n// --------------------------------------------------\n\n\n.pager {\n  padding-left: 0;\n  margin: @line-height-computed 0;\n  list-style: none;\n  text-align: center;\n  &:extend(.clearfix all);\n  li {\n    display: inline;\n    > a,\n    > span {\n      display: inline-block;\n      padding: 5px 14px;\n      background-color: @pager-bg;\n      border: 1px solid @pager-border;\n      border-radius: @pager-border-radius;\n    }\n\n    > a:hover,\n    > a:focus {\n      text-decoration: none;\n      background-color: @pager-hover-bg;\n    }\n  }\n\n  .next {\n    > a,\n    > span {\n      float: right;\n    }\n  }\n\n  .previous {\n    > a,\n    > span {\n      float: left;\n    }\n  }\n\n  .disabled {\n    > a,\n    > a:hover,\n    > a:focus,\n    > span {\n      color: @pager-disabled-color;\n      background-color: @pager-bg;\n      cursor: not-allowed;\n    }\n  }\n\n}\n","//\n// Labels\n// --------------------------------------------------\n\n.label {\n  display: inline;\n  padding: .2em .6em .3em;\n  font-size: 75%;\n  font-weight: bold;\n  line-height: 1;\n  color: @label-color;\n  text-align: center;\n  white-space: nowrap;\n  vertical-align: baseline;\n  border-radius: .25em;\n\n  // Add hover effects, but only for links\n  &[href] {\n    &:hover,\n    &:focus {\n      color: @label-link-hover-color;\n      text-decoration: none;\n      cursor: pointer;\n    }\n  }\n\n  // Empty labels collapse automatically (not available in IE8)\n  &:empty {\n    display: none;\n  }\n\n  // Quick fix for labels in buttons\n  .btn & {\n    position: relative;\n    top: -1px;\n  }\n}\n\n// Colors\n// Contextual variations (linked labels get darker on :hover)\n\n.label-default {\n  .label-variant(@label-default-bg);\n}\n\n.label-primary {\n  .label-variant(@label-primary-bg);\n}\n\n.label-success {\n  .label-variant(@label-success-bg);\n}\n\n.label-info {\n  .label-variant(@label-info-bg);\n}\n\n.label-warning {\n  .label-variant(@label-warning-bg);\n}\n\n.label-danger {\n  .label-variant(@label-danger-bg);\n}\n","//\n// Badges\n// --------------------------------------------------\n\n\n// Base classes\n.badge {\n  display: inline-block;\n  min-width: 10px;\n  padding: 3px 7px;\n  font-size: @font-size-small;\n  font-weight: @badge-font-weight;\n  color: @badge-color;\n  line-height: @badge-line-height;\n  vertical-align: baseline;\n  white-space: nowrap;\n  text-align: center;\n  background-color: @badge-bg;\n  border-radius: @badge-border-radius;\n\n  // Empty badges collapse automatically (not available in IE8)\n  &:empty {\n    display: none;\n  }\n\n  // Quick fix for badges in buttons\n  .btn & {\n    position: relative;\n    top: -1px;\n  }\n  .btn-xs & {\n    top: 0;\n    padding: 1px 5px;\n  }\n}\n\n// Hover state, but only for links\na.badge {\n  &:hover,\n  &:focus {\n    color: @badge-link-hover-color;\n    text-decoration: none;\n    cursor: pointer;\n  }\n}\n\n// Account for counters in navs\na.list-group-item.active > .badge,\n.nav-pills > .active > a > .badge {\n  color: @badge-active-color;\n  background-color: @badge-active-bg;\n}\n.nav-pills > li > a > .badge {\n  margin-left: 3px;\n}\n","//\n// Jumbotron\n// --------------------------------------------------\n\n\n.jumbotron {\n  padding: @jumbotron-padding;\n  margin-bottom: @jumbotron-padding;\n  color: @jumbotron-color;\n  background-color: @jumbotron-bg;\n\n  h1,\n  .h1 {\n    color: @jumbotron-heading-color;\n  }\n  p {\n    margin-bottom: (@jumbotron-padding / 2);\n    font-size: @jumbotron-font-size;\n    font-weight: 200;\n  }\n\n  .container & {\n    border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container\n  }\n\n  .container {\n    max-width: 100%;\n  }\n\n  @media screen and (min-width: @screen-sm-min) {\n    padding-top:    (@jumbotron-padding * 1.6);\n    padding-bottom: (@jumbotron-padding * 1.6);\n\n    .container & {\n      padding-left:  (@jumbotron-padding * 2);\n      padding-right: (@jumbotron-padding * 2);\n    }\n\n    h1,\n    .h1 {\n      font-size: (@font-size-base * 4.5);\n    }\n  }\n}\n","//\n// Thumbnails\n// --------------------------------------------------\n\n\n// Mixin and adjust the regular image class\n.thumbnail {\n  display: block;\n  padding: @thumbnail-padding;\n  margin-bottom: @line-height-computed;\n  line-height: @line-height-base;\n  background-color: @thumbnail-bg;\n  border: 1px solid @thumbnail-border;\n  border-radius: @thumbnail-border-radius;\n  .transition(all .2s ease-in-out);\n\n  > img,\n  a > img {\n    .img-responsive();\n    margin-left: auto;\n    margin-right: auto;\n  }\n\n  // Add a hover state for linked versions only\n  a&:hover,\n  a&:focus,\n  a&.active {\n    border-color: @link-color;\n  }\n\n  // Image captions\n  .caption {\n    padding: @thumbnail-caption-padding;\n    color: @thumbnail-caption-color;\n  }\n}\n","//\n// Alerts\n// --------------------------------------------------\n\n\n// Base styles\n// -------------------------\n\n.alert {\n  padding: @alert-padding;\n  margin-bottom: @line-height-computed;\n  border: 1px solid transparent;\n  border-radius: @alert-border-radius;\n\n  // Headings for larger alerts\n  h4 {\n    margin-top: 0;\n    // Specified for the h4 to prevent conflicts of changing @headings-color\n    color: inherit;\n  }\n  // Provide class for links that match alerts\n  .alert-link {\n    font-weight: @alert-link-font-weight;\n  }\n\n  // Improve alignment and spacing of inner content\n  > p,\n  > ul {\n    margin-bottom: 0;\n  }\n  > p + p {\n    margin-top: 5px;\n  }\n}\n\n// Dismissable alerts\n//\n// Expand the right padding and account for the close button's positioning.\n\n.alert-dismissable {\n padding-right: (@alert-padding + 20);\n\n  // Adjust close link position\n  .close {\n    position: relative;\n    top: -2px;\n    right: -21px;\n    color: inherit;\n  }\n}\n\n// Alternate styles\n//\n// Generate contextual modifier classes for colorizing the alert.\n\n.alert-success {\n  .alert-variant(@alert-success-bg; @alert-success-border; @alert-success-text);\n}\n.alert-info {\n  .alert-variant(@alert-info-bg; @alert-info-border; @alert-info-text);\n}\n.alert-warning {\n  .alert-variant(@alert-warning-bg; @alert-warning-border; @alert-warning-text);\n}\n.alert-danger {\n  .alert-variant(@alert-danger-bg; @alert-danger-border; @alert-danger-text);\n}\n","//\n// Progress bars\n// --------------------------------------------------\n\n\n// Bar animations\n// -------------------------\n\n// WebKit\n@-webkit-keyframes progress-bar-stripes {\n  from  { background-position: 40px 0; }\n  to    { background-position: 0 0; }\n}\n\n// Spec and IE10+\n@keyframes progress-bar-stripes {\n  from  { background-position: 40px 0; }\n  to    { background-position: 0 0; }\n}\n\n\n\n// Bar itself\n// -------------------------\n\n// Outer container\n.progress {\n  overflow: hidden;\n  height: @line-height-computed;\n  margin-bottom: @line-height-computed;\n  background-color: @progress-bg;\n  border-radius: @border-radius-base;\n  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));\n}\n\n// Bar of progress\n.progress-bar {\n  float: left;\n  width: 0%;\n  height: 100%;\n  font-size: @font-size-small;\n  line-height: @line-height-computed;\n  color: @progress-bar-color;\n  text-align: center;\n  background-color: @progress-bar-bg;\n  .box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));\n  .transition(width .6s ease);\n}\n\n// Striped bars\n.progress-striped .progress-bar {\n  #gradient > .striped();\n  background-size: 40px 40px;\n}\n\n// Call animation for the active one\n.progress.active .progress-bar {\n  .animation(progress-bar-stripes 2s linear infinite);\n}\n\n\n\n// Variations\n// -------------------------\n\n.progress-bar-success {\n  .progress-bar-variant(@progress-bar-success-bg);\n}\n\n.progress-bar-info {\n  .progress-bar-variant(@progress-bar-info-bg);\n}\n\n.progress-bar-warning {\n  .progress-bar-variant(@progress-bar-warning-bg);\n}\n\n.progress-bar-danger {\n  .progress-bar-variant(@progress-bar-danger-bg);\n}\n","// Media objects\n// Source: http://stubbornella.org/content/?p=497\n// --------------------------------------------------\n\n\n// Common styles\n// -------------------------\n\n// Clear the floats\n.media,\n.media-body {\n  overflow: hidden;\n  zoom: 1;\n}\n\n// Proper spacing between instances of .media\n.media,\n.media .media {\n  margin-top: 15px;\n}\n.media:first-child {\n  margin-top: 0;\n}\n\n// For images and videos, set to block\n.media-object {\n  display: block;\n}\n\n// Reset margins on headings for tighter default spacing\n.media-heading {\n  margin: 0 0 5px;\n}\n\n\n// Media image alignment\n// -------------------------\n\n.media {\n  > .pull-left {\n    margin-right: 10px;\n  }\n  > .pull-right {\n    margin-left: 10px;\n  }\n}\n\n\n// Media list variation\n// -------------------------\n\n// Undo default ul/ol styles\n.media-list {\n  padding-left: 0;\n  list-style: none;\n}\n","//\n// List groups\n// --------------------------------------------------\n\n\n// Base class\n//\n// Easily usable on <ul>, <ol>, or <div>.\n\n.list-group {\n  // No need to set list-style: none; since .list-group-item is block level\n  margin-bottom: 20px;\n  padding-left: 0; // reset padding because ul and ol\n}\n\n\n// Individual list items\n//\n// Use on `li`s or `div`s within the `.list-group` parent.\n\n.list-group-item {\n  position: relative;\n  display: block;\n  padding: 10px 15px;\n  // Place the border on the list items and negative margin up for better styling\n  margin-bottom: -1px;\n  background-color: @list-group-bg;\n  border: 1px solid @list-group-border;\n\n  // Round the first and last items\n  &:first-child {\n    .border-top-radius(@list-group-border-radius);\n  }\n  &:last-child {\n    margin-bottom: 0;\n    .border-bottom-radius(@list-group-border-radius);\n  }\n\n  // Align badges within list items\n  > .badge {\n    float: right;\n  }\n  > .badge + .badge {\n    margin-right: 5px;\n  }\n}\n\n\n// Linked list items\n//\n// Use anchor elements instead of `li`s or `div`s to create linked list items.\n// Includes an extra `.active` modifier class for showing selected items.\n\na.list-group-item {\n  color: @list-group-link-color;\n\n  .list-group-item-heading {\n    color: @list-group-link-heading-color;\n  }\n\n  // Hover state\n  &:hover,\n  &:focus {\n    text-decoration: none;\n    background-color: @list-group-hover-bg;\n  }\n\n  // Active class on item itself, not parent\n  &.active,\n  &.active:hover,\n  &.active:focus {\n    z-index: 2; // Place active items above their siblings for proper border styling\n    color: @list-group-active-color;\n    background-color: @list-group-active-bg;\n    border-color: @list-group-active-border;\n\n    // Force color to inherit for custom content\n    .list-group-item-heading {\n      color: inherit;\n    }\n    .list-group-item-text {\n      color: @list-group-active-text-color;\n    }\n  }\n}\n\n\n// Contextual variants\n//\n// Add modifier classes to change text and background color on individual items.\n// Organizationally, this must come after the `:hover` states.\n\n.list-group-item-variant(success; @state-success-bg; @state-success-text);\n.list-group-item-variant(info; @state-info-bg; @state-info-text);\n.list-group-item-variant(warning; @state-warning-bg; @state-warning-text);\n.list-group-item-variant(danger; @state-danger-bg; @state-danger-text);\n\n\n// Custom content options\n//\n// Extra classes for creating well-formatted content within `.list-group-item`s.\n\n.list-group-item-heading {\n  margin-top: 0;\n  margin-bottom: 5px;\n}\n.list-group-item-text {\n  margin-bottom: 0;\n  line-height: 1.3;\n}\n","//\n// Panels\n// --------------------------------------------------\n\n\n// Base class\n.panel {\n  margin-bottom: @line-height-computed;\n  background-color: @panel-bg;\n  border: 1px solid transparent;\n  border-radius: @panel-border-radius;\n  .box-shadow(0 1px 1px rgba(0,0,0,.05));\n}\n\n// Panel contents\n.panel-body {\n  padding: @panel-body-padding;\n  &:extend(.clearfix all);\n}\n\n\n// List groups in panels\n//\n// By default, space out list group content from panel headings to account for\n// any kind of custom content between the two.\n\n.panel {\n  > .list-group {\n    margin-bottom: 0;\n    .list-group-item {\n      border-width: 1px 0;\n      border-radius: 0;\n      &:first-child {\n        border-top: 0;\n      }\n      &:last-child {\n        border-bottom: 0;\n      }\n    }\n    // Add border top radius for first one\n    &:first-child {\n      .list-group-item:first-child {\n        .border-top-radius((@panel-border-radius - 1));\n      }\n    }\n    // Add border bottom radius for last one\n    &:last-child {\n      .list-group-item:last-child {\n        .border-bottom-radius((@panel-border-radius - 1));\n      }\n    }\n  }\n}\n// Collapse space between when there's no additional content.\n.panel-heading + .list-group {\n  .list-group-item:first-child {\n    border-top-width: 0;\n  }\n}\n\n\n// Tables in panels\n//\n// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and\n// watch it go full width.\n\n.panel {\n  > .table,\n  > .table-responsive > .table {\n    margin-bottom: 0;\n  }\n  // Add border top radius for first one\n  > .table:first-child,\n  > .table-responsive:first-child > .table:first-child {\n    > thead:first-child,\n    > tbody:first-child {\n      > tr:first-child {\n        td:first-child,\n        th:first-child {\n          border-top-left-radius: (@panel-border-radius - 1);\n        }\n        td:last-child,\n        th:last-child {\n          border-top-right-radius: (@panel-border-radius - 1);\n        }\n      }\n    }\n  }\n  // Add border bottom radius for last one\n  > .table:last-child,\n  > .table-responsive:last-child > .table:last-child {\n    > tbody:last-child,\n    > tfoot:last-child {\n      > tr:last-child {\n        td:first-child,\n        th:first-child {\n          border-bottom-left-radius: (@panel-border-radius - 1);\n        }\n        td:last-child,\n        th:last-child {\n          border-bottom-right-radius: (@panel-border-radius - 1);\n        }\n      }\n    }\n  }\n  > .panel-body + .table,\n  > .panel-body + .table-responsive {\n    border-top: 1px solid @table-border-color;\n  }\n  > .table > tbody:first-child > tr:first-child th,\n  > .table > tbody:first-child > tr:first-child td {\n    border-top: 0;\n  }\n  > .table-bordered,\n  > .table-responsive > .table-bordered {\n    border: 0;\n    > thead,\n    > tbody,\n    > tfoot {\n      > tr {\n        > th:first-child,\n        > td:first-child {\n          border-left: 0;\n        }\n        > th:last-child,\n        > td:last-child {\n          border-right: 0;\n        }\n        &:first-child > th,\n        &:first-child > td {\n          border-top: 0;\n        }\n        &:last-child > th,\n        &:last-child > td {\n          border-bottom: 0;\n        }\n      }\n    }\n  }\n  > .table-responsive {\n    border: 0;\n    margin-bottom: 0;\n  }\n}\n\n\n// Optional heading\n.panel-heading {\n  padding: 10px 15px;\n  border-bottom: 1px solid transparent;\n  .border-top-radius((@panel-border-radius - 1));\n\n  > .dropdown .dropdown-toggle {\n    color: inherit;\n  }\n}\n\n// Within heading, strip any `h*` tag of its default margins for spacing.\n.panel-title {\n  margin-top: 0;\n  margin-bottom: 0;\n  font-size: ceil((@font-size-base * 1.125));\n  color: inherit;\n\n  > a {\n    color: inherit;\n  }\n}\n\n// Optional footer (stays gray in every modifier class)\n.panel-footer {\n  padding: 10px 15px;\n  background-color: @panel-footer-bg;\n  border-top: 1px solid @panel-inner-border;\n  .border-bottom-radius((@panel-border-radius - 1));\n}\n\n\n// Collapsable panels (aka, accordion)\n//\n// Wrap a series of panels in `.panel-group` to turn them into an accordion with\n// the help of our collapse JavaScript plugin.\n\n.panel-group {\n  margin-bottom: @line-height-computed;\n\n  // Tighten up margin so it's only between panels\n  .panel {\n    margin-bottom: 0;\n    border-radius: @panel-border-radius;\n    overflow: hidden; // crop contents when collapsed\n    + .panel {\n      margin-top: 5px;\n    }\n  }\n\n  .panel-heading {\n    border-bottom: 0;\n    + .panel-collapse .panel-body {\n      border-top: 1px solid @panel-inner-border;\n    }\n  }\n  .panel-footer {\n    border-top: 0;\n    + .panel-collapse .panel-body {\n      border-bottom: 1px solid @panel-inner-border;\n    }\n  }\n}\n\n\n// Contextual variations\n.panel-default {\n  .panel-variant(@panel-default-border; @panel-default-text; @panel-default-heading-bg; @panel-default-border);\n}\n.panel-primary {\n  .panel-variant(@panel-primary-border; @panel-primary-text; @panel-primary-heading-bg; @panel-primary-border);\n}\n.panel-success {\n  .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);\n}\n.panel-info {\n  .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);\n}\n.panel-warning {\n  .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);\n}\n.panel-danger {\n  .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);\n}\n","//\n// Wells\n// --------------------------------------------------\n\n\n// Base class\n.well {\n  min-height: 20px;\n  padding: 19px;\n  margin-bottom: 20px;\n  background-color: @well-bg;\n  border: 1px solid @well-border;\n  border-radius: @border-radius-base;\n  .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));\n  blockquote {\n    border-color: #ddd;\n    border-color: rgba(0,0,0,.15);\n  }\n}\n\n// Sizes\n.well-lg {\n  padding: 24px;\n  border-radius: @border-radius-large;\n}\n.well-sm {\n  padding: 9px;\n  border-radius: @border-radius-small;\n}\n","//\n// Close icons\n// --------------------------------------------------\n\n\n.close {\n  float: right;\n  font-size: (@font-size-base * 1.5);\n  font-weight: @close-font-weight;\n  line-height: 1;\n  color: @close-color;\n  text-shadow: @close-text-shadow;\n  .opacity(.2);\n\n  &:hover,\n  &:focus {\n    color: @close-color;\n    text-decoration: none;\n    cursor: pointer;\n    .opacity(.5);\n  }\n\n  // Additional properties for button version\n  // iOS requires the button element instead of an anchor tag.\n  // If you want the anchor version, it requires `href=\"#\"`.\n  button& {\n    padding: 0;\n    cursor: pointer;\n    background: transparent;\n    border: 0;\n    -webkit-appearance: none;\n  }\n}\n","//\n// Modals\n// --------------------------------------------------\n\n// .modal-open      - body class for killing the scroll\n// .modal           - container to scroll within\n// .modal-dialog    - positioning shell for the actual modal\n// .modal-content   - actual modal w/ bg and corners and shit\n\n// Kill the scroll on the body\n.modal-open {\n  overflow: hidden;\n}\n\n// Container that the modal scrolls within\n.modal {\n  display: none;\n  overflow: auto;\n  overflow-y: scroll;\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: @zindex-modal;\n  -webkit-overflow-scrolling: touch;\n\n  // Prevent Chrome on Windows from adding a focus outline. For details, see\n  // https://github.com/twbs/bootstrap/pull/10951.\n  outline: 0;\n\n  // When fading in the modal, animate it to slide down\n  &.fade .modal-dialog {\n    .translate(0, -25%);\n    .transition-transform(~\"0.3s ease-out\");\n  }\n  &.in .modal-dialog { .translate(0, 0)}\n}\n\n// Shell div to position the modal with bottom padding\n.modal-dialog {\n  position: relative;\n  width: auto;\n  margin: 10px;\n}\n\n// Actual modal\n.modal-content {\n  position: relative;\n  background-color: @modal-content-bg;\n  border: 1px solid @modal-content-fallback-border-color; //old browsers fallback (ie8 etc)\n  border: 1px solid @modal-content-border-color;\n  border-radius: @border-radius-large;\n  .box-shadow(0 3px 9px rgba(0,0,0,.5));\n  background-clip: padding-box;\n  // Remove focus outline from opened modal\n  outline: none;\n}\n\n// Modal background\n.modal-backdrop {\n  position: fixed;\n  top: 0;\n  right: 0;\n  bottom: 0;\n  left: 0;\n  z-index: @zindex-modal-background;\n  background-color: @modal-backdrop-bg;\n  // Fade for backdrop\n  &.fade { .opacity(0); }\n  &.in { .opacity(@modal-backdrop-opacity); }\n}\n\n// Modal header\n// Top section of the modal w/ title and dismiss\n.modal-header {\n  padding: @modal-title-padding;\n  border-bottom: 1px solid @modal-header-border-color;\n  min-height: (@modal-title-padding + @modal-title-line-height);\n}\n// Close icon\n.modal-header .close {\n  margin-top: -2px;\n}\n\n// Title text within header\n.modal-title {\n  margin: 0;\n  line-height: @modal-title-line-height;\n}\n\n// Modal body\n// Where all modal content resides (sibling of .modal-header and .modal-footer)\n.modal-body {\n  position: relative;\n  padding: @modal-inner-padding;\n}\n\n// Footer (for actions)\n.modal-footer {\n  margin-top: 15px;\n  padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding;\n  text-align: right; // right align buttons\n  border-top: 1px solid @modal-footer-border-color;\n  &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons\n\n  // Properly space out buttons\n  .btn + .btn {\n    margin-left: 5px;\n    margin-bottom: 0; // account for input[type=\"submit\"] which gets the bottom margin like all other inputs\n  }\n  // but override that for button groups\n  .btn-group .btn + .btn {\n    margin-left: -1px;\n  }\n  // and override it for block buttons as well\n  .btn-block + .btn-block {\n    margin-left: 0;\n  }\n}\n\n// Scale up the modal\n@media (min-width: @screen-sm-min) {\n\n  // Automatically set modal's width for larger viewports\n  .modal-dialog {\n    width: @modal-md;\n    margin: 30px auto;\n  }\n  .modal-content {\n    .box-shadow(0 5px 15px rgba(0,0,0,.5));\n  }\n\n  // Modal sizes\n  .modal-sm { width: @modal-sm; }\n  .modal-lg { width: @modal-lg; }\n\n}\n","//\n// Tooltips\n// --------------------------------------------------\n\n\n// Base class\n.tooltip {\n  position: absolute;\n  z-index: @zindex-tooltip;\n  display: block;\n  visibility: visible;\n  font-size: @font-size-small;\n  line-height: 1.4;\n  .opacity(0);\n\n  &.in     { .opacity(@tooltip-opacity); }\n  &.top    { margin-top:  -3px; padding: @tooltip-arrow-width 0; }\n  &.right  { margin-left:  3px; padding: 0 @tooltip-arrow-width; }\n  &.bottom { margin-top:   3px; padding: @tooltip-arrow-width 0; }\n  &.left   { margin-left: -3px; padding: 0 @tooltip-arrow-width; }\n}\n\n// Wrapper for the tooltip content\n.tooltip-inner {\n  max-width: @tooltip-max-width;\n  padding: 3px 8px;\n  color: @tooltip-color;\n  text-align: center;\n  text-decoration: none;\n  background-color: @tooltip-bg;\n  border-radius: @border-radius-base;\n}\n\n// Arrows\n.tooltip-arrow {\n  position: absolute;\n  width: 0;\n  height: 0;\n  border-color: transparent;\n  border-style: solid;\n}\n.tooltip {\n  &.top .tooltip-arrow {\n    bottom: 0;\n    left: 50%;\n    margin-left: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.top-left .tooltip-arrow {\n    bottom: 0;\n    left: @tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.top-right .tooltip-arrow {\n    bottom: 0;\n    right: @tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-top-color: @tooltip-arrow-color;\n  }\n  &.right .tooltip-arrow {\n    top: 50%;\n    left: 0;\n    margin-top: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width @tooltip-arrow-width @tooltip-arrow-width 0;\n    border-right-color: @tooltip-arrow-color;\n  }\n  &.left .tooltip-arrow {\n    top: 50%;\n    right: 0;\n    margin-top: -@tooltip-arrow-width;\n    border-width: @tooltip-arrow-width 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-left-color: @tooltip-arrow-color;\n  }\n  &.bottom .tooltip-arrow {\n    top: 0;\n    left: 50%;\n    margin-left: -@tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n  &.bottom-left .tooltip-arrow {\n    top: 0;\n    left: @tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n  &.bottom-right .tooltip-arrow {\n    top: 0;\n    right: @tooltip-arrow-width;\n    border-width: 0 @tooltip-arrow-width @tooltip-arrow-width;\n    border-bottom-color: @tooltip-arrow-color;\n  }\n}\n","//\n// Popovers\n// --------------------------------------------------\n\n\n.popover {\n  position: absolute;\n  top: 0;\n  left: 0;\n  z-index: @zindex-popover;\n  display: none;\n  max-width: @popover-max-width;\n  padding: 1px;\n  text-align: left; // Reset given new insertion method\n  background-color: @popover-bg;\n  background-clip: padding-box;\n  border: 1px solid @popover-fallback-border-color;\n  border: 1px solid @popover-border-color;\n  border-radius: @border-radius-large;\n  .box-shadow(0 5px 10px rgba(0,0,0,.2));\n\n  // Overrides for proper insertion\n  white-space: normal;\n\n  // Offset the popover to account for the popover arrow\n  &.top     { margin-top: -10px; }\n  &.right   { margin-left: 10px; }\n  &.bottom  { margin-top: 10px; }\n  &.left    { margin-left: -10px; }\n}\n\n.popover-title {\n  margin: 0; // reset heading margin\n  padding: 8px 14px;\n  font-size: @font-size-base;\n  font-weight: normal;\n  line-height: 18px;\n  background-color: @popover-title-bg;\n  border-bottom: 1px solid darken(@popover-title-bg, 5%);\n  border-radius: 5px 5px 0 0;\n}\n\n.popover-content {\n  padding: 9px 14px;\n}\n\n// Arrows\n//\n// .arrow is outer, .arrow:after is inner\n\n.popover .arrow {\n  &,\n  &:after {\n    position: absolute;\n    display: block;\n    width: 0;\n    height: 0;\n    border-color: transparent;\n    border-style: solid;\n  }\n}\n.popover .arrow {\n  border-width: @popover-arrow-outer-width;\n}\n.popover .arrow:after {\n  border-width: @popover-arrow-width;\n  content: \"\";\n}\n\n.popover {\n  &.top .arrow {\n    left: 50%;\n    margin-left: -@popover-arrow-outer-width;\n    border-bottom-width: 0;\n    border-top-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-top-color: @popover-arrow-outer-color;\n    bottom: -@popover-arrow-outer-width;\n    &:after {\n      content: \" \";\n      bottom: 1px;\n      margin-left: -@popover-arrow-width;\n      border-bottom-width: 0;\n      border-top-color: @popover-arrow-color;\n    }\n  }\n  &.right .arrow {\n    top: 50%;\n    left: -@popover-arrow-outer-width;\n    margin-top: -@popover-arrow-outer-width;\n    border-left-width: 0;\n    border-right-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-right-color: @popover-arrow-outer-color;\n    &:after {\n      content: \" \";\n      left: 1px;\n      bottom: -@popover-arrow-width;\n      border-left-width: 0;\n      border-right-color: @popover-arrow-color;\n    }\n  }\n  &.bottom .arrow {\n    left: 50%;\n    margin-left: -@popover-arrow-outer-width;\n    border-top-width: 0;\n    border-bottom-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-bottom-color: @popover-arrow-outer-color;\n    top: -@popover-arrow-outer-width;\n    &:after {\n      content: \" \";\n      top: 1px;\n      margin-left: -@popover-arrow-width;\n      border-top-width: 0;\n      border-bottom-color: @popover-arrow-color;\n    }\n  }\n\n  &.left .arrow {\n    top: 50%;\n    right: -@popover-arrow-outer-width;\n    margin-top: -@popover-arrow-outer-width;\n    border-right-width: 0;\n    border-left-color: @popover-arrow-outer-fallback-color; // IE8 fallback\n    border-left-color: @popover-arrow-outer-color;\n    &:after {\n      content: \" \";\n      right: 1px;\n      border-right-width: 0;\n      border-left-color: @popover-arrow-color;\n      bottom: -@popover-arrow-width;\n    }\n  }\n\n}\n","//\n// Carousel\n// --------------------------------------------------\n\n\n// Wrapper for the slide container and indicators\n.carousel {\n  position: relative;\n}\n\n.carousel-inner {\n  position: relative;\n  overflow: hidden;\n  width: 100%;\n\n  > .item {\n    display: none;\n    position: relative;\n    .transition(.6s ease-in-out left);\n\n    // Account for jankitude on images\n    > img,\n    > a > img {\n      .img-responsive();\n      line-height: 1;\n    }\n  }\n\n  > .active,\n  > .next,\n  > .prev { display: block; }\n\n  > .active {\n    left: 0;\n  }\n\n  > .next,\n  > .prev {\n    position: absolute;\n    top: 0;\n    width: 100%;\n  }\n\n  > .next {\n    left: 100%;\n  }\n  > .prev {\n    left: -100%;\n  }\n  > .next.left,\n  > .prev.right {\n    left: 0;\n  }\n\n  > .active.left {\n    left: -100%;\n  }\n  > .active.right {\n    left: 100%;\n  }\n\n}\n\n// Left/right controls for nav\n// ---------------------------\n\n.carousel-control {\n  position: absolute;\n  top: 0;\n  left: 0;\n  bottom: 0;\n  width: @carousel-control-width;\n  .opacity(@carousel-control-opacity);\n  font-size: @carousel-control-font-size;\n  color: @carousel-control-color;\n  text-align: center;\n  text-shadow: @carousel-text-shadow;\n  // We can't have this transition here because WebKit cancels the carousel\n  // animation if you trip this while in the middle of another animation.\n\n  // Set gradients for backgrounds\n  &.left {\n    #gradient > .horizontal(@start-color: rgba(0,0,0,.5); @end-color: rgba(0,0,0,.0001));\n  }\n  &.right {\n    left: auto;\n    right: 0;\n    #gradient > .horizontal(@start-color: rgba(0,0,0,.0001); @end-color: rgba(0,0,0,.5));\n  }\n\n  // Hover/focus state\n  &:hover,\n  &:focus {\n    outline: none;\n    color: @carousel-control-color;\n    text-decoration: none;\n    .opacity(.9);\n  }\n\n  // Toggles\n  .icon-prev,\n  .icon-next,\n  .glyphicon-chevron-left,\n  .glyphicon-chevron-right {\n    position: absolute;\n    top: 50%;\n    z-index: 5;\n    display: inline-block;\n  }\n  .icon-prev,\n  .glyphicon-chevron-left {\n    left: 50%;\n  }\n  .icon-next,\n  .glyphicon-chevron-right {\n    right: 50%;\n  }\n  .icon-prev,\n  .icon-next {\n    width:  20px;\n    height: 20px;\n    margin-top: -10px;\n    margin-left: -10px;\n    font-family: serif;\n  }\n\n  .icon-prev {\n    &:before {\n      content: '\\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)\n    }\n  }\n  .icon-next {\n    &:before {\n      content: '\\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)\n    }\n  }\n}\n\n// Optional indicator pips\n//\n// Add an unordered list with the following class and add a list item for each\n// slide your carousel holds.\n\n.carousel-indicators {\n  position: absolute;\n  bottom: 10px;\n  left: 50%;\n  z-index: 15;\n  width: 60%;\n  margin-left: -30%;\n  padding-left: 0;\n  list-style: none;\n  text-align: center;\n\n  li {\n    display: inline-block;\n    width:  10px;\n    height: 10px;\n    margin: 1px;\n    text-indent: -999px;\n    border: 1px solid @carousel-indicator-border-color;\n    border-radius: 10px;\n    cursor: pointer;\n\n    // IE8-9 hack for event handling\n    //\n    // Internet Explorer 8-9 does not support clicks on elements without a set\n    // `background-color`. We cannot use `filter` since that's not viewed as a\n    // background color by the browser. Thus, a hack is needed.\n    //\n    // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we\n    // set alpha transparency for the best results possible.\n    background-color: #000 \\9; // IE8\n    background-color: rgba(0,0,0,0); // IE9\n  }\n  .active {\n    margin: 0;\n    width:  12px;\n    height: 12px;\n    background-color: @carousel-indicator-active-bg;\n  }\n}\n\n// Optional captions\n// -----------------------------\n// Hidden by default for smaller viewports\n.carousel-caption {\n  position: absolute;\n  left: 15%;\n  right: 15%;\n  bottom: 20px;\n  z-index: 10;\n  padding-top: 20px;\n  padding-bottom: 20px;\n  color: @carousel-caption-color;\n  text-align: center;\n  text-shadow: @carousel-text-shadow;\n  & .btn {\n    text-shadow: none; // No shadow for button elements in carousel-caption\n  }\n}\n\n\n// Scale up controls for tablets and up\n@media screen and (min-width: @screen-sm-min) {\n\n  // Scale up the controls a smidge\n  .carousel-control {\n    .glyphicons-chevron-left,\n    .glyphicons-chevron-right,\n    .icon-prev,\n    .icon-next {\n      width: 30px;\n      height: 30px;\n      margin-top: -15px;\n      margin-left: -15px;\n      font-size: 30px;\n    }\n  }\n\n  // Show and left align the captions\n  .carousel-caption {\n    left: 20%;\n    right: 20%;\n    padding-bottom: 30px;\n  }\n\n  // Move up the indicators\n  .carousel-indicators {\n    bottom: 20px;\n  }\n}\n","//\n// Responsive: Utility classes\n// --------------------------------------------------\n\n\n// IE10 in Windows (Phone) 8\n//\n// Support for responsive views via media queries is kind of borked in IE10, for\n// Surface/desktop in split view and for Windows Phone 8. This particular fix\n// must be accompanied by a snippet of JavaScript to sniff the user agent and\n// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at\n// our Getting Started page for more information on this bug.\n//\n// For more information, see the following:\n//\n// Issue: https://github.com/twbs/bootstrap/issues/10497\n// Docs: http://getbootstrap.com/getting-started/#browsers\n// Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/\n\n@-ms-viewport {\n  width: device-width;\n}\n\n\n// Visibility utilities\n.visible-xs {\n  .responsive-invisibility();\n\n  @media (max-width: @screen-xs-max) {\n    .responsive-visibility();\n  }\n}\n.visible-sm {\n  .responsive-invisibility();\n\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    .responsive-visibility();\n  }\n}\n.visible-md {\n  .responsive-invisibility();\n\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    .responsive-visibility();\n  }\n}\n.visible-lg {\n  .responsive-invisibility();\n\n  @media (min-width: @screen-lg-min) {\n    .responsive-visibility();\n  }\n}\n\n.hidden-xs {\n  @media (max-width: @screen-xs-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-sm {\n  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-md {\n  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {\n    .responsive-invisibility();\n  }\n}\n.hidden-lg {\n  @media (min-width: @screen-lg-min) {\n    .responsive-invisibility();\n  }\n}\n\n\n// Print utilities\n//\n// Media queries are placed on the inside to be mixin-friendly.\n\n.visible-print {\n  .responsive-invisibility();\n\n  @media print {\n    .responsive-visibility();\n  }\n}\n\n.hidden-print {\n  @media print {\n    .responsive-invisibility();\n  }\n}\n"]}
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.min.css b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.min.css
index c547283..381834e 100644
--- a/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.min.css
+++ b/plugins/system/t3/base-bs3/bootstrap/css/bootstrap.min.css
@@ -1,7 +1,7 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,video{display:inline-block}audio:not([controls]){display:none;height:0}[hidden],template{display:none}html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a{background:transparent}a:focus{outline:thin dotted}a:active,a:hover{outline:0}h1{margin:.67em 0;font-size:2em}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}hr{height:0;-moz-box-sizing:content-box;box-sizing:content-box}mark{color:#000;background:#ff0}code,kbd,pre,samp{font-family:monospace,serif;font-size:1em}pre{white-space:pre-wrap}q{quotes:"\201C" "\201D" "\2018" "\2019"}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:0}fieldset{padding:.35em .625em .75em;margin:0 2px;border:1px solid #c0c0c0}legend{padding:0;border:0}button,input,select,textarea{margin:0;font-family:inherit;font-size:100%}button,input{line-height:normal}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button}button[disabled],html input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{padding:0;box-sizing:border-box}input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0}textarea{overflow:auto;vertical-align:top}table{border-collapse:collapse;border-spacing:0}@media print{*{color:#000!important;text-shadow:none!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}@page{margin:2cm .5cm}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*,*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}img{vertical-align:middle}.img-responsive{display:block;height:auto;max-width:100%}.img-rounded{border-radius:6px}.img-thumbnail{display:inline-block;height:auto;max-width:100%;padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:normal;line-height:1;color:#999}h1,h2,h3{margin-top:20px;margin-bottom:10px}h1 small,h2 small,h3 small,h1 .small,h2 .small,h3 .small{font-size:65%}h4,h5,h6{margin-top:10px;margin-bottom:10px}h4 small,h5 small,h6 small,h4 .small,h5 .small,h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media(min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-muted{color:#999}.text-primary{color:#428bca}.text-primary:hover{color:#3071a9}.text-warning{color:#8a6d3b}.text-warning:hover{color:#66512c}.text-danger{color:#a94442}.text-danger:hover{color:#843534}.text-success{color:#3c763d}.text-success:hover{color:#2b542c}.text-info{color:#31708f}.text-info:hover{color:#245269}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-right:5px;padding-left:5px}.list-inline>li:first-child{padding-left:0}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:bold}dd{margin-left:0}@media(min-width:768px){.dl-horizontal dt{float:left;width:160px;overflow:hidden;clear:left;text-align:right;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}.dl-horizontal dd:before,.dl-horizontal dd:after{display:table;content:" "}.dl-horizontal dd:after{clear:both}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;border-left:5px solid #eee}blockquote p{font-size:17.5px;font-weight:300;line-height:1.25}blockquote p:last-child{margin-bottom:0}blockquote small,blockquote .small{display:block;line-height:1.428571429;color:#999}blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0}blockquote.pull-right p,blockquote.pull-right small,blockquote.pull-right .small{text-align:right}blockquote.pull-right small:before,blockquote.pull-right .small:before{content:''}blockquote.pull-right small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.428571429}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;white-space:nowrap;background-color:#f9f2f4;border-radius:4px}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;color:#333;word-break:break-all;word-wrap:break-word;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}.container:before,.container:after{display:table;content:" "}.container:after{clear:both}@media(min-width:768px){.container{width:750px}}@media(min-width:992px){.container{width:970px}}@media(min-width:1200px){.container{width:1170px}}.row{margin-right:-15px;margin-left:-15px}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.row:before,.row:after{display:table;content:" "}.row:after{clear:both}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-right:15px;padding-left:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666666666666%}.col-xs-10{width:83.33333333333334%}.col-xs-9{width:75%}.col-xs-8{width:66.66666666666666%}.col-xs-7{width:58.333333333333336%}.col-xs-6{width:50%}.col-xs-5{width:41.66666666666667%}.col-xs-4{width:33.33333333333333%}.col-xs-3{width:25%}.col-xs-2{width:16.666666666666664%}.col-xs-1{width:8.333333333333332%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666666666666%}.col-xs-pull-10{right:83.33333333333334%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666666666666%}.col-xs-pull-7{right:58.333333333333336%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666666666667%}.col-xs-pull-4{right:33.33333333333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.666666666666664%}.col-xs-pull-1{right:8.333333333333332%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666666666666%}.col-xs-push-10{left:83.33333333333334%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666666666666%}.col-xs-push-7{left:58.333333333333336%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666666666667%}.col-xs-push-4{left:33.33333333333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.666666666666664%}.col-xs-push-1{left:8.333333333333332%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666666666666%}.col-xs-offset-10{margin-left:83.33333333333334%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666666666666%}.col-xs-offset-7{margin-left:58.333333333333336%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666666666667%}.col-xs-offset-4{margin-left:33.33333333333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.666666666666664%}.col-xs-offset-1{margin-left:8.333333333333332%}.col-xs-offset-0{margin-left:0}@media(min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666666666666%}.col-sm-10{width:83.33333333333334%}.col-sm-9{width:75%}.col-sm-8{width:66.66666666666666%}.col-sm-7{width:58.333333333333336%}.col-sm-6{width:50%}.col-sm-5{width:41.66666666666667%}.col-sm-4{width:33.33333333333333%}.col-sm-3{width:25%}.col-sm-2{width:16.666666666666664%}.col-sm-1{width:8.333333333333332%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666666666666%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666666666666%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-0{margin-left:0}}@media(min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666666666666%}.col-md-10{width:83.33333333333334%}.col-md-9{width:75%}.col-md-8{width:66.66666666666666%}.col-md-7{width:58.333333333333336%}.col-md-6{width:50%}.col-md-5{width:41.66666666666667%}.col-md-4{width:33.33333333333333%}.col-md-3{width:25%}.col-md-2{width:16.666666666666664%}.col-md-1{width:8.333333333333332%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666666666666%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666666666666%}.col-md-push-10{left:83.33333333333334%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666666666666%}.col-md-push-7{left:58.333333333333336%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666666666667%}.col-md-push-4{left:33.33333333333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.666666666666664%}.col-md-push-1{left:8.333333333333332%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666666666666%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-0{margin-left:0}}@media(min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666666666666%}.col-lg-10{width:83.33333333333334%}.col-lg-9{width:75%}.col-lg-8{width:66.66666666666666%}.col-lg-7{width:58.333333333333336%}.col-lg-6{width:50%}.col-lg-5{width:41.66666666666667%}.col-lg-4{width:33.33333333333333%}.col-lg-3{width:25%}.col-lg-2{width:16.666666666666664%}.col-lg-1{width:8.333333333333332%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666666666666%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666666666666%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*="col-"]{position:static;display:table-column;float:none}table td[class*="col-"],table th[class*="col-"]{display:table-cell;float:none}.table>thead>tr>.active,.table>tbody>tr>.active,.table>tfoot>tr>.active,.table>thead>.active>td,.table>tbody>.active>td,.table>tfoot>.active>td,.table>thead>.active>th,.table>tbody>.active>th,.table>tfoot>.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>.active:hover,.table-hover>tbody>.active:hover>td,.table-hover>tbody>.active:hover>th{background-color:#e8e8e8}.table>thead>tr>.success,.table>tbody>tr>.success,.table>tfoot>tr>.success,.table>thead>.success>td,.table>tbody>.success>td,.table>tfoot>.success>td,.table>thead>.success>th,.table>tbody>.success>th,.table>tfoot>.success>th{background-color:#dff0d8}.table-hover>tbody>tr>.success:hover,.table-hover>tbody>.success:hover>td,.table-hover>tbody>.success:hover>th{background-color:#d0e9c6}.table>thead>tr>.danger,.table>tbody>tr>.danger,.table>tfoot>tr>.danger,.table>thead>.danger>td,.table>tbody>.danger>td,.table>tfoot>.danger>td,.table>thead>.danger>th,.table>tbody>.danger>th,.table>tfoot>.danger>th{background-color:#f2dede}.table-hover>tbody>tr>.danger:hover,.table-hover>tbody>.danger:hover>td,.table-hover>tbody>.danger:hover>th{background-color:#ebcccc}.table>thead>tr>.warning,.table>tbody>tr>.warning,.table>tfoot>tr>.warning,.table>thead>.warning>td,.table>tbody>.warning>td,.table>tfoot>.warning>td,.table>thead>.warning>th,.table>tbody>.warning>th,.table>tfoot>.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>.warning:hover,.table-hover>tbody>.warning:hover>td,.table-hover>tbody>.warning:hover>th{background-color:#faf2cc}@media(max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-x:scroll;overflow-y:hidden;border:1px solid #ddd;-ms-overflow-style:-ms-autohiding-scrollbar;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:bold}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="radio"],input[type="checkbox"]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type="file"]{display:block}select[multiple],select[size]{height:auto}select optgroup{font-family:inherit;font-size:inherit;font-style:inherit}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}input[type="number"]::-webkit-outer-spin-button,input[type="number"]::-webkit-inner-spin-button{height:auto}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;vertical-align:middle;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 8px rgba(102,175,233,0.6)}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee}textarea.form-control{height:auto}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;padding-left:20px;margin-top:10px;margin-bottom:10px;vertical-align:middle}.radio label,.checkbox label{display:inline;margin-bottom:0;font-weight:normal;cursor:pointer}.radio input[type="radio"],.radio-inline input[type="radio"],.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;font-weight:normal;vertical-align:middle;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type="radio"][disabled],input[type="checkbox"][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type="radio"],fieldset[disabled] input[type="checkbox"],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg{height:auto}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;background-color:#fcf8e3;border-color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;background-color:#f2dede;border-color:#a94442}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075);box-shadow:inset 0 1px 1px rgba(0,0,0,0.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,0.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;background-color:#dff0d8;border-color:#3c763d}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media(min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block}.form-inline select.form-control{width:auto}.form-inline .radio,.form-inline .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:none;margin-left:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{padding-top:7px;margin-top:0;margin-bottom:0}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-right:-15px;margin-left:-15px}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-group:before,.form-horizontal .form-group:after{display:table;content:" "}.form-horizontal .form-group:after{clear:both}.form-horizontal .form-control-static{padding-top:7px}@media(min-width:768px){.form-horizontal .control-label{text-align:right}}.btn{display:inline-block;padding:6px 12px;margin-bottom:0;font-size:14px;font-weight:normal;line-height:1.428571429;text-align:center;white-space:nowrap;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{background-image:none;outline:0;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{pointer-events:none;cursor:not-allowed;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#fff}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-link{font-weight:normal;color:#428bca;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-right:0;padding-left:0}.btn-block+.btn-block{margin-top:5px}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url('../fonts/glyphicons-halflings-regular.eot');src:url('../fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'),url('../fonts/glyphicons-halflings-regular.woff') format('woff'),url('../fonts/glyphicons-halflings-regular.ttf') format('truetype'),url('../fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';-webkit-font-smoothing:antialiased;font-style:normal;font-weight:normal;line-height:1;-moz-osx-font-smoothing:grayscale}.glyphicon:empty{width:1em}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;font-size:14px;list-style:none;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,0.175);box-shadow:0 6px 12px rgba(0,0,0,0.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{color:#262626;text-decoration:none;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;background-color:#428bca;outline:0}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;cursor:not-allowed;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media(min-width:768px){.navbar-right .dropdown-menu{right:0;left:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar:before,.btn-toolbar:after{display:table;content:" "}.btn-toolbar:after{clear:both}.btn-toolbar .btn-group{float:left}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group,.btn-toolbar>.btn-group+.btn-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-right:8px;padding-left:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-right:12px;padding-left:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.125);box-shadow:inset 0 3px 5px rgba(0,0,0,0.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after{display:table;content:" "}.btn-group-vertical>.btn-group:after{clear:both}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-top-right-radius:0;border-bottom-left-radius:4px;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child>.btn:last-child,.btn-group-vertical>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;border-collapse:separate;table-layout:fixed}.btn-group-justified>.btn,.btn-group-justified>.btn-group{display:table-cell;float:none;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle="buttons"]>.btn>input[type="radio"],[data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*="col-"]{float:none;padding-right:0;padding-left:0}.input-group .form-control{width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:normal;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type="radio"],.input-group-addon input[type="checkbox"]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;white-space:nowrap}.input-group-btn:first-child>.btn{margin-right:-1px}.input-group-btn:last-child>.btn{margin-left:-1px}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-4px}.input-group-btn>.btn:hover,.input-group-btn>.btn:active{z-index:2}.nav{padding-left:0;margin-bottom:0;list-style:none}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav:before,.nav:after{display:table;content:" "}.nav:after{clear:both}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;cursor:not-allowed;background-color:transparent}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;cursor:default;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{margin-bottom:5px;text-align:center}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media(min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media(min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}.navbar:before,.navbar:after{display:table;content:" "}.navbar:after{clear:both}@media(min-width:768px){.navbar{border-radius:4px}}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}.navbar-header:before,.navbar-header:after{display:table;content:" "}.navbar-header:after{clear:both}@media(min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;padding-right:15px;padding-left:15px;overflow-x:visible;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,0.1);-webkit-overflow-scrolling:touch}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse:before,.navbar-collapse:after{display:table;content:" "}.navbar-collapse:after{clear:both}.navbar-collapse.in{overflow-y:auto}@media(min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-right:0;padding-left:0}}.container>.navbar-header,.container>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media(min-width:768px){.container>.navbar-header,.container>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media(min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media(min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px 15px;font-size:18px;line-height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media(min-width:768px){.navbar>.container .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;padding:9px 10px;margin-top:8px;margin-right:15px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media(min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media(max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media(min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media(min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{padding:10px 15px;margin-top:8px;margin-right:-15px;margin-bottom:8px;margin-left:-15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}@media(min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block}.navbar-form select.form-control{width:auto}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;padding-left:0;margin-top:0;margin-bottom:0}.navbar-form .radio input[type="radio"],.navbar-form .checkbox input[type="checkbox"]{float:none;margin-left:0}}@media(max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media(min-width:768px){.navbar-form{width:auto;padding-top:0;padding-bottom:0;margin-right:0;margin-left:0;border:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-nav.pull-right>li>.dropdown-menu,.navbar-nav>li>.dropdown-menu.pull-right{right:0;left:auto}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media(min-width:768px){.navbar-text{float:left;margin-right:15px;margin-left:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#ccc}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{color:#555;background-color:#e7e7e7}@media(max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{color:#fff;background-color:#080808}@media(max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{padding:0 5px;color:#ccc;content:"/\00a0"}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;margin-left:-1px;line-height:1.428571429;text-decoration:none;background-color:#fff;border:1px solid #ddd}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-top-right-radius:4px;border-bottom-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{background-color:#eee}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;cursor:default;background-color:#428bca;border-color:#428bca}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;cursor:not-allowed;background-color:#fff;border-color:#ddd}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-top-right-radius:6px;border-bottom-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-top-right-radius:3px;border-bottom-right-radius:3px}.pager{padding-left:0;margin:20px 0;text-align:center;list-style:none}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager:before,.pager:after{display:table;content:" "}.pager:after{clear:both}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;cursor:not-allowed;background-color:#fff}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:#808080}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:bold;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;font-size:21px;font-weight:200;line-height:2.1428571435;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{line-height:1;color:inherit}.jumbotron p{line-height:1.4}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-right:60px;padding-left:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img,.thumbnail a>img{display:block;height:auto;max-width:100%;margin-right:auto;margin-left:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:bold}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{height:20px;margin-bottom:20px;overflow:hidden;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,0.1);box-shadow:inset 0 1px 2px rgba(0,0,0,0.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,0.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,0.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,0.15) 50%,rgba(255,255,255,0.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{padding-left:0;margin-bottom:20px}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,0.05);box-shadow:0 1px 1px rgba(0,0,0,0.05)}.panel-body{padding:15px}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel-body:before,.panel-body:after{display:table;content:" "}.panel-body:after{clear:both}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0}.panel>.list-group .list-group-item:first-child{border-top-right-radius:0;border-top-left-radius:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child th,.panel>.table>tbody:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:last-child>th,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:last-child>td,.panel>.table-responsive>.table-bordered>thead>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}.panel>.table-responsive{margin-bottom:0;border:0}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group .panel{margin-bottom:0;overflow:hidden;border-radius:4px}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,0.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;display:none;overflow:auto;overflow-y:scroll}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;z-index:1050;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,0.2);border-radius:6px;outline:0;-webkit-box-shadow:0 3px 9px rgba(0,0,0,0.5);box-shadow:0 3px 9px rgba(0,0,0,0.5);background-clip:padding-box}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1030;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{min-height:16.428571429px;padding:15px;border-bottom:1px solid #e5e5e5}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{padding:19px 20px 20px;margin-top:15px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer:before,.modal-footer:after{display:table;content:" "}.modal-footer:after{clear:both}.modal-footer .btn+.btn{margin-bottom:0;margin-left:5px}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media screen and (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,0.5);box-shadow:0 5px 15px rgba(0,0,0,0.5)}}.tooltip{position:absolute;z-index:1030;display:block;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0);visibility:visible}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{padding:5px 0;margin-top:-3px}.tooltip.right{padding:0 5px;margin-left:3px}.tooltip.bottom{padding:5px 0;margin-top:3px}.tooltip.left{padding:0 5px;margin-left:-3px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-top-color:#000;border-width:5px 5px 0}.tooltip.top-right .tooltip-arrow{right:5px;bottom:0;border-top-color:#000;border-width:5px 5px 0}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-right-color:#000;border-width:5px 5px 5px 0}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-left-color:#000;border-width:5px 0 5px 5px}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-bottom-color:#000;border-width:0 5px 5px}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-bottom-color:#000;border-width:0 5px 5px}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;white-space:normal;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,0.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,0.2);box-shadow:0 5px 10px rgba(0,0,0,0.2);background-clip:padding-box}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{padding:8px 14px;margin:0;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{bottom:-11px;left:50%;margin-left:-11px;border-top-color:#999;border-top-color:rgba(0,0,0,0.25);border-bottom-width:0}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-top-color:#fff;border-bottom-width:0;content:" "}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-right-color:#999;border-right-color:rgba(0,0,0,0.25);border-left-width:0}.popover.right .arrow:after{bottom:-10px;left:1px;border-right-color:#fff;border-left-width:0;content:" "}.popover.bottom .arrow{top:-11px;left:50%;margin-left:-11px;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,0.25);border-top-width:0}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-bottom-color:#fff;border-top-width:0;content:" "}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-left-color:#999;border-left-color:rgba(0,0,0,0.25);border-right-width:0}.popover.left .arrow:after{right:1px;bottom:-10px;border-left-color:#fff;border-right-width:0;content:" "}.carousel{position:relative}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner>.item{position:relative;display:none;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;height:auto;max-width:100%;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;bottom:0;left:0;width:15%;font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6);opacity:.5;filter:alpha(opacity=50)}.carousel-control.left{background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.5) 0),color-stop(rgba(0,0,0,0.0001) 100%));background-image:linear-gradient(to right,rgba(0,0,0,0.5) 0,rgba(0,0,0,0.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000',endColorstr='#00000000',GradientType=1)}.carousel-control.right{right:0;left:auto;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,0.0001) 0),color-stop(rgba(0,0,0,0.5) 100%));background-image:linear-gradient(to right,rgba(0,0,0,0.0001) 0,rgba(0,0,0,0.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000',endColorstr='#80000000',GradientType=1)}.carousel-control:hover,.carousel-control:focus{color:#fff;text-decoration:none;outline:0;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;padding-left:0;margin-left:-30%;text-align:center;list-style:none}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0);border:1px solid #fff;border-radius:10px}.carousel-indicators .active{width:12px;height:12px;margin:0;background-color:#fff}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,0.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicons-chevron-left,.carousel-control .glyphicons-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{right:20%;left:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after{display:table;content:" "}.clearfix:after{clear:both}.center-block{display:block;margin-right:auto;margin-left:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,tr.visible-xs,th.visible-xs,td.visible-xs{display:none!important}@media(max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-xs.visible-sm{display:block!important}table.visible-xs.visible-sm{display:table}tr.visible-xs.visible-sm{display:table-row!important}th.visible-xs.visible-sm,td.visible-xs.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-xs.visible-md{display:block!important}table.visible-xs.visible-md{display:table}tr.visible-xs.visible-md{display:table-row!important}th.visible-xs.visible-md,td.visible-xs.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-xs.visible-lg{display:block!important}table.visible-xs.visible-lg{display:table}tr.visible-xs.visible-lg{display:table-row!important}th.visible-xs.visible-lg,td.visible-xs.visible-lg{display:table-cell!important}}.visible-sm,tr.visible-sm,th.visible-sm,td.visible-sm{display:none!important}@media(max-width:767px){.visible-sm.visible-xs{display:block!important}table.visible-sm.visible-xs{display:table}tr.visible-sm.visible-xs{display:table-row!important}th.visible-sm.visible-xs,td.visible-sm.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-sm.visible-md{display:block!important}table.visible-sm.visible-md{display:table}tr.visible-sm.visible-md{display:table-row!important}th.visible-sm.visible-md,td.visible-sm.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-sm.visible-lg{display:block!important}table.visible-sm.visible-lg{display:table}tr.visible-sm.visible-lg{display:table-row!important}th.visible-sm.visible-lg,td.visible-sm.visible-lg{display:table-cell!important}}.visible-md,tr.visible-md,th.visible-md,td.visible-md{display:none!important}@media(max-width:767px){.visible-md.visible-xs{display:block!important}table.visible-md.visible-xs{display:table}tr.visible-md.visible-xs{display:table-row!important}th.visible-md.visible-xs,td.visible-md.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-md.visible-sm{display:block!important}table.visible-md.visible-sm{display:table}tr.visible-md.visible-sm{display:table-row!important}th.visible-md.visible-sm,td.visible-md.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-md.visible-lg{display:block!important}table.visible-md.visible-lg{display:table}tr.visible-md.visible-lg{display:table-row!important}th.visible-md.visible-lg,td.visible-md.visible-lg{display:table-cell!important}}.visible-lg,tr.visible-lg,th.visible-lg,td.visible-lg{display:none!important}@media(max-width:767px){.visible-lg.visible-xs{display:block!important}table.visible-lg.visible-xs{display:table}tr.visible-lg.visible-xs{display:table-row!important}th.visible-lg.visible-xs,td.visible-lg.visible-xs{display:table-cell!important}}@media(min-width:768px) and (max-width:991px){.visible-lg.visible-sm{display:block!important}table.visible-lg.visible-sm{display:table}tr.visible-lg.visible-sm{display:table-row!important}th.visible-lg.visible-sm,td.visible-lg.visible-sm{display:table-cell!important}}@media(min-width:992px) and (max-width:1199px){.visible-lg.visible-md{display:block!important}table.visible-lg.visible-md{display:table}tr.visible-lg.visible-md{display:table-row!important}th.visible-lg.visible-md,td.visible-lg.visible-md{display:table-cell!important}}@media(min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}.hidden-xs{display:block!important}table.hidden-xs{display:table}tr.hidden-xs{display:table-row!important}th.hidden-xs,td.hidden-xs{display:table-cell!important}@media(max-width:767px){.hidden-xs,tr.hidden-xs,th.hidden-xs,td.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-xs.hidden-sm,tr.hidden-xs.hidden-sm,th.hidden-xs.hidden-sm,td.hidden-xs.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-xs.hidden-md,tr.hidden-xs.hidden-md,th.hidden-xs.hidden-md,td.hidden-xs.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-xs.hidden-lg,tr.hidden-xs.hidden-lg,th.hidden-xs.hidden-lg,td.hidden-xs.hidden-lg{display:none!important}}.hidden-sm{display:block!important}table.hidden-sm{display:table}tr.hidden-sm{display:table-row!important}th.hidden-sm,td.hidden-sm{display:table-cell!important}@media(max-width:767px){.hidden-sm.hidden-xs,tr.hidden-sm.hidden-xs,th.hidden-sm.hidden-xs,td.hidden-sm.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-sm,tr.hidden-sm,th.hidden-sm,td.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-sm.hidden-md,tr.hidden-sm.hidden-md,th.hidden-sm.hidden-md,td.hidden-sm.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-sm.hidden-lg,tr.hidden-sm.hidden-lg,th.hidden-sm.hidden-lg,td.hidden-sm.hidden-lg{display:none!important}}.hidden-md{display:block!important}table.hidden-md{display:table}tr.hidden-md{display:table-row!important}th.hidden-md,td.hidden-md{display:table-cell!important}@media(max-width:767px){.hidden-md.hidden-xs,tr.hidden-md.hidden-xs,th.hidden-md.hidden-xs,td.hidden-md.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-md.hidden-sm,tr.hidden-md.hidden-sm,th.hidden-md.hidden-sm,td.hidden-md.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-md,tr.hidden-md,th.hidden-md,td.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-md.hidden-lg,tr.hidden-md.hidden-lg,th.hidden-md.hidden-lg,td.hidden-md.hidden-lg{display:none!important}}.hidden-lg{display:block!important}table.hidden-lg{display:table}tr.hidden-lg{display:table-row!important}th.hidden-lg,td.hidden-lg{display:table-cell!important}@media(max-width:767px){.hidden-lg.hidden-xs,tr.hidden-lg.hidden-xs,th.hidden-lg.hidden-xs,td.hidden-lg.hidden-xs{display:none!important}}@media(min-width:768px) and (max-width:991px){.hidden-lg.hidden-sm,tr.hidden-lg.hidden-sm,th.hidden-lg.hidden-sm,td.hidden-lg.hidden-sm{display:none!important}}@media(min-width:992px) and (max-width:1199px){.hidden-lg.hidden-md,tr.hidden-lg.hidden-md,th.hidden-lg.hidden-md,td.hidden-lg.hidden-md{display:none!important}}@media(min-width:1200px){.hidden-lg,tr.hidden-lg,th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print,tr.visible-print,th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}.hidden-print,tr.hidden-print,th.hidden-print,td.hidden-print{display:none!important}}
\ No newline at end of file
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background:0 0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}@media print{*{text-shadow:none!important;color:#000!important;background:transparent!important;box-shadow:none!important}a,a:visited{text-decoration:underline}a[href]:after{content:" (" attr(href) ")"}abbr[title]:after{content:" (" attr(title) ")"}a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{border:1px solid #999;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100%!important}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}select{background:#fff!important}.navbar{display:none}.table td,.table th{background-color:#fff!important}.btn>.caret,.dropup>.btn>.caret{border-top-color:#000!important}.label{border:1px solid #000}.table{border-collapse:collapse!important}.table-bordered th,.table-bordered td{border:1px solid #ddd!important}}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}:before,:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:62.5%;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.428571429;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#428bca;text-decoration:none}a:hover,a:focus{color:#2a6496;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0,0,0,0);border:0}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{font-family:inherit;font-weight:500;line-height:1.1;color:inherit}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small,.h1 small,.h2 small,.h3 small,.h4 small,.h5 small,.h6 small,h1 .small,h2 .small,h3 .small,h4 .small,h5 .small,h6 .small,.h1 .small,.h2 .small,.h3 .small,.h4 .small,.h5 .small,.h6 .small{font-weight:400;line-height:1;color:#999}h1,.h1,h2,.h2,h3,.h3{margin-top:20px;margin-bottom:10px}h1 small,.h1 small,h2 small,.h2 small,h3 small,.h3 small,h1 .small,.h1 .small,h2 .small,.h2 .small,h3 .small,.h3 .small{font-size:65%}h4,.h4,h5,.h5,h6,.h6{margin-top:10px;margin-bottom:10px}h4 small,.h4 small,h5 small,.h5 small,h6 small,.h6 small,h4 .small,.h4 .small,h5 .small,.h5 .small,h6 .small,.h6 .small{font-size:75%}h1,.h1{font-size:36px}h2,.h2{font-size:30px}h3,.h3{font-size:24px}h4,.h4{font-size:18px}h5,.h5{font-size:14px}h6,.h6{font-size:12px}p{margin:0 0 10px}.lead{margin-bottom:20px;font-size:16px;font-weight:200;line-height:1.4}@media (min-width:768px){.lead{font-size:21px}}small,.small{font-size:85%}cite{font-style:normal}.text-left{text-align:left}.text-right{text-align:right}.text-center{text-align:center}.text-justify{text-align:justify}.text-muted{color:#999}.text-primary{color:#428bca}a.text-primary:hover{color:#3071a9}.text-success{color:#3c763d}a.text-success:hover{color:#2b542c}.text-info{color:#31708f}a.text-info:hover{color:#245269}.text-warning{color:#8a6d3b}a.text-warning:hover{color:#66512c}.text-danger{color:#a94442}a.text-danger:hover{color:#843534}.bg-primary{color:#fff;background-color:#428bca}a.bg-primary:hover{background-color:#3071a9}.bg-success{background-color:#dff0d8}a.bg-success:hover{background-color:#c1e2b3}.bg-info{background-color:#d9edf7}a.bg-info:hover{background-color:#afd9ee}.bg-warning{background-color:#fcf8e3}a.bg-warning:hover{background-color:#f7ecb5}.bg-danger{background-color:#f2dede}a.bg-danger:hover{background-color:#e4b9b9}.page-header{padding-bottom:9px;margin:40px 0 20px;border-bottom:1px solid #eee}ul,ol{margin-top:0;margin-bottom:10px}ul ul,ol ul,ul ol,ol ol{margin-bottom:0}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline>li{display:inline-block;padding-left:5px;padding-right:5px}.list-inline>li:first-child{padding-left:0}dl{margin-top:0;margin-bottom:20px}dt,dd{line-height:1.428571429}dt{font-weight:700}dd{margin-left:0}@media (min-width:768px){.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.dl-horizontal dd{margin-left:180px}}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999}.initialism{font-size:90%;text-transform:uppercase}blockquote{padding:10px 20px;margin:0 0 20px;font-size:17.5px;border-left:5px solid #eee}blockquote p:last-child,blockquote ul:last-child,blockquote ol:last-child{margin-bottom:0}blockquote footer,blockquote small,blockquote .small{display:block;font-size:80%;line-height:1.428571429;color:#999}blockquote footer:before,blockquote small:before,blockquote .small:before{content:'\2014 \00A0'}.blockquote-reverse,blockquote.pull-right{padding-right:15px;padding-left:0;border-right:5px solid #eee;border-left:0;text-align:right}.blockquote-reverse footer:before,blockquote.pull-right footer:before,.blockquote-reverse small:before,blockquote.pull-right small:before,.blockquote-reverse .small:before,blockquote.pull-right .small:before{content:''}.blockquote-reverse footer:after,blockquote.pull-right footer:after,.blockquote-reverse small:after,blockquote.pull-right small:after,.blockquote-reverse .small:after,blockquote.pull-right .small:after{content:'\00A0 \2014'}blockquote:before,blockquote:after{content:""}address{margin-bottom:20px;font-style:normal;line-height:1.428571429}code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:2px 4px;font-size:90%;color:#c7254e;background-color:#f9f2f4;white-space:nowrap;border-radius:4px}kbd{padding:2px 4px;font-size:90%;color:#fff;background-color:#333;border-radius:3px;box-shadow:inset 0 -1px 0 rgba(0,0,0,.25)}pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:1.428571429;word-break:break-all;word-wrap:break-word;color:#333;background-color:#f5f5f5;border:1px solid #ccc;border-radius:4px}pre code{padding:0;font-size:inherit;color:inherit;white-space:pre-wrap;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}@media (min-width:768px){.container{width:750px}}@media (min-width:992px){.container{width:970px}}@media (min-width:1200px){.container{width:1170px}}.container-fluid{margin-right:auto;margin-left:auto;padding-left:15px;padding-right:15px}.row{margin-left:-15px;margin-right:-15px}.col-xs-1,.col-sm-1,.col-md-1,.col-lg-1,.col-xs-2,.col-sm-2,.col-md-2,.col-lg-2,.col-xs-3,.col-sm-3,.col-md-3,.col-lg-3,.col-xs-4,.col-sm-4,.col-md-4,.col-lg-4,.col-xs-5,.col-sm-5,.col-md-5,.col-lg-5,.col-xs-6,.col-sm-6,.col-md-6,.col-lg-6,.col-xs-7,.col-sm-7,.col-md-7,.col-lg-7,.col-xs-8,.col-sm-8,.col-md-8,.col-lg-8,.col-xs-9,.col-sm-9,.col-md-9,.col-lg-9,.col-xs-10,.col-sm-10,.col-md-10,.col-lg-10,.col-xs-11,.col-sm-11,.col-md-11,.col-lg-11,.col-xs-12,.col-sm-12,.col-md-12,.col-lg-12{position:relative;min-height:1px;padding-left:15px;padding-right:15px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12{float:left}.col-xs-12{width:100%}.col-xs-11{width:91.66666666666666%}.col-xs-10{width:83.33333333333334%}.col-xs-9{width:75%}.col-xs-8{width:66.66666666666666%}.col-xs-7{width:58.333333333333336%}.col-xs-6{width:50%}.col-xs-5{width:41.66666666666667%}.col-xs-4{width:33.33333333333333%}.col-xs-3{width:25%}.col-xs-2{width:16.666666666666664%}.col-xs-1{width:8.333333333333332%}.col-xs-pull-12{right:100%}.col-xs-pull-11{right:91.66666666666666%}.col-xs-pull-10{right:83.33333333333334%}.col-xs-pull-9{right:75%}.col-xs-pull-8{right:66.66666666666666%}.col-xs-pull-7{right:58.333333333333336%}.col-xs-pull-6{right:50%}.col-xs-pull-5{right:41.66666666666667%}.col-xs-pull-4{right:33.33333333333333%}.col-xs-pull-3{right:25%}.col-xs-pull-2{right:16.666666666666664%}.col-xs-pull-1{right:8.333333333333332%}.col-xs-pull-0{right:0}.col-xs-push-12{left:100%}.col-xs-push-11{left:91.66666666666666%}.col-xs-push-10{left:83.33333333333334%}.col-xs-push-9{left:75%}.col-xs-push-8{left:66.66666666666666%}.col-xs-push-7{left:58.333333333333336%}.col-xs-push-6{left:50%}.col-xs-push-5{left:41.66666666666667%}.col-xs-push-4{left:33.33333333333333%}.col-xs-push-3{left:25%}.col-xs-push-2{left:16.666666666666664%}.col-xs-push-1{left:8.333333333333332%}.col-xs-push-0{left:0}.col-xs-offset-12{margin-left:100%}.col-xs-offset-11{margin-left:91.66666666666666%}.col-xs-offset-10{margin-left:83.33333333333334%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-8{margin-left:66.66666666666666%}.col-xs-offset-7{margin-left:58.333333333333336%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-5{margin-left:41.66666666666667%}.col-xs-offset-4{margin-left:33.33333333333333%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-2{margin-left:16.666666666666664%}.col-xs-offset-1{margin-left:8.333333333333332%}.col-xs-offset-0{margin-left:0}@media (min-width:768px){.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12{float:left}.col-sm-12{width:100%}.col-sm-11{width:91.66666666666666%}.col-sm-10{width:83.33333333333334%}.col-sm-9{width:75%}.col-sm-8{width:66.66666666666666%}.col-sm-7{width:58.333333333333336%}.col-sm-6{width:50%}.col-sm-5{width:41.66666666666667%}.col-sm-4{width:33.33333333333333%}.col-sm-3{width:25%}.col-sm-2{width:16.666666666666664%}.col-sm-1{width:8.333333333333332%}.col-sm-pull-12{right:100%}.col-sm-pull-11{right:91.66666666666666%}.col-sm-pull-10{right:83.33333333333334%}.col-sm-pull-9{right:75%}.col-sm-pull-8{right:66.66666666666666%}.col-sm-pull-7{right:58.333333333333336%}.col-sm-pull-6{right:50%}.col-sm-pull-5{right:41.66666666666667%}.col-sm-pull-4{right:33.33333333333333%}.col-sm-pull-3{right:25%}.col-sm-pull-2{right:16.666666666666664%}.col-sm-pull-1{right:8.333333333333332%}.col-sm-pull-0{right:0}.col-sm-push-12{left:100%}.col-sm-push-11{left:91.66666666666666%}.col-sm-push-10{left:83.33333333333334%}.col-sm-push-9{left:75%}.col-sm-push-8{left:66.66666666666666%}.col-sm-push-7{left:58.333333333333336%}.col-sm-push-6{left:50%}.col-sm-push-5{left:41.66666666666667%}.col-sm-push-4{left:33.33333333333333%}.col-sm-push-3{left:25%}.col-sm-push-2{left:16.666666666666664%}.col-sm-push-1{left:8.333333333333332%}.col-sm-push-0{left:0}.col-sm-offset-12{margin-left:100%}.col-sm-offset-11{margin-left:91.66666666666666%}.col-sm-offset-10{margin-left:83.33333333333334%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-8{margin-left:66.66666666666666%}.col-sm-offset-7{margin-left:58.333333333333336%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-5{margin-left:41.66666666666667%}.col-sm-offset-4{margin-left:33.33333333333333%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-2{margin-left:16.666666666666664%}.col-sm-offset-1{margin-left:8.333333333333332%}.col-sm-offset-0{margin-left:0}}@media (min-width:992px){.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12{float:left}.col-md-12{width:100%}.col-md-11{width:91.66666666666666%}.col-md-10{width:83.33333333333334%}.col-md-9{width:75%}.col-md-8{width:66.66666666666666%}.col-md-7{width:58.333333333333336%}.col-md-6{width:50%}.col-md-5{width:41.66666666666667%}.col-md-4{width:33.33333333333333%}.col-md-3{width:25%}.col-md-2{width:16.666666666666664%}.col-md-1{width:8.333333333333332%}.col-md-pull-12{right:100%}.col-md-pull-11{right:91.66666666666666%}.col-md-pull-10{right:83.33333333333334%}.col-md-pull-9{right:75%}.col-md-pull-8{right:66.66666666666666%}.col-md-pull-7{right:58.333333333333336%}.col-md-pull-6{right:50%}.col-md-pull-5{right:41.66666666666667%}.col-md-pull-4{right:33.33333333333333%}.col-md-pull-3{right:25%}.col-md-pull-2{right:16.666666666666664%}.col-md-pull-1{right:8.333333333333332%}.col-md-pull-0{right:0}.col-md-push-12{left:100%}.col-md-push-11{left:91.66666666666666%}.col-md-push-10{left:83.33333333333334%}.col-md-push-9{left:75%}.col-md-push-8{left:66.66666666666666%}.col-md-push-7{left:58.333333333333336%}.col-md-push-6{left:50%}.col-md-push-5{left:41.66666666666667%}.col-md-push-4{left:33.33333333333333%}.col-md-push-3{left:25%}.col-md-push-2{left:16.666666666666664%}.col-md-push-1{left:8.333333333333332%}.col-md-push-0{left:0}.col-md-offset-12{margin-left:100%}.col-md-offset-11{margin-left:91.66666666666666%}.col-md-offset-10{margin-left:83.33333333333334%}.col-md-offset-9{margin-left:75%}.col-md-offset-8{margin-left:66.66666666666666%}.col-md-offset-7{margin-left:58.333333333333336%}.col-md-offset-6{margin-left:50%}.col-md-offset-5{margin-left:41.66666666666667%}.col-md-offset-4{margin-left:33.33333333333333%}.col-md-offset-3{margin-left:25%}.col-md-offset-2{margin-left:16.666666666666664%}.col-md-offset-1{margin-left:8.333333333333332%}.col-md-offset-0{margin-left:0}}@media (min-width:1200px){.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12{float:left}.col-lg-12{width:100%}.col-lg-11{width:91.66666666666666%}.col-lg-10{width:83.33333333333334%}.col-lg-9{width:75%}.col-lg-8{width:66.66666666666666%}.col-lg-7{width:58.333333333333336%}.col-lg-6{width:50%}.col-lg-5{width:41.66666666666667%}.col-lg-4{width:33.33333333333333%}.col-lg-3{width:25%}.col-lg-2{width:16.666666666666664%}.col-lg-1{width:8.333333333333332%}.col-lg-pull-12{right:100%}.col-lg-pull-11{right:91.66666666666666%}.col-lg-pull-10{right:83.33333333333334%}.col-lg-pull-9{right:75%}.col-lg-pull-8{right:66.66666666666666%}.col-lg-pull-7{right:58.333333333333336%}.col-lg-pull-6{right:50%}.col-lg-pull-5{right:41.66666666666667%}.col-lg-pull-4{right:33.33333333333333%}.col-lg-pull-3{right:25%}.col-lg-pull-2{right:16.666666666666664%}.col-lg-pull-1{right:8.333333333333332%}.col-lg-pull-0{right:0}.col-lg-push-12{left:100%}.col-lg-push-11{left:91.66666666666666%}.col-lg-push-10{left:83.33333333333334%}.col-lg-push-9{left:75%}.col-lg-push-8{left:66.66666666666666%}.col-lg-push-7{left:58.333333333333336%}.col-lg-push-6{left:50%}.col-lg-push-5{left:41.66666666666667%}.col-lg-push-4{left:33.33333333333333%}.col-lg-push-3{left:25%}.col-lg-push-2{left:16.666666666666664%}.col-lg-push-1{left:8.333333333333332%}.col-lg-push-0{left:0}.col-lg-offset-12{margin-left:100%}.col-lg-offset-11{margin-left:91.66666666666666%}.col-lg-offset-10{margin-left:83.33333333333334%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-8{margin-left:66.66666666666666%}.col-lg-offset-7{margin-left:58.333333333333336%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-5{margin-left:41.66666666666667%}.col-lg-offset-4{margin-left:33.33333333333333%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-2{margin-left:16.666666666666664%}.col-lg-offset-1{margin-left:8.333333333333332%}.col-lg-offset-0{margin-left:0}}table{max-width:100%;background-color:transparent}th{text-align:left}.table{width:100%;margin-bottom:20px}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:8px;line-height:1.428571429;vertical-align:top;border-top:1px solid #ddd}.table>thead>tr>th{vertical-align:bottom;border-bottom:2px solid #ddd}.table>caption+thead>tr:first-child>th,.table>colgroup+thead>tr:first-child>th,.table>thead:first-child>tr:first-child>th,.table>caption+thead>tr:first-child>td,.table>colgroup+thead>tr:first-child>td,.table>thead:first-child>tr:first-child>td{border-top:0}.table>tbody+tbody{border-top:2px solid #ddd}.table .table{background-color:#fff}.table-condensed>thead>tr>th,.table-condensed>tbody>tr>th,.table-condensed>tfoot>tr>th,.table-condensed>thead>tr>td,.table-condensed>tbody>tr>td,.table-condensed>tfoot>tr>td{padding:5px}.table-bordered{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>tbody>tr>th,.table-bordered>tfoot>tr>th,.table-bordered>thead>tr>td,.table-bordered>tbody>tr>td,.table-bordered>tfoot>tr>td{border:1px solid #ddd}.table-bordered>thead>tr>th,.table-bordered>thead>tr>td{border-bottom-width:2px}.table-striped>tbody>tr:nth-child(odd)>td,.table-striped>tbody>tr:nth-child(odd)>th{background-color:#f9f9f9}.table-hover>tbody>tr:hover>td,.table-hover>tbody>tr:hover>th{background-color:#f5f5f5}table col[class*=col-]{position:static;float:none;display:table-column}table td[class*=col-],table th[class*=col-]{position:static;float:none;display:table-cell}.table>thead>tr>td.active,.table>tbody>tr>td.active,.table>tfoot>tr>td.active,.table>thead>tr>th.active,.table>tbody>tr>th.active,.table>tfoot>tr>th.active,.table>thead>tr.active>td,.table>tbody>tr.active>td,.table>tfoot>tr.active>td,.table>thead>tr.active>th,.table>tbody>tr.active>th,.table>tfoot>tr.active>th{background-color:#f5f5f5}.table-hover>tbody>tr>td.active:hover,.table-hover>tbody>tr>th.active:hover,.table-hover>tbody>tr.active:hover>td,.table-hover>tbody>tr.active:hover>th{background-color:#e8e8e8}.table>thead>tr>td.success,.table>tbody>tr>td.success,.table>tfoot>tr>td.success,.table>thead>tr>th.success,.table>tbody>tr>th.success,.table>tfoot>tr>th.success,.table>thead>tr.success>td,.table>tbody>tr.success>td,.table>tfoot>tr.success>td,.table>thead>tr.success>th,.table>tbody>tr.success>th,.table>tfoot>tr.success>th{background-color:#dff0d8}.table-hover>tbody>tr>td.success:hover,.table-hover>tbody>tr>th.success:hover,.table-hover>tbody>tr.success:hover>td,.table-hover>tbody>tr.success:hover>th{background-color:#d0e9c6}.table>thead>tr>td.info,.table>tbody>tr>td.info,.table>tfoot>tr>td.info,.table>thead>tr>th.info,.table>tbody>tr>th.info,.table>tfoot>tr>th.info,.table>thead>tr.info>td,.table>tbody>tr.info>td,.table>tfoot>tr.info>td,.table>thead>tr.info>th,.table>tbody>tr.info>th,.table>tfoot>tr.info>th{background-color:#d9edf7}.table-hover>tbody>tr>td.info:hover,.table-hover>tbody>tr>th.info:hover,.table-hover>tbody>tr.info:hover>td,.table-hover>tbody>tr.info:hover>th{background-color:#c4e3f3}.table>thead>tr>td.warning,.table>tbody>tr>td.warning,.table>tfoot>tr>td.warning,.table>thead>tr>th.warning,.table>tbody>tr>th.warning,.table>tfoot>tr>th.warning,.table>thead>tr.warning>td,.table>tbody>tr.warning>td,.table>tfoot>tr.warning>td,.table>thead>tr.warning>th,.table>tbody>tr.warning>th,.table>tfoot>tr.warning>th{background-color:#fcf8e3}.table-hover>tbody>tr>td.warning:hover,.table-hover>tbody>tr>th.warning:hover,.table-hover>tbody>tr.warning:hover>td,.table-hover>tbody>tr.warning:hover>th{background-color:#faf2cc}.table>thead>tr>td.danger,.table>tbody>tr>td.danger,.table>tfoot>tr>td.danger,.table>thead>tr>th.danger,.table>tbody>tr>th.danger,.table>tfoot>tr>th.danger,.table>thead>tr.danger>td,.table>tbody>tr.danger>td,.table>tfoot>tr.danger>td,.table>thead>tr.danger>th,.table>tbody>tr.danger>th,.table>tfoot>tr.danger>th{background-color:#f2dede}.table-hover>tbody>tr>td.danger:hover,.table-hover>tbody>tr>th.danger:hover,.table-hover>tbody>tr.danger:hover>td,.table-hover>tbody>tr.danger:hover>th{background-color:#ebcccc}@media (max-width:767px){.table-responsive{width:100%;margin-bottom:15px;overflow-y:hidden;overflow-x:scroll;-ms-overflow-style:-ms-autohiding-scrollbar;border:1px solid #ddd;-webkit-overflow-scrolling:touch}.table-responsive>.table{margin-bottom:0}.table-responsive>.table>thead>tr>th,.table-responsive>.table>tbody>tr>th,.table-responsive>.table>tfoot>tr>th,.table-responsive>.table>thead>tr>td,.table-responsive>.table>tbody>tr>td,.table-responsive>.table>tfoot>tr>td{white-space:nowrap}.table-responsive>.table-bordered{border:0}.table-responsive>.table-bordered>thead>tr>th:first-child,.table-responsive>.table-bordered>tbody>tr>th:first-child,.table-responsive>.table-bordered>tfoot>tr>th:first-child,.table-responsive>.table-bordered>thead>tr>td:first-child,.table-responsive>.table-bordered>tbody>tr>td:first-child,.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.table-responsive>.table-bordered>thead>tr>th:last-child,.table-responsive>.table-bordered>tbody>tr>th:last-child,.table-responsive>.table-bordered>tfoot>tr>th:last-child,.table-responsive>.table-bordered>thead>tr>td:last-child,.table-responsive>.table-bordered>tbody>tr>td:last-child,.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.table-responsive>.table-bordered>tbody>tr:last-child>th,.table-responsive>.table-bordered>tfoot>tr:last-child>th,.table-responsive>.table-bordered>tbody>tr:last-child>td,.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}}fieldset{padding:0;margin:0;border:0;min-width:0}legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:inherit;color:#333;border:0;border-bottom:1px solid #e5e5e5}label{display:inline-block;margin-bottom:5px;font-weight:700}input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=radio],input[type=checkbox]{margin:4px 0 0;margin-top:1px \9;line-height:normal}input[type=file]{display:block}input[type=range]{display:block;width:100%}select[multiple],select[size]{height:auto}input[type=file]:focus,input[type=radio]:focus,input[type=checkbox]:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}output{display:block;padding-top:7px;font-size:14px;line-height:1.428571429;color:#555}.form-control{display:block;width:100%;height:34px;padding:6px 12px;font-size:14px;line-height:1.428571429;color:#555;background-color:#fff;background-image:none;border:1px solid #ccc;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075);-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.form-control:focus{border-color:#66afe9;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)}.form-control:-moz-placeholder{color:#999}.form-control::-moz-placeholder{color:#999;opacity:1}.form-control:-ms-input-placeholder{color:#999}.form-control::-webkit-input-placeholder{color:#999}.form-control[disabled],.form-control[readonly],fieldset[disabled] .form-control{cursor:not-allowed;background-color:#eee;opacity:1}textarea.form-control{height:auto}input[type=date]{line-height:34px}.form-group{margin-bottom:15px}.radio,.checkbox{display:block;min-height:20px;margin-top:10px;margin-bottom:10px;padding-left:20px}.radio label,.checkbox label{display:inline;font-weight:400;cursor:pointer}.radio input[type=radio],.radio-inline input[type=radio],.checkbox input[type=checkbox],.checkbox-inline input[type=checkbox]{float:left;margin-left:-20px}.radio+.radio,.checkbox+.checkbox{margin-top:-5px}.radio-inline,.checkbox-inline{display:inline-block;padding-left:20px;margin-bottom:0;vertical-align:middle;font-weight:400;cursor:pointer}.radio-inline+.radio-inline,.checkbox-inline+.checkbox-inline{margin-top:0;margin-left:10px}input[type=radio][disabled],input[type=checkbox][disabled],.radio[disabled],.radio-inline[disabled],.checkbox[disabled],.checkbox-inline[disabled],fieldset[disabled] input[type=radio],fieldset[disabled] input[type=checkbox],fieldset[disabled] .radio,fieldset[disabled] .radio-inline,fieldset[disabled] .checkbox,fieldset[disabled] .checkbox-inline{cursor:not-allowed}.input-sm{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-sm{height:30px;line-height:30px}textarea.input-sm,select[multiple].input-sm{height:auto}.input-lg{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-lg{height:46px;line-height:46px}textarea.input-lg,select[multiple].input-lg{height:auto}.has-feedback{position:relative}.has-feedback .form-control{padding-right:42.5px}.has-feedback .form-control-feedback{position:absolute;top:25px;right:0;display:block;width:34px;height:34px;line-height:34px;text-align:center}.has-success .help-block,.has-success .control-label,.has-success .radio,.has-success .checkbox,.has-success .radio-inline,.has-success .checkbox-inline{color:#3c763d}.has-success .form-control{border-color:#3c763d;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-success .form-control:focus{border-color:#2b542c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #67b168}.has-success .input-group-addon{color:#3c763d;border-color:#3c763d;background-color:#dff0d8}.has-success .form-control-feedback{color:#3c763d}.has-warning .help-block,.has-warning .control-label,.has-warning .radio,.has-warning .checkbox,.has-warning .radio-inline,.has-warning .checkbox-inline{color:#8a6d3b}.has-warning .form-control{border-color:#8a6d3b;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-warning .form-control:focus{border-color:#66512c;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #c0a16b}.has-warning .input-group-addon{color:#8a6d3b;border-color:#8a6d3b;background-color:#fcf8e3}.has-warning .form-control-feedback{color:#8a6d3b}.has-error .help-block,.has-error .control-label,.has-error .radio,.has-error .checkbox,.has-error .radio-inline,.has-error .checkbox-inline{color:#a94442}.has-error .form-control{border-color:#a94442;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 1px rgba(0,0,0,.075)}.has-error .form-control:focus{border-color:#843534;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483;box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 6px #ce8483}.has-error .input-group-addon{color:#a94442;border-color:#a94442;background-color:#f2dede}.has-error .form-control-feedback{color:#a94442}.form-control-static{margin-bottom:0}.help-block{display:block;margin-top:5px;margin-bottom:10px;color:#737373}@media (min-width:768px){.form-inline .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .control-label{margin-bottom:0;vertical-align:middle}.form-inline .radio,.form-inline .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.form-inline .radio input[type=radio],.form-inline .checkbox input[type=checkbox]{float:none;margin-left:0}.form-inline .has-feedback .form-control-feedback{top:0}}.form-horizontal .control-label,.form-horizontal .radio,.form-horizontal .checkbox,.form-horizontal .radio-inline,.form-horizontal .checkbox-inline{margin-top:0;margin-bottom:0;padding-top:7px}.form-horizontal .radio,.form-horizontal .checkbox{min-height:27px}.form-horizontal .form-group{margin-left:-15px;margin-right:-15px}.form-horizontal .form-control-static{padding-top:7px}@media (min-width:768px){.form-horizontal .control-label{text-align:right}}.form-horizontal .has-feedback .form-control-feedback{top:0;right:15px}.btn{display:inline-block;margin-bottom:0;font-weight:400;text-align:center;vertical-align:middle;cursor:pointer;background-image:none;border:1px solid transparent;white-space:nowrap;padding:6px 12px;font-size:14px;line-height:1.428571429;border-radius:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none}.btn:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.btn:hover,.btn:focus{color:#333;text-decoration:none}.btn:active,.btn.active{outline:0;background-image:none;-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn.disabled,.btn[disabled],fieldset[disabled] .btn{cursor:not-allowed;pointer-events:none;opacity:.65;filter:alpha(opacity=65);-webkit-box-shadow:none;box-shadow:none}.btn-default{color:#333;background-color:#fff;border-color:#ccc}.btn-default:hover,.btn-default:focus,.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{color:#333;background-color:#ebebeb;border-color:#adadad}.btn-default:active,.btn-default.active,.open .dropdown-toggle.btn-default{background-image:none}.btn-default.disabled,.btn-default[disabled],fieldset[disabled] .btn-default,.btn-default.disabled:hover,.btn-default[disabled]:hover,fieldset[disabled] .btn-default:hover,.btn-default.disabled:focus,.btn-default[disabled]:focus,fieldset[disabled] .btn-default:focus,.btn-default.disabled:active,.btn-default[disabled]:active,fieldset[disabled] .btn-default:active,.btn-default.disabled.active,.btn-default[disabled].active,fieldset[disabled] .btn-default.active{background-color:#fff;border-color:#ccc}.btn-default .badge{color:#fff;background-color:#333}.btn-primary{color:#fff;background-color:#428bca;border-color:#357ebd}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{color:#fff;background-color:#3276b1;border-color:#285e8e}.btn-primary:active,.btn-primary.active,.open .dropdown-toggle.btn-primary{background-image:none}.btn-primary.disabled,.btn-primary[disabled],fieldset[disabled] .btn-primary,.btn-primary.disabled:hover,.btn-primary[disabled]:hover,fieldset[disabled] .btn-primary:hover,.btn-primary.disabled:focus,.btn-primary[disabled]:focus,fieldset[disabled] .btn-primary:focus,.btn-primary.disabled:active,.btn-primary[disabled]:active,fieldset[disabled] .btn-primary:active,.btn-primary.disabled.active,.btn-primary[disabled].active,fieldset[disabled] .btn-primary.active{background-color:#428bca;border-color:#357ebd}.btn-primary .badge{color:#428bca;background-color:#fff}.btn-success{color:#fff;background-color:#5cb85c;border-color:#4cae4c}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{color:#fff;background-color:#47a447;border-color:#398439}.btn-success:active,.btn-success.active,.open .dropdown-toggle.btn-success{background-image:none}.btn-success.disabled,.btn-success[disabled],fieldset[disabled] .btn-success,.btn-success.disabled:hover,.btn-success[disabled]:hover,fieldset[disabled] .btn-success:hover,.btn-success.disabled:focus,.btn-success[disabled]:focus,fieldset[disabled] .btn-success:focus,.btn-success.disabled:active,.btn-success[disabled]:active,fieldset[disabled] .btn-success:active,.btn-success.disabled.active,.btn-success[disabled].active,fieldset[disabled] .btn-success.active{background-color:#5cb85c;border-color:#4cae4c}.btn-success .badge{color:#5cb85c;background-color:#fff}.btn-info{color:#fff;background-color:#5bc0de;border-color:#46b8da}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{color:#fff;background-color:#39b3d7;border-color:#269abc}.btn-info:active,.btn-info.active,.open .dropdown-toggle.btn-info{background-image:none}.btn-info.disabled,.btn-info[disabled],fieldset[disabled] .btn-info,.btn-info.disabled:hover,.btn-info[disabled]:hover,fieldset[disabled] .btn-info:hover,.btn-info.disabled:focus,.btn-info[disabled]:focus,fieldset[disabled] .btn-info:focus,.btn-info.disabled:active,.btn-info[disabled]:active,fieldset[disabled] .btn-info:active,.btn-info.disabled.active,.btn-info[disabled].active,fieldset[disabled] .btn-info.active{background-color:#5bc0de;border-color:#46b8da}.btn-info .badge{color:#5bc0de;background-color:#fff}.btn-warning{color:#fff;background-color:#f0ad4e;border-color:#eea236}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{color:#fff;background-color:#ed9c28;border-color:#d58512}.btn-warning:active,.btn-warning.active,.open .dropdown-toggle.btn-warning{background-image:none}.btn-warning.disabled,.btn-warning[disabled],fieldset[disabled] .btn-warning,.btn-warning.disabled:hover,.btn-warning[disabled]:hover,fieldset[disabled] .btn-warning:hover,.btn-warning.disabled:focus,.btn-warning[disabled]:focus,fieldset[disabled] .btn-warning:focus,.btn-warning.disabled:active,.btn-warning[disabled]:active,fieldset[disabled] .btn-warning:active,.btn-warning.disabled.active,.btn-warning[disabled].active,fieldset[disabled] .btn-warning.active{background-color:#f0ad4e;border-color:#eea236}.btn-warning .badge{color:#f0ad4e;background-color:#fff}.btn-danger{color:#fff;background-color:#d9534f;border-color:#d43f3a}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{color:#fff;background-color:#d2322d;border-color:#ac2925}.btn-danger:active,.btn-danger.active,.open .dropdown-toggle.btn-danger{background-image:none}.btn-danger.disabled,.btn-danger[disabled],fieldset[disabled] .btn-danger,.btn-danger.disabled:hover,.btn-danger[disabled]:hover,fieldset[disabled] .btn-danger:hover,.btn-danger.disabled:focus,.btn-danger[disabled]:focus,fieldset[disabled] .btn-danger:focus,.btn-danger.disabled:active,.btn-danger[disabled]:active,fieldset[disabled] .btn-danger:active,.btn-danger.disabled.active,.btn-danger[disabled].active,fieldset[disabled] .btn-danger.active{background-color:#d9534f;border-color:#d43f3a}.btn-danger .badge{color:#d9534f;background-color:#fff}.btn-link{color:#428bca;font-weight:400;cursor:pointer;border-radius:0}.btn-link,.btn-link:active,.btn-link[disabled],fieldset[disabled] .btn-link{background-color:transparent;-webkit-box-shadow:none;box-shadow:none}.btn-link,.btn-link:hover,.btn-link:focus,.btn-link:active{border-color:transparent}.btn-link:hover,.btn-link:focus{color:#2a6496;text-decoration:underline;background-color:transparent}.btn-link[disabled]:hover,fieldset[disabled] .btn-link:hover,.btn-link[disabled]:focus,fieldset[disabled] .btn-link:focus{color:#999;text-decoration:none}.btn-lg{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-sm{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-xs{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-block{display:block;width:100%;padding-left:0;padding-right:0}.btn-block+.btn-block{margin-top:5px}input[type=submit].btn-block,input[type=reset].btn-block,input[type=button].btn-block{width:100%}.fade{opacity:0;-webkit-transition:opacity .15s linear;transition:opacity .15s linear}.fade.in{opacity:1}.collapse{display:none}.collapse.in{display:block}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height .35s ease;transition:height .35s ease}@font-face{font-family:'Glyphicons Halflings';src:url(../fonts/glyphicons-halflings-regular.eot);src:url(../fonts/glyphicons-halflings-regular.eot?#iefix) format('embedded-opentype'),url(../fonts/glyphicons-halflings-regular.woff) format('woff'),url(../fonts/glyphicons-halflings-regular.ttf) format('truetype'),url(../fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular) format('svg')}.glyphicon{position:relative;top:1px;display:inline-block;font-family:'Glyphicons Halflings';font-style:normal;font-weight:400;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.glyphicon-asterisk:before{content:"\2a"}.glyphicon-plus:before{content:"\2b"}.glyphicon-euro:before{content:"\20ac"}.glyphicon-minus:before{content:"\2212"}.glyphicon-cloud:before{content:"\2601"}.glyphicon-envelope:before{content:"\2709"}.glyphicon-pencil:before{content:"\270f"}.glyphicon-glass:before{content:"\e001"}.glyphicon-music:before{content:"\e002"}.glyphicon-search:before{content:"\e003"}.glyphicon-heart:before{content:"\e005"}.glyphicon-star:before{content:"\e006"}.glyphicon-star-empty:before{content:"\e007"}.glyphicon-user:before{content:"\e008"}.glyphicon-film:before{content:"\e009"}.glyphicon-th-large:before{content:"\e010"}.glyphicon-th:before{content:"\e011"}.glyphicon-th-list:before{content:"\e012"}.glyphicon-ok:before{content:"\e013"}.glyphicon-remove:before{content:"\e014"}.glyphicon-zoom-in:before{content:"\e015"}.glyphicon-zoom-out:before{content:"\e016"}.glyphicon-off:before{content:"\e017"}.glyphicon-signal:before{content:"\e018"}.glyphicon-cog:before{content:"\e019"}.glyphicon-trash:before{content:"\e020"}.glyphicon-home:before{content:"\e021"}.glyphicon-file:before{content:"\e022"}.glyphicon-time:before{content:"\e023"}.glyphicon-road:before{content:"\e024"}.glyphicon-download-alt:before{content:"\e025"}.glyphicon-download:before{content:"\e026"}.glyphicon-upload:before{content:"\e027"}.glyphicon-inbox:before{content:"\e028"}.glyphicon-play-circle:before{content:"\e029"}.glyphicon-repeat:before{content:"\e030"}.glyphicon-refresh:before{content:"\e031"}.glyphicon-list-alt:before{content:"\e032"}.glyphicon-lock:before{content:"\e033"}.glyphicon-flag:before{content:"\e034"}.glyphicon-headphones:before{content:"\e035"}.glyphicon-volume-off:before{content:"\e036"}.glyphicon-volume-down:before{content:"\e037"}.glyphicon-volume-up:before{content:"\e038"}.glyphicon-qrcode:before{content:"\e039"}.glyphicon-barcode:before{content:"\e040"}.glyphicon-tag:before{content:"\e041"}.glyphicon-tags:before{content:"\e042"}.glyphicon-book:before{content:"\e043"}.glyphicon-bookmark:before{content:"\e044"}.glyphicon-print:before{content:"\e045"}.glyphicon-camera:before{content:"\e046"}.glyphicon-font:before{content:"\e047"}.glyphicon-bold:before{content:"\e048"}.glyphicon-italic:before{content:"\e049"}.glyphicon-text-height:before{content:"\e050"}.glyphicon-text-width:before{content:"\e051"}.glyphicon-align-left:before{content:"\e052"}.glyphicon-align-center:before{content:"\e053"}.glyphicon-align-right:before{content:"\e054"}.glyphicon-align-justify:before{content:"\e055"}.glyphicon-list:before{content:"\e056"}.glyphicon-indent-left:before{content:"\e057"}.glyphicon-indent-right:before{content:"\e058"}.glyphicon-facetime-video:before{content:"\e059"}.glyphicon-picture:before{content:"\e060"}.glyphicon-map-marker:before{content:"\e062"}.glyphicon-adjust:before{content:"\e063"}.glyphicon-tint:before{content:"\e064"}.glyphicon-edit:before{content:"\e065"}.glyphicon-share:before{content:"\e066"}.glyphicon-check:before{content:"\e067"}.glyphicon-move:before{content:"\e068"}.glyphicon-step-backward:before{content:"\e069"}.glyphicon-fast-backward:before{content:"\e070"}.glyphicon-backward:before{content:"\e071"}.glyphicon-play:before{content:"\e072"}.glyphicon-pause:before{content:"\e073"}.glyphicon-stop:before{content:"\e074"}.glyphicon-forward:before{content:"\e075"}.glyphicon-fast-forward:before{content:"\e076"}.glyphicon-step-forward:before{content:"\e077"}.glyphicon-eject:before{content:"\e078"}.glyphicon-chevron-left:before{content:"\e079"}.glyphicon-chevron-right:before{content:"\e080"}.glyphicon-plus-sign:before{content:"\e081"}.glyphicon-minus-sign:before{content:"\e082"}.glyphicon-remove-sign:before{content:"\e083"}.glyphicon-ok-sign:before{content:"\e084"}.glyphicon-question-sign:before{content:"\e085"}.glyphicon-info-sign:before{content:"\e086"}.glyphicon-screenshot:before{content:"\e087"}.glyphicon-remove-circle:before{content:"\e088"}.glyphicon-ok-circle:before{content:"\e089"}.glyphicon-ban-circle:before{content:"\e090"}.glyphicon-arrow-left:before{content:"\e091"}.glyphicon-arrow-right:before{content:"\e092"}.glyphicon-arrow-up:before{content:"\e093"}.glyphicon-arrow-down:before{content:"\e094"}.glyphicon-share-alt:before{content:"\e095"}.glyphicon-resize-full:before{content:"\e096"}.glyphicon-resize-small:before{content:"\e097"}.glyphicon-exclamation-sign:before{content:"\e101"}.glyphicon-gift:before{content:"\e102"}.glyphicon-leaf:before{content:"\e103"}.glyphicon-fire:before{content:"\e104"}.glyphicon-eye-open:before{content:"\e105"}.glyphicon-eye-close:before{content:"\e106"}.glyphicon-warning-sign:before{content:"\e107"}.glyphicon-plane:before{content:"\e108"}.glyphicon-calendar:before{content:"\e109"}.glyphicon-random:before{content:"\e110"}.glyphicon-comment:before{content:"\e111"}.glyphicon-magnet:before{content:"\e112"}.glyphicon-chevron-up:before{content:"\e113"}.glyphicon-chevron-down:before{content:"\e114"}.glyphicon-retweet:before{content:"\e115"}.glyphicon-shopping-cart:before{content:"\e116"}.glyphicon-folder-close:before{content:"\e117"}.glyphicon-folder-open:before{content:"\e118"}.glyphicon-resize-vertical:before{content:"\e119"}.glyphicon-resize-horizontal:before{content:"\e120"}.glyphicon-hdd:before{content:"\e121"}.glyphicon-bullhorn:before{content:"\e122"}.glyphicon-bell:before{content:"\e123"}.glyphicon-certificate:before{content:"\e124"}.glyphicon-thumbs-up:before{content:"\e125"}.glyphicon-thumbs-down:before{content:"\e126"}.glyphicon-hand-right:before{content:"\e127"}.glyphicon-hand-left:before{content:"\e128"}.glyphicon-hand-up:before{content:"\e129"}.glyphicon-hand-down:before{content:"\e130"}.glyphicon-circle-arrow-right:before{content:"\e131"}.glyphicon-circle-arrow-left:before{content:"\e132"}.glyphicon-circle-arrow-up:before{content:"\e133"}.glyphicon-circle-arrow-down:before{content:"\e134"}.glyphicon-globe:before{content:"\e135"}.glyphicon-wrench:before{content:"\e136"}.glyphicon-tasks:before{content:"\e137"}.glyphicon-filter:before{content:"\e138"}.glyphicon-briefcase:before{content:"\e139"}.glyphicon-fullscreen:before{content:"\e140"}.glyphicon-dashboard:before{content:"\e141"}.glyphicon-paperclip:before{content:"\e142"}.glyphicon-heart-empty:before{content:"\e143"}.glyphicon-link:before{content:"\e144"}.glyphicon-phone:before{content:"\e145"}.glyphicon-pushpin:before{content:"\e146"}.glyphicon-usd:before{content:"\e148"}.glyphicon-gbp:before{content:"\e149"}.glyphicon-sort:before{content:"\e150"}.glyphicon-sort-by-alphabet:before{content:"\e151"}.glyphicon-sort-by-alphabet-alt:before{content:"\e152"}.glyphicon-sort-by-order:before{content:"\e153"}.glyphicon-sort-by-order-alt:before{content:"\e154"}.glyphicon-sort-by-attributes:before{content:"\e155"}.glyphicon-sort-by-attributes-alt:before{content:"\e156"}.glyphicon-unchecked:before{content:"\e157"}.glyphicon-expand:before{content:"\e158"}.glyphicon-collapse-down:before{content:"\e159"}.glyphicon-collapse-up:before{content:"\e160"}.glyphicon-log-in:before{content:"\e161"}.glyphicon-flash:before{content:"\e162"}.glyphicon-log-out:before{content:"\e163"}.glyphicon-new-window:before{content:"\e164"}.glyphicon-record:before{content:"\e165"}.glyphicon-save:before{content:"\e166"}.glyphicon-open:before{content:"\e167"}.glyphicon-saved:before{content:"\e168"}.glyphicon-import:before{content:"\e169"}.glyphicon-export:before{content:"\e170"}.glyphicon-send:before{content:"\e171"}.glyphicon-floppy-disk:before{content:"\e172"}.glyphicon-floppy-saved:before{content:"\e173"}.glyphicon-floppy-remove:before{content:"\e174"}.glyphicon-floppy-save:before{content:"\e175"}.glyphicon-floppy-open:before{content:"\e176"}.glyphicon-credit-card:before{content:"\e177"}.glyphicon-transfer:before{content:"\e178"}.glyphicon-cutlery:before{content:"\e179"}.glyphicon-header:before{content:"\e180"}.glyphicon-compressed:before{content:"\e181"}.glyphicon-earphone:before{content:"\e182"}.glyphicon-phone-alt:before{content:"\e183"}.glyphicon-tower:before{content:"\e184"}.glyphicon-stats:before{content:"\e185"}.glyphicon-sd-video:before{content:"\e186"}.glyphicon-hd-video:before{content:"\e187"}.glyphicon-subtitles:before{content:"\e188"}.glyphicon-sound-stereo:before{content:"\e189"}.glyphicon-sound-dolby:before{content:"\e190"}.glyphicon-sound-5-1:before{content:"\e191"}.glyphicon-sound-6-1:before{content:"\e192"}.glyphicon-sound-7-1:before{content:"\e193"}.glyphicon-copyright-mark:before{content:"\e194"}.glyphicon-registration-mark:before{content:"\e195"}.glyphicon-cloud-download:before{content:"\e197"}.glyphicon-cloud-upload:before{content:"\e198"}.glyphicon-tree-conifer:before{content:"\e199"}.glyphicon-tree-deciduous:before{content:"\e200"}.caret{display:inline-block;width:0;height:0;margin-left:2px;vertical-align:middle;border-top:4px solid;border-right:4px solid transparent;border-left:4px solid transparent}.dropdown{position:relative}.dropdown-toggle:focus{outline:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;font-size:14px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0,0,0,.15);border-radius:4px;-webkit-box-shadow:0 6px 12px rgba(0,0,0,.175);box-shadow:0 6px 12px rgba(0,0,0,.175);background-clip:padding-box}.dropdown-menu.pull-right{right:0;left:auto}.dropdown-menu .divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429;color:#333;white-space:nowrap}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{text-decoration:none;color:#262626;background-color:#f5f5f5}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#fff;text-decoration:none;outline:0;background-color:#428bca}.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999}.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);cursor:not-allowed}.open>.dropdown-menu{display:block}.open>a{outline:0}.dropdown-menu-right{left:auto;right:0}.dropdown-menu-left{left:0;right:auto}.dropdown-header{display:block;padding:3px 20px;font-size:12px;line-height:1.428571429;color:#999}.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990}.pull-right>.dropdown-menu{right:0;left:auto}.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid;content:""}.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px}@media (min-width:768px){.navbar-right .dropdown-menu{left:auto;right:0}.navbar-right .dropdown-menu-left{left:0;right:auto}}.btn-group,.btn-group-vertical{position:relative;display:inline-block;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;float:left}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover,.btn-group>.btn:focus,.btn-group-vertical>.btn:focus,.btn-group>.btn:active,.btn-group-vertical>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn.active{z-index:2}.btn-group>.btn:focus,.btn-group-vertical>.btn:focus{outline:0}.btn-group .btn+.btn,.btn-group .btn+.btn-group,.btn-group .btn-group+.btn,.btn-group .btn-group+.btn-group{margin-left:-1px}.btn-toolbar{margin-left:-5px}.btn-toolbar .btn-group,.btn-toolbar .input-group{float:left}.btn-toolbar>.btn,.btn-toolbar>.btn-group,.btn-toolbar>.input-group{margin-left:5px}.btn-group>.btn:not(:first-child):not(:last-child):not(.dropdown-toggle){border-radius:0}.btn-group>.btn:first-child{margin-left:0}.btn-group>.btn:first-child:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn:last-child:not(:first-child),.btn-group>.dropdown-toggle:not(:first-child){border-bottom-left-radius:0;border-top-left-radius:0}.btn-group>.btn-group{float:left}.btn-group>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group>.btn-group:first-child>.btn:last-child,.btn-group>.btn-group:first-child>.dropdown-toggle{border-bottom-right-radius:0;border-top-right-radius:0}.btn-group>.btn-group:last-child>.btn:first-child{border-bottom-left-radius:0;border-top-left-radius:0}.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0}.btn-group-xs>.btn{padding:1px 5px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-sm>.btn{padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}.btn-group-lg>.btn{padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px}.btn-group>.btn-lg+.dropdown-toggle{padding-left:12px;padding-right:12px}.btn-group.open .dropdown-toggle{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-group.open .dropdown-toggle.btn-link{-webkit-box-shadow:none;box-shadow:none}.btn .caret{margin-left:0}.btn-lg .caret{border-width:5px 5px 0;border-bottom-width:0}.dropup .btn-lg .caret{border-width:0 5px 5px}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group,.btn-group-vertical>.btn-group>.btn{display:block;float:none;width:100%;max-width:100%}.btn-group-vertical>.btn-group>.btn{float:none}.btn-group-vertical>.btn+.btn,.btn-group-vertical>.btn+.btn-group,.btn-group-vertical>.btn-group+.btn,.btn-group-vertical>.btn-group+.btn-group{margin-top:-1px;margin-left:0}.btn-group-vertical>.btn:not(:first-child):not(:last-child){border-radius:0}.btn-group-vertical>.btn:first-child:not(:last-child){border-top-right-radius:4px;border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:last-child:not(:first-child){border-bottom-left-radius:4px;border-top-right-radius:0;border-top-left-radius:0}.btn-group-vertical>.btn-group:not(:first-child):not(:last-child)>.btn{border-radius:0}.btn-group-vertical>.btn-group:first-child:not(:last-child)>.btn:last-child,.btn-group-vertical>.btn-group:first-child:not(:last-child)>.dropdown-toggle{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn-group:last-child:not(:first-child)>.btn:first-child{border-top-right-radius:0;border-top-left-radius:0}.btn-group-justified{display:table;width:100%;table-layout:fixed;border-collapse:separate}.btn-group-justified>.btn,.btn-group-justified>.btn-group{float:none;display:table-cell;width:1%}.btn-group-justified>.btn-group .btn{width:100%}[data-toggle=buttons]>.btn>input[type=radio],[data-toggle=buttons]>.btn>input[type=checkbox]{display:none}.input-group{position:relative;display:table;border-collapse:separate}.input-group[class*=col-]{float:none;padding-left:0;padding-right:0}.input-group .form-control{float:left;width:100%;margin-bottom:0}.input-group-lg>.form-control,.input-group-lg>.input-group-addon,.input-group-lg>.input-group-btn>.btn{height:46px;padding:10px 16px;font-size:18px;line-height:1.33;border-radius:6px}select.input-group-lg>.form-control,select.input-group-lg>.input-group-addon,select.input-group-lg>.input-group-btn>.btn{height:46px;line-height:46px}textarea.input-group-lg>.form-control,textarea.input-group-lg>.input-group-addon,textarea.input-group-lg>.input-group-btn>.btn,select[multiple].input-group-lg>.form-control,select[multiple].input-group-lg>.input-group-addon,select[multiple].input-group-lg>.input-group-btn>.btn{height:auto}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:5px 10px;font-size:12px;line-height:1.5;border-radius:3px}select.input-group-sm>.form-control,select.input-group-sm>.input-group-addon,select.input-group-sm>.input-group-btn>.btn{height:30px;line-height:30px}textarea.input-group-sm>.form-control,textarea.input-group-sm>.input-group-addon,textarea.input-group-sm>.input-group-btn>.btn,select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.input-group-addon,select[multiple].input-group-sm>.input-group-btn>.btn{height:auto}.input-group-addon,.input-group-btn,.input-group .form-control{display:table-cell}.input-group-addon:not(:first-child):not(:last-child),.input-group-btn:not(:first-child):not(:last-child),.input-group .form-control:not(:first-child):not(:last-child){border-radius:0}.input-group-addon,.input-group-btn{width:1%;white-space:nowrap;vertical-align:middle}.input-group-addon{padding:6px 12px;font-size:14px;font-weight:400;line-height:1;color:#555;text-align:center;background-color:#eee;border:1px solid #ccc;border-radius:4px}.input-group-addon.input-sm{padding:5px 10px;font-size:12px;border-radius:3px}.input-group-addon.input-lg{padding:10px 16px;font-size:18px;border-radius:6px}.input-group-addon input[type=radio],.input-group-addon input[type=checkbox]{margin-top:0}.input-group .form-control:first-child,.input-group-addon:first-child,.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group>.btn,.input-group-btn:first-child>.dropdown-toggle,.input-group-btn:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group-btn:last-child>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-top-right-radius:0}.input-group-addon:first-child{border-right:0}.input-group .form-control:last-child,.input-group-addon:last-child,.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group>.btn,.input-group-btn:last-child>.dropdown-toggle,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:first-child>.btn-group:not(:first-child)>.btn{border-bottom-left-radius:0;border-top-left-radius:0}.input-group-addon:last-child{border-left:0}.input-group-btn{position:relative;font-size:0;white-space:nowrap}.input-group-btn>.btn{position:relative}.input-group-btn>.btn+.btn{margin-left:-1px}.input-group-btn>.btn:hover,.input-group-btn>.btn:focus,.input-group-btn>.btn:active{z-index:2}.input-group-btn:first-child>.btn,.input-group-btn:first-child>.btn-group{margin-right:-1px}.input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{margin-left:-1px}.nav{margin-bottom:0;padding-left:0;list-style:none}.nav>li{position:relative;display:block}.nav>li>a{position:relative;display:block;padding:10px 15px}.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eee}.nav>li.disabled>a{color:#999}.nav>li.disabled>a:hover,.nav>li.disabled>a:focus{color:#999;text-decoration:none;background-color:transparent;cursor:not-allowed}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{background-color:#eee;border-color:#428bca}.nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5}.nav>li>a>img{max-width:none}.nav-tabs{border-bottom:1px solid #ddd}.nav-tabs>li{float:left;margin-bottom:-1px}.nav-tabs>li>a{margin-right:2px;line-height:1.428571429;border:1px solid transparent;border-radius:4px 4px 0 0}.nav-tabs>li>a:hover{border-color:#eee #eee #ddd}.nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{color:#555;background-color:#fff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default}.nav-tabs.nav-justified{width:100%;border-bottom:0}.nav-tabs.nav-justified>li{float:none}.nav-tabs.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-tabs.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-tabs.nav-justified>li{display:table-cell;width:1%}.nav-tabs.nav-justified>li>a{margin-bottom:0}}.nav-tabs.nav-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs.nav-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{border-bottom-color:#fff}}.nav-pills>li{float:left}.nav-pills>li>a{border-radius:4px}.nav-pills>li+li{margin-left:2px}.nav-pills>li.active>a,.nav-pills>li.active>a:hover,.nav-pills>li.active>a:focus{color:#fff;background-color:#428bca}.nav-stacked>li{float:none}.nav-stacked>li+li{margin-top:2px;margin-left:0}.nav-justified{width:100%}.nav-justified>li{float:none}.nav-justified>li>a{text-align:center;margin-bottom:5px}.nav-justified>.dropdown .dropdown-menu{top:auto;left:auto}@media (min-width:768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{margin-bottom:0}}.nav-tabs-justified{border-bottom:0}.nav-tabs-justified>li>a{margin-right:0;border-radius:4px}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border:1px solid #ddd}@media (min-width:768px){.nav-tabs-justified>li>a{border-bottom:1px solid #ddd;border-radius:4px 4px 0 0}.nav-tabs-justified>.active>a,.nav-tabs-justified>.active>a:hover,.nav-tabs-justified>.active>a:focus{border-bottom-color:#fff}}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-right-radius:0;border-top-left-radius:0}.navbar{position:relative;min-height:50px;margin-bottom:20px;border:1px solid transparent}@media (min-width:768px){.navbar{border-radius:4px}}@media (min-width:768px){.navbar-header{float:left}}.navbar-collapse{max-height:340px;overflow-x:visible;padding-right:15px;padding-left:15px;border-top:1px solid transparent;box-shadow:inset 0 1px 0 rgba(255,255,255,.1);-webkit-overflow-scrolling:touch}.navbar-collapse.in{overflow-y:auto}@media (min-width:768px){.navbar-collapse{width:auto;border-top:0;box-shadow:none}.navbar-collapse.collapse{display:block!important;height:auto!important;padding-bottom:0;overflow:visible!important}.navbar-collapse.in{overflow-y:visible}.navbar-fixed-top .navbar-collapse,.navbar-static-top .navbar-collapse,.navbar-fixed-bottom .navbar-collapse{padding-left:0;padding-right:0}}.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:-15px;margin-left:-15px}@media (min-width:768px){.container>.navbar-header,.container-fluid>.navbar-header,.container>.navbar-collapse,.container-fluid>.navbar-collapse{margin-right:0;margin-left:0}}.navbar-static-top{z-index:1000;border-width:0 0 1px}@media (min-width:768px){.navbar-static-top{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width:768px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0;border-width:0 0 1px}.navbar-fixed-bottom{bottom:0;margin-bottom:0;border-width:1px 0 0}.navbar-brand{float:left;padding:15px;font-size:18px;line-height:20px;height:20px}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}@media (min-width:768px){.navbar>.container .navbar-brand,.navbar>.container-fluid .navbar-brand{margin-left:-15px}}.navbar-toggle{position:relative;float:right;margin-right:15px;padding:9px 10px;margin-top:8px;margin-bottom:8px;background-color:transparent;background-image:none;border:1px solid transparent;border-radius:4px}.navbar-toggle:focus{outline:0}.navbar-toggle .icon-bar{display:block;width:22px;height:2px;border-radius:1px}.navbar-toggle .icon-bar+.icon-bar{margin-top:4px}@media (min-width:768px){.navbar-toggle{display:none}}.navbar-nav{margin:7.5px -15px}.navbar-nav>li>a{padding-top:10px;padding-bottom:10px;line-height:20px}@media (max-width:767px){.navbar-nav .open .dropdown-menu{position:static;float:none;width:auto;margin-top:0;background-color:transparent;border:0;box-shadow:none}.navbar-nav .open .dropdown-menu>li>a,.navbar-nav .open .dropdown-menu .dropdown-header{padding:5px 15px 5px 25px}.navbar-nav .open .dropdown-menu>li>a{line-height:20px}.navbar-nav .open .dropdown-menu>li>a:hover,.navbar-nav .open .dropdown-menu>li>a:focus{background-image:none}}@media (min-width:768px){.navbar-nav{float:left;margin:0}.navbar-nav>li{float:left}.navbar-nav>li>a{padding-top:15px;padding-bottom:15px}.navbar-nav.navbar-right:last-child{margin-right:-15px}}@media (min-width:768px){.navbar-left{float:left!important}.navbar-right{float:right!important}}.navbar-form{margin-left:-15px;margin-right:-15px;padding:10px 15px;border-top:1px solid transparent;border-bottom:1px solid transparent;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1);margin-top:8px;margin-bottom:8px}@media (min-width:768px){.navbar-form .form-group{display:inline-block;margin-bottom:0;vertical-align:middle}.navbar-form .form-control{display:inline-block;width:auto;vertical-align:middle}.navbar-form .control-label{margin-bottom:0;vertical-align:middle}.navbar-form .radio,.navbar-form .checkbox{display:inline-block;margin-top:0;margin-bottom:0;padding-left:0;vertical-align:middle}.navbar-form .radio input[type=radio],.navbar-form .checkbox input[type=checkbox]{float:none;margin-left:0}.navbar-form .has-feedback .form-control-feedback{top:0}}@media (max-width:767px){.navbar-form .form-group{margin-bottom:5px}}@media (min-width:768px){.navbar-form{width:auto;border:0;margin-left:0;margin-right:0;padding-top:0;padding-bottom:0;-webkit-box-shadow:none;box-shadow:none}.navbar-form.navbar-right:last-child{margin-right:-15px}}.navbar-nav>li>.dropdown-menu{margin-top:0;border-top-right-radius:0;border-top-left-radius:0}.navbar-fixed-bottom .navbar-nav>li>.dropdown-menu{border-bottom-right-radius:0;border-bottom-left-radius:0}.navbar-btn{margin-top:8px;margin-bottom:8px}.navbar-btn.btn-sm{margin-top:10px;margin-bottom:10px}.navbar-btn.btn-xs{margin-top:14px;margin-bottom:14px}.navbar-text{margin-top:15px;margin-bottom:15px}@media (min-width:768px){.navbar-text{float:left;margin-left:15px;margin-right:15px}.navbar-text.navbar-right:last-child{margin-right:0}}.navbar-default{background-color:#f8f8f8;border-color:#e7e7e7}.navbar-default .navbar-brand{color:#777}.navbar-default .navbar-brand:hover,.navbar-default .navbar-brand:focus{color:#5e5e5e;background-color:transparent}.navbar-default .navbar-text{color:#777}.navbar-default .navbar-nav>li>a{color:#777}.navbar-default .navbar-nav>li>a:hover,.navbar-default .navbar-nav>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:hover,.navbar-default .navbar-nav>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:hover,.navbar-default .navbar-nav>.disabled>a:focus{color:#ccc;background-color:transparent}.navbar-default .navbar-toggle{border-color:#ddd}.navbar-default .navbar-toggle:hover,.navbar-default .navbar-toggle:focus{background-color:#ddd}.navbar-default .navbar-toggle .icon-bar{background-color:#888}.navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#e7e7e7}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.open>a:hover,.navbar-default .navbar-nav>.open>a:focus{background-color:#e7e7e7;color:#555}@media (max-width:767px){.navbar-default .navbar-nav .open .dropdown-menu>li>a{color:#777}.navbar-default .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>li>a:focus{color:#333;background-color:transparent}.navbar-default .navbar-nav .open .dropdown-menu>.active>a,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.active>a:focus{color:#555;background-color:#e7e7e7}.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-default .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#ccc;background-color:transparent}}.navbar-default .navbar-link{color:#777}.navbar-default .navbar-link:hover{color:#333}.navbar-inverse{background-color:#222;border-color:#080808}.navbar-inverse .navbar-brand{color:#999}.navbar-inverse .navbar-brand:hover,.navbar-inverse .navbar-brand:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-text{color:#999}.navbar-inverse .navbar-nav>li>a{color:#999}.navbar-inverse .navbar-nav>li>a:hover,.navbar-inverse .navbar-nav>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.active>a:hover,.navbar-inverse .navbar-nav>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav>.disabled>a,.navbar-inverse .navbar-nav>.disabled>a:hover,.navbar-inverse .navbar-nav>.disabled>a:focus{color:#444;background-color:transparent}.navbar-inverse .navbar-toggle{border-color:#333}.navbar-inverse .navbar-toggle:hover,.navbar-inverse .navbar-toggle:focus{background-color:#333}.navbar-inverse .navbar-toggle .icon-bar{background-color:#fff}.navbar-inverse .navbar-collapse,.navbar-inverse .navbar-form{border-color:#101010}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.open>a:hover,.navbar-inverse .navbar-nav>.open>a:focus{background-color:#080808;color:#fff}@media (max-width:767px){.navbar-inverse .navbar-nav .open .dropdown-menu>.dropdown-header{border-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu .divider{background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a{color:#999}.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>li>a:focus{color:#fff;background-color:transparent}.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-color:#080808}.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:hover,.navbar-inverse .navbar-nav .open .dropdown-menu>.disabled>a:focus{color:#444;background-color:transparent}}.navbar-inverse .navbar-link{color:#999}.navbar-inverse .navbar-link:hover{color:#fff}.breadcrumb{padding:8px 15px;margin-bottom:20px;list-style:none;background-color:#f5f5f5;border-radius:4px}.breadcrumb>li{display:inline-block}.breadcrumb>li+li:before{content:"/\00a0";padding:0 5px;color:#ccc}.breadcrumb>.active{color:#999}.pagination{display:inline-block;padding-left:0;margin:20px 0;border-radius:4px}.pagination>li{display:inline}.pagination>li>a,.pagination>li>span{position:relative;float:left;padding:6px 12px;line-height:1.428571429;text-decoration:none;color:#428bca;background-color:#fff;border:1px solid #ddd;margin-left:-1px}.pagination>li:first-child>a,.pagination>li:first-child>span{margin-left:0;border-bottom-left-radius:4px;border-top-left-radius:4px}.pagination>li:last-child>a,.pagination>li:last-child>span{border-bottom-right-radius:4px;border-top-right-radius:4px}.pagination>li>a:hover,.pagination>li>span:hover,.pagination>li>a:focus,.pagination>li>span:focus{color:#2a6496;background-color:#eee;border-color:#ddd}.pagination>.active>a,.pagination>.active>span,.pagination>.active>a:hover,.pagination>.active>span:hover,.pagination>.active>a:focus,.pagination>.active>span:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca;cursor:default}.pagination>.disabled>span,.pagination>.disabled>span:hover,.pagination>.disabled>span:focus,.pagination>.disabled>a,.pagination>.disabled>a:hover,.pagination>.disabled>a:focus{color:#999;background-color:#fff;border-color:#ddd;cursor:not-allowed}.pagination-lg>li>a,.pagination-lg>li>span{padding:10px 16px;font-size:18px}.pagination-lg>li:first-child>a,.pagination-lg>li:first-child>span{border-bottom-left-radius:6px;border-top-left-radius:6px}.pagination-lg>li:last-child>a,.pagination-lg>li:last-child>span{border-bottom-right-radius:6px;border-top-right-radius:6px}.pagination-sm>li>a,.pagination-sm>li>span{padding:5px 10px;font-size:12px}.pagination-sm>li:first-child>a,.pagination-sm>li:first-child>span{border-bottom-left-radius:3px;border-top-left-radius:3px}.pagination-sm>li:last-child>a,.pagination-sm>li:last-child>span{border-bottom-right-radius:3px;border-top-right-radius:3px}.pager{padding-left:0;margin:20px 0;list-style:none;text-align:center}.pager li{display:inline}.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;border-radius:15px}.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#eee}.pager .next>a,.pager .next>span{float:right}.pager .previous>a,.pager .previous>span{float:left}.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999;background-color:#fff;cursor:not-allowed}.label{display:inline;padding:.2em .6em .3em;font-size:75%;font-weight:700;line-height:1;color:#fff;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25em}.label[href]:hover,.label[href]:focus{color:#fff;text-decoration:none;cursor:pointer}.label:empty{display:none}.btn .label{position:relative;top:-1px}.label-default{background-color:#999}.label-default[href]:hover,.label-default[href]:focus{background-color:gray}.label-primary{background-color:#428bca}.label-primary[href]:hover,.label-primary[href]:focus{background-color:#3071a9}.label-success{background-color:#5cb85c}.label-success[href]:hover,.label-success[href]:focus{background-color:#449d44}.label-info{background-color:#5bc0de}.label-info[href]:hover,.label-info[href]:focus{background-color:#31b0d5}.label-warning{background-color:#f0ad4e}.label-warning[href]:hover,.label-warning[href]:focus{background-color:#ec971f}.label-danger{background-color:#d9534f}.label-danger[href]:hover,.label-danger[href]:focus{background-color:#c9302c}.badge{display:inline-block;min-width:10px;padding:3px 7px;font-size:12px;font-weight:700;color:#fff;line-height:1;vertical-align:baseline;white-space:nowrap;text-align:center;background-color:#999;border-radius:10px}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.btn-xs .badge{top:0;padding:1px 5px}a.badge:hover,a.badge:focus{color:#fff;text-decoration:none;cursor:pointer}a.list-group-item.active>.badge,.nav-pills>.active>a>.badge{color:#428bca;background-color:#fff}.nav-pills>li>a>.badge{margin-left:3px}.jumbotron{padding:30px;margin-bottom:30px;color:inherit;background-color:#eee}.jumbotron h1,.jumbotron .h1{color:inherit}.jumbotron p{margin-bottom:15px;font-size:21px;font-weight:200}.container .jumbotron{border-radius:6px}.jumbotron .container{max-width:100%}@media screen and (min-width:768px){.jumbotron{padding-top:48px;padding-bottom:48px}.container .jumbotron{padding-left:60px;padding-right:60px}.jumbotron h1,.jumbotron .h1{font-size:63px}}.thumbnail{display:block;padding:4px;margin-bottom:20px;line-height:1.428571429;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.thumbnail>img,.thumbnail a>img{display:block;max-width:100%;height:auto;margin-left:auto;margin-right:auto}a.thumbnail:hover,a.thumbnail:focus,a.thumbnail.active{border-color:#428bca}.thumbnail .caption{padding:9px;color:#333}.alert{padding:15px;margin-bottom:20px;border:1px solid transparent;border-radius:4px}.alert h4{margin-top:0;color:inherit}.alert .alert-link{font-weight:700}.alert>p,.alert>ul{margin-bottom:0}.alert>p+p{margin-top:5px}.alert-dismissable{padding-right:35px}.alert-dismissable .close{position:relative;top:-2px;right:-21px;color:inherit}.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#3c763d}.alert-success hr{border-top-color:#c9e2b3}.alert-success .alert-link{color:#2b542c}.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#31708f}.alert-info hr{border-top-color:#a6e1ec}.alert-info .alert-link{color:#245269}.alert-warning{background-color:#fcf8e3;border-color:#faebcc;color:#8a6d3b}.alert-warning hr{border-top-color:#f7e1b5}.alert-warning .alert-link{color:#66512c}.alert-danger{background-color:#f2dede;border-color:#ebccd1;color:#a94442}.alert-danger hr{border-top-color:#e4b9c0}.alert-danger .alert-link{color:#843534}@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:40px 0}to{background-position:0 0}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f5f5f5;border-radius:4px;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1);box-shadow:inset 0 1px 2px rgba(0,0,0,.1)}.progress-bar{float:left;width:0;height:100%;font-size:12px;line-height:20px;color:#fff;text-align:center;background-color:#428bca;-webkit-box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 0 -1px 0 rgba(0,0,0,.15);-webkit-transition:width .6s ease;transition:width .6s ease}.progress-striped .progress-bar{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:40px 40px}.progress.active .progress-bar{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-bar-success{background-color:#5cb85c}.progress-striped .progress-bar-success{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-info{background-color:#5bc0de}.progress-striped .progress-bar-info{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-warning{background-color:#f0ad4e}.progress-striped .progress-bar-warning{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.progress-bar-danger{background-color:#d9534f}.progress-striped .progress-bar-danger{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.media,.media-body{overflow:hidden;zoom:1}.media,.media .media{margin-top:15px}.media:first-child{margin-top:0}.media-object{display:block}.media-heading{margin:0 0 5px}.media>.pull-left{margin-right:10px}.media>.pull-right{margin-left:10px}.media-list{padding-left:0;list-style:none}.list-group{margin-bottom:20px;padding-left:0}.list-group-item{position:relative;display:block;padding:10px 15px;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:4px;border-top-left-radius:4px}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:4px;border-bottom-left-radius:4px}.list-group-item>.badge{float:right}.list-group-item>.badge+.badge{margin-right:5px}a.list-group-item{color:#555}a.list-group-item .list-group-item-heading{color:#333}a.list-group-item:hover,a.list-group-item:focus{text-decoration:none;background-color:#f5f5f5}a.list-group-item.active,a.list-group-item.active:hover,a.list-group-item.active:focus{z-index:2;color:#fff;background-color:#428bca;border-color:#428bca}a.list-group-item.active .list-group-item-heading,a.list-group-item.active:hover .list-group-item-heading,a.list-group-item.active:focus .list-group-item-heading{color:inherit}a.list-group-item.active .list-group-item-text,a.list-group-item.active:hover .list-group-item-text,a.list-group-item.active:focus .list-group-item-text{color:#e1edf7}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:hover,a.list-group-item-success:focus{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:hover,a.list-group-item-success.active:focus{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:hover,a.list-group-item-info:focus{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:hover,a.list-group-item-info.active:focus{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:hover,a.list-group-item-warning:focus{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:hover,a.list-group-item-warning.active:focus{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:hover,a.list-group-item-danger:focus{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:hover,a.list-group-item-danger.active:focus{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.panel{margin-bottom:20px;background-color:#fff;border:1px solid transparent;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0,0,0,.05);box-shadow:0 1px 1px rgba(0,0,0,.05)}.panel-body{padding:15px}.panel>.list-group{margin-bottom:0}.panel>.list-group .list-group-item{border-width:1px 0;border-radius:0}.panel>.list-group .list-group-item:first-child{border-top:0}.panel>.list-group .list-group-item:last-child{border-bottom:0}.panel>.list-group:first-child .list-group-item:first-child{border-top-right-radius:3px;border-top-left-radius:3px}.panel>.list-group:last-child .list-group-item:last-child{border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-heading+.list-group .list-group-item:first-child{border-top-width:0}.panel>.table,.panel>.table-responsive>.table{margin-bottom:0}.panel>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:first-child,.panel>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:first-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:first-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:first-child{border-top-left-radius:3px}.panel>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child td:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child td:last-child,.panel>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>thead:first-child>tr:first-child th:last-child,.panel>.table:first-child>tbody:first-child>tr:first-child th:last-child,.panel>.table-responsive:first-child>.table:first-child>tbody:first-child>tr:first-child th:last-child{border-top-right-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:first-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:first-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:first-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:first-child{border-bottom-left-radius:3px}.panel>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child td:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child td:last-child,.panel>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tbody:last-child>tr:last-child th:last-child,.panel>.table:last-child>tfoot:last-child>tr:last-child th:last-child,.panel>.table-responsive:last-child>.table:last-child>tfoot:last-child>tr:last-child th:last-child{border-bottom-right-radius:3px}.panel>.panel-body+.table,.panel>.panel-body+.table-responsive{border-top:1px solid #ddd}.panel>.table>tbody:first-child>tr:first-child th,.panel>.table>tbody:first-child>tr:first-child td{border-top:0}.panel>.table-bordered,.panel>.table-responsive>.table-bordered{border:0}.panel>.table-bordered>thead>tr>th:first-child,.panel>.table-responsive>.table-bordered>thead>tr>th:first-child,.panel>.table-bordered>tbody>tr>th:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:first-child,.panel>.table-bordered>tfoot>tr>th:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:first-child,.panel>.table-bordered>thead>tr>td:first-child,.panel>.table-responsive>.table-bordered>thead>tr>td:first-child,.panel>.table-bordered>tbody>tr>td:first-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:first-child,.panel>.table-bordered>tfoot>tr>td:first-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:first-child{border-left:0}.panel>.table-bordered>thead>tr>th:last-child,.panel>.table-responsive>.table-bordered>thead>tr>th:last-child,.panel>.table-bordered>tbody>tr>th:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>th:last-child,.panel>.table-bordered>tfoot>tr>th:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>th:last-child,.panel>.table-bordered>thead>tr>td:last-child,.panel>.table-responsive>.table-bordered>thead>tr>td:last-child,.panel>.table-bordered>tbody>tr>td:last-child,.panel>.table-responsive>.table-bordered>tbody>tr>td:last-child,.panel>.table-bordered>tfoot>tr>td:last-child,.panel>.table-responsive>.table-bordered>tfoot>tr>td:last-child{border-right:0}.panel>.table-bordered>thead>tr:first-child>th,.panel>.table-responsive>.table-bordered>thead>tr:first-child>th,.panel>.table-bordered>tbody>tr:first-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>th,.panel>.table-bordered>tfoot>tr:first-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:first-child>th,.panel>.table-bordered>thead>tr:first-child>td,.panel>.table-responsive>.table-bordered>thead>tr:first-child>td,.panel>.table-bordered>tbody>tr:first-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:first-child>td,.panel>.table-bordered>tfoot>tr:first-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:first-child>td{border-top:0}.panel>.table-bordered>thead>tr:last-child>th,.panel>.table-responsive>.table-bordered>thead>tr:last-child>th,.panel>.table-bordered>tbody>tr:last-child>th,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>th,.panel>.table-bordered>tfoot>tr:last-child>th,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>th,.panel>.table-bordered>thead>tr:last-child>td,.panel>.table-responsive>.table-bordered>thead>tr:last-child>td,.panel>.table-bordered>tbody>tr:last-child>td,.panel>.table-responsive>.table-bordered>tbody>tr:last-child>td,.panel>.table-bordered>tfoot>tr:last-child>td,.panel>.table-responsive>.table-bordered>tfoot>tr:last-child>td{border-bottom:0}.panel>.table-responsive{border:0;margin-bottom:0}.panel-heading{padding:10px 15px;border-bottom:1px solid transparent;border-top-right-radius:3px;border-top-left-radius:3px}.panel-heading>.dropdown .dropdown-toggle{color:inherit}.panel-title{margin-top:0;margin-bottom:0;font-size:16px;color:inherit}.panel-title>a{color:inherit}.panel-footer{padding:10px 15px;background-color:#f5f5f5;border-top:1px solid #ddd;border-bottom-right-radius:3px;border-bottom-left-radius:3px}.panel-group{margin-bottom:20px}.panel-group .panel{margin-bottom:0;border-radius:4px;overflow:hidden}.panel-group .panel+.panel{margin-top:5px}.panel-group .panel-heading{border-bottom:0}.panel-group .panel-heading+.panel-collapse .panel-body{border-top:1px solid #ddd}.panel-group .panel-footer{border-top:0}.panel-group .panel-footer+.panel-collapse .panel-body{border-bottom:1px solid #ddd}.panel-default{border-color:#ddd}.panel-default>.panel-heading{color:#333;background-color:#f5f5f5;border-color:#ddd}.panel-default>.panel-heading+.panel-collapse .panel-body{border-top-color:#ddd}.panel-default>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ddd}.panel-primary{border-color:#428bca}.panel-primary>.panel-heading{color:#fff;background-color:#428bca;border-color:#428bca}.panel-primary>.panel-heading+.panel-collapse .panel-body{border-top-color:#428bca}.panel-primary>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#428bca}.panel-success{border-color:#d6e9c6}.panel-success>.panel-heading{color:#3c763d;background-color:#dff0d8;border-color:#d6e9c6}.panel-success>.panel-heading+.panel-collapse .panel-body{border-top-color:#d6e9c6}.panel-success>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#d6e9c6}.panel-info{border-color:#bce8f1}.panel-info>.panel-heading{color:#31708f;background-color:#d9edf7;border-color:#bce8f1}.panel-info>.panel-heading+.panel-collapse .panel-body{border-top-color:#bce8f1}.panel-info>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#bce8f1}.panel-warning{border-color:#faebcc}.panel-warning>.panel-heading{color:#8a6d3b;background-color:#fcf8e3;border-color:#faebcc}.panel-warning>.panel-heading+.panel-collapse .panel-body{border-top-color:#faebcc}.panel-warning>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#faebcc}.panel-danger{border-color:#ebccd1}.panel-danger>.panel-heading{color:#a94442;background-color:#f2dede;border-color:#ebccd1}.panel-danger>.panel-heading+.panel-collapse .panel-body{border-top-color:#ebccd1}.panel-danger>.panel-footer+.panel-collapse .panel-body{border-bottom-color:#ebccd1}.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.05);box-shadow:inset 0 1px 1px rgba(0,0,0,.05)}.well blockquote{border-color:#ddd;border-color:rgba(0,0,0,.15)}.well-lg{padding:24px;border-radius:6px}.well-sm{padding:9px;border-radius:3px}.close{float:right;font-size:21px;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2;filter:alpha(opacity=20)}.close:hover,.close:focus{color:#000;text-decoration:none;cursor:pointer;opacity:.5;filter:alpha(opacity=50)}button.close{padding:0;cursor:pointer;background:0 0;border:0;-webkit-appearance:none}.modal-open{overflow:hidden}.modal{display:none;overflow:auto;overflow-y:scroll;position:fixed;top:0;right:0;bottom:0;left:0;z-index:1050;-webkit-overflow-scrolling:touch;outline:0}.modal.fade .modal-dialog{-webkit-transform:translate(0,-25%);-ms-transform:translate(0,-25%);transform:translate(0,-25%);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal.in .modal-dialog{-webkit-transform:translate(0,0);-ms-transform:translate(0,0);transform:translate(0,0)}.modal-dialog{position:relative;width:auto;margin:10px}.modal-content{position:relative;background-color:#fff;border:1px solid #999;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 3px 9px rgba(0,0,0,.5);box-shadow:0 3px 9px rgba(0,0,0,.5);background-clip:padding-box;outline:0}.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000}.modal-backdrop.fade{opacity:0;filter:alpha(opacity=0)}.modal-backdrop.in{opacity:.5;filter:alpha(opacity=50)}.modal-header{padding:15px;border-bottom:1px solid #e5e5e5;min-height:16.428571429px}.modal-header .close{margin-top:-2px}.modal-title{margin:0;line-height:1.428571429}.modal-body{position:relative;padding:20px}.modal-footer{margin-top:15px;padding:19px 20px 20px;text-align:right;border-top:1px solid #e5e5e5}.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0}.modal-footer .btn-group .btn+.btn{margin-left:-1px}.modal-footer .btn-block+.btn-block{margin-left:0}@media (min-width:768px){.modal-dialog{width:600px;margin:30px auto}.modal-content{-webkit-box-shadow:0 5px 15px rgba(0,0,0,.5);box-shadow:0 5px 15px rgba(0,0,0,.5)}.modal-sm{width:300px}.modal-lg{width:900px}}.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;font-size:12px;line-height:1.4;opacity:0;filter:alpha(opacity=0)}.tooltip.in{opacity:.9;filter:alpha(opacity=90)}.tooltip.top{margin-top:-3px;padding:5px 0}.tooltip.right{margin-left:3px;padding:0 5px}.tooltip.bottom{margin-top:3px;padding:5px 0}.tooltip.left{margin-left:-3px;padding:0 5px}.tooltip-inner{max-width:200px;padding:3px 8px;color:#fff;text-align:center;text-decoration:none;background-color:#000;border-radius:4px}.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid}.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-left .tooltip-arrow{bottom:0;left:5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.top-right .tooltip-arrow{bottom:0;right:5px;border-width:5px 5px 0;border-top-color:#000}.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000}.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000}.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-left .tooltip-arrow{top:0;left:5px;border-width:0 5px 5px;border-bottom-color:#000}.tooltip.bottom-right .tooltip-arrow{top:0;right:5px;border-width:0 5px 5px;border-bottom-color:#000}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#fff;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0,0,0,.2);border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0,0,0,.2);box-shadow:0 5px 10px rgba(0,0,0,.2);white-space:normal}.popover.top{margin-top:-10px}.popover.right{margin-left:10px}.popover.bottom{margin-top:10px}.popover.left{margin-left:-10px}.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:400;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-radius:5px 5px 0 0}.popover-content{padding:9px 14px}.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid}.popover .arrow{border-width:11px}.popover .arrow:after{border-width:10px;content:""}.popover.top .arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0,0,0,.25);bottom:-11px}.popover.top .arrow:after{content:" ";bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#fff}.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0,0,0,.25)}.popover.right .arrow:after{content:" ";left:1px;bottom:-10px;border-left-width:0;border-right-color:#fff}.popover.bottom .arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0,0,0,.25);top:-11px}.popover.bottom .arrow:after{content:" ";top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#fff}.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0,0,0,.25)}.popover.left .arrow:after{content:" ";right:1px;border-right-width:0;border-left-color:#fff;bottom:-10px}.carousel{position:relative}.carousel-inner{position:relative;overflow:hidden;width:100%}.carousel-inner>.item{display:none;position:relative;-webkit-transition:.6s ease-in-out left;transition:.6s ease-in-out left}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;max-width:100%;height:auto;line-height:1}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block}.carousel-inner>.active{left:0}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.carousel-inner>.next{left:100%}.carousel-inner>.prev{left:-100%}.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0}.carousel-inner>.active.left{left:-100%}.carousel-inner>.active.right{left:100%}.carousel-control{position:absolute;top:0;left:0;bottom:0;width:15%;opacity:.5;filter:alpha(opacity=50);font-size:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-control.left{background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.5) 0),color-stop(rgba(0,0,0,.0001) 100%));background-image:linear-gradient(to right,rgba(0,0,0,.5) 0,rgba(0,0,0,.0001) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1)}.carousel-control.right{left:auto;right:0;background-image:-webkit-linear-gradient(left,color-stop(rgba(0,0,0,.0001) 0),color-stop(rgba(0,0,0,.5) 100%));background-image:linear-gradient(to right,rgba(0,0,0,.0001) 0,rgba(0,0,0,.5) 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1)}.carousel-control:hover,.carousel-control:focus{outline:0;color:#fff;text-decoration:none;opacity:.9;filter:alpha(opacity=90)}.carousel-control .icon-prev,.carousel-control .icon-next,.carousel-control .glyphicon-chevron-left,.carousel-control .glyphicon-chevron-right{position:absolute;top:50%;z-index:5;display:inline-block}.carousel-control .icon-prev,.carousel-control .glyphicon-chevron-left{left:50%}.carousel-control .icon-next,.carousel-control .glyphicon-chevron-right{right:50%}.carousel-control .icon-prev,.carousel-control .icon-next{width:20px;height:20px;margin-top:-10px;margin-left:-10px;font-family:serif}.carousel-control .icon-prev:before{content:'\2039'}.carousel-control .icon-next:before{content:'\203a'}.carousel-indicators{position:absolute;bottom:10px;left:50%;z-index:15;width:60%;margin-left:-30%;padding-left:0;list-style:none;text-align:center}.carousel-indicators li{display:inline-block;width:10px;height:10px;margin:1px;text-indent:-999px;border:1px solid #fff;border-radius:10px;cursor:pointer;background-color:#000 \9;background-color:rgba(0,0,0,0)}.carousel-indicators .active{margin:0;width:12px;height:12px;background-color:#fff}.carousel-caption{position:absolute;left:15%;right:15%;bottom:20px;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center;text-shadow:0 1px 2px rgba(0,0,0,.6)}.carousel-caption .btn{text-shadow:none}@media screen and (min-width:768px){.carousel-control .glyphicons-chevron-left,.carousel-control .glyphicons-chevron-right,.carousel-control .icon-prev,.carousel-control .icon-next{width:30px;height:30px;margin-top:-15px;margin-left:-15px;font-size:30px}.carousel-caption{left:20%;right:20%;padding-bottom:30px}.carousel-indicators{bottom:20px}}.clearfix:before,.clearfix:after,.container:before,.container:after,.container-fluid:before,.container-fluid:after,.row:before,.row:after,.form-horizontal .form-group:before,.form-horizontal .form-group:after,.btn-toolbar:before,.btn-toolbar:after,.btn-group-vertical>.btn-group:before,.btn-group-vertical>.btn-group:after,.nav:before,.nav:after,.navbar:before,.navbar:after,.navbar-header:before,.navbar-header:after,.navbar-collapse:before,.navbar-collapse:after,.pager:before,.pager:after,.panel-body:before,.panel-body:after,.modal-footer:before,.modal-footer:after{content:" ";display:table}.clearfix:after,.container:after,.container-fluid:after,.row:after,.form-horizontal .form-group:after,.btn-toolbar:after,.btn-group-vertical>.btn-group:after,.nav:after,.navbar:after,.navbar-header:after,.navbar-collapse:after,.pager:after,.panel-body:after,.modal-footer:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right!important}.pull-left{float:left!important}.hide{display:none!important}.show{display:block!important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none!important;visibility:hidden!important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,tr.visible-xs,th.visible-xs,td.visible-xs{display:none!important}@media (max-width:767px){.visible-xs{display:block!important}table.visible-xs{display:table}tr.visible-xs{display:table-row!important}th.visible-xs,td.visible-xs{display:table-cell!important}}.visible-sm,tr.visible-sm,th.visible-sm,td.visible-sm{display:none!important}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block!important}table.visible-sm{display:table}tr.visible-sm{display:table-row!important}th.visible-sm,td.visible-sm{display:table-cell!important}}.visible-md,tr.visible-md,th.visible-md,td.visible-md{display:none!important}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block!important}table.visible-md{display:table}tr.visible-md{display:table-row!important}th.visible-md,td.visible-md{display:table-cell!important}}.visible-lg,tr.visible-lg,th.visible-lg,td.visible-lg{display:none!important}@media (min-width:1200px){.visible-lg{display:block!important}table.visible-lg{display:table}tr.visible-lg{display:table-row!important}th.visible-lg,td.visible-lg{display:table-cell!important}}@media (max-width:767px){.hidden-xs,tr.hidden-xs,th.hidden-xs,td.hidden-xs{display:none!important}}@media (min-width:768px) and (max-width:991px){.hidden-sm,tr.hidden-sm,th.hidden-sm,td.hidden-sm{display:none!important}}@media (min-width:992px) and (max-width:1199px){.hidden-md,tr.hidden-md,th.hidden-md,td.hidden-md{display:none!important}}@media (min-width:1200px){.hidden-lg,tr.hidden-lg,th.hidden-lg,td.hidden-lg{display:none!important}}.visible-print,tr.visible-print,th.visible-print,td.visible-print{display:none!important}@media print{.visible-print{display:block!important}table.visible-print{display:table}tr.visible-print{display:table-row!important}th.visible-print,td.visible-print{display:table-cell!important}}@media print{.hidden-print,tr.hidden-print,th.hidden-print,td.hidden-print{display:none!important}}
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.js b/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.js
index 850e6e5..39ec471 100644
--- a/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.js
+++ b/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.js
@@ -1,32 +1,22 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }
+if (typeof jQuery === 'undefined') { throw new Error('Bootstrap requires jQuery') }
 
 /* ========================================================================
- * Bootstrap: transition.js v3.0.3
+ * Bootstrap: transition.js v3.1.0
  * http://getbootstrap.com/javascript/#transitions
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
   // ============================================================
@@ -35,10 +25,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     var el = document.createElement('bootstrap')
 
     var transEndEventNames = {
-      'WebkitTransition' : 'webkitTransitionEnd'
-    , 'MozTransition'    : 'transitionend'
-    , 'OTransition'      : 'oTransitionEnd otransitionend'
-    , 'transition'       : 'transitionend'
+      'WebkitTransition' : 'webkitTransitionEnd',
+      'MozTransition'    : 'transitionend',
+      'OTransition'      : 'oTransitionEnd otransitionend',
+      'transition'       : 'transitionend'
     }
 
     for (var name in transEndEventNames) {
@@ -46,6 +36,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
         return { end: transEndEventNames[name] }
       }
     }
+
+    return false // explicit for ie8 (  ._.)
   }
 
   // http://blog.alexmaccaw.com/css-transitions
@@ -64,26 +56,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: alert.js v3.0.3
+ * Bootstrap: alert.js v3.1.0
  * http://getbootstrap.com/javascript/#alerts
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // ALERT CLASS DEFINITION
   // ======================
@@ -163,33 +145,24 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: button.js v3.0.3
+ * Bootstrap: button.js v3.1.0
  * http://getbootstrap.com/javascript/#buttons
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // BUTTON PUBLIC CLASS DEFINITION
   // ==============================
 
   var Button = function (element, options) {
-    this.$element = $(element)
-    this.options  = $.extend({}, Button.DEFAULTS, options)
+    this.$element  = $(element)
+    this.options   = $.extend({}, Button.DEFAULTS, options)
+    this.isLoading = false
   }
 
   Button.DEFAULTS = {
@@ -209,25 +182,26 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     $el[val](data[state] || this.options[state])
 
     // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
-        $el.removeClass(d).removeAttr(d);
-    }, 0)
+    setTimeout($.proxy(function () {
+      if (state == 'loadingText') {
+        this.isLoading = true
+        $el.addClass(d).attr(d, d)
+      } else if (this.isLoading) {
+        this.isLoading = false
+        $el.removeClass(d).removeAttr(d)
+      }
+    }, this), 0)
   }
 
   Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons"]')
     var changed = true
+    var $parent = this.$element.closest('[data-toggle="buttons"]')
 
     if ($parent.length) {
       var $input = this.$element.find('input')
-      if ($input.prop('type') === 'radio') {
-        // see if clicking on current one
-        if ($input.prop('checked') && this.$element.hasClass('active'))
-          changed = false
-        else
-          $parent.find('.active').removeClass('active')
+      if ($input.prop('type') == 'radio') {
+        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
+        else $parent.find('.active').removeClass('active')
       }
       if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
     }
@@ -279,26 +253,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: carousel.js v3.0.3
+ * Bootstrap: carousel.js v3.1.0
  * http://getbootstrap.com/javascript/#carousel
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // CAROUSEL CLASS DEFINITION
   // =========================
@@ -319,9 +283,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Carousel.DEFAULTS = {
-    interval: 5000
-  , pause: 'hover'
-  , wrap: true
+    interval: 5000,
+    pause: 'hover',
+    wrap: true
   }
 
   Carousel.prototype.cycle =  function (e) {
@@ -358,7 +322,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   Carousel.prototype.pause = function (e) {
     e || (this.paused = true)
 
-    if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+    if (this.$element.find('.next, .prev').length && $.support.transition) {
       this.$element.trigger($.support.transition.end)
       this.cycle(true)
     }
@@ -391,13 +355,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       $next = this.$element.find('.item')[fallback]()
     }
 
-    this.sliding = true
-
-    isCycling && this.pause()
+    if ($next.hasClass('active')) return this.sliding = false
 
     var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
+    this.$element.trigger(e)
+    if (e.isDefaultPrevented()) return
 
-    if ($next.hasClass('active')) return
+    this.sliding = true
+
+    isCycling && this.pause()
 
     if (this.$indicators.length) {
       this.$indicators.find('.active').removeClass('active')
@@ -408,8 +374,6 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     }
 
     if ($.support.transition && this.$element.hasClass('slide')) {
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
       $next.addClass(type)
       $next[0].offsetWidth // force reflow
       $active.addClass(direction)
@@ -421,10 +385,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
           that.sliding = false
           setTimeout(function () { that.$element.trigger('slid.bs.carousel') }, 0)
         })
-        .emulateTransitionEnd(600)
+        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
     } else {
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
       $active.removeClass('active')
       $next.addClass('active')
       this.sliding = false
@@ -497,26 +459,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: collapse.js v3.0.3
+ * Bootstrap: collapse.js v3.1.0
  * http://getbootstrap.com/javascript/#collapse
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // COLLAPSE PUBLIC CLASS DEFINITION
   // ================================
@@ -567,7 +519,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     var complete = function () {
       this.$element
         .removeClass('collapsing')
-        .addClass('in')
+        .addClass('collapse in')
         [dimension]('auto')
       this.transitioning = 0
       this.$element.trigger('shown.bs.collapse')
@@ -635,6 +587,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       var data    = $this.data('bs.collapse')
       var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
 
+      if (!data && options.toggle && option == 'show') option = !option
       if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })
@@ -677,26 +630,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: dropdown.js v3.0.3
+ * Bootstrap: dropdown.js v3.1.0
  * http://getbootstrap.com/javascript/#dropdowns
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // DROPDOWN CLASS DEFINITION
   // =========================
@@ -723,13 +666,14 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
         $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
       }
 
-      $parent.trigger(e = $.Event('show.bs.dropdown'))
+      var relatedTarget = { relatedTarget: this }
+      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
 
       if (e.isDefaultPrevented()) return
 
       $parent
         .toggleClass('open')
-        .trigger('shown.bs.dropdown')
+        .trigger('shown.bs.dropdown', relatedTarget)
 
       $this.focus()
     }
@@ -755,7 +699,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       return $this.click()
     }
 
-    var $items = $('[role=menu] li:not(.divider):visible a', $parent)
+    var desc = ' li:not(.divider):visible a'
+    var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc)
 
     if (!$items.length) return
 
@@ -763,19 +708,20 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
     if (e.keyCode == 38 && index > 0)                 index--                        // up
     if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-    if (!~index)                                      index=0
+    if (!~index)                                      index = 0
 
     $items.eq(index).focus()
   }
 
-  function clearMenus() {
+  function clearMenus(e) {
     $(backdrop).remove()
-    $(toggle).each(function (e) {
+    $(toggle).each(function () {
       var $parent = getParent($(this))
+      var relatedTarget = { relatedTarget: this }
       if (!$parent.hasClass('open')) return
-      $parent.trigger(e = $.Event('hide.bs.dropdown'))
+      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
       if (e.isDefaultPrevented()) return
-      $parent.removeClass('open').trigger('hidden.bs.dropdown')
+      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
     })
   }
 
@@ -784,7 +730,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
     if (!selector) {
       selector = $this.attr('href')
-      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
     }
 
     var $parent = selector && $(selector)
@@ -826,32 +772,22 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   $(document)
     .on('click.bs.dropdown.data-api', clearMenus)
     .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
 
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: modal.js v3.0.3
+ * Bootstrap: modal.js v3.1.0
  * http://getbootstrap.com/javascript/#modals
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // MODAL CLASS DEFINITION
   // ======================
@@ -862,13 +798,19 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     this.$backdrop =
     this.isShown   = null
 
-    if (this.options.remote) this.$element.load(this.options.remote)
+    if (this.options.remote) {
+      this.$element
+        .find('.modal-content')
+        .load(this.options.remote, $.proxy(function () {
+          this.$element.trigger('loaded.bs.modal')
+        }, this))
+    }
   }
 
   Modal.DEFAULTS = {
-      backdrop: true
-    , keyboard: true
-    , show: true
+    backdrop: true,
+    keyboard: true,
+    show: true
   }
 
   Modal.prototype.toggle = function (_relatedTarget) {
@@ -887,7 +829,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
     this.escape()
 
-    this.$element.on('click.dismiss.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
+    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
 
     this.backdrop(function () {
       var transition = $.support.transition && that.$element.hasClass('fade')
@@ -896,7 +838,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
         that.$element.appendTo(document.body) // don't move modals dom position
       }
 
-      that.$element.show()
+      that.$element
+        .show()
+        .scrollTop(0)
 
       if (transition) {
         that.$element[0].offsetWidth // force reflow
@@ -938,7 +882,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     this.$element
       .removeClass('in')
       .attr('aria-hidden', true)
-      .off('click.dismiss.modal')
+      .off('click.dismiss.bs.modal')
 
     $.support.transition && this.$element.hasClass('fade') ?
       this.$element
@@ -982,7 +926,6 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Modal.prototype.backdrop = function (callback) {
-    var that    = this
     var animate = this.$element.hasClass('fade') ? 'fade' : ''
 
     if (this.isShown && this.options.backdrop) {
@@ -991,7 +934,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(document.body)
 
-      this.$element.on('click.dismiss.modal', $.proxy(function (e) {
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
         if (e.target !== e.currentTarget) return
         this.options.backdrop == 'static'
           ? this.$element[0].focus.call(this.$element[0])
@@ -1013,7 +956,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     } else if (!this.isShown && this.$backdrop) {
       this.$backdrop.removeClass('in')
 
-      $.support.transition && this.$element.hasClass('fade')?
+      $.support.transition && this.$element.hasClass('fade') ?
         this.$backdrop
           .one($.support.transition.end, callback)
           .emulateTransitionEnd(150) :
@@ -1061,9 +1004,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     var $this   = $(this)
     var href    = $this.attr('href')
     var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-    var option  = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
 
-    e.preventDefault()
+    if ($this.is('a')) e.preventDefault()
 
     $target
       .modal(option, this)
@@ -1073,33 +1016,23 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   })
 
   $(document)
-    .on('show.bs.modal',  '.modal', function () { $(document.body).addClass('modal-open') })
+    .on('show.bs.modal', '.modal', function () { $(document.body).addClass('modal-open') })
     .on('hidden.bs.modal', '.modal', function () { $(document.body).removeClass('modal-open') })
 
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: tooltip.js v3.0.3
+ * Bootstrap: tooltip.js v3.1.0
  * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // TOOLTIP PUBLIC CLASS DEFINITION
   // ===============================
@@ -1116,15 +1049,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Tooltip.DEFAULTS = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-  , trigger: 'hover focus'
-  , title: ''
-  , delay: 0
-  , html: false
-  , container: false
+    animation: true,
+    placement: 'top',
+    selector: false,
+    template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+    trigger: 'hover focus',
+    title: '',
+    delay: 0,
+    html: false,
+    container: false
   }
 
   Tooltip.prototype.init = function (type, element, options) {
@@ -1141,8 +1074,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       if (trigger == 'click') {
         this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
       } else if (trigger != 'manual') {
-        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focus'
-        var eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
+        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
 
         this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
         this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
@@ -1163,8 +1096,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
     if (options.delay && typeof options.delay == 'number') {
       options.delay = {
-        show: options.delay
-      , hide: options.delay
+        show: options.delay,
+        hide: options.delay
       }
     }
 
@@ -1213,12 +1146,13 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Tooltip.prototype.show = function () {
-    var e = $.Event('show.bs.'+ this.type)
+    var e = $.Event('show.bs.' + this.type)
 
     if (this.hasContent() && this.enabled) {
       this.$element.trigger(e)
 
       if (e.isDefaultPrevented()) return
+      var that = this;
 
       var $tip = this.tip()
 
@@ -1268,11 +1202,21 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
 
       this.applyPlacement(calculatedOffset, placement)
-      this.$element.trigger('shown.bs.' + this.type)
+      this.hoverState = null
+
+      var complete = function() {
+        that.$element.trigger('shown.bs.' + that.type)
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        $tip
+          .one($.support.transition.end, complete)
+          .emulateTransitionEnd(150) :
+        complete()
     }
   }
 
-  Tooltip.prototype.applyPlacement = function(offset, placement) {
+  Tooltip.prototype.applyPlacement = function (offset, placement) {
     var replace
     var $tip   = this.tip()
     var width  = $tip[0].offsetWidth
@@ -1289,9 +1233,18 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     offset.top  = offset.top  + marginTop
     offset.left = offset.left + marginLeft
 
-    $tip
-      .offset(offset)
-      .addClass('in')
+    // $.fn.offset doesn't round pixel values
+    // so we use setOffset directly with our own function B-0
+    $.offset.setOffset($tip[0], $.extend({
+      using: function (props) {
+        $tip.css({
+          top: Math.round(props.top),
+          left: Math.round(props.left)
+        })
+      }
+    }, offset), 0)
+
+    $tip.addClass('in')
 
     // check to see if placing tip in new offset caused the tip to resize itself
     var actualWidth  = $tip[0].offsetWidth
@@ -1323,8 +1276,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     if (replace) $tip.offset(offset)
   }
 
-  Tooltip.prototype.replaceArrow = function(delta, dimension, position) {
-    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+  Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
+    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
   }
 
   Tooltip.prototype.setContent = function () {
@@ -1342,6 +1295,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
     function complete() {
       if (that.hoverState != 'in') $tip.detach()
+      that.$element.trigger('hidden.bs.' + that.type)
     }
 
     this.$element.trigger(e)
@@ -1356,7 +1310,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
         .emulateTransitionEnd(150) :
       complete()
 
-    this.$element.trigger('hidden.bs.' + this.type)
+    this.hoverState = null
 
     return this
   }
@@ -1375,8 +1329,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   Tooltip.prototype.getPosition = function () {
     var el = this.$element[0]
     return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-      width: el.offsetWidth
-    , height: el.offsetHeight
+      width: el.offsetWidth,
+      height: el.offsetHeight
     }, this.$element.offset())
   }
 
@@ -1432,6 +1386,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Tooltip.prototype.destroy = function () {
+    clearTimeout(this.timeout)
     this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
   }
 
@@ -1447,6 +1402,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       var data    = $this.data('bs.tooltip')
       var options = typeof option == 'object' && option
 
+      if (!data && option == 'destroy') return
       if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
       if (typeof option == 'string') data[option]()
     })
@@ -1466,26 +1422,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: popover.js v3.0.3
+ * Bootstrap: popover.js v3.1.0
  * http://getbootstrap.com/javascript/#popovers
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // POPOVER PUBLIC CLASS DEFINITION
   // ===============================
@@ -1496,11 +1442,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
   if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
-  Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+    placement: 'right',
+    trigger: 'click',
+    content: '',
+    template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
   })
 
 
@@ -1521,7 +1467,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     var content = this.getContent()
 
     $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-    $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+    $tip.find('.popover-content')[ // we use append for html objects to maintain js events
+      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
+    ](content)
 
     $tip.removeClass('fade top bottom left right in')
 
@@ -1565,6 +1513,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       var data    = $this.data('bs.popover')
       var options = typeof option == 'object' && option
 
+      if (!data && option == 'destroy') return
       if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
       if (typeof option == 'string') data[option]()
     })
@@ -1584,26 +1533,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: scrollspy.js v3.0.3
+ * Bootstrap: scrollspy.js v3.1.0
  * http://getbootstrap.com/javascript/#scrollspy
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // SCROLLSPY CLASS DEFINITION
   // ==========================
@@ -1643,10 +1582,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       .map(function () {
         var $el   = $(this)
         var href  = $el.data('target') || $el.attr('href')
-        var $href = /^#\w/.test(href) && $(href)
+        var $href = /^#./.test(href) && $(href)
 
         return ($href
           && $href.length
+          && $href.is(':visible')
           && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
       })
       .sort(function (a, b) { return a[0] - b[0] })
@@ -1669,6 +1609,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       return activeTarget != (i = targets.last()[0]) && this.activate(i)
     }
 
+    if (activeTarget && scrollTop <= offsets[0]) {
+      return activeTarget != (i = targets[0]) && this.activate(i)
+    }
+
     for (i = offsets.length; i--;) {
       activeTarget != targets[i]
         && scrollTop >= offsets[i]
@@ -1681,18 +1625,18 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     this.activeTarget = target
 
     $(this.selector)
-      .parents('.active')
+      .parentsUntil(this.options.target, '.active')
       .removeClass('active')
 
-    var selector = this.selector
-      + '[data-target="' + target + '"],'
-      + this.selector + '[href="' + target + '"]'
+    var selector = this.selector +
+        '[data-target="' + target + '"],' +
+        this.selector + '[href="' + target + '"]'
 
     var active = $(selector)
       .parents('li')
       .addClass('active')
 
-    if (active.parent('.dropdown-menu').length)  {
+    if (active.parent('.dropdown-menu').length) {
       active = active
         .closest('li.dropdown')
         .addClass('active')
@@ -1743,26 +1687,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: tab.js v3.0.3
+ * Bootstrap: tab.js v3.1.0
  * http://getbootstrap.com/javascript/#tabs
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // TAB CLASS DEFINITION
   // ====================
@@ -1797,8 +1731,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     this.activate($this.parent('li'), $ul)
     this.activate($target, $target.parent(), function () {
       $this.trigger({
-        type: 'shown.bs.tab'
-      , relatedTarget: previous
+        type: 'shown.bs.tab',
+        relatedTarget: previous
       })
     })
   }
@@ -1879,26 +1813,16 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 }(jQuery);
 
 /* ========================================================================
- * Bootstrap: affix.js v3.0.3
+ * Bootstrap: affix.js v3.1.0
  * http://getbootstrap.com/javascript/#affix
  * ========================================================================
- * Copyright 2013 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  * ======================================================================== */
 
 
-+function ($) { "use strict";
++function ($) {
+  'use strict';
 
   // AFFIX CLASS DEFINITION
   // ======================
@@ -1909,9 +1833,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
       .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
       .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
 
-    this.$element = $(element)
-    this.affixed  =
-    this.unpin    = null
+    this.$element     = $(element)
+    this.affixed      =
+    this.unpin        =
+    this.pinnedOffset = null
 
     this.checkPosition()
   }
@@ -1922,6 +1847,14 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     offset: 0
   }
 
+  Affix.prototype.getPinnedOffset = function () {
+    if (this.pinnedOffset) return this.pinnedOffset
+    this.$element.removeClass(Affix.RESET).addClass('affix')
+    var scrollTop = this.$window.scrollTop()
+    var position  = this.$element.offset()
+    return (this.pinnedOffset = position.top - scrollTop)
+  }
+
   Affix.prototype.checkPositionWithEventLoop = function () {
     setTimeout($.proxy(this.checkPosition, this), 1)
   }
@@ -1936,9 +1869,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     var offsetTop    = offset.top
     var offsetBottom = offset.bottom
 
+    if (this.affixed == 'top') position.top += scrollTop
+
     if (typeof offset != 'object')         offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function')    offsetTop    = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
 
     var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
                 offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
@@ -1947,13 +1882,23 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     if (this.affixed === affix) return
     if (this.unpin) this.$element.css('top', '')
 
+    var affixType = 'affix' + (affix ? '-' + affix : '')
+    var e         = $.Event(affixType + '.bs.affix')
+
+    this.$element.trigger(e)
+
+    if (e.isDefaultPrevented()) return
+
     this.affixed = affix
-    this.unpin   = affix == 'bottom' ? position.top - scrollTop : null
+    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
 
-    this.$element.removeClass(Affix.RESET).addClass('affix' + (affix ? '-' + affix : ''))
+    this.$element
+      .removeClass(Affix.RESET)
+      .addClass(affixType)
+      .trigger($.Event(affixType.replace('affix', 'affixed')))
 
     if (affix == 'bottom') {
-      this.$element.offset({ top: document.body.offsetHeight - offsetBottom - this.$element.height() })
+      this.$element.offset({ top: scrollHeight - offsetBottom - this.$element.height() })
     }
   }
 
diff --git a/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.min.js b/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.min.js
index 1a6258e..1d4a4ed 100644
--- a/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.min.js
+++ b/plugins/system/t3/base-bs3/bootstrap/js/bootstrap.min.js
@@ -1,7 +1,6 @@
 /*!
- * Bootstrap v3.0.3 (http://getbootstrap.com)
- * Copyright 2013 Twitter, Inc.
- * Licensed under http://www.apache.org/licenses/LICENSE-2.0
+ * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
-
-if("undefined"==typeof jQuery)throw new Error("Bootstrap requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]}}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d)};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(a){var b="disabled",c=this.$element,d=c.is("input")?"val":"html",e=c.data();a+="Text",e.resetText||c.data("resetText",c[d]()),c[d](e[a]||this.options[a]),setTimeout(function(){"loadingText"==a?c.addClass(b).attr(b,b):c.removeClass(b).removeAttr(b)},0)},b.prototype.toggle=function(){var a=this.$element.closest('[data-toggle="buttons"]'),b=!0;if(a.length){var c=this.$element.find("input");"radio"===c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?b=!1:a.find(".active").removeClass("active")),b&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}b&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition.end&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}this.sliding=!0,f&&this.pause();var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});if(!e.hasClass("active")){if(this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")){if(this.$element.trigger(j),j.isDefaultPrevented())return;e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(600)}else{if(this.$element.trigger(j),j.isDefaultPrevented())return;d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")}return f&&this.cycle(),this}};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?(this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350),void 0):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(jQuery),+function(a){"use strict";function b(){a(d).remove(),a(e).each(function(b){var d=c(a(this));d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown")),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown"))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){if("ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b),f.trigger(d=a.Event("show.bs.dropdown")),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown"),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=a("[role=menu] li:not(.divider):visible a",f);if(h.length){var i=h.index(h.filter(":focus"));38==b.keyCode&&i>0&&i--,40==b.keyCode&&i<h.length-1&&i++,~i||(i=0),h.eq(i).focus()}}}};var g=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new f(this)),"string"==typeof b&&d[b].call(c)})},a.fn.dropdown.Constructor=f,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=g,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",e,f.prototype.toggle).on("keydown.bs.dropdown.data-api",e+", [role=menu]",f.prototype.keydown)}(jQuery),+function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b),this.$backdrop=this.isShown=null,this.options.remote&&this.$element.load(this.options.remote)};b.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},b.prototype.toggle=function(a){return this[this.isShown?"hide":"show"](a)},b.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.$element.on("click.dismiss.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(document.body),c.$element.show(),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one(a.support.transition.end,function(){c.$element.focus().trigger(e)}).emulateTransitionEnd(300):c.$element.focus().trigger(e)}))},b.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one(a.support.transition.end,a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},b.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.focus()},this))},b.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},b.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden.bs.modal")})},b.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},b.prototype.backdrop=function(b){var c=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var d=a.support.transition&&c;if(this.$backdrop=a('<div class="modal-backdrop '+c+'" />').appendTo(document.body),this.$element.on("click.dismiss.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focus",i="hover"==g?"mouseleave":"blur";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show),void 0):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide),void 0):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this.tip();this.setContent(),this.options.animation&&c.addClass("fade");var d="function"==typeof this.options.placement?this.options.placement.call(this,c[0],this.$element[0]):this.options.placement,e=/\s?auto?\s?/i,f=e.test(d);f&&(d=d.replace(e,"")||"top"),c.detach().css({top:0,left:0,display:"block"}).addClass(d),this.options.container?c.appendTo(this.options.container):c.insertAfter(this.$element);var g=this.getPosition(),h=c[0].offsetWidth,i=c[0].offsetHeight;if(f){var j=this.$element.parent(),k=d,l=document.documentElement.scrollTop||document.body.scrollTop,m="body"==this.options.container?window.innerWidth:j.outerWidth(),n="body"==this.options.container?window.innerHeight:j.outerHeight(),o="body"==this.options.container?0:j.offset().left;d="bottom"==d&&g.top+g.height+i-l>n?"top":"top"==d&&g.top-l-i<0?"bottom":"right"==d&&g.right+h>m?"left":"left"==d&&g.left-h<o?"right":d,c.removeClass(k).addClass(d)}var p=this.getCalculatedOffset(d,g,h,i);this.applyPlacement(p,d),this.$element.trigger("shown.bs."+this.type)}},b.prototype.applyPlacement=function(a,b){var c,d=this.tip(),e=d[0].offsetWidth,f=d[0].offsetHeight,g=parseInt(d.css("margin-top"),10),h=parseInt(d.css("margin-left"),10);isNaN(g)&&(g=0),isNaN(h)&&(h=0),a.top=a.top+g,a.left=a.left+h,d.offset(a).addClass("in");var i=d[0].offsetWidth,j=d[0].offsetHeight;if("top"==b&&j!=f&&(c=!0,a.top=a.top+f-j),/bottom|top/.test(b)){var k=0;a.left<0&&(k=-2*a.left,a.left=0,d.offset(a),i=d[0].offsetWidth,j=d[0].offsetHeight),this.replaceArrow(k-e+i,i,"left")}else this.replaceArrow(j-f,j,"top");c&&d.offset(a)},b.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},b.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach()}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.trigger(e),e.isDefaultPrevented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,b).emulateTransitionEnd(150):b(),this.$element.trigger("hidden.bs."+this.type),this)},b.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},b.prototype.hasContent=function(){return this.getTitle()},b.prototype.getPosition=function(){var b=this.$element[0];return a.extend({},"function"==typeof b.getBoundingClientRect?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},b.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},b.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},b.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},b.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},b.prototype.enable=function(){this.enabled=!0},b.prototype.disable=function(){this.enabled=!1},b.prototype.toggleEnabled=function(){this.enabled=!this.enabled},b.prototype.toggle=function(b){var c=b?a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type):this;c.tip().hasClass("in")?c.leave(c):c.enter(c)},b.prototype.destroy=function(){this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof c&&c;e||d.data("bs.tooltip",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.tooltip.Constructor=b,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(jQuery),+function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");b.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"html":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(c).is("body")?a(window):a(c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#\w/.test(e)&&a(e);return f&&f.length&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parents(".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top()),"function"==typeof h&&(h=f.bottom());var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;this.affixed!==i&&(this.unpin&&this.$element.css("top",""),this.affixed=i,this.unpin="bottom"==i?e.top-d:null,this.$element.removeClass(b.RESET).addClass("affix"+(i?"-"+i:"")),"bottom"==i&&this.$element.offset({top:document.body.offsetHeight-h-this.$element.height()}))}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery);
\ No newline at end of file
+if("undefined"==typeof jQuery)throw new Error("Bootstrap requires jQuery");+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"};for(var c in b)if(void 0!==a.style[c])return{end:b[c]};return!1}a.fn.emulateTransitionEnd=function(b){var c=!1,d=this;a(this).one(a.support.transition.end,function(){c=!0});var e=function(){c||a(d).trigger(a.support.transition.end)};return setTimeout(e,b),this},a(function(){a.support.transition=b()})}(jQuery),+function(a){"use strict";var b='[data-dismiss="alert"]',c=function(c){a(c).on("click",b,this.close)};c.prototype.close=function(b){function c(){f.trigger("closed.bs.alert").remove()}var d=a(this),e=d.attr("data-target");e||(e=d.attr("href"),e=e&&e.replace(/.*(?=#[^\s]*$)/,""));var f=a(e);b&&b.preventDefault(),f.length||(f=d.hasClass("alert")?d:d.parent()),f.trigger(b=a.Event("close.bs.alert")),b.isDefaultPrevented()||(f.removeClass("in"),a.support.transition&&f.hasClass("fade")?f.one(a.support.transition.end,c).emulateTransitionEnd(150):c())};var d=a.fn.alert;a.fn.alert=function(b){return this.each(function(){var d=a(this),e=d.data("bs.alert");e||d.data("bs.alert",e=new c(this)),"string"==typeof b&&e[b].call(d)})},a.fn.alert.Constructor=c,a.fn.alert.noConflict=function(){return a.fn.alert=d,this},a(document).on("click.bs.alert.data-api",b,c.prototype.close)}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.isLoading=!1};b.DEFAULTS={loadingText:"loading..."},b.prototype.setState=function(b){var c="disabled",d=this.$element,e=d.is("input")?"val":"html",f=d.data();b+="Text",f.resetText||d.data("resetText",d[e]()),d[e](f[b]||this.options[b]),setTimeout(a.proxy(function(){"loadingText"==b?(this.isLoading=!0,d.addClass(c).attr(c,c)):this.isLoading&&(this.isLoading=!1,d.removeClass(c).removeAttr(c))},this),0)},b.prototype.toggle=function(){var a=!0,b=this.$element.closest('[data-toggle="buttons"]');if(b.length){var c=this.$element.find("input");"radio"==c.prop("type")&&(c.prop("checked")&&this.$element.hasClass("active")?a=!1:b.find(".active").removeClass("active")),a&&c.prop("checked",!this.$element.hasClass("active")).trigger("change")}a&&this.$element.toggleClass("active")};var c=a.fn.button;a.fn.button=function(c){return this.each(function(){var d=a(this),e=d.data("bs.button"),f="object"==typeof c&&c;e||d.data("bs.button",e=new b(this,f)),"toggle"==c?e.toggle():c&&e.setState(c)})},a.fn.button.Constructor=b,a.fn.button.noConflict=function(){return a.fn.button=c,this},a(document).on("click.bs.button.data-api","[data-toggle^=button]",function(b){var c=a(b.target);c.hasClass("btn")||(c=c.closest(".btn")),c.button("toggle"),b.preventDefault()})}(jQuery),+function(a){"use strict";var b=function(b,c){this.$element=a(b),this.$indicators=this.$element.find(".carousel-indicators"),this.options=c,this.paused=this.sliding=this.interval=this.$active=this.$items=null,"hover"==this.options.pause&&this.$element.on("mouseenter",a.proxy(this.pause,this)).on("mouseleave",a.proxy(this.cycle,this))};b.DEFAULTS={interval:5e3,pause:"hover",wrap:!0},b.prototype.cycle=function(b){return b||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(a.proxy(this.next,this),this.options.interval)),this},b.prototype.getActiveIndex=function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},b.prototype.to=function(b){var c=this,d=this.getActiveIndex();return b>this.$items.length-1||0>b?void 0:this.sliding?this.$element.one("slid.bs.carousel",function(){c.to(b)}):d==b?this.pause().cycle():this.slide(b>d?"next":"prev",a(this.$items[b]))},b.prototype.pause=function(b){return b||(this.paused=!0),this.$element.find(".next, .prev").length&&a.support.transition&&(this.$element.trigger(a.support.transition.end),this.cycle(!0)),this.interval=clearInterval(this.interval),this},b.prototype.next=function(){return this.sliding?void 0:this.slide("next")},b.prototype.prev=function(){return this.sliding?void 0:this.slide("prev")},b.prototype.slide=function(b,c){var d=this.$element.find(".item.active"),e=c||d[b](),f=this.interval,g="next"==b?"left":"right",h="next"==b?"first":"last",i=this;if(!e.length){if(!this.options.wrap)return;e=this.$element.find(".item")[h]()}if(e.hasClass("active"))return this.sliding=!1;var j=a.Event("slide.bs.carousel",{relatedTarget:e[0],direction:g});return this.$element.trigger(j),j.isDefaultPrevented()?void 0:(this.sliding=!0,f&&this.pause(),this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid.bs.carousel",function(){var b=a(i.$indicators.children()[i.getActiveIndex()]);b&&b.addClass("active")})),a.support.transition&&this.$element.hasClass("slide")?(e.addClass(b),e[0].offsetWidth,d.addClass(g),e.addClass(g),d.one(a.support.transition.end,function(){e.removeClass([b,g].join(" ")).addClass("active"),d.removeClass(["active",g].join(" ")),i.sliding=!1,setTimeout(function(){i.$element.trigger("slid.bs.carousel")},0)}).emulateTransitionEnd(1e3*d.css("transition-duration").slice(0,-1))):(d.removeClass("active"),e.addClass("active"),this.sliding=!1,this.$element.trigger("slid.bs.carousel")),f&&this.cycle(),this)};var c=a.fn.carousel;a.fn.carousel=function(c){return this.each(function(){var d=a(this),e=d.data("bs.carousel"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c),g="string"==typeof c?c:f.slide;e||d.data("bs.carousel",e=new b(this,f)),"number"==typeof c?e.to(c):g?e[g]():f.interval&&e.pause().cycle()})},a.fn.carousel.Constructor=b,a.fn.carousel.noConflict=function(){return a.fn.carousel=c,this},a(document).on("click.bs.carousel.data-api","[data-slide], [data-slide-to]",function(b){var c,d=a(this),e=a(d.attr("data-target")||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,"")),f=a.extend({},e.data(),d.data()),g=d.attr("data-slide-to");g&&(f.interval=!1),e.carousel(f),(g=d.attr("data-slide-to"))&&e.data("bs.carousel").to(g),b.preventDefault()}),a(window).on("load",function(){a('[data-ride="carousel"]').each(function(){var b=a(this);b.carousel(b.data())})})}(jQuery),+function(a){"use strict";var b=function(c,d){this.$element=a(c),this.options=a.extend({},b.DEFAULTS,d),this.transitioning=null,this.options.parent&&(this.$parent=a(this.options.parent)),this.options.toggle&&this.toggle()};b.DEFAULTS={toggle:!0},b.prototype.dimension=function(){var a=this.$element.hasClass("width");return a?"width":"height"},b.prototype.show=function(){if(!this.transitioning&&!this.$element.hasClass("in")){var b=a.Event("show.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.$parent&&this.$parent.find("> .panel > .in");if(c&&c.length){var d=c.data("bs.collapse");if(d&&d.transitioning)return;c.collapse("hide"),d||c.data("bs.collapse",null)}var e=this.dimension();this.$element.removeClass("collapse").addClass("collapsing")[e](0),this.transitioning=1;var f=function(){this.$element.removeClass("collapsing").addClass("collapse in")[e]("auto"),this.transitioning=0,this.$element.trigger("shown.bs.collapse")};if(!a.support.transition)return f.call(this);var g=a.camelCase(["scroll",e].join("-"));this.$element.one(a.support.transition.end,a.proxy(f,this)).emulateTransitionEnd(350)[e](this.$element[0][g])}}},b.prototype.hide=function(){if(!this.transitioning&&this.$element.hasClass("in")){var b=a.Event("hide.bs.collapse");if(this.$element.trigger(b),!b.isDefaultPrevented()){var c=this.dimension();this.$element[c](this.$element[c]())[0].offsetHeight,this.$element.addClass("collapsing").removeClass("collapse").removeClass("in"),this.transitioning=1;var d=function(){this.transitioning=0,this.$element.trigger("hidden.bs.collapse").removeClass("collapsing").addClass("collapse")};return a.support.transition?void this.$element[c](0).one(a.support.transition.end,a.proxy(d,this)).emulateTransitionEnd(350):d.call(this)}}},b.prototype.toggle=function(){this[this.$element.hasClass("in")?"hide":"show"]()};var c=a.fn.collapse;a.fn.collapse=function(c){return this.each(function(){var d=a(this),e=d.data("bs.collapse"),f=a.extend({},b.DEFAULTS,d.data(),"object"==typeof c&&c);!e&&f.toggle&&"show"==c&&(c=!c),e||d.data("bs.collapse",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.collapse.Constructor=b,a.fn.collapse.noConflict=function(){return a.fn.collapse=c,this},a(document).on("click.bs.collapse.data-api","[data-toggle=collapse]",function(b){var c,d=a(this),e=d.attr("data-target")||b.preventDefault()||(c=d.attr("href"))&&c.replace(/.*(?=#[^\s]+$)/,""),f=a(e),g=f.data("bs.collapse"),h=g?"toggle":d.data(),i=d.attr("data-parent"),j=i&&a(i);g&&g.transitioning||(j&&j.find('[data-toggle=collapse][data-parent="'+i+'"]').not(d).addClass("collapsed"),d[f.hasClass("in")?"addClass":"removeClass"]("collapsed")),f.collapse(h)})}(jQuery),+function(a){"use strict";function b(b){a(d).remove(),a(e).each(function(){var d=c(a(this)),e={relatedTarget:this};d.hasClass("open")&&(d.trigger(b=a.Event("hide.bs.dropdown",e)),b.isDefaultPrevented()||d.removeClass("open").trigger("hidden.bs.dropdown",e))})}function c(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}var d=".dropdown-backdrop",e="[data-toggle=dropdown]",f=function(b){a(b).on("click.bs.dropdown",this.toggle)};f.prototype.toggle=function(d){var e=a(this);if(!e.is(".disabled, :disabled")){var f=c(e),g=f.hasClass("open");if(b(),!g){"ontouchstart"in document.documentElement&&!f.closest(".navbar-nav").length&&a('<div class="dropdown-backdrop"/>').insertAfter(a(this)).on("click",b);var h={relatedTarget:this};if(f.trigger(d=a.Event("show.bs.dropdown",h)),d.isDefaultPrevented())return;f.toggleClass("open").trigger("shown.bs.dropdown",h),e.focus()}return!1}},f.prototype.keydown=function(b){if(/(38|40|27)/.test(b.keyCode)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var f=c(d),g=f.hasClass("open");if(!g||g&&27==b.keyCode)return 27==b.which&&f.find(e).focus(),d.click();var h=" li:not(.divider):visible a",i=f.find("[role=menu]"+h+", [role=listbox]"+h);if(i.length){var j=i.index(i.filter(":focus"));38==b.keyCode&&j>0&&j--,40==b.keyCode&&j<i.length-1&&j++,~j||(j=0),i.eq(j).focus()}}}};var g=a.fn.dropdown;a.fn.dropdown=function(b){return this.each(function(){var c=a(this),d=c.data("bs.dropdown");d||c.data("bs.dropdown",d=new f(this)),"string"==typeof b&&d[b].call(c)})},a.fn.dropdown.Constructor=f,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=g,this},a(document).on("click.bs.dropdown.data-api",b).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",e,f.prototype.toggle).on("keydown.bs.dropdown.data-api",e+", [role=menu], [role=listbox]",f.prototype.keydown)}(jQuery),+function(a){"use strict";var b=function(b,c){this.options=c,this.$element=a(b),this.$backdrop=this.isShown=null,this.options.remote&&this.$element.find(".modal-content").load(this.options.remote,a.proxy(function(){this.$element.trigger("loaded.bs.modal")},this))};b.DEFAULTS={backdrop:!0,keyboard:!0,show:!0},b.prototype.toggle=function(a){return this[this.isShown?"hide":"show"](a)},b.prototype.show=function(b){var c=this,d=a.Event("show.bs.modal",{relatedTarget:b});this.$element.trigger(d),this.isShown||d.isDefaultPrevented()||(this.isShown=!0,this.escape(),this.$element.on("click.dismiss.bs.modal",'[data-dismiss="modal"]',a.proxy(this.hide,this)),this.backdrop(function(){var d=a.support.transition&&c.$element.hasClass("fade");c.$element.parent().length||c.$element.appendTo(document.body),c.$element.show().scrollTop(0),d&&c.$element[0].offsetWidth,c.$element.addClass("in").attr("aria-hidden",!1),c.enforceFocus();var e=a.Event("shown.bs.modal",{relatedTarget:b});d?c.$element.find(".modal-dialog").one(a.support.transition.end,function(){c.$element.focus().trigger(e)}).emulateTransitionEnd(300):c.$element.focus().trigger(e)}))},b.prototype.hide=function(b){b&&b.preventDefault(),b=a.Event("hide.bs.modal"),this.$element.trigger(b),this.isShown&&!b.isDefaultPrevented()&&(this.isShown=!1,this.escape(),a(document).off("focusin.bs.modal"),this.$element.removeClass("in").attr("aria-hidden",!0).off("click.dismiss.bs.modal"),a.support.transition&&this.$element.hasClass("fade")?this.$element.one(a.support.transition.end,a.proxy(this.hideModal,this)).emulateTransitionEnd(300):this.hideModal())},b.prototype.enforceFocus=function(){a(document).off("focusin.bs.modal").on("focusin.bs.modal",a.proxy(function(a){this.$element[0]===a.target||this.$element.has(a.target).length||this.$element.focus()},this))},b.prototype.escape=function(){this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.bs.modal",a.proxy(function(a){27==a.which&&this.hide()},this)):this.isShown||this.$element.off("keyup.dismiss.bs.modal")},b.prototype.hideModal=function(){var a=this;this.$element.hide(),this.backdrop(function(){a.removeBackdrop(),a.$element.trigger("hidden.bs.modal")})},b.prototype.removeBackdrop=function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},b.prototype.backdrop=function(b){var c=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var d=a.support.transition&&c;if(this.$backdrop=a('<div class="modal-backdrop '+c+'" />').appendTo(document.body),this.$element.on("click.dismiss.bs.modal",a.proxy(function(a){a.target===a.currentTarget&&("static"==this.options.backdrop?this.$element[0].focus.call(this.$element[0]):this.hide.call(this))},this)),d&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in"),!b)return;d?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),a.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(a.support.transition.end,b).emulateTransitionEnd(150):b()):b&&b()};var c=a.fn.modal;a.fn.modal=function(c,d){return this.each(function(){var e=a(this),f=e.data("bs.modal"),g=a.extend({},b.DEFAULTS,e.data(),"object"==typeof c&&c);f||e.data("bs.modal",f=new b(this,g)),"string"==typeof c?f[c](d):g.show&&f.show(d)})},a.fn.modal.Constructor=b,a.fn.modal.noConflict=function(){return a.fn.modal=c,this},a(document).on("click.bs.modal.data-api",'[data-toggle="modal"]',function(b){var c=a(this),d=c.attr("href"),e=a(c.attr("data-target")||d&&d.replace(/.*(?=#[^\s]+$)/,"")),f=e.data("bs.modal")?"toggle":a.extend({remote:!/#/.test(d)&&d},e.data(),c.data());c.is("a")&&b.preventDefault(),e.modal(f,this).one("hide",function(){c.is(":visible")&&c.focus()})}),a(document).on("show.bs.modal",".modal",function(){a(document.body).addClass("modal-open")}).on("hidden.bs.modal",".modal",function(){a(document.body).removeClass("modal-open")})}(jQuery),+function(a){"use strict";var b=function(a,b){this.type=this.options=this.enabled=this.timeout=this.hoverState=this.$element=null,this.init("tooltip",a,b)};b.DEFAULTS={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},b.prototype.init=function(b,c,d){this.enabled=!0,this.type=b,this.$element=a(c),this.options=this.getOptions(d);for(var e=this.options.trigger.split(" "),f=e.length;f--;){var g=e[f];if("click"==g)this.$element.on("click."+this.type,this.options.selector,a.proxy(this.toggle,this));else if("manual"!=g){var h="hover"==g?"mouseenter":"focusin",i="hover"==g?"mouseleave":"focusout";this.$element.on(h+"."+this.type,this.options.selector,a.proxy(this.enter,this)),this.$element.on(i+"."+this.type,this.options.selector,a.proxy(this.leave,this))}}this.options.selector?this._options=a.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.getOptions=function(b){return b=a.extend({},this.getDefaults(),this.$element.data(),b),b.delay&&"number"==typeof b.delay&&(b.delay={show:b.delay,hide:b.delay}),b},b.prototype.getDelegateOptions=function(){var b={},c=this.getDefaults();return this._options&&a.each(this._options,function(a,d){c[a]!=d&&(b[a]=d)}),b},b.prototype.enter=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="in",c.options.delay&&c.options.delay.show?void(c.timeout=setTimeout(function(){"in"==c.hoverState&&c.show()},c.options.delay.show)):c.show()},b.prototype.leave=function(b){var c=b instanceof this.constructor?b:a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type);return clearTimeout(c.timeout),c.hoverState="out",c.options.delay&&c.options.delay.hide?void(c.timeout=setTimeout(function(){"out"==c.hoverState&&c.hide()},c.options.delay.hide)):c.hide()},b.prototype.show=function(){var b=a.Event("show.bs."+this.type);if(this.hasContent()&&this.enabled){if(this.$element.trigger(b),b.isDefaultPrevented())return;var c=this,d=this.tip();this.setContent(),this.options.animation&&d.addClass("fade");var e="function"==typeof this.options.placement?this.options.placement.call(this,d[0],this.$element[0]):this.options.placement,f=/\s?auto?\s?/i,g=f.test(e);g&&(e=e.replace(f,"")||"top"),d.detach().css({top:0,left:0,display:"block"}).addClass(e),this.options.container?d.appendTo(this.options.container):d.insertAfter(this.$element);var h=this.getPosition(),i=d[0].offsetWidth,j=d[0].offsetHeight;if(g){var k=this.$element.parent(),l=e,m=document.documentElement.scrollTop||document.body.scrollTop,n="body"==this.options.container?window.innerWidth:k.outerWidth(),o="body"==this.options.container?window.innerHeight:k.outerHeight(),p="body"==this.options.container?0:k.offset().left;e="bottom"==e&&h.top+h.height+j-m>o?"top":"top"==e&&h.top-m-j<0?"bottom":"right"==e&&h.right+i>n?"left":"left"==e&&h.left-i<p?"right":e,d.removeClass(l).addClass(e)}var q=this.getCalculatedOffset(e,h,i,j);this.applyPlacement(q,e),this.hoverState=null;var r=function(){c.$element.trigger("shown.bs."+c.type)};a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,r).emulateTransitionEnd(150):r()}},b.prototype.applyPlacement=function(b,c){var d,e=this.tip(),f=e[0].offsetWidth,g=e[0].offsetHeight,h=parseInt(e.css("margin-top"),10),i=parseInt(e.css("margin-left"),10);isNaN(h)&&(h=0),isNaN(i)&&(i=0),b.top=b.top+h,b.left=b.left+i,a.offset.setOffset(e[0],a.extend({using:function(a){e.css({top:Math.round(a.top),left:Math.round(a.left)})}},b),0),e.addClass("in");var j=e[0].offsetWidth,k=e[0].offsetHeight;if("top"==c&&k!=g&&(d=!0,b.top=b.top+g-k),/bottom|top/.test(c)){var l=0;b.left<0&&(l=-2*b.left,b.left=0,e.offset(b),j=e[0].offsetWidth,k=e[0].offsetHeight),this.replaceArrow(l-f+j,j,"left")}else this.replaceArrow(k-g,k,"top");d&&e.offset(b)},b.prototype.replaceArrow=function(a,b,c){this.arrow().css(c,a?50*(1-a/b)+"%":"")},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle();a.find(".tooltip-inner")[this.options.html?"html":"text"](b),a.removeClass("fade in top bottom left right")},b.prototype.hide=function(){function b(){"in"!=c.hoverState&&d.detach(),c.$element.trigger("hidden.bs."+c.type)}var c=this,d=this.tip(),e=a.Event("hide.bs."+this.type);return this.$element.trigger(e),e.isDefaultPrevented()?void 0:(d.removeClass("in"),a.support.transition&&this.$tip.hasClass("fade")?d.one(a.support.transition.end,b).emulateTransitionEnd(150):b(),this.hoverState=null,this)},b.prototype.fixTitle=function(){var a=this.$element;(a.attr("title")||"string"!=typeof a.attr("data-original-title"))&&a.attr("data-original-title",a.attr("title")||"").attr("title","")},b.prototype.hasContent=function(){return this.getTitle()},b.prototype.getPosition=function(){var b=this.$element[0];return a.extend({},"function"==typeof b.getBoundingClientRect?b.getBoundingClientRect():{width:b.offsetWidth,height:b.offsetHeight},this.$element.offset())},b.prototype.getCalculatedOffset=function(a,b,c,d){return"bottom"==a?{top:b.top+b.height,left:b.left+b.width/2-c/2}:"top"==a?{top:b.top-d,left:b.left+b.width/2-c/2}:"left"==a?{top:b.top+b.height/2-d/2,left:b.left-c}:{top:b.top+b.height/2-d/2,left:b.left+b.width}},b.prototype.getTitle=function(){var a,b=this.$element,c=this.options;return a=b.attr("data-original-title")||("function"==typeof c.title?c.title.call(b[0]):c.title)},b.prototype.tip=function(){return this.$tip=this.$tip||a(this.options.template)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},b.prototype.validate=function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},b.prototype.enable=function(){this.enabled=!0},b.prototype.disable=function(){this.enabled=!1},b.prototype.toggleEnabled=function(){this.enabled=!this.enabled},b.prototype.toggle=function(b){var c=b?a(b.currentTarget)[this.type](this.getDelegateOptions()).data("bs."+this.type):this;c.tip().hasClass("in")?c.leave(c):c.enter(c)},b.prototype.destroy=function(){clearTimeout(this.timeout),this.hide().$element.off("."+this.type).removeData("bs."+this.type)};var c=a.fn.tooltip;a.fn.tooltip=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tooltip"),f="object"==typeof c&&c;(e||"destroy"!=c)&&(e||d.data("bs.tooltip",e=new b(this,f)),"string"==typeof c&&e[c]())})},a.fn.tooltip.Constructor=b,a.fn.tooltip.noConflict=function(){return a.fn.tooltip=c,this}}(jQuery),+function(a){"use strict";var b=function(a,b){this.init("popover",a,b)};if(!a.fn.tooltip)throw new Error("Popover requires tooltip.js");b.DEFAULTS=a.extend({},a.fn.tooltip.Constructor.DEFAULTS,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),b.prototype=a.extend({},a.fn.tooltip.Constructor.prototype),b.prototype.constructor=b,b.prototype.getDefaults=function(){return b.DEFAULTS},b.prototype.setContent=function(){var a=this.tip(),b=this.getTitle(),c=this.getContent();a.find(".popover-title")[this.options.html?"html":"text"](b),a.find(".popover-content")[this.options.html?"string"==typeof c?"html":"append":"text"](c),a.removeClass("fade top bottom left right in"),a.find(".popover-title").html()||a.find(".popover-title").hide()},b.prototype.hasContent=function(){return this.getTitle()||this.getContent()},b.prototype.getContent=function(){var a=this.$element,b=this.options;return a.attr("data-content")||("function"==typeof b.content?b.content.call(a[0]):b.content)},b.prototype.arrow=function(){return this.$arrow=this.$arrow||this.tip().find(".arrow")},b.prototype.tip=function(){return this.$tip||(this.$tip=a(this.options.template)),this.$tip};var c=a.fn.popover;a.fn.popover=function(c){return this.each(function(){var d=a(this),e=d.data("bs.popover"),f="object"==typeof c&&c;(e||"destroy"!=c)&&(e||d.data("bs.popover",e=new b(this,f)),"string"==typeof c&&e[c]())})},a.fn.popover.Constructor=b,a.fn.popover.noConflict=function(){return a.fn.popover=c,this}}(jQuery),+function(a){"use strict";function b(c,d){var e,f=a.proxy(this.process,this);this.$element=a(a(c).is("body")?window:c),this.$body=a("body"),this.$scrollElement=this.$element.on("scroll.bs.scroll-spy.data-api",f),this.options=a.extend({},b.DEFAULTS,d),this.selector=(this.options.target||(e=a(c).attr("href"))&&e.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.offsets=a([]),this.targets=a([]),this.activeTarget=null,this.refresh(),this.process()}b.DEFAULTS={offset:10},b.prototype.refresh=function(){var b=this.$element[0]==window?"offset":"position";this.offsets=a([]),this.targets=a([]);{var c=this;this.$body.find(this.selector).map(function(){var d=a(this),e=d.data("target")||d.attr("href"),f=/^#./.test(e)&&a(e);return f&&f.length&&f.is(":visible")&&[[f[b]().top+(!a.isWindow(c.$scrollElement.get(0))&&c.$scrollElement.scrollTop()),e]]||null}).sort(function(a,b){return a[0]-b[0]}).each(function(){c.offsets.push(this[0]),c.targets.push(this[1])})}},b.prototype.process=function(){var a,b=this.$scrollElement.scrollTop()+this.options.offset,c=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,d=c-this.$scrollElement.height(),e=this.offsets,f=this.targets,g=this.activeTarget;if(b>=d)return g!=(a=f.last()[0])&&this.activate(a);if(g&&b<=e[0])return g!=(a=f[0])&&this.activate(a);for(a=e.length;a--;)g!=f[a]&&b>=e[a]&&(!e[a+1]||b<=e[a+1])&&this.activate(f[a])},b.prototype.activate=function(b){this.activeTarget=b,a(this.selector).parentsUntil(this.options.target,".active").removeClass("active");var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")};var c=a.fn.scrollspy;a.fn.scrollspy=function(c){return this.each(function(){var d=a(this),e=d.data("bs.scrollspy"),f="object"==typeof c&&c;e||d.data("bs.scrollspy",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return a.fn.scrollspy=c,this},a(window).on("load",function(){a('[data-spy="scroll"]').each(function(){var b=a(this);b.scrollspy(b.data())})})}(jQuery),+function(a){"use strict";var b=function(b){this.element=a(b)};b.prototype.show=function(){var b=this.element,c=b.closest("ul:not(.dropdown-menu)"),d=b.data("target");if(d||(d=b.attr("href"),d=d&&d.replace(/.*(?=#[^\s]*$)/,"")),!b.parent("li").hasClass("active")){var e=c.find(".active:last a")[0],f=a.Event("show.bs.tab",{relatedTarget:e});if(b.trigger(f),!f.isDefaultPrevented()){var g=a(d);this.activate(b.parent("li"),c),this.activate(g,g.parent(),function(){b.trigger({type:"shown.bs.tab",relatedTarget:e})})}}},b.prototype.activate=function(b,c,d){function e(){f.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),b.addClass("active"),g?(b[0].offsetWidth,b.addClass("in")):b.removeClass("fade"),b.parent(".dropdown-menu")&&b.closest("li.dropdown").addClass("active"),d&&d()}var f=c.find("> .active"),g=d&&a.support.transition&&f.hasClass("fade");g?f.one(a.support.transition.end,e).emulateTransitionEnd(150):e(),f.removeClass("in")};var c=a.fn.tab;a.fn.tab=function(c){return this.each(function(){var d=a(this),e=d.data("bs.tab");e||d.data("bs.tab",e=new b(this)),"string"==typeof c&&e[c]()})},a.fn.tab.Constructor=b,a.fn.tab.noConflict=function(){return a.fn.tab=c,this},a(document).on("click.bs.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(b){b.preventDefault(),a(this).tab("show")})}(jQuery),+function(a){"use strict";var b=function(c,d){this.options=a.extend({},b.DEFAULTS,d),this.$window=a(window).on("scroll.bs.affix.data-api",a.proxy(this.checkPosition,this)).on("click.bs.affix.data-api",a.proxy(this.checkPositionWithEventLoop,this)),this.$element=a(c),this.affixed=this.unpin=this.pinnedOffset=null,this.checkPosition()};b.RESET="affix affix-top affix-bottom",b.DEFAULTS={offset:0},b.prototype.getPinnedOffset=function(){if(this.pinnedOffset)return this.pinnedOffset;this.$element.removeClass(b.RESET).addClass("affix");var a=this.$window.scrollTop(),c=this.$element.offset();return this.pinnedOffset=c.top-a},b.prototype.checkPositionWithEventLoop=function(){setTimeout(a.proxy(this.checkPosition,this),1)},b.prototype.checkPosition=function(){if(this.$element.is(":visible")){var c=a(document).height(),d=this.$window.scrollTop(),e=this.$element.offset(),f=this.options.offset,g=f.top,h=f.bottom;"top"==this.affixed&&(e.top+=d),"object"!=typeof f&&(h=g=f),"function"==typeof g&&(g=f.top(this.$element)),"function"==typeof h&&(h=f.bottom(this.$element));var i=null!=this.unpin&&d+this.unpin<=e.top?!1:null!=h&&e.top+this.$element.height()>=c-h?"bottom":null!=g&&g>=d?"top":!1;if(this.affixed!==i){this.unpin&&this.$element.css("top","");var j="affix"+(i?"-"+i:""),k=a.Event(j+".bs.affix");this.$element.trigger(k),k.isDefaultPrevented()||(this.affixed=i,this.unpin="bottom"==i?this.getPinnedOffset():null,this.$element.removeClass(b.RESET).addClass(j).trigger(a.Event(j.replace("affix","affixed"))),"bottom"==i&&this.$element.offset({top:c-h-this.$element.height()}))}}};var c=a.fn.affix;a.fn.affix=function(c){return this.each(function(){var d=a(this),e=d.data("bs.affix"),f="object"==typeof c&&c;e||d.data("bs.affix",e=new b(this,f)),"string"==typeof c&&e[c]()})},a.fn.affix.Constructor=b,a.fn.affix.noConflict=function(){return a.fn.affix=c,this},a(window).on("load",function(){a('[data-spy="affix"]').each(function(){var b=a(this),c=b.data();c.offset=c.offset||{},c.offsetBottom&&(c.offset.bottom=c.offsetBottom),c.offsetTop&&(c.offset.top=c.offsetTop),b.affix(c)})})}(jQuery);
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/.csscomb.json b/plugins/system/t3/base-bs3/bootstrap/less/.csscomb.json
new file mode 100644
index 0000000..c3d0c08
--- /dev/null
+++ b/plugins/system/t3/base-bs3/bootstrap/less/.csscomb.json
@@ -0,0 +1,297 @@
+{
+  "always-semicolon": true,
+  "block-indent": 2,
+  "colon-space": true,
+  "color-case": "lower",
+  "color-shorthand": true,
+  "combinator-space": true,
+  "element-case": "lower",
+  "eof-newline": true,
+  "leading-zero": false,
+  "remove-empty-rulesets": true,
+  "rule-indent": 2,
+  "stick-brace": true,
+  "strip-spaces": true,
+  "unitless-zero": true,
+  "vendor-prefix-align": true,
+  "sort-order": [
+    [
+      "position",
+      "top",
+      "right",
+      "bottom",
+      "left",
+      "z-index",
+      "display",
+      "float",
+      "width",
+      "min-width",
+      "max-width",
+      "height",
+      "min-height",
+      "max-height",
+      "-webkit-box-sizing",
+      "-moz-box-sizing",
+      "box-sizing",
+      "-webkit-appearance",
+      "padding",
+      "padding-top",
+      "padding-right",
+      "padding-bottom",
+      "padding-left",
+      "margin",
+      "margin-top",
+      "margin-right",
+      "margin-bottom",
+      "margin-left",
+      "overflow",
+      "overflow-x",
+      "overflow-y",
+      "-webkit-overflow-scrolling",
+      "-ms-overflow-x",
+      "-ms-overflow-y",
+      "-ms-overflow-style",
+      "clip",
+      "clear",
+      "font",
+      "font-family",
+      "font-size",
+      "font-style",
+      "font-weight",
+      "font-variant",
+      "font-size-adjust",
+      "font-stretch",
+      "font-effect",
+      "font-emphasize",
+      "font-emphasize-position",
+      "font-emphasize-style",
+      "font-smooth",
+      "-webkit-hyphens",
+      "-moz-hyphens",
+      "hyphens",
+      "line-height",
+      "color",
+      "text-align",
+      "-webkit-text-align-last",
+      "-moz-text-align-last",
+      "-ms-text-align-last",
+      "text-align-last",
+      "text-emphasis",
+      "text-emphasis-color",
+      "text-emphasis-style",
+      "text-emphasis-position",
+      "text-decoration",
+      "text-indent",
+      "text-justify",
+      "text-outline",
+      "-ms-text-overflow",
+      "text-overflow",
+      "text-overflow-ellipsis",
+      "text-overflow-mode",
+      "text-shadow",
+      "text-transform",
+      "text-wrap",
+      "-webkit-text-size-adjust",
+      "-ms-text-size-adjust",
+      "letter-spacing",
+      "-ms-word-break",
+      "word-break",
+      "word-spacing",
+      "-ms-word-wrap",
+      "word-wrap",
+      "-moz-tab-size",
+      "-o-tab-size",
+      "tab-size",
+      "white-space",
+      "vertical-align",
+      "list-style",
+      "list-style-position",
+      "list-style-type",
+      "list-style-image",
+      "pointer-events",
+      "cursor",
+      "visibility",
+      "zoom",
+      "flex-direction",
+      "flex-order",
+      "flex-pack",
+      "flex-align",
+      "table-layout",
+      "empty-cells",
+      "caption-side",
+      "border-spacing",
+      "border-collapse",
+      "content",
+      "quotes",
+      "counter-reset",
+      "counter-increment",
+      "resize",
+      "-webkit-user-select",
+      "-moz-user-select",
+      "-ms-user-select",
+      "-o-user-select",
+      "user-select",
+      "nav-index",
+      "nav-up",
+      "nav-right",
+      "nav-down",
+      "nav-left",
+      "background",
+      "background-color",
+      "background-image",
+      "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient",
+      "filter:progid:DXImageTransform.Microsoft.gradient",
+      "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
+      "filter",
+      "background-repeat",
+      "background-attachment",
+      "background-position",
+      "background-position-x",
+      "background-position-y",
+      "-webkit-background-clip",
+      "-moz-background-clip",
+      "background-clip",
+      "background-origin",
+      "-webkit-background-size",
+      "-moz-background-size",
+      "-o-background-size",
+      "background-size",
+      "border",
+      "border-color",
+      "border-style",
+      "border-width",
+      "border-top",
+      "border-top-color",
+      "border-top-style",
+      "border-top-width",
+      "border-right",
+      "border-right-color",
+      "border-right-style",
+      "border-right-width",
+      "border-bottom",
+      "border-bottom-color",
+      "border-bottom-style",
+      "border-bottom-width",
+      "border-left",
+      "border-left-color",
+      "border-left-style",
+      "border-left-width",
+      "border-radius",
+      "border-top-left-radius",
+      "border-top-right-radius",
+      "border-bottom-right-radius",
+      "border-bottom-left-radius",
+      "-webkit-border-image",
+      "-moz-border-image",
+      "-o-border-image",
+      "border-image",
+      "-webkit-border-image-source",
+      "-moz-border-image-source",
+      "-o-border-image-source",
+      "border-image-source",
+      "-webkit-border-image-slice",
+      "-moz-border-image-slice",
+      "-o-border-image-slice",
+      "border-image-slice",
+      "-webkit-border-image-width",
+      "-moz-border-image-width",
+      "-o-border-image-width",
+      "border-image-width",
+      "-webkit-border-image-outset",
+      "-moz-border-image-outset",
+      "-o-border-image-outset",
+      "border-image-outset",
+      "-webkit-border-image-repeat",
+      "-moz-border-image-repeat",
+      "-o-border-image-repeat",
+      "border-image-repeat",
+      "outline",
+      "outline-width",
+      "outline-style",
+      "outline-color",
+      "outline-offset",
+      "-webkit-box-shadow",
+      "-moz-box-shadow",
+      "box-shadow",
+      "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
+      "-ms-filter:\\'progid:DXImageTransform.Microsoft.Alpha",
+      "opacity",
+      "-ms-interpolation-mode",
+      "-webkit-transition",
+      "-moz-transition",
+      "-ms-transition",
+      "-o-transition",
+      "transition",
+      "-webkit-transition-delay",
+      "-moz-transition-delay",
+      "-ms-transition-delay",
+      "-o-transition-delay",
+      "transition-delay",
+      "-webkit-transition-timing-function",
+      "-moz-transition-timing-function",
+      "-ms-transition-timing-function",
+      "-o-transition-timing-function",
+      "transition-timing-function",
+      "-webkit-transition-duration",
+      "-moz-transition-duration",
+      "-ms-transition-duration",
+      "-o-transition-duration",
+      "transition-duration",
+      "-webkit-transition-property",
+      "-moz-transition-property",
+      "-ms-transition-property",
+      "-o-transition-property",
+      "transition-property",
+      "-webkit-transform",
+      "-moz-transform",
+      "-ms-transform",
+      "-o-transform",
+      "transform",
+      "-webkit-transform-origin",
+      "-moz-transform-origin",
+      "-ms-transform-origin",
+      "-o-transform-origin",
+      "transform-origin",
+      "-webkit-animation",
+      "-moz-animation",
+      "-ms-animation",
+      "-o-animation",
+      "animation",
+      "-webkit-animation-name",
+      "-moz-animation-name",
+      "-ms-animation-name",
+      "-o-animation-name",
+      "animation-name",
+      "-webkit-animation-duration",
+      "-moz-animation-duration",
+      "-ms-animation-duration",
+      "-o-animation-duration",
+      "animation-duration",
+      "-webkit-animation-play-state",
+      "-moz-animation-play-state",
+      "-ms-animation-play-state",
+      "-o-animation-play-state",
+      "animation-play-state",
+      "-webkit-animation-timing-function",
+      "-moz-animation-timing-function",
+      "-ms-animation-timing-function",
+      "-o-animation-timing-function",
+      "animation-timing-function",
+      "-webkit-animation-delay",
+      "-moz-animation-delay",
+      "-ms-animation-delay",
+      "-o-animation-delay",
+      "animation-delay",
+      "-webkit-animation-iteration-count",
+      "-moz-animation-iteration-count",
+      "-ms-animation-iteration-count",
+      "-o-animation-iteration-count",
+      "animation-iteration-count",
+      "-webkit-animation-direction",
+      "-moz-animation-direction",
+      "-ms-animation-direction",
+      "-o-animation-direction",
+      "animation-direction"
+    ]
+  ]
+}
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/.csslintrc b/plugins/system/t3/base-bs3/bootstrap/less/.csslintrc
new file mode 100644
index 0000000..005b862
--- /dev/null
+++ b/plugins/system/t3/base-bs3/bootstrap/less/.csslintrc
@@ -0,0 +1,19 @@
+{
+  "adjoining-classes": false,
+  "box-sizing": false,
+  "box-model": false,
+  "compatible-vendor-prefixes": false,
+  "floats": false,
+  "font-sizes": false,
+  "gradients": false,
+  "important": false,
+  "known-properties": false,
+  "outline-none": false,
+  "qualified-headings": false,
+  "regex-selectors": false,
+  "shorthand": false,
+  "text-indent": false,
+  "unique-headings": false,
+  "universal-selector": false,
+  "unqualified-attributes": false
+}
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/badges.less b/plugins/system/t3/base-bs3/bootstrap/less/badges.less
index 166b2be..56828ca 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/badges.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/badges.less
@@ -28,6 +28,10 @@
     position: relative;
     top: -1px;
   }
+  .btn-xs & {
+    top: 0;
+    padding: 1px 5px;
+  }
 }
 
 // Hover state, but only for links
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/breadcrumbs.less b/plugins/system/t3/base-bs3/bootstrap/less/breadcrumbs.less
index 60b33ea..cb01d50 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/breadcrumbs.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/breadcrumbs.less
@@ -4,19 +4,22 @@
 
 
 .breadcrumb {
-  padding: 8px 15px;
+  padding: @breadcrumb-padding-vertical @breadcrumb-padding-horizontal;
   margin-bottom: @line-height-computed;
   list-style: none;
   background-color: @breadcrumb-bg;
   border-radius: @border-radius-base;
+
   > li {
     display: inline-block;
+
     + li:before {
       content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
       color: @breadcrumb-color;
     }
   }
+
   > .active {
     color: @breadcrumb-active-color;
   }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/button-groups.less b/plugins/system/t3/base-bs3/bootstrap/less/button-groups.less
index 05fda14..58fd906 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/button-groups.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/button-groups.less
@@ -37,18 +37,17 @@
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
-  .clearfix();
+  margin-left: -5px; // Offset the first child's margin
+  &:extend(.clearfix all);
 
-  .btn-group {
+  .btn-group,
+  .input-group {
     float: left;
   }
-  // Space out series of button groups
   > .btn,
-  > .btn-group {
-    + .btn,
-    + .btn-group {
-      margin-left: 5px;
-    }
+  > .btn-group,
+  > .input-group {
+    margin-left: 5px;
   }
 }
 
@@ -157,7 +156,7 @@
 
   // Clear floats so dropdown menus can be properly placed
   > .btn-group {
-    .clearfix();
+    &:extend(.clearfix all);
     > .btn {
       float: none;
     }
@@ -188,13 +187,13 @@
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) {
   > .btn:last-child,
   > .dropdown-toggle {
     .border-bottom-radius(0);
   }
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   .border-top-radius(0);
 }
 
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/buttons.less b/plugins/system/t3/base-bs3/bootstrap/less/buttons.less
index 62e693b..4858a8a 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/buttons.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/buttons.less
@@ -56,14 +56,6 @@
 .btn-primary {
   .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border);
 }
-// Warning appears as orange
-.btn-warning {
-  .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
-}
-// Danger and error appear as red
-.btn-danger {
-  .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
-}
 // Success appears as green
 .btn-success {
   .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border);
@@ -72,6 +64,14 @@
 .btn-info {
   .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border);
 }
+// Warning appears as orange
+.btn-warning {
+  .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border);
+}
+// Danger and error appear as red
+.btn-danger {
+  .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border);
+}
 
 
 // Link buttons
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/code.less b/plugins/system/t3/base-bs3/bootstrap/less/code.less
index 44e9e89..3eed26c 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/code.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/code.less
@@ -21,6 +21,16 @@ code {
   border-radius: @border-radius-base;
 }
 
+// User input typically entered via keyboard
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: @kbd-color;
+  background-color: @kbd-bg;
+  border-radius: @border-radius-small;
+  box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
+}
+
 // Blocks of code
 pre {
   display: block;
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/dropdowns.less b/plugins/system/t3/base-bs3/bootstrap/less/dropdowns.less
index 1a8f197..f165165 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/dropdowns.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/dropdowns.less
@@ -46,6 +46,8 @@
   background-clip: padding-box;
 
   // Aligns the dropdown menu to right
+  //
+  // Deprecated as of 3.1.0 in favor of `.dropdown-menu-[dir]`
   &.pull-right {
     right: 0;
     left: auto;
@@ -126,6 +128,25 @@
   }
 }
 
+// Menu positioning
+//
+// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown
+// menu with the parent.
+.dropdown-menu-right {
+  left: auto; // Reset the default from `.dropdown-menu`
+  right: 0;
+}
+// With v3, we enabled auto-flipping if you have a dropdown within a right
+// aligned nav component. To enable the undoing of that, we provide an override
+// to restore the default dropdown menu alignment.
+//
+// This is only for left-aligning a dropdown menu within a `.navbar-right` or
+// `.pull-right` nav component.
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
+
 // Dropdown section headers
 .dropdown-header {
   display: block;
@@ -142,7 +163,7 @@
   right: 0;
   bottom: 0;
   top: 0;
-  z-index: @zindex-dropdown - 10;
+  z-index: (@zindex-dropdown - 10);
 }
 
 // Right aligned dropdowns
@@ -180,7 +201,12 @@
 @media (min-width: @grid-float-breakpoint) {
   .navbar-right {
     .dropdown-menu {
-      .pull-right > .dropdown-menu();
+      .dropdown-menu-right();
+    }
+    // Necessary for overrides of the default right aligned menu.
+    // Will remove come v4 in all likelihood.
+    .dropdown-menu-left {
+      .dropdown-menu-left();
     }
   }
 }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/forms.less b/plugins/system/t3/base-bs3/bootstrap/less/forms.less
index dc425ec..d0189d0 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/forms.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/forms.less
@@ -11,6 +11,10 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  // Chrome and Firefox set a `min-width: -webkit-min-content;` on fieldsets,
+  // so we reset that to ensure it behaves more like a standard block element.
+  // See https://github.com/twbs/bootstrap/issues/12359.
+  min-width: 0;
 }
 
 legend {
@@ -33,6 +37,10 @@ label {
 
 
 // Normalize form controls
+//
+// While most of our form styles require extra classes, some basic normalization
+// is required to ensure optimum display with or without those classes to better
+// address browser inconsistencies.
 
 // Override content-box in Normalize (* isn't specific enough)
 input[type="search"] {
@@ -47,41 +55,30 @@ input[type="checkbox"] {
   line-height: normal;
 }
 
-// Set the height of select and file controls to match text inputs
+// Set the height of file controls to match text inputs
 input[type="file"] {
   display: block;
 }
 
+// Make range inputs behave like textual form controls
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
+
 // Make multiple select elements height not fixed
 select[multiple],
 select[size] {
   height: auto;
 }
 
-// Fix optgroup Firefox bug per https://github.com/twbs/bootstrap/issues/7611
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
-
-// Focus for select, file, radio, and checkbox
+// Focus for file, radio, and checkbox
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
   .tab-focus();
 }
 
-// Fix for Chrome number input
-// Setting certain font-sizes causes the `I` bar to appear on hover of the bottom increment button.
-// See https://github.com/twbs/bootstrap/issues/8350 for more.
-input[type="number"] {
-  &::-webkit-outer-spin-button,
-  &::-webkit-inner-spin-button {
-    height: auto;
-  }
-}
-
 // Adjust output element
 output {
   display: block;
@@ -89,7 +86,6 @@ output {
   font-size: @font-size-base;
   line-height: @line-height-base;
   color: @input-color;
-  vertical-align: middle;
 }
 
 
@@ -123,7 +119,6 @@ output {
   font-size: @font-size-base;
   line-height: @line-height-base;
   color: @input-color;
-  vertical-align: middle;
   background-color: @input-bg;
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid @input-border;
@@ -135,9 +130,6 @@ output {
   .form-control-focus();
 
   // Placeholder
-  //
-  // Placeholder text gets special styles because when browsers invalidate entire
-  // lines if it doesn't understand a selector/
   .placeholder();
 
   // Disabled and read-only inputs
@@ -149,6 +141,7 @@ output {
   fieldset[disabled] & {
     cursor: not-allowed;
     background-color: @input-bg-disabled;
+    opacity: 1; // iOS fix for unreadable disabled content
   }
 
   // Reset height for `textarea`s
@@ -157,6 +150,14 @@ output {
   }
 }
 
+// Special styles for iOS date input
+//
+// In Mobile Safari, date inputs require a pixel line-height that matches the
+// given height of the input.
+input[type="date"] {
+  line-height: @input-height-base;
+}
+
 
 // Form groups
 //
@@ -179,10 +180,8 @@ output {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 20px;
-  vertical-align: middle;
   label {
     display: inline;
-    margin-bottom: 0;
     font-weight: normal;
     cursor: pointer;
   }
@@ -230,7 +229,12 @@ input[type="checkbox"],
   }
 }
 
+
 // Form control sizing
+//
+// Build on `.form-control` with modifier classes to decrease or increase the
+// height and font-size of form controls.
+
 .input-sm {
   .input-size(@input-height-small; @padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
@@ -244,18 +248,38 @@ input[type="checkbox"],
 //
 // Apply contextual and semantic states to individual form controls.
 
-// Warning
+.has-feedback {
+  // Enable absolute positioning
+  position: relative;
+
+  // Ensure icons don't overlap text
+  .form-control {
+    padding-right: (@input-height-base * 1.25);
+  }
+
+  // Feedback icon (requires .glyphicon classes)
+  .form-control-feedback {
+    position: absolute;
+    top: (@line-height-computed + 5); // Height of the `label` and its margin
+    right: 0;
+    display: block;
+    width: @input-height-base;
+    height: @input-height-base;
+    line-height: @input-height-base;
+    text-align: center;
+  }
+}
+
+// Feedback states
+.has-success {
+  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);
+}
 .has-warning {
   .form-control-validation(@state-warning-text; @state-warning-text; @state-warning-bg);
 }
-// Error
 .has-error {
   .form-control-validation(@state-danger-text; @state-danger-text; @state-danger-bg);
 }
-// Success
-.has-success {
-  .form-control-validation(@state-success-text; @state-success-text; @state-success-bg);
-}
 
 
 // Static form control text
@@ -296,9 +320,9 @@ input[type="checkbox"],
 .form-inline {
 
   // Kick in the inline
-  @media (min-width: @screen-sm) {
+  @media (min-width: @screen-sm-min) {
     // Inline-block all the things for "inline"
-    .form-group  {
+    .form-group {
       display: inline-block;
       margin-bottom: 0;
       vertical-align: middle;
@@ -307,11 +331,13 @@ input[type="checkbox"],
     // In navbar-form, allow folks to *not* use `.form-group`
     .form-control {
       display: inline-block;
+      width: auto; // Prevent labels from stacking above inputs in `.form-group`
+      vertical-align: middle;
     }
 
-    // Override `width: 100%;` when not within a `.form-group`
-    select.form-control {
-      width: auto;
+    .control-label {
+      margin-bottom: 0;
+      vertical-align: middle;
     }
 
     // Remove default margin on radios/checkboxes that were used for stacking, and
@@ -323,12 +349,21 @@ input[type="checkbox"],
       margin-top: 0;
       margin-bottom: 0;
       padding-left: 0;
+      vertical-align: middle;
     }
     .radio input[type="radio"],
     .checkbox input[type="checkbox"] {
       float: none;
       margin-left: 0;
     }
+
+    // Validation states
+    //
+    // Reposition the icon because it's now within a grid column and columns have
+    // `position: relative;` on them. Also accounts for the grid gutter padding.
+    .has-feedback .form-control-feedback {
+      top: 0;
+    }
   }
 }
 
@@ -354,7 +389,7 @@ input[type="checkbox"],
   // and other content below items
   .radio,
   .checkbox {
-    min-height: @line-height-computed + (@padding-base-vertical + 1);
+    min-height: (@line-height-computed + (@padding-base-vertical + 1));
   }
 
   // Make form groups behave like rows
@@ -372,4 +407,13 @@ input[type="checkbox"],
       text-align: right;
     }
   }
+
+  // Validation states
+  //
+  // Reposition the icon because it's now within a grid column and columns have
+  // `position: relative;` on them. Also accounts for the grid gutter padding.
+  .has-feedback .form-control-feedback {
+    top: 0;
+    right: (@grid-gutter-width / 2);
+  }
 }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/glyphicons.less b/plugins/system/t3/base-bs3/bootstrap/less/glyphicons.less
index 8a68f11..789c5e7 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/glyphicons.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/glyphicons.less
@@ -14,7 +14,7 @@
   src: ~"url('@{icon-font-path}@{icon-font-name}.eot?#iefix') format('embedded-opentype')",
        ~"url('@{icon-font-path}@{icon-font-name}.woff') format('woff')",
        ~"url('@{icon-font-path}@{icon-font-name}.ttf') format('truetype')",
-       ~"url('@{icon-font-path}@{icon-font-name}.svg#glyphicons-halflingsregular') format('svg')";
+       ~"url('@{icon-font-path}@{icon-font-name}.svg#@{icon-font-svg-id}') format('svg')";
 }
 
 // Catchall baseclass
@@ -28,10 +28,6 @@
   line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-
-  &:empty {
-    width: 1em;
-  }
 }
 
 // Individual icons
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/grid.less b/plugins/system/t3/base-bs3/bootstrap/less/grid.less
index 279d803..88957f4 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/grid.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/grid.less
@@ -2,14 +2,18 @@
 // Grid system
 // --------------------------------------------------
 
-// Set the container width, and override it for fixed navbars in media queries
+
+// Container widths
+//
+// Set the container width, and override it for fixed navbars in media queries.
+
 .container {
   .container-fixed();
 
-  @media (min-width: @screen-sm) {
+  @media (min-width: @screen-sm-min) {
     width: @container-sm;
   }
-  @media (min-width: @screen-md) {
+  @media (min-width: @screen-md-min) {
     width: @container-md;
   }
   @media (min-width: @screen-lg-min) {
@@ -17,12 +21,30 @@
   }
 }
 
-// mobile first defaults
+
+// Fluid container
+//
+// Utilizes the mixin meant for fixed width containers, but without any defined
+// width for fluid, full width layouts.
+
+.container-fluid {
+  .container-fixed();
+}
+
+
+// Row
+//
+// Rows contain and clear the floats of your columns.
+
 .row {
   .make-row();
 }
 
+
+// Columns
+//
 // Common styles for small and large grid columns
+
 .make-grid-columns();
 
 
@@ -76,4 +98,3 @@
   .make-grid(@grid-columns, lg, push);
   .make-grid(@grid-columns, lg, offset);
 }
-
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/input-groups.less b/plugins/system/t3/base-bs3/bootstrap/less/input-groups.less
index d19c4c6..b486cf4 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/input-groups.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/input-groups.less
@@ -17,6 +17,11 @@
   }
 
   .form-control {
+    // IE9 fubars the placeholder attribute in text inputs and the arrows on
+    // select elements in input groups. To fix it, we float the input. Details:
+    // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855
+    float: left;
+
     width: 100%;
     margin-bottom: 0;
   }
@@ -90,8 +95,10 @@
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   .border-right-radius(0);
 }
 .input-group-addon:first-child {
@@ -100,8 +107,10 @@
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   .border-left-radius(0);
 }
 .input-group-addon:last-child {
@@ -112,25 +121,37 @@
 // -------------------------
 .input-group-btn {
   position: relative;
+  // Jankily prevent input button groups from wrapping with `white-space` and
+  // `font-size` in combination with `inline-block` on buttons.
+  font-size: 0;
   white-space: nowrap;
 
-  // Negative margin to only have a 1px border between the two
-  &:first-child > .btn {
-    margin-right: -1px;
+  // Negative margin for spacing, position for bringing hovered/focused/actived
+  // element above the siblings.
+  > .btn {
+    position: relative;
+    + .btn {
+      margin-left: -1px;
+    }
+    // Bring the "active" button to the front
+    &:hover,
+    &:focus,
+    &:active {
+      z-index: 2;
+    }
   }
-  &:last-child > .btn {
-    margin-left: -1px;
-  }
-}
-.input-group-btn > .btn {
-  position: relative;
-  // Jankily prevent input button groups from wrapping
-  + .btn {
-    margin-left: -4px;
+
+  // Negative margin to only have a 1px border between the two
+  &:first-child {
+    > .btn,
+    > .btn-group {
+      margin-right: -1px;
+    }
   }
-  // Bring the "active" button to the front
-  &:hover,
-  &:active {
-    z-index: 2;
+  &:last-child {
+    > .btn,
+    > .btn-group {
+      margin-left: -1px;
+    }
   }
 }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/jumbotron.less b/plugins/system/t3/base-bs3/bootstrap/less/jumbotron.less
index 0460b69..a15e169 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/jumbotron.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/jumbotron.less
@@ -6,19 +6,17 @@
 .jumbotron {
   padding: @jumbotron-padding;
   margin-bottom: @jumbotron-padding;
-  font-size: @jumbotron-font-size;
-  font-weight: 200;
-  line-height: (@line-height-base * 1.5);
   color: @jumbotron-color;
   background-color: @jumbotron-bg;
 
   h1,
   .h1 {
-    line-height: 1;
     color: @jumbotron-heading-color;
   }
   p {
-    line-height: 1.4;
+    margin-bottom: (@jumbotron-padding / 2);
+    font-size: @jumbotron-font-size;
+    font-weight: 200;
   }
 
   .container & {
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/list-group.less b/plugins/system/t3/base-bs3/bootstrap/less/list-group.less
index 2cee529..3343f8e 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/list-group.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/list-group.less
@@ -2,17 +2,21 @@
 // List groups
 // --------------------------------------------------
 
+
 // Base class
 //
 // Easily usable on <ul>, <ol>, or <div>.
+
 .list-group {
   // No need to set list-style: none; since .list-group-item is block level
   margin-bottom: 20px;
   padding-left: 0; // reset padding because ul and ol
 }
 
+
 // Individual list items
-// -------------------------
+//
+// Use on `li`s or `div`s within the `.list-group` parent.
 
 .list-group-item {
   position: relative;
@@ -41,7 +45,12 @@
   }
 }
 
+
 // Linked list items
+//
+// Use anchor elements instead of `li`s or `div`s to create linked list items.
+// Includes an extra `.active` modifier class for showing selected items.
+
 a.list-group-item {
   color: @list-group-link-color;
 
@@ -70,13 +79,26 @@ a.list-group-item {
       color: inherit;
     }
     .list-group-item-text {
-      color: lighten(@list-group-active-bg, 40%);
+      color: @list-group-active-text-color;
     }
   }
 }
 
+
+// Contextual variants
+//
+// Add modifier classes to change text and background color on individual items.
+// Organizationally, this must come after the `:hover` states.
+
+.list-group-item-variant(success; @state-success-bg; @state-success-text);
+.list-group-item-variant(info; @state-info-bg; @state-info-text);
+.list-group-item-variant(warning; @state-warning-bg; @state-warning-text);
+.list-group-item-variant(danger; @state-danger-bg; @state-danger-text);
+
+
 // Custom content options
-// -------------------------
+//
+// Extra classes for creating well-formatted content within `.list-group-item`s.
 
 .list-group-item-heading {
   margin-top: 0;
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/mixins.less b/plugins/system/t3/base-bs3/bootstrap/less/mixins.less
index 5c54c64..ae746d8 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/mixins.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/mixins.less
@@ -115,6 +115,10 @@
 }
 
 // Drop shadows
+//
+// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
+//   supported browsers that have box shadow capabilities now support the
+//   standard `box-shadow` property.
 .box-shadow(@shadow) {
   -webkit-box-shadow: @shadow; // iOS <4.3 & Android <4.1
           box-shadow: @shadow;
@@ -147,17 +151,17 @@
 // Transformations
 .rotate(@degrees) {
   -webkit-transform: rotate(@degrees);
-      -ms-transform: rotate(@degrees); // IE9+
+      -ms-transform: rotate(@degrees); // IE9 only
           transform: rotate(@degrees);
 }
-.scale(@ratio) {
-  -webkit-transform: scale(@ratio);
-      -ms-transform: scale(@ratio); // IE9+
-          transform: scale(@ratio);
+.scale(@ratio; @ratio-y...) {
+  -webkit-transform: scale(@ratio, @ratio-y);
+      -ms-transform: scale(@ratio, @ratio-y); // IE9 only
+          transform: scale(@ratio, @ratio-y);
 }
 .translate(@x; @y) {
   -webkit-transform: translate(@x, @y);
-      -ms-transform: translate(@x, @y); // IE9+
+      -ms-transform: translate(@x, @y); // IE9 only
           transform: translate(@x, @y);
 }
 .skew(@x; @y) {
@@ -172,12 +176,12 @@
 
 .rotateX(@degrees) {
   -webkit-transform: rotateX(@degrees);
-      -ms-transform: rotateX(@degrees); // IE9+
+      -ms-transform: rotateX(@degrees); // IE9 only
           transform: rotateX(@degrees);
 }
 .rotateY(@degrees) {
   -webkit-transform: rotateY(@degrees);
-      -ms-transform: rotateY(@degrees); // IE9+
+      -ms-transform: rotateY(@degrees); // IE9 only
           transform: rotateY(@degrees);
 }
 .perspective(@perspective) {
@@ -193,6 +197,7 @@
 .transform-origin(@origin) {
   -webkit-transform-origin: @origin;
      -moz-transform-origin: @origin;
+      -ms-transform-origin: @origin; // IE9 only
           transform-origin: @origin;
 }
 
@@ -201,6 +206,30 @@
   -webkit-animation: @animation;
           animation: @animation;
 }
+.animation-name(@name) {
+  -webkit-animation-name: @name;
+          animation-name: @name;
+}
+.animation-duration(@duration) {
+  -webkit-animation-duration: @duration;
+          animation-duration: @duration;
+}
+.animation-timing-function(@timing-function) {
+  -webkit-animation-timing-function: @timing-function;
+          animation-timing-function: @timing-function;
+}
+.animation-delay(@delay) {
+  -webkit-animation-delay: @delay;
+          animation-delay: @delay;
+}
+.animation-iteration-count(@iteration-count) {
+  -webkit-animation-iteration-count: @iteration-count;
+          animation-iteration-count: @iteration-count;
+}
+.animation-direction(@direction) {
+  -webkit-animation-direction: @direction;
+          animation-direction: @direction;
+}
 
 // Backface visibility
 // Prevent browsers from flickering when using CSS 3D transforms.
@@ -353,7 +382,7 @@
 //
 // Keep images from scaling beyond the width of their parents.
 
-.img-responsive(@display: block;) {
+.img-responsive(@display: block) {
   display: @display;
   max-width: 100%; // Part 1: Set a maximum relative to the parent
   height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
@@ -414,29 +443,57 @@
 .table-row-variant(@state; @background) {
   // Exact selectors below required to override `.table-striped` and prevent
   // inheritance to nested tables.
-  .table {
-    > thead,
-    > tbody,
-    > tfoot {
-      > tr > .@{state},
-      > .@{state} > td,
-      > .@{state} > th {
-        background-color: @background;
-      }
+  .table > thead > tr,
+  .table > tbody > tr,
+  .table > tfoot > tr {
+    > td.@{state},
+    > th.@{state},
+    &.@{state} > td,
+    &.@{state} > th {
+      background-color: @background;
     }
   }
 
   // Hover states for `.table-hover`
   // Note: this is not available for cells or rows within `thead` or `tfoot`.
-  .table-hover > tbody {
-    > tr > .@{state}:hover,
-    > .@{state}:hover > td,
-    > .@{state}:hover > th {
+  .table-hover > tbody > tr {
+    > td.@{state}:hover,
+    > th.@{state}:hover,
+    &.@{state}:hover > td,
+    &.@{state}:hover > th {
       background-color: darken(@background, 5%);
     }
   }
 }
 
+// List Groups
+// -------------------------
+.list-group-item-variant(@state; @background; @color) {
+  .list-group-item-@{state} {
+    color: @color;
+    background-color: @background;
+
+    a& {
+      color: @color;
+
+      .list-group-item-heading { color: inherit; }
+
+      &:hover,
+      &:focus {
+        color: @color;
+        background-color: darken(@background, 5%);
+      }
+      &.active,
+      &.active:hover,
+      &.active:focus {
+        color: #fff;
+        background-color: @color;
+        border-color: @color;
+      }
+    }
+  }
+}
+
 // Button variants
 // -------------------------
 // Easily pump out default styles, as well as :hover, :focus, :active,
@@ -475,7 +532,7 @@
 
   .badge {
     color: @background;
-    background-color: #fff;
+    background-color: @color;
   }
 }
 
@@ -524,6 +581,24 @@
   }
 }
 
+// Contextual backgrounds
+// -------------------------
+.bg-variant(@color) {
+  background-color: @color;
+  a&:hover {
+    background-color: darken(@color, 10%);
+  }
+}
+
+// Typography
+// -------------------------
+.text-emphasis-variant(@color) {
+  color: @color;
+  a&:hover {
+    color: darken(@color, 10%);
+  }
+}
+
 // Navbar vertical align
 // -------------------------
 // Vertically center elements in the navbar.
@@ -570,14 +645,14 @@
   margin-left: auto;
   padding-left:  (@grid-gutter-width / 2);
   padding-right: (@grid-gutter-width / 2);
-  .clearfix();
+  &:extend(.clearfix all);
 }
 
 // Creates a wrapper for a series of columns
 .make-row(@gutter: @grid-gutter-width) {
   margin-left:  (@gutter / -2);
   margin-right: (@gutter / -2);
-  .clearfix();
+  &:extend(.clearfix all);
 }
 
 // Generate the extra small columns
@@ -585,30 +660,39 @@
   position: relative;
   float: left;
   width: percentage((@columns / @grid-columns));
-  // Prevent columns from collapsing when empty
   min-height: 1px;
-  // Inner gutter via padding
   padding-left:  (@gutter / 2);
   padding-right: (@gutter / 2);
 }
+.make-xs-column-offset(@columns) {
+  @media (min-width: @screen-xs-min) {
+    margin-left: percentage((@columns / @grid-columns));
+  }
+}
+.make-xs-column-push(@columns) {
+  @media (min-width: @screen-xs-min) {
+    left: percentage((@columns / @grid-columns));
+  }
+}
+.make-xs-column-pull(@columns) {
+  @media (min-width: @screen-xs-min) {
+    right: percentage((@columns / @grid-columns));
+  }
+}
+
 
 // Generate the small columns
 .make-sm-column(@columns; @gutter: @grid-gutter-width) {
   position: relative;
-  // Prevent columns from collapsing when empty
   min-height: 1px;
-  // Inner gutter via padding
   padding-left:  (@gutter / 2);
   padding-right: (@gutter / 2);
 
-  // Calculate width based on number of columns available
   @media (min-width: @screen-sm-min) {
     float: left;
     width: percentage((@columns / @grid-columns));
   }
 }
-
-// Generate the small column offsets
 .make-sm-column-offset(@columns) {
   @media (min-width: @screen-sm-min) {
     margin-left: percentage((@columns / @grid-columns));
@@ -625,30 +709,26 @@
   }
 }
 
+
 // Generate the medium columns
 .make-md-column(@columns; @gutter: @grid-gutter-width) {
   position: relative;
-  // Prevent columns from collapsing when empty
   min-height: 1px;
-  // Inner gutter via padding
   padding-left:  (@gutter / 2);
   padding-right: (@gutter / 2);
 
-  // Calculate width based on number of columns available
   @media (min-width: @screen-md-min) {
     float: left;
     width: percentage((@columns / @grid-columns));
   }
 }
-
-// Generate the medium column offsets
 .make-md-column-offset(@columns) {
   @media (min-width: @screen-md-min) {
     margin-left: percentage((@columns / @grid-columns));
   }
 }
 .make-md-column-push(@columns) {
-  @media (min-width: @screen-md) {
+  @media (min-width: @screen-md-min) {
     left: percentage((@columns / @grid-columns));
   }
 }
@@ -658,23 +738,19 @@
   }
 }
 
+
 // Generate the large columns
 .make-lg-column(@columns; @gutter: @grid-gutter-width) {
   position: relative;
-  // Prevent columns from collapsing when empty
   min-height: 1px;
-  // Inner gutter via padding
   padding-left:  (@gutter / 2);
   padding-right: (@gutter / 2);
 
-  // Calculate width based on number of columns available
   @media (min-width: @screen-lg-min) {
     float: left;
     width: percentage((@columns / @grid-columns));
   }
 }
-
-// Generate the large column offsets
 .make-lg-column-offset(@columns) {
   @media (min-width: @screen-lg-min) {
     margin-left: percentage((@columns / @grid-columns));
@@ -701,11 +777,11 @@
   // Common styles for all sizes of grid columns, widths 1-12
   .col(@index) when (@index = 1) { // initial
     @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
-    .col(@index + 1, @item);
+    .col((@index + 1), @item);
   }
   .col(@index, @list) when (@index =< @grid-columns) { // general; "=<" isn't a typo
     @item: ~".col-xs-@{index}, .col-sm-@{index}, .col-md-@{index}, .col-lg-@{index}";
-    .col(@index + 1, ~"@{list}, @{item}");
+    .col((@index + 1), ~"@{list}, @{item}");
   }
   .col(@index, @list) when (@index > @grid-columns) { // terminal
     @{list} {
@@ -723,11 +799,11 @@
 .make-grid-columns-float(@class) {
   .col(@index) when (@index = 1) { // initial
     @item: ~".col-@{class}-@{index}";
-    .col(@index + 1, @item);
+    .col((@index + 1), @item);
   }
   .col(@index, @list) when (@index =< @grid-columns) { // general
     @item: ~".col-@{class}-@{index}";
-    .col(@index + 1, ~"@{list}, @{item}");
+    .col((@index + 1), ~"@{list}, @{item}");
   }
   .col(@index, @list) when (@index > @grid-columns) { // terminal
     @{list} {
@@ -762,7 +838,7 @@
 .make-grid(@index, @class, @type) when (@index >= 0) {
   .calc-grid(@index, @class, @type);
   // next iteration
-  .make-grid(@index - 1, @class, @type);
+  .make-grid((@index - 1), @class, @type);
 }
 
 
@@ -797,6 +873,10 @@
     border-color: @border-color;
     background-color: @background-color;
   }
+  // Optional feedback icon
+  .form-control-feedback {
+    color: @text-color;
+  }
 }
 
 // Form control focus state
@@ -839,7 +919,8 @@
     line-height: @input-height;
   }
 
-  textarea& {
+  textarea&,
+  select[multiple]& {
     height: auto;
   }
 }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/modals.less b/plugins/system/t3/base-bs3/bootstrap/less/modals.less
index e65dbf7..e7f3d72 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/modals.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/modals.less
@@ -22,7 +22,12 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: @zindex-modal-background;
+  z-index: @zindex-modal;
+  -webkit-overflow-scrolling: touch;
+
+  // Prevent Chrome on Windows from adding a focus outline. For details, see
+  // https://github.com/twbs/bootstrap/pull/10951.
+  outline: 0;
 
   // When fading in the modal, animate it to slide down
   &.fade .modal-dialog {
@@ -37,7 +42,6 @@
   position: relative;
   width: auto;
   margin: 10px;
-  z-index: (@zindex-modal-background + 10);
 }
 
 // Actual modal
@@ -60,11 +64,11 @@
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: (@zindex-modal-background - 10);
+  z-index: @zindex-modal-background;
   background-color: @modal-backdrop-bg;
   // Fade for backdrop
   &.fade { .opacity(0); }
-  &.in { .opacity(.5); }
+  &.in { .opacity(@modal-backdrop-opacity); }
 }
 
 // Modal header
@@ -98,7 +102,7 @@
   padding: (@modal-inner-padding - 1) @modal-inner-padding @modal-inner-padding;
   text-align: right; // right align buttons
   border-top: 1px solid @modal-footer-border-color;
-  .clearfix(); // clear it in case folks use .pull-* classes on buttons
+  &:extend(.clearfix all); // clear it in case folks use .pull-* classes on buttons
 
   // Properly space out buttons
   .btn + .btn {
@@ -116,14 +120,19 @@
 }
 
 // Scale up the modal
-@media screen and (min-width: @screen-sm-min) {
+@media (min-width: @screen-sm-min) {
 
+  // Automatically set modal's width for larger viewports
   .modal-dialog {
-    width: 600px;
+    width: @modal-md;
     margin: 30px auto;
   }
   .modal-content {
     .box-shadow(0 5px 15px rgba(0,0,0,.5));
   }
 
+  // Modal sizes
+  .modal-sm { width: @modal-sm; }
+  .modal-lg { width: @modal-lg; }
+
 }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/navbar.less b/plugins/system/t3/base-bs3/bootstrap/less/navbar.less
index ea284fe..ddb67b9 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/navbar.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/navbar.less
@@ -15,7 +15,7 @@
   border: 1px solid transparent;
 
   // Prevent floats from breaking the navbar
-  .clearfix();
+  &:extend(.clearfix all);
 
   @media (min-width: @grid-float-breakpoint) {
     border-radius: @navbar-border-radius;
@@ -29,7 +29,7 @@
 // styling of responsive aspects.
 
 .navbar-header {
-  .clearfix();
+  &:extend(.clearfix all);
 
   @media (min-width: @grid-float-breakpoint) {
     float: left;
@@ -48,13 +48,13 @@
 // content for the user's viewport.
 
 .navbar-collapse {
-  max-height: 340px;
+  max-height: @navbar-collapse-max-height;
   overflow-x: visible;
   padding-right: @navbar-padding-horizontal;
   padding-left:  @navbar-padding-horizontal;
   border-top: 1px solid transparent;
   box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
-  .clearfix();
+  &:extend(.clearfix all);
   -webkit-overflow-scrolling: touch;
 
   &.in {
@@ -93,14 +93,17 @@
 //
 // When a container is present, change the behavior of the header and collapse.
 
-.container > .navbar-header,
-.container > .navbar-collapse {
-  margin-right: -@navbar-padding-horizontal;
-  margin-left:  -@navbar-padding-horizontal;
+.container,
+.container-fluid {
+  > .navbar-header,
+  > .navbar-collapse {
+    margin-right: -@navbar-padding-horizontal;
+    margin-left:  -@navbar-padding-horizontal;
 
-  @media (min-width: @grid-float-breakpoint) {
-    margin-right: 0;
-    margin-left:  0;
+    @media (min-width: @grid-float-breakpoint) {
+      margin-right: 0;
+      margin-left:  0;
+    }
   }
 }
 
@@ -152,6 +155,7 @@
   padding: @navbar-padding-vertical @navbar-padding-horizontal;
   font-size: @font-size-large;
   line-height: @line-height-computed;
+  height: @line-height-computed;
 
   &:hover,
   &:focus {
@@ -159,7 +163,8 @@
   }
 
   @media (min-width: @grid-float-breakpoint) {
-    .navbar > .container & {
+    .navbar > .container &,
+    .navbar > .container-fluid & {
       margin-left: -@navbar-padding-horizontal;
     }
   }
@@ -182,6 +187,12 @@
   border: 1px solid transparent;
   border-radius: @border-radius-base;
 
+  // We remove the `outline` here, but later compensate by attaching `:hover`
+  // styles to `:focus`.
+  &:focus {
+    outline: none;
+  }
+
   // Bars
   .icon-bar {
     display: block;
@@ -201,7 +212,7 @@
 
 // Navbar nav links
 //
-// Builds on top of the `.nav` components with it's own modifier class to make
+// Builds on top of the `.nav` components with its own modifier class to make
 // the nav the full height of the horizontal nav (above 768px).
 
 .navbar-nav {
@@ -325,13 +336,6 @@
   .border-bottom-radius(0);
 }
 
-// Right aligned menus need alt position
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-}
-
 
 // Buttons in navbars
 //
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/navs.less b/plugins/system/t3/base-bs3/bootstrap/less/navs.less
index 859d5d8..9e729b3 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/navs.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/navs.less
@@ -10,7 +10,7 @@
   margin-bottom: 0;
   padding-left: 0; // Override default ul/ol
   list-style: none;
-  .clearfix();
+  &:extend(.clearfix all);
 
   > li {
     position: relative;
@@ -91,7 +91,7 @@
       }
     }
 
-    // Active state, and it's :hover to override normal :hover
+    // Active state, and its :hover to override normal :hover
     &.active > a {
       &,
       &:hover,
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/normalize.less b/plugins/system/t3/base-bs3/bootstrap/less/normalize.less
index 42a393f..024e257 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/normalize.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/normalize.less
@@ -1,6 +1,25 @@
-/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.0 | MIT License | git.io/normalize */
+
+//
+// 1. Set default font family to sans-serif.
+// 2. Prevent iOS text size adjust after orientation change, without disabling
+//    user zoom.
+//
+
+html {
+  font-family: sans-serif; // 1
+  -ms-text-size-adjust: 100%; // 2
+  -webkit-text-size-adjust: 100%; // 2
+}
+
+//
+// Remove default margin.
+//
+
+body {
+  margin: 0;
+}
 
-// ==========================================================================
 // HTML5 display definitions
 // ==========================================================================
 
@@ -24,13 +43,16 @@ summary {
 }
 
 //
-// Correct `inline-block` display not defined in IE 8/9.
+// 1. Correct `inline-block` display not defined in IE 8/9.
+// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
 //
 
 audio,
 canvas,
+progress,
 video {
-  display: inline-block;
+  display: inline-block; // 1
+  vertical-align: baseline; // 2
 }
 
 //
@@ -53,31 +75,6 @@ template {
   display: none;
 }
 
-// ==========================================================================
-// Base
-// ==========================================================================
-
-//
-// 1. Set default font family to sans-serif.
-// 2. Prevent iOS text size adjust after orientation change, without disabling
-//    user zoom.
-//
-
-html {
-  font-family: sans-serif; // 1
-  -ms-text-size-adjust: 100%; // 2
-  -webkit-text-size-adjust: 100%; // 2
-}
-
-//
-// Remove default margin.
-//
-
-body {
-  margin: 0;
-}
-
-// ==========================================================================
 // Links
 // ==========================================================================
 
@@ -89,14 +86,6 @@ a {
   background: transparent;
 }
 
-//
-// Address `outline` inconsistency between Chrome and other browsers.
-//
-
-a:focus {
-  outline: thin dotted;
-}
-
 //
 // Improve readability when focused and also mouse hovered in all browsers.
 //
@@ -106,19 +95,8 @@ a:hover {
   outline: 0;
 }
 
+// Text-level semantics
 // ==========================================================================
-// Typography
-// ==========================================================================
-
-//
-// Address variable `h1` font-size and margin within `section` and `article`
-// contexts in Firefox 4+, Safari 5, and Chrome.
-//
-
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 
 //
 // Address styling not present in IE 8/9, Safari 5, and Chrome.
@@ -146,13 +124,13 @@ dfn {
 }
 
 //
-// Address differences between Firefox and other browsers.
+// Address variable `h1` font-size and margin within `section` and `article`
+// contexts in Firefox 4+, Safari 5, and Chrome.
 //
 
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 
 //
@@ -164,34 +142,6 @@ mark {
   color: #000;
 }
 
-//
-// Correct font family set oddly in Safari 5 and Chrome.
-//
-
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-
-//
-// Improve readability of pre-formatted text in all browsers.
-//
-
-pre {
-  white-space: pre-wrap;
-}
-
-//
-// Set consistent quote types.
-//
-
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
 //
 // Address inconsistent and variable font size in all browsers.
 //
@@ -220,7 +170,6 @@ sub {
   bottom: -0.25em;
 }
 
-// ==========================================================================
 // Embedded content
 // ==========================================================================
 
@@ -240,8 +189,7 @@ svg:not(:root) {
   overflow: hidden;
 }
 
-// ==========================================================================
-// Figures
+// Grouping content
 // ==========================================================================
 
 //
@@ -249,63 +197,77 @@ svg:not(:root) {
 //
 
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
 
-// ==========================================================================
-// Forms
-// ==========================================================================
+//
+// Address differences between Firefox and other browsers.
+//
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
 
 //
-// Define consistent border, margin, and padding.
+// Contain overflow in all browsers.
 //
 
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+pre {
+  overflow: auto;
 }
 
 //
-// 1. Correct `color` not being inherited in IE 8/9.
-// 2. Remove padding so people aren't caught out if they zero out fieldsets.
+// Address odd `em`-unit font size rendering in all browsers.
 //
 
-legend {
-  border: 0; // 1
-  padding: 0; // 2
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 
+// Forms
+// ==========================================================================
+
+//
+// Known limitation: by default, Chrome and Safari on OS X allow very limited
+// styling of `select`, unless a `border` property is set.
+//
+
 //
-// 1. Correct font family not being inherited in all browsers.
-// 2. Correct font size not being inherited in all browsers.
+// 1. Correct color not being inherited.
+//    Known issue: affects color of disabled elements.
+// 2. Correct font properties not being inherited.
 // 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
 //
 
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit; // 1
-  font-size: 100%; // 2
+  color: inherit; // 1
+  font: inherit; // 2
   margin: 0; // 3
 }
 
 //
-// Address Firefox 4+ setting `line-height` on `input` using `!important` in
-// the UA stylesheet.
+// Address `overflow` set to `hidden` in IE 8/9/10.
 //
 
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 
 //
 // Address inconsistent `text-transform` inheritance for `button` and `select`.
 // All other form control elements do not inherit `text-transform` values.
-// Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
-// Correct `select` style inheritance in Firefox 4+ and Opera.
+// Correct `button` style inheritance in Firefox, IE 8+, and Opera
+// Correct `select` style inheritance in Firefox.
 //
 
 button,
@@ -338,6 +300,28 @@ html input[disabled] {
   cursor: default;
 }
 
+//
+// Remove inner padding and border in Firefox 4+.
+//
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+//
+// Address Firefox 4+ setting `line-height` on `input` using `!important` in
+// the UA stylesheet.
+//
+
+input {
+  line-height: normal;
+}
+
+//
+// It's recommended that you don't attempt to style these elements.
+// Firefox's implementation doesn't respect box-sizing, padding, or width.
 //
 // 1. Address box sizing set to `content-box` in IE 8/9/10.
 // 2. Remove excess padding in IE 8/9/10.
@@ -349,6 +333,17 @@ input[type="radio"] {
   padding: 0; // 2
 }
 
+//
+// Fix the cursor style for Chrome's increment/decrement buttons. For certain
+// `font-size` values of the `input`, it causes the cursor style of the
+// decrement button to change from `default` to `text`.
+//
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
 //
 // 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
 // 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
@@ -363,8 +358,9 @@ input[type="search"] {
 }
 
 //
-// Remove inner padding and search cancel button in Safari 5 and Chrome
-// on OS X.
+// Remove inner padding and search cancel button in Safari and Chrome on OS X.
+// Safari (but not Chrome) clips the cancel button when the search input has
+// padding (and `textfield` appearance).
 //
 
 input[type="search"]::-webkit-search-cancel-button,
@@ -373,26 +369,42 @@ input[type="search"]::-webkit-search-decoration {
 }
 
 //
-// Remove inner padding and border in Firefox 4+.
+// Define consistent border, margin, and padding.
 //
 
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  border: 0;
-  padding: 0;
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
 }
 
 //
-// 1. Remove default vertical scrollbar in IE 8/9.
-// 2. Improve readability and alignment in all browsers.
+// 1. Correct `color` not being inherited in IE 8/9.
+// 2. Remove padding so people aren't caught out if they zero out fieldsets.
+//
+
+legend {
+  border: 0; // 1
+  padding: 0; // 2
+}
+
+//
+// Remove default vertical scrollbar in IE 8/9.
 //
 
 textarea {
-  overflow: auto; // 1
-  vertical-align: top; // 2
+  overflow: auto;
+}
+
+//
+// Don't inherit the `font-weight` (applied by a rule above).
+// NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+//
+
+optgroup {
+  font-weight: bold;
 }
 
-// ==========================================================================
 // Tables
 // ==========================================================================
 
@@ -404,3 +416,8 @@ table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+
+td,
+th {
+  padding: 0;
+}
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/pager.less b/plugins/system/t3/base-bs3/bootstrap/less/pager.less
index 16993dd..59103f4 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/pager.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/pager.less
@@ -8,22 +8,22 @@
   margin: @line-height-computed 0;
   list-style: none;
   text-align: center;
-  .clearfix();
+  &:extend(.clearfix all);
   li {
     display: inline;
     > a,
     > span {
       display: inline-block;
       padding: 5px 14px;
-      background-color: @pagination-bg;
-      border: 1px solid @pagination-border;
+      background-color: @pager-bg;
+      border: 1px solid @pager-border;
       border-radius: @pager-border-radius;
     }
 
     > a:hover,
     > a:focus {
       text-decoration: none;
-      background-color: @pagination-hover-bg;
+      background-color: @pager-hover-bg;
     }
   }
 
@@ -47,7 +47,7 @@
     > a:focus,
     > span {
       color: @pager-disabled-color;
-      background-color: @pagination-bg;
+      background-color: @pager-bg;
       cursor: not-allowed;
     }
   }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/pagination.less b/plugins/system/t3/base-bs3/bootstrap/less/pagination.less
index 5c68b8b..b2856ae 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/pagination.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/pagination.less
@@ -16,6 +16,7 @@
       padding: @padding-base-vertical @padding-base-horizontal;
       line-height: @line-height-base;
       text-decoration: none;
+      color: @pagination-color;
       background-color: @pagination-bg;
       border: 1px solid @pagination-border;
       margin-left: -1px;
@@ -39,7 +40,9 @@
   > li > span {
     &:hover,
     &:focus {
+      color: @pagination-hover-color;
       background-color: @pagination-hover-bg;
+      border-color: @pagination-hover-border;
     }
   }
 
@@ -51,7 +54,7 @@
       z-index: 2;
       color: @pagination-active-color;
       background-color: @pagination-active-bg;
-      border-color: @pagination-active-bg;
+      border-color: @pagination-active-border;
       cursor: default;
     }
   }
@@ -64,8 +67,8 @@
     > a:hover,
     > a:focus {
       color: @pagination-disabled-color;
-      background-color: @pagination-bg;
-      border-color: @pagination-border;
+      background-color: @pagination-disabled-bg;
+      border-color: @pagination-disabled-border;
       cursor: not-allowed;
     }
   }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/panels.less b/plugins/system/t3/base-bs3/bootstrap/less/panels.less
index a5ada2a..e677d2b 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/panels.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/panels.less
@@ -14,8 +14,8 @@
 
 // Panel contents
 .panel-body {
-  padding: 15px;
-  .clearfix();
+  padding: @panel-body-padding;
+  &:extend(.clearfix all);
 }
 
 
@@ -27,19 +27,28 @@
 .panel {
   > .list-group {
     margin-bottom: 0;
-
     .list-group-item {
       border-width: 1px 0;
-
-      // Remove border radius for top one
+      border-radius: 0;
       &:first-child {
-        .border-top-radius(0);
+        border-top: 0;
       }
-      // But keep it for the last one
       &:last-child {
         border-bottom: 0;
       }
     }
+    // Add border top radius for first one
+    &:first-child {
+      .list-group-item:first-child {
+        .border-top-radius((@panel-border-radius - 1));
+      }
+    }
+    // Add border bottom radius for last one
+    &:last-child {
+      .list-group-item:last-child {
+        .border-bottom-radius((@panel-border-radius - 1));
+      }
+    }
   }
 }
 // Collapse space between when there's no additional content.
@@ -60,12 +69,46 @@
   > .table-responsive > .table {
     margin-bottom: 0;
   }
+  // Add border top radius for first one
+  > .table:first-child,
+  > .table-responsive:first-child > .table:first-child {
+    > thead:first-child,
+    > tbody:first-child {
+      > tr:first-child {
+        td:first-child,
+        th:first-child {
+          border-top-left-radius: (@panel-border-radius - 1);
+        }
+        td:last-child,
+        th:last-child {
+          border-top-right-radius: (@panel-border-radius - 1);
+        }
+      }
+    }
+  }
+  // Add border bottom radius for last one
+  > .table:last-child,
+  > .table-responsive:last-child > .table:last-child {
+    > tbody:last-child,
+    > tfoot:last-child {
+      > tr:last-child {
+        td:first-child,
+        th:first-child {
+          border-bottom-left-radius: (@panel-border-radius - 1);
+        }
+        td:last-child,
+        th:last-child {
+          border-bottom-right-radius: (@panel-border-radius - 1);
+        }
+      }
+    }
+  }
   > .panel-body + .table,
   > .panel-body + .table-responsive {
     border-top: 1px solid @table-border-color;
   }
-  > .table > tbody:first-child th,
-  > .table > tbody:first-child td {
+  > .table > tbody:first-child > tr:first-child th,
+  > .table > tbody:first-child > tr:first-child td {
     border-top: 0;
   }
   > .table-bordered,
@@ -83,7 +126,10 @@
         > td:last-child {
           border-right: 0;
         }
-
+        &:first-child > th,
+        &:first-child > td {
+          border-top: 0;
+        }
         &:last-child > th,
         &:last-child > td {
           border-bottom: 0;
@@ -102,14 +148,14 @@
 .panel-heading {
   padding: 10px 15px;
   border-bottom: 1px solid transparent;
-  .border-top-radius(@panel-border-radius - 1);
+  .border-top-radius((@panel-border-radius - 1));
 
   > .dropdown .dropdown-toggle {
     color: inherit;
   }
 }
 
-// Within heading, strip any `h*` tag of it's default margins for spacing.
+// Within heading, strip any `h*` tag of its default margins for spacing.
 .panel-title {
   margin-top: 0;
   margin-bottom: 0;
@@ -126,7 +172,7 @@
   padding: 10px 15px;
   background-color: @panel-footer-bg;
   border-top: 1px solid @panel-inner-border;
-  .border-bottom-radius(@panel-border-radius - 1);
+  .border-bottom-radius((@panel-border-radius - 1));
 }
 
 
@@ -136,6 +182,8 @@
 // the help of our collapse JavaScript plugin.
 
 .panel-group {
+  margin-bottom: @line-height-computed;
+
   // Tighten up margin so it's only between panels
   .panel {
     margin-bottom: 0;
@@ -171,12 +219,12 @@
 .panel-success {
   .panel-variant(@panel-success-border; @panel-success-text; @panel-success-heading-bg; @panel-success-border);
 }
+.panel-info {
+  .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
+}
 .panel-warning {
   .panel-variant(@panel-warning-border; @panel-warning-text; @panel-warning-heading-bg; @panel-warning-border);
 }
 .panel-danger {
   .panel-variant(@panel-danger-border; @panel-danger-text; @panel-danger-heading-bg; @panel-danger-border);
 }
-.panel-info {
-  .panel-variant(@panel-info-border; @panel-info-text; @panel-info-heading-bg; @panel-info-border);
-}
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/print.less b/plugins/system/t3/base-bs3/bootstrap/less/print.less
index 07277a3..3655d03 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/print.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/print.less
@@ -50,10 +50,6 @@
     max-width: 100% !important;
   }
 
-  @page {
-    margin: 2cm .5cm;
-  }
-
   p,
   h2,
   h3 {
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/responsive-utilities.less b/plugins/system/t3/base-bs3/bootstrap/less/responsive-utilities.less
index df53e47..5a31816 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/responsive-utilities.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/responsive-utilities.less
@@ -23,187 +23,71 @@
 
 
 // Visibility utilities
-
 .visible-xs {
   .responsive-invisibility();
+
   @media (max-width: @screen-xs-max) {
     .responsive-visibility();
   }
-  &.visible-sm {
-    @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
-      .responsive-visibility();
-    }
-  }
-  &.visible-md {
-    @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
-      .responsive-visibility();
-    }
-  }
-  &.visible-lg {
-    @media (min-width: @screen-lg-min) {
-      .responsive-visibility();
-    }
-  }
 }
 .visible-sm {
   .responsive-invisibility();
-  &.visible-xs {
-    @media (max-width: @screen-xs-max) {
-      .responsive-visibility();
-    }
-  }
+
   @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
     .responsive-visibility();
   }
-  &.visible-md {
-    @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
-      .responsive-visibility();
-    }
-  }
-  &.visible-lg {
-    @media (min-width: @screen-lg-min) {
-      .responsive-visibility();
-    }
-  }
 }
 .visible-md {
   .responsive-invisibility();
-  &.visible-xs {
-    @media (max-width: @screen-xs-max) {
-      .responsive-visibility();
-    }
-  }
-  &.visible-sm {
-    @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
-      .responsive-visibility();
-    }
-  }
+
   @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
     .responsive-visibility();
   }
-  &.visible-lg {
-    @media (min-width: @screen-lg-min) {
-      .responsive-visibility();
-    }
-  }
 }
 .visible-lg {
   .responsive-invisibility();
-  &.visible-xs {
-    @media (max-width: @screen-xs-max) {
-      .responsive-visibility();
-    }
-  }
-  &.visible-sm {
-    @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
-      .responsive-visibility();
-    }
-  }
-  &.visible-md {
-    @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
-      .responsive-visibility();
-    }
-  }
+
   @media (min-width: @screen-lg-min) {
     .responsive-visibility();
   }
 }
 
 .hidden-xs {
-  .responsive-visibility();
   @media (max-width: @screen-xs-max) {
     .responsive-invisibility();
   }
-  &.hidden-sm {
-    @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
-      .responsive-invisibility();
-    }
-  }
-  &.hidden-md {
-    @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
-      .responsive-invisibility();
-    }
-  }
-  &.hidden-lg {
-    @media (min-width: @screen-lg-min) {
-      .responsive-invisibility();
-    }
-  }
 }
 .hidden-sm {
-  .responsive-visibility();
-  &.hidden-xs {
-    @media (max-width: @screen-xs-max) {
-      .responsive-invisibility();
-    }
-  }
   @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
     .responsive-invisibility();
   }
-  &.hidden-md {
-    @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
-      .responsive-invisibility();
-    }
-  }
-  &.hidden-lg {
-    @media (min-width: @screen-lg-min) {
-      .responsive-invisibility();
-    }
-  }
 }
 .hidden-md {
-  .responsive-visibility();
-  &.hidden-xs {
-    @media (max-width: @screen-xs-max) {
-      .responsive-invisibility();
-    }
-  }
-  &.hidden-sm {
-    @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
-      .responsive-invisibility();
-    }
-  }
   @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
     .responsive-invisibility();
   }
-  &.hidden-lg {
-    @media (min-width: @screen-lg-min) {
-      .responsive-invisibility();
-    }
-  }
 }
 .hidden-lg {
-  .responsive-visibility();
-  &.hidden-xs {
-    @media (max-width: @screen-xs-max) {
-      .responsive-invisibility();
-    }
-  }
-  &.hidden-sm {
-    @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
-      .responsive-invisibility();
-    }
-  }
-  &.hidden-md {
-    @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
-      .responsive-invisibility();
-    }
-  }
   @media (min-width: @screen-lg-min) {
     .responsive-invisibility();
   }
 }
 
+
 // Print utilities
+//
+// Media queries are placed on the inside to be mixin-friendly.
+
 .visible-print {
   .responsive-invisibility();
-}
 
-@media print {
-  .visible-print {
+  @media print {
     .responsive-visibility();
   }
-  .hidden-print {
+}
+
+.hidden-print {
+  @media print {
     .responsive-invisibility();
   }
 }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/scaffolding.less b/plugins/system/t3/base-bs3/bootstrap/less/scaffolding.less
index 976b4e3..fe29f2d 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/scaffolding.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/scaffolding.less
@@ -4,8 +4,13 @@
 
 
 // Reset the box-sizing
-
-*,
+//
+// Heads up! This reset may cause conflicts with some third-party widgets.
+// For recommendations on resolving such conflicts, see
+// http://getbootstrap.com/getting-started/#third-box-sizing
+* {
+  .box-sizing(border-box);
+}
 *:before,
 *:after {
   .box-sizing(border-box);
@@ -56,6 +61,16 @@ a {
 }
 
 
+// Figures
+//
+// We reset this here because previously Normalize had no `figure` margins. This
+// ensures we don't break anyone's use of the element.
+
+figure {
+  margin: 0;
+}
+
+
 // Images
 
 img {
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/tables.less b/plugins/system/t3/base-bs3/bootstrap/less/tables.less
index ca565f4..c41989c 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/tables.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/tables.less
@@ -141,6 +141,7 @@ table {
   td,
   th {
     &[class*="col-"] {
+      position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
       float: none;
       display: table-cell;
     }
@@ -156,8 +157,9 @@ table {
 // Generate the contextual variants
 .table-row-variant(active; @table-bg-active);
 .table-row-variant(success; @state-success-bg);
-.table-row-variant(danger; @state-danger-bg);
+.table-row-variant(info; @state-info-bg);
 .table-row-variant(warning; @state-warning-bg);
+.table-row-variant(danger; @state-danger-bg);
 
 
 // Responsive tables
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/theme.less b/plugins/system/t3/base-bs3/bootstrap/less/theme.less
index 0addce3..6f957fb 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/theme.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/theme.less
@@ -63,9 +63,9 @@
 .btn-default { .btn-styles(@btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
 .btn-primary { .btn-styles(@btn-primary-bg); }
 .btn-success { .btn-styles(@btn-success-bg); }
+.btn-info    { .btn-styles(@btn-info-bg); }
 .btn-warning { .btn-styles(@btn-warning-bg); }
 .btn-danger  { .btn-styles(@btn-danger-bg); }
-.btn-info    { .btn-styles(@btn-info-bg); }
 
 
 
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/tooltip.less b/plugins/system/t3/base-bs3/bootstrap/less/tooltip.less
index ce793cb..bd62699 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/tooltip.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/tooltip.less
@@ -13,7 +13,7 @@
   line-height: 1.4;
   .opacity(0);
 
-  &.in     { .opacity(.9); }
+  &.in     { .opacity(@tooltip-opacity); }
   &.top    { margin-top:  -3px; padding: @tooltip-arrow-width 0; }
   &.right  { margin-left:  3px; padding: 0 @tooltip-arrow-width; }
   &.bottom { margin-top:   3px; padding: @tooltip-arrow-width 0; }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/type.less b/plugins/system/t3/base-bs3/bootstrap/less/type.less
index ac07ac7..a55730d 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/type.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/type.less
@@ -21,9 +21,9 @@ h1, h2, h3, h4, h5, h6,
   }
 }
 
-h1,
-h2,
-h3 {
+h1, .h1,
+h2, .h2,
+h3, .h3 {
   margin-top: @line-height-computed;
   margin-bottom: (@line-height-computed / 2);
 
@@ -32,9 +32,9 @@ h3 {
     font-size: 65%;
   }
 }
-h4,
-h5,
-h6 {
+h4, .h4,
+h5, .h5,
+h6, .h6 {
   margin-top: (@line-height-computed / 2);
   margin-bottom: (@line-height-computed / 2);
 
@@ -61,7 +61,7 @@ p {
 
 .lead {
   margin-bottom: @line-height-computed;
-  font-size: floor(@font-size-base * 1.15);
+  font-size: floor((@font-size-base * 1.15));
   font-weight: 200;
   line-height: 1.4;
 
@@ -81,45 +81,53 @@ small,
 // Undo browser default styling
 cite    { font-style: normal; }
 
-// Contextual emphasis
+// Alignment
+.text-left           { text-align: left; }
+.text-right          { text-align: right; }
+.text-center         { text-align: center; }
+.text-justify        { text-align: justify; }
+
+// Contextual colors
 .text-muted {
   color: @text-muted;
 }
 .text-primary {
-  color: @brand-primary;
-  &:hover {
-    color: darken(@brand-primary, 10%);
-  }
+  .text-emphasis-variant(@brand-primary);
+}
+.text-success {
+  .text-emphasis-variant(@state-success-text);
+}
+.text-info {
+  .text-emphasis-variant(@state-info-text);
 }
 .text-warning {
-  color: @state-warning-text;
-  &:hover {
-    color: darken(@state-warning-text, 10%);
-  }
+  .text-emphasis-variant(@state-warning-text);
 }
 .text-danger {
-  color: @state-danger-text;
-  &:hover {
-    color: darken(@state-danger-text, 10%);
-  }
+  .text-emphasis-variant(@state-danger-text);
 }
-.text-success {
-  color: @state-success-text;
-  &:hover {
-    color: darken(@state-success-text, 10%);
-  }
+
+// Contextual backgrounds
+// For now we'll leave these alongside the text classes until v4 when we can
+// safely shift things around (per SemVer rules).
+.bg-primary {
+  // Given the contrast here, this is the only class to have its color inverted
+  // automatically.
+  color: #fff;
+  .bg-variant(@brand-primary);
 }
-.text-info {
-  color: @state-info-text;
-  &:hover {
-    color: darken(@state-info-text, 10%);
-  }
+.bg-success {
+  .bg-variant(@state-success-bg);
+}
+.bg-info {
+  .bg-variant(@state-info-bg);
+}
+.bg-warning {
+  .bg-variant(@state-warning-bg);
+}
+.bg-danger {
+  .bg-variant(@state-danger-bg);
 }
-
-// Alignment
-.text-left           { text-align: left; }
-.text-right          { text-align: right; }
-.text-center         { text-align: center; }
 
 
 // Page header
@@ -201,7 +209,7 @@ dd {
     }
     dd {
       margin-left: @component-offset-horizontal;
-      .clearfix(); // Clear the floated `dt` if an empty `dd` is present
+      &:extend(.clearfix all); // Clear the floated `dt` if an empty `dd` is present
     }
   }
 }
@@ -225,44 +233,51 @@ abbr[data-original-title] {
 blockquote {
   padding: (@line-height-computed / 2) @line-height-computed;
   margin: 0 0 @line-height-computed;
+  font-size: (@font-size-base * 1.25);
   border-left: 5px solid @blockquote-border-color;
-  p {
-    font-size: (@font-size-base * 1.25);
-    font-weight: 300;
-    line-height: 1.25;
-  }
-  p:last-child {
-    margin-bottom: 0;
+
+  p,
+  ul,
+  ol {
+    &:last-child {
+      margin-bottom: 0;
+    }
   }
+
+  // Note: Deprecated small and .small as of v3.1.0
+  // Context: https://github.com/twbs/bootstrap/issues/11660
+  footer,
   small,
   .small {
     display: block;
+    font-size: 80%; // back to default font-size
     line-height: @line-height-base;
     color: @blockquote-small-color;
+
     &:before {
-      content: '\2014 \00A0'; // EM DASH, NBSP
+      content: '\2014 \00A0'; // em dash, nbsp
     }
   }
+}
 
-  // Float right with text-align: right
-  &.pull-right {
-    padding-right: 15px;
-    padding-left: 0;
-    border-right: 5px solid @blockquote-border-color;
-    border-left: 0;
-    p,
-    small,
-    .small {
-      text-align: right;
-    }
-    small,
-    .small {
-      &:before {
-        content: '';
-      }
-      &:after {
-        content: '\00A0 \2014'; // NBSP, EM DASH
-      }
+// Opposite alignment of blockquote
+//
+// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.
+.blockquote-reverse,
+blockquote.pull-right {
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid @blockquote-border-color;
+  border-left: 0;
+  text-align: right;
+
+  // Account for citation
+  footer,
+  small,
+  .small {
+    &:before { content: ''; }
+    &:after {
+      content: '\00A0 \2014'; // nbsp, em dash
     }
   }
 }
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/variables.less b/plugins/system/t3/base-bs3/bootstrap/less/variables.less
index 8b5f218..ebc72c0 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/variables.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/variables.less
@@ -3,11 +3,9 @@
 // --------------------------------------------------
 
 
-// Global values
-// --------------------------------------------------
-
-// Grays
-// -------------------------
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
 
 @gray-darker:            lighten(#000, 13.5%); // #222
 @gray-dark:              lighten(#000, 20%);   // #333
@@ -15,107 +13,127 @@
 @gray-light:             lighten(#000, 60%);   // #999
 @gray-lighter:           lighten(#000, 93.5%); // #eee
 
-// Brand colors
-// -------------------------
-
 @brand-primary:         #428bca;
 @brand-success:         #5cb85c;
+@brand-info:            #5bc0de;
 @brand-warning:         #f0ad4e;
 @brand-danger:          #d9534f;
-@brand-info:            #5bc0de;
 
-// Scaffolding
-// -------------------------
 
+//== Scaffolding
+//
+// ## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
 @body-bg:               #fff;
+//** Global text color on `<body>`.
 @text-color:            @gray-dark;
 
-// Links
-// -------------------------
-
+//** Global textual link color.
 @link-color:            @brand-primary;
+//** Link hover color set via `darken()` function.
 @link-hover-color:      darken(@link-color, 15%);
 
-// Typography
-// -------------------------
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
 
 @font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
 @font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
 @font-size-base:          14px;
-@font-size-large:         ceil(@font-size-base * 1.25); // ~18px
-@font-size-small:         ceil(@font-size-base * 0.85); // ~12px
+@font-size-large:         ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small:         ceil((@font-size-base * 0.85)); // ~12px
 
-@font-size-h1:            floor(@font-size-base * 2.6); // ~36px
-@font-size-h2:            floor(@font-size-base * 2.15); // ~30px
-@font-size-h3:            ceil(@font-size-base * 1.7); // ~24px
-@font-size-h4:            ceil(@font-size-base * 1.25); // ~18px
+@font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3:            ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
 @font-size-h5:            @font-size-base;
-@font-size-h6:            ceil(@font-size-base * 0.85); // ~12px
+@font-size-h6:            ceil((@font-size-base * 0.85)); // ~12px
 
+//** Unit-less `line-height` for use in components like buttons.
 @line-height-base:        1.428571429; // 20/14
-@line-height-computed:    floor(@font-size-base * @line-height-base); // ~20px
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed:    floor((@font-size-base * @line-height-base)); // ~20px
 
-@headings-font-family:    @font-family-base;
+//** By default, this inherits from the `<body>`.
+@headings-font-family:    inherit;
 @headings-font-weight:    500;
 @headings-line-height:    1.1;
 @headings-color:          inherit;
 
 
-// Iconography
-// -------------------------
+//-- Iconography
+//
+//## Specify custom locations of the include Glyphicons icon font. Useful for those including Bootstrap via Bower.
 
 @icon-font-path:          "../fonts/";
 @icon-font-name:          "glyphicons-halflings-regular";
+@icon-font-svg-id:				"glyphicons_halflingsregular";
 
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
 
-// Components
-// -------------------------
-// Based on 14px font-size and 1.428 line-height (~20px to start)
+@padding-base-vertical:     6px;
+@padding-base-horizontal:   12px;
 
-@padding-base-vertical:          6px;
-@padding-base-horizontal:        12px;
+@padding-large-vertical:    10px;
+@padding-large-horizontal:  16px;
 
-@padding-large-vertical:         10px;
-@padding-large-horizontal:       16px;
+@padding-small-vertical:    5px;
+@padding-small-horizontal:  10px;
 
-@padding-small-vertical:         5px;
-@padding-small-horizontal:       10px;
+@padding-xs-vertical:       1px;
+@padding-xs-horizontal:     5px;
 
-@padding-xs-vertical:            1px;
-@padding-xs-horizontal:          5px;
+@line-height-large:         1.33;
+@line-height-small:         1.5;
 
-@line-height-large:              1.33;
-@line-height-small:              1.5;
+@border-radius-base:        4px;
+@border-radius-large:       6px;
+@border-radius-small:       3px;
 
-@border-radius-base:             4px;
-@border-radius-large:            6px;
-@border-radius-small:            3px;
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color:    #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg:       @brand-primary;
 
-@component-active-color:         #fff;
-@component-active-bg:            @brand-primary;
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base:          4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large:         5px;
 
-@caret-width-base:               4px;
-@caret-width-large:              5px;
 
-// Tables
-// -------------------------
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
 
-@table-cell-padding:                 8px;
-@table-condensed-cell-padding:       5px;
+//** Padding for `<th>`s and `<td>`s.
+@table-cell-padding:            8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding:  5px;
 
-@table-bg:                           transparent; // overall background-color
-@table-bg-accent:                    #f9f9f9; // for striping
-@table-bg-hover:                     #f5f5f5;
-@table-bg-active:                    @table-bg-hover;
+//** Default background color used for all tables.
+@table-bg:                      transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent:               #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover:                #f5f5f5;
+@table-bg-active:               @table-bg-hover;
 
-@table-border-color:                 #ddd; // table and cell border
+//** Border color for table and cell borders.
+@table-border-color:            #ddd;
 
 
-// Buttons
-// -------------------------
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
 
 @btn-font-weight:                normal;
 
@@ -131,6 +149,10 @@
 @btn-success-bg:                 @brand-success;
 @btn-success-border:             darken(@btn-success-bg, 5%);
 
+@btn-info-color:                 #fff;
+@btn-info-bg:                    @brand-info;
+@btn-info-border:                darken(@btn-info-bg, 5%);
+
 @btn-warning-color:              #fff;
 @btn-warning-bg:                 @brand-warning;
 @btn-warning-border:             darken(@btn-warning-bg, 5%);
@@ -139,65 +161,87 @@
 @btn-danger-bg:                  @brand-danger;
 @btn-danger-border:              darken(@btn-danger-bg, 5%);
 
-@btn-info-color:                 #fff;
-@btn-info-bg:                    @brand-info;
-@btn-info-border:                darken(@btn-info-bg, 5%);
-
 @btn-link-disabled-color:        @gray-light;
 
 
-// Forms
-// -------------------------
+//== Forms
+//
+//##
 
+//** `<input>` background color
 @input-bg:                       #fff;
+//** `<input disabled>` background color
 @input-bg-disabled:              @gray-lighter;
 
+//** Text color for `<input>`s
 @input-color:                    @gray;
+//** `<input>` border color
 @input-border:                   #ccc;
+//** `<input>` border radius
 @input-border-radius:            @border-radius-base;
+//** Border color for inputs on focus
 @input-border-focus:             #66afe9;
 
+//** Placeholder text color
 @input-color-placeholder:        @gray-light;
 
+//** Default `.form-control` height
 @input-height-base:              (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
 @input-height-large:             (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
 @input-height-small:             (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
 
 @legend-color:                   @gray-dark;
 @legend-border-color:            #e5e5e5;
 
+//** Background color for textual input addons
 @input-group-addon-bg:           @gray-lighter;
+//** Border color for textual input addons
 @input-group-addon-border-color: @input-border;
 
 
-// Dropdowns
-// -------------------------
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
 
+//** Background for the dropdown menu.
 @dropdown-bg:                    #fff;
+//** Dropdown menu `border-color`.
 @dropdown-border:                rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
 @dropdown-fallback-border:       #ccc;
+//** Divider color for between dropdown items.
 @dropdown-divider-bg:            #e5e5e5;
 
+//** Dropdown link text color.
 @dropdown-link-color:            @gray-dark;
+//** Hover color for dropdown links.
 @dropdown-link-hover-color:      darken(@gray-dark, 5%);
+//** Hover background for dropdown links.
 @dropdown-link-hover-bg:         #f5f5f5;
 
+//** Active dropdown menu item text color.
 @dropdown-link-active-color:     @component-active-color;
+//** Active dropdown menu item background color.
 @dropdown-link-active-bg:        @component-active-bg;
 
+//** Disabled dropdown menu item background color.
 @dropdown-link-disabled-color:   @gray-light;
 
+//** Text color for headers within dropdown menus.
 @dropdown-header-color:          @gray-light;
 
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
+// Note: Deprecated @dropdown-caret-color as of v3.1.0
+@dropdown-caret-color:           #000;
 
 
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
 
 @zindex-navbar:            1000;
 @zindex-dropdown:          1000;
@@ -207,8 +251,10 @@
 @zindex-modal-background:  1040;
 @zindex-modal:             1050;
 
-// Media queries breakpoints
-// --------------------------------------------------
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
 
 // Extra small screen / phone
 // Note: Deprecated @screen-xs and @screen-phone as of v3.0.1
@@ -240,31 +286,32 @@
 @screen-md-max:              (@screen-lg-min - 1);
 
 
-// Grid system
-// --------------------------------------------------
+//== Grid system
+//
+//## Define your custom responsive grid.
 
-// Number of columns in the grid system
+//** Number of columns in the grid.
 @grid-columns:              12;
-// Padding, to be divided by two and applied to the left and right of all columns
+//** Padding between columns. Gets divided in half for the left and right.
 @grid-gutter-width:         30px;
-
 // Navbar collapse
-
-// Point at which the navbar becomes uncollapsed
+//** Point at which the navbar becomes uncollapsed.
 @grid-float-breakpoint:     @screen-sm-min;
-// Point at which the navbar begins collapsing
+//** Point at which the navbar begins collapsing.
 @grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
 
 
-// Navbar
-// -------------------------
+//== Navbar
+//
+//##
 
 // Basics of a navbar
 @navbar-height:                    50px;
 @navbar-margin-bottom:             @line-height-computed;
 @navbar-border-radius:             @border-radius-base;
-@navbar-padding-horizontal:        floor(@grid-gutter-width / 2);
+@navbar-padding-horizontal:        floor((@grid-gutter-width / 2));
 @navbar-padding-vertical:          ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height:       340px;
 
 @navbar-default-color:             #777;
 @navbar-default-bg:                #f8f8f8;
@@ -286,12 +333,11 @@
 
 // Navbar toggle
 @navbar-default-toggle-hover-bg:           #ddd;
-@navbar-default-toggle-icon-bar-bg:        #ccc;
+@navbar-default-toggle-icon-bar-bg:        #888;
 @navbar-default-toggle-border-color:       #ddd;
 
 
 // Inverted navbar
-//
 // Reset inverted navbar basics
 @navbar-inverse-color:                      @gray-light;
 @navbar-inverse-bg:                         #222;
@@ -317,9 +363,11 @@
 @navbar-inverse-toggle-border-color:        #333;
 
 
-// Navs
-// -------------------------
+//== Navs
+//
+//##
 
+//=== Shared nav styles
 @nav-link-padding:                          10px 15px;
 @nav-link-hover-bg:                         @gray-lighter;
 
@@ -328,7 +376,7 @@
 
 @nav-open-link-hover-color:                 #fff;
 
-// Tabs
+//== Tabs
 @nav-tabs-border-color:                     #ddd;
 
 @nav-tabs-link-hover-border-color:          @gray-lighter;
@@ -340,45 +388,63 @@
 @nav-tabs-justified-link-border-color:            #ddd;
 @nav-tabs-justified-active-link-border-color:     @body-bg;
 
-// Pills
+//== Pills
 @nav-pills-border-radius:                   @border-radius-base;
 @nav-pills-active-link-hover-bg:            @component-active-bg;
 @nav-pills-active-link-hover-color:         @component-active-color;
 
 
-// Pagination
-// -------------------------
+//== Pagination
+//
+//##
 
+@pagination-color:                     @link-color;
 @pagination-bg:                        #fff;
 @pagination-border:                    #ddd;
 
+@pagination-hover-color:               @link-hover-color;
 @pagination-hover-bg:                  @gray-lighter;
+@pagination-hover-border:              #ddd;
 
-@pagination-active-bg:                 @brand-primary;
 @pagination-active-color:              #fff;
+@pagination-active-bg:                 @brand-primary;
+@pagination-active-border:             @brand-primary;
 
 @pagination-disabled-color:            @gray-light;
+@pagination-disabled-bg:               #fff;
+@pagination-disabled-border:           #ddd;
 
 
-// Pager
-// -------------------------
+//== Pager
+//
+//##
 
+@pager-bg:                             @pagination-bg;
+@pager-border:                         @pagination-border;
 @pager-border-radius:                  15px;
-@pager-disabled-color:                 @gray-light;
 
+@pager-hover-bg:                       @pagination-hover-bg;
+
+@pager-active-bg:                      @pagination-active-bg;
+@pager-active-color:                   @pagination-active-color;
+
+@pager-disabled-color:                 @pagination-disabled-color;
 
-// Jumbotron
-// -------------------------
+
+//== Jumbotron
+//
+//##
 
 @jumbotron-padding:              30px;
 @jumbotron-color:                inherit;
 @jumbotron-bg:                   @gray-lighter;
 @jumbotron-heading-color:        inherit;
-@jumbotron-font-size:            ceil(@font-size-base * 1.5);
+@jumbotron-font-size:            ceil((@font-size-base * 1.5));
 
 
-// Form states and alerts
-// -------------------------
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
 
 @state-success-text:             #3c763d;
 @state-success-bg:               #dff0d8;
@@ -397,65 +463,113 @@
 @state-danger-border:            darken(spin(@state-danger-bg, -10), 5%);
 
 
-// Tooltips
-// -------------------------
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
 @tooltip-max-width:           200px;
+//** Tooltip text color
 @tooltip-color:               #fff;
+//** Tooltip background color
 @tooltip-bg:                  #000;
+@tooltip-opacity:             .9;
 
+//** Tooltip arrow width
 @tooltip-arrow-width:         5px;
+//** Tooltip arrow color
 @tooltip-arrow-color:         @tooltip-bg;
 
 
-// Popovers
-// -------------------------
+//== Popovers
+//
+//##
+
+//** Popover body background color
 @popover-bg:                          #fff;
+//** Popover maximum width
 @popover-max-width:                   276px;
+//** Popover border color
 @popover-border-color:                rgba(0,0,0,.2);
+//** Popover fallback border color
 @popover-fallback-border-color:       #ccc;
 
+//** Popover title background color
 @popover-title-bg:                    darken(@popover-bg, 3%);
 
+//** Popover arrow width
 @popover-arrow-width:                 10px;
+//** Popover arrow color
 @popover-arrow-color:                 #fff;
 
+//** Popover outer arrow width
 @popover-arrow-outer-width:           (@popover-arrow-width + 1);
+//** Popover outer arrow color
 @popover-arrow-outer-color:           rgba(0,0,0,.25);
+//** Popover outer arrow fallback color
 @popover-arrow-outer-fallback-color:  #999;
 
 
-// Labels
-// -------------------------
+//== Labels
+//
+//##
 
+//** Default label background color
 @label-default-bg:            @gray-light;
+//** Primary label background color
 @label-primary-bg:            @brand-primary;
+//** Success label background color
 @label-success-bg:            @brand-success;
+//** Info label background color
 @label-info-bg:               @brand-info;
+//** Warning label background color
 @label-warning-bg:            @brand-warning;
+//** Danger label background color
 @label-danger-bg:             @brand-danger;
 
+//** Default label text color
 @label-color:                 #fff;
+//** Default text color of a linked label
 @label-link-hover-color:      #fff;
 
 
-// Modals
-// -------------------------
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
 @modal-inner-padding:         20px;
 
+//** Padding applied to the modal title
 @modal-title-padding:         15px;
+//** Modal title line-height
 @modal-title-line-height:     @line-height-base;
 
+//** Background color of modal content area
 @modal-content-bg:                             #fff;
+//** Modal content border color
 @modal-content-border-color:                   rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
 @modal-content-fallback-border-color:          #999;
 
+//** Modal backdrop background color
 @modal-backdrop-bg:           #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity:      .5;
+//** Modal header border color
 @modal-header-border-color:   #e5e5e5;
+//** Modal footer border color
 @modal-footer-border-color:   @modal-header-border-color;
 
+@modal-lg:                    900px;
+@modal-md:                    600px;
+@modal-sm:                    300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
 
-// Alerts
-// -------------------------
 @alert-padding:               15px;
 @alert-border-radius:         @border-radius-base;
 @alert-link-font-weight:      bold;
@@ -477,38 +591,62 @@
 @alert-danger-border:         @state-danger-border;
 
 
-// Progress bars
-// -------------------------
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
 @progress-bg:                 #f5f5f5;
+//** Progress bar text color
 @progress-bar-color:          #fff;
 
+//** Default progress bar color
 @progress-bar-bg:             @brand-primary;
+//** Success progress bar color
 @progress-bar-success-bg:     @brand-success;
+//** Warning progress bar color
 @progress-bar-warning-bg:     @brand-warning;
+//** Danger progress bar color
 @progress-bar-danger-bg:      @brand-danger;
+//** Info progress bar color
 @progress-bar-info-bg:        @brand-info;
 
 
-// List group
-// -------------------------
-@list-group-bg:               #fff;
-@list-group-border:           #ddd;
-@list-group-border-radius:    @border-radius-base;
-
-@list-group-hover-bg:         #f5f5f5;
-@list-group-active-color:     @component-active-color;
-@list-group-active-bg:        @component-active-bg;
-@list-group-active-border:    @list-group-active-bg;
-
-@list-group-link-color:          #555;
-@list-group-link-heading-color:  #333;
-
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg:                 #fff;
+//** `.list-group-item` border color
+@list-group-border:             #ddd;
+//** List group border radius
+@list-group-border-radius:      @border-radius-base;
+
+//** Background color of single list elements on hover
+@list-group-hover-bg:           #f5f5f5;
+//** Text color of active list elements
+@list-group-active-color:       @component-active-color;
+//** Background color of active list elements
+@list-group-active-bg:          @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border:      @list-group-active-bg;
+@list-group-active-text-color:  lighten(@list-group-active-bg, 40%);
+
+@list-group-link-color:         #555;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
 
-// Panels
-// -------------------------
 @panel-bg:                    #fff;
-@panel-inner-border:          #ddd;
+@panel-body-padding:          15px;
 @panel-border-radius:         @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border:          #ddd;
 @panel-footer-bg:             #f5f5f5;
 
 @panel-default-text:          @gray-dark;
@@ -523,6 +661,10 @@
 @panel-success-border:        @state-success-border;
 @panel-success-heading-bg:    @state-success-bg;
 
+@panel-info-text:             @state-info-text;
+@panel-info-border:           @state-info-border;
+@panel-info-heading-bg:       @state-info-bg;
+
 @panel-warning-text:          @state-warning-text;
 @panel-warning-border:        @state-warning-border;
 @panel-warning-heading-bg:    @state-warning-bg;
@@ -531,34 +673,46 @@
 @panel-danger-border:         @state-danger-border;
 @panel-danger-heading-bg:     @state-danger-bg;
 
-@panel-info-text:             @state-info-text;
-@panel-info-border:           @state-info-border;
-@panel-info-heading-bg:       @state-info-bg;
 
+//== Thumbnails
+//
+//##
 
-// Thumbnails
-// -------------------------
+//** Padding around the thumbnail image
 @thumbnail-padding:           4px;
+//** Thumbnail background color
 @thumbnail-bg:                @body-bg;
+//** Thumbnail border color
 @thumbnail-border:            #ddd;
+//** Thumbnail border radius
 @thumbnail-border-radius:     @border-radius-base;
 
+//** Custom text color for thumbnail captions
 @thumbnail-caption-color:     @text-color;
+//** Padding around the thumbnail caption
 @thumbnail-caption-padding:   9px;
 
 
-// Wells
-// -------------------------
+//== Wells
+//
+//##
+
 @well-bg:                     #f5f5f5;
+@well-border:                 darken(@well-bg, 7%);
 
 
-// Badges
-// -------------------------
+//== Badges
+//
+//##
+
 @badge-color:                 #fff;
+//** Linked badge text color on hover
 @badge-link-hover-color:      #fff;
 @badge-bg:                    @gray-light;
 
+//** Badge text color in active nav link
 @badge-active-color:          @link-color;
+//** Badge background color in active nav link
 @badge-active-bg:             #fff;
 
 @badge-font-weight:           bold;
@@ -566,16 +720,25 @@
 @badge-border-radius:         10px;
 
 
-// Breadcrumbs
-// -------------------------
-@breadcrumb-bg:               #f5f5f5;
-@breadcrumb-color:            #ccc;
-@breadcrumb-active-color:     @gray-light;
-@breadcrumb-separator:        "/";
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical:   8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg:                 #f5f5f5;
+//** Breadcrumb text color
+@breadcrumb-color:              #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color:       @gray-light;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator:          "/";
 
 
-// Carousel
-// ------------------------
+//== Carousel
+//
+//##
 
 @carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6);
 
@@ -590,53 +753,75 @@
 @carousel-caption-color:                      #fff;
 
 
-// Close
-// ------------------------
+//== Close
+//
+//##
+
 @close-font-weight:           bold;
 @close-color:                 #000;
 @close-text-shadow:           0 1px 0 #fff;
 
 
-// Code
-// ------------------------
+//== Code
+//
+//##
+
 @code-color:                  #c7254e;
 @code-bg:                     #f9f2f4;
 
+@kbd-color:                   #fff;
+@kbd-bg:                      #333;
+
 @pre-bg:                      #f5f5f5;
 @pre-color:                   @gray-dark;
 @pre-border-color:            #ccc;
 @pre-scrollable-max-height:   340px;
 
-// Type
-// ------------------------
+
+//== Type
+//
+//##
+
+//** Text muted color
 @text-muted:                  @gray-light;
+//** Abbreviations and acronyms border color
 @abbr-border-color:           @gray-light;
+//** Headings small color
 @headings-small-color:        @gray-light;
+//** Blockquote small color
 @blockquote-small-color:      @gray-light;
+//** Blockquote border color
 @blockquote-border-color:     @gray-lighter;
+//** Page header border color
 @page-header-border-color:    @gray-lighter;
 
-// Miscellaneous
-// -------------------------
 
-// Hr border color
+//== Miscellaneous
+//
+//##
+
+//** Horizontal line color.
 @hr-border:                   @gray-lighter;
 
-// Horizontal forms & lists
+//** Horizontal offset for forms and lists.
 @component-offset-horizontal: 180px;
 
 
-// Container sizes
-// --------------------------------------------------
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
 
 // Small screen / tablet
 @container-tablet:             ((720px + @grid-gutter-width));
+//** For `@screen-sm-min` and up.
 @container-sm:                 @container-tablet;
 
 // Medium screen / desktop
 @container-desktop:            ((940px + @grid-gutter-width));
+//** For `@screen-md-min` and up.
 @container-md:                 @container-desktop;
 
 // Large screen / wide desktop
 @container-large-desktop:      ((1140px + @grid-gutter-width));
+//** For `@screen-lg-min` and up.
 @container-lg:                 @container-large-desktop;
diff --git a/plugins/system/t3/base-bs3/bootstrap/less/wells.less b/plugins/system/t3/base-bs3/bootstrap/less/wells.less
index 865abc2..15d072b 100644
--- a/plugins/system/t3/base-bs3/bootstrap/less/wells.less
+++ b/plugins/system/t3/base-bs3/bootstrap/less/wells.less
@@ -9,7 +9,7 @@
   padding: 19px;
   margin-bottom: 20px;
   background-color: @well-bg;
-  border: 1px solid darken(@well-bg, 7%);
+  border: 1px solid @well-border;
   border-radius: @border-radius-base;
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
diff --git a/plugins/system/t3/base-bs3/fonts/font-awesome/css/font-awesome-ie7.css b/plugins/system/t3/base-bs3/fonts/font-awesome/css/font-awesome-ie7.css
deleted file mode 100644
index 17f0776..0000000
--- a/plugins/system/t3/base-bs3/fonts/font-awesome/css/font-awesome-ie7.css
+++ /dev/null
@@ -1,1203 +0,0 @@
-/*!
- *  Font Awesome 3.2.1
- *  the iconic font designed for Bootstrap
- *  ------------------------------------------------------------------------------
- *  The full suite of pictographic icons, examples, and documentation can be
- *  found at http://fontawesome.io.  Stay up to date on Twitter at
- *  http://twitter.com/fontawesome.
- *
- *  License
- *  ------------------------------------------------------------------------------
- *  - The Font Awesome font is licensed under SIL OFL 1.1 -
- *    http://scripts.sil.org/OFL
- *  - Font Awesome CSS, LESS, and SASS files are licensed under MIT License -
- *    http://opensource.org/licenses/mit-license.html
- *  - Font Awesome documentation licensed under CC BY 3.0 -
- *    http://creativecommons.org/licenses/by/3.0/
- *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    "Font Awesome by Dave Gandy - http://fontawesome.io"
- *
- *  Author - Dave Gandy
- *  ------------------------------------------------------------------------------
- *  Email: dave@fontawesome.io
- *  Twitter: http://twitter.com/davegandy
- *  Work: Lead Product Designer @ Kyruus - http://kyruus.com
- */
-.icon-large {
-  font-size: 1.3333333333333333em;
-  margin-top: -4px;
-  padding-top: 3px;
-  margin-bottom: -4px;
-  padding-bottom: 3px;
-  vertical-align: middle;
-}
-.nav [class^="icon-"],
-.nav [class*=" icon-"] {
-  vertical-align: inherit;
-  margin-top: -4px;
-  padding-top: 3px;
-  margin-bottom: -4px;
-  padding-bottom: 3px;
-}
-.nav [class^="icon-"].icon-large,
-.nav [class*=" icon-"].icon-large {
-  vertical-align: -25%;
-}
-.nav-pills [class^="icon-"].icon-large,
-.nav-tabs [class^="icon-"].icon-large,
-.nav-pills [class*=" icon-"].icon-large,
-.nav-tabs [class*=" icon-"].icon-large {
-  line-height: .75em;
-  margin-top: -7px;
-  padding-top: 5px;
-  margin-bottom: -5px;
-  padding-bottom: 4px;
-}
-.btn [class^="icon-"].pull-left,
-.btn [class*=" icon-"].pull-left,
-.btn [class^="icon-"].pull-right,
-.btn [class*=" icon-"].pull-right {
-  vertical-align: inherit;
-}
-.btn [class^="icon-"].icon-large,
-.btn [class*=" icon-"].icon-large {
-  margin-top: -0.5em;
-}
-a [class^="icon-"],
-a [class*=" icon-"] {
-  cursor: pointer;
-}
-.icon-glass {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf000;');
-}
-.icon-music {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf001;');
-}
-.icon-search {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf002;');
-}
-.icon-envelope-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf003;');
-}
-.icon-heart {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf004;');
-}
-.icon-star {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf005;');
-}
-.icon-star-empty {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf006;');
-}
-.icon-user {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf007;');
-}
-.icon-film {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf008;');
-}
-.icon-th-large {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf009;');
-}
-.icon-th {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00a;');
-}
-.icon-th-list {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00b;');
-}
-.icon-ok {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00c;');
-}
-.icon-remove {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00d;');
-}
-.icon-zoom-in {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00e;');
-}
-.icon-zoom-out {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf010;');
-}
-.icon-off {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf011;');
-}
-.icon-power-off {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf011;');
-}
-.icon-signal {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf012;');
-}
-.icon-cog {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf013;');
-}
-.icon-gear {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf013;');
-}
-.icon-trash {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf014;');
-}
-.icon-home {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf015;');
-}
-.icon-file-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf016;');
-}
-.icon-time {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf017;');
-}
-.icon-road {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf018;');
-}
-.icon-download-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf019;');
-}
-.icon-download {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01a;');
-}
-.icon-upload {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01b;');
-}
-.icon-inbox {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01c;');
-}
-.icon-play-circle {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01d;');
-}
-.icon-repeat {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01e;');
-}
-.icon-rotate-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01e;');
-}
-.icon-refresh {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf021;');
-}
-.icon-list-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf022;');
-}
-.icon-lock {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf023;');
-}
-.icon-flag {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf024;');
-}
-.icon-headphones {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf025;');
-}
-.icon-volume-off {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf026;');
-}
-.icon-volume-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf027;');
-}
-.icon-volume-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf028;');
-}
-.icon-qrcode {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf029;');
-}
-.icon-barcode {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02a;');
-}
-.icon-tag {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02b;');
-}
-.icon-tags {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02c;');
-}
-.icon-book {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02d;');
-}
-.icon-bookmark {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02e;');
-}
-.icon-print {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02f;');
-}
-.icon-camera {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf030;');
-}
-.icon-font {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf031;');
-}
-.icon-bold {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf032;');
-}
-.icon-italic {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf033;');
-}
-.icon-text-height {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf034;');
-}
-.icon-text-width {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf035;');
-}
-.icon-align-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf036;');
-}
-.icon-align-center {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf037;');
-}
-.icon-align-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf038;');
-}
-.icon-align-justify {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf039;');
-}
-.icon-list {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03a;');
-}
-.icon-indent-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03b;');
-}
-.icon-indent-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03c;');
-}
-.icon-facetime-video {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03d;');
-}
-.icon-picture {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03e;');
-}
-.icon-pencil {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf040;');
-}
-.icon-map-marker {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf041;');
-}
-.icon-adjust {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf042;');
-}
-.icon-tint {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf043;');
-}
-.icon-edit {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf044;');
-}
-.icon-share {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf045;');
-}
-.icon-check {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf046;');
-}
-.icon-move {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf047;');
-}
-.icon-step-backward {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf048;');
-}
-.icon-fast-backward {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf049;');
-}
-.icon-backward {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04a;');
-}
-.icon-play {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04b;');
-}
-.icon-pause {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04c;');
-}
-.icon-stop {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04d;');
-}
-.icon-forward {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04e;');
-}
-.icon-fast-forward {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf050;');
-}
-.icon-step-forward {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf051;');
-}
-.icon-eject {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf052;');
-}
-.icon-chevron-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf053;');
-}
-.icon-chevron-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf054;');
-}
-.icon-plus-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf055;');
-}
-.icon-minus-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf056;');
-}
-.icon-remove-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf057;');
-}
-.icon-ok-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf058;');
-}
-.icon-question-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf059;');
-}
-.icon-info-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05a;');
-}
-.icon-screenshot {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05b;');
-}
-.icon-remove-circle {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05c;');
-}
-.icon-ok-circle {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05d;');
-}
-.icon-ban-circle {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05e;');
-}
-.icon-arrow-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf060;');
-}
-.icon-arrow-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf061;');
-}
-.icon-arrow-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf062;');
-}
-.icon-arrow-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf063;');
-}
-.icon-share-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf064;');
-}
-.icon-mail-forward {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf064;');
-}
-.icon-resize-full {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf065;');
-}
-.icon-resize-small {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf066;');
-}
-.icon-plus {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf067;');
-}
-.icon-minus {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf068;');
-}
-.icon-asterisk {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf069;');
-}
-.icon-exclamation-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06a;');
-}
-.icon-gift {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06b;');
-}
-.icon-leaf {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06c;');
-}
-.icon-fire {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06d;');
-}
-.icon-eye-open {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06e;');
-}
-.icon-eye-close {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf070;');
-}
-.icon-warning-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf071;');
-}
-.icon-plane {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf072;');
-}
-.icon-calendar {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf073;');
-}
-.icon-random {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf074;');
-}
-.icon-comment {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf075;');
-}
-.icon-magnet {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf076;');
-}
-.icon-chevron-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf077;');
-}
-.icon-chevron-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf078;');
-}
-.icon-retweet {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf079;');
-}
-.icon-shopping-cart {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07a;');
-}
-.icon-folder-close {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07b;');
-}
-.icon-folder-open {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07c;');
-}
-.icon-resize-vertical {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07d;');
-}
-.icon-resize-horizontal {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07e;');
-}
-.icon-bar-chart {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf080;');
-}
-.icon-twitter-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf081;');
-}
-.icon-facebook-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf082;');
-}
-.icon-camera-retro {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf083;');
-}
-.icon-key {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf084;');
-}
-.icon-cogs {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf085;');
-}
-.icon-gears {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf085;');
-}
-.icon-comments {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf086;');
-}
-.icon-thumbs-up-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf087;');
-}
-.icon-thumbs-down-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf088;');
-}
-.icon-star-half {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf089;');
-}
-.icon-heart-empty {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08a;');
-}
-.icon-signout {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08b;');
-}
-.icon-linkedin-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08c;');
-}
-.icon-pushpin {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08d;');
-}
-.icon-external-link {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08e;');
-}
-.icon-signin {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf090;');
-}
-.icon-trophy {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf091;');
-}
-.icon-github-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf092;');
-}
-.icon-upload-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf093;');
-}
-.icon-lemon {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf094;');
-}
-.icon-phone {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf095;');
-}
-.icon-check-empty {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf096;');
-}
-.icon-unchecked {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf096;');
-}
-.icon-bookmark-empty {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf097;');
-}
-.icon-phone-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf098;');
-}
-.icon-twitter {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf099;');
-}
-.icon-facebook {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09a;');
-}
-.icon-github {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09b;');
-}
-.icon-unlock {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09c;');
-}
-.icon-credit-card {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09d;');
-}
-.icon-rss {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09e;');
-}
-.icon-hdd {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a0;');
-}
-.icon-bullhorn {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a1;');
-}
-.icon-bell {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a2;');
-}
-.icon-certificate {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a3;');
-}
-.icon-hand-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a4;');
-}
-.icon-hand-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a5;');
-}
-.icon-hand-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a6;');
-}
-.icon-hand-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a7;');
-}
-.icon-circle-arrow-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a8;');
-}
-.icon-circle-arrow-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a9;');
-}
-.icon-circle-arrow-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0aa;');
-}
-.icon-circle-arrow-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ab;');
-}
-.icon-globe {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ac;');
-}
-.icon-wrench {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ad;');
-}
-.icon-tasks {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ae;');
-}
-.icon-filter {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b0;');
-}
-.icon-briefcase {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b1;');
-}
-.icon-fullscreen {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b2;');
-}
-.icon-group {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c0;');
-}
-.icon-link {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c1;');
-}
-.icon-cloud {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c2;');
-}
-.icon-beaker {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c3;');
-}
-.icon-cut {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c4;');
-}
-.icon-copy {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c5;');
-}
-.icon-paper-clip {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c6;');
-}
-.icon-paperclip {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c6;');
-}
-.icon-save {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c7;');
-}
-.icon-sign-blank {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c8;');
-}
-.icon-reorder {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c9;');
-}
-.icon-list-ul {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ca;');
-}
-.icon-list-ol {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0cb;');
-}
-.icon-strikethrough {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0cc;');
-}
-.icon-underline {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0cd;');
-}
-.icon-table {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ce;');
-}
-.icon-magic {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d0;');
-}
-.icon-truck {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d1;');
-}
-.icon-pinterest {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d2;');
-}
-.icon-pinterest-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d3;');
-}
-.icon-google-plus-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d4;');
-}
-.icon-google-plus {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d5;');
-}
-.icon-money {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d6;');
-}
-.icon-caret-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d7;');
-}
-.icon-caret-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d8;');
-}
-.icon-caret-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d9;');
-}
-.icon-caret-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0da;');
-}
-.icon-columns {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0db;');
-}
-.icon-sort {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0dc;');
-}
-.icon-sort-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0dd;');
-}
-.icon-sort-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0de;');
-}
-.icon-envelope {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e0;');
-}
-.icon-linkedin {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e1;');
-}
-.icon-undo {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e2;');
-}
-.icon-rotate-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e2;');
-}
-.icon-legal {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e3;');
-}
-.icon-dashboard {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e4;');
-}
-.icon-comment-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e5;');
-}
-.icon-comments-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e6;');
-}
-.icon-bolt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e7;');
-}
-.icon-sitemap {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e8;');
-}
-.icon-umbrella {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e9;');
-}
-.icon-paste {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ea;');
-}
-.icon-lightbulb {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0eb;');
-}
-.icon-exchange {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ec;');
-}
-.icon-cloud-download {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ed;');
-}
-.icon-cloud-upload {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ee;');
-}
-.icon-user-md {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f0;');
-}
-.icon-stethoscope {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f1;');
-}
-.icon-suitcase {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f2;');
-}
-.icon-bell-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f3;');
-}
-.icon-coffee {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f4;');
-}
-.icon-food {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f5;');
-}
-.icon-file-text-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f6;');
-}
-.icon-building {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f7;');
-}
-.icon-hospital {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f8;');
-}
-.icon-ambulance {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f9;');
-}
-.icon-medkit {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fa;');
-}
-.icon-fighter-jet {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fb;');
-}
-.icon-beer {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fc;');
-}
-.icon-h-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fd;');
-}
-.icon-plus-sign-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fe;');
-}
-.icon-double-angle-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf100;');
-}
-.icon-double-angle-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf101;');
-}
-.icon-double-angle-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf102;');
-}
-.icon-double-angle-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf103;');
-}
-.icon-angle-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf104;');
-}
-.icon-angle-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf105;');
-}
-.icon-angle-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf106;');
-}
-.icon-angle-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf107;');
-}
-.icon-desktop {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf108;');
-}
-.icon-laptop {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf109;');
-}
-.icon-tablet {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10a;');
-}
-.icon-mobile-phone {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10b;');
-}
-.icon-circle-blank {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10c;');
-}
-.icon-quote-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10d;');
-}
-.icon-quote-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10e;');
-}
-.icon-spinner {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf110;');
-}
-.icon-circle {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf111;');
-}
-.icon-reply {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf112;');
-}
-.icon-mail-reply {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf112;');
-}
-.icon-github-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf113;');
-}
-.icon-folder-close-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf114;');
-}
-.icon-folder-open-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf115;');
-}
-.icon-expand-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf116;');
-}
-.icon-collapse-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf117;');
-}
-.icon-smile {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf118;');
-}
-.icon-frown {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf119;');
-}
-.icon-meh {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11a;');
-}
-.icon-gamepad {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11b;');
-}
-.icon-keyboard {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11c;');
-}
-.icon-flag-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11d;');
-}
-.icon-flag-checkered {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11e;');
-}
-.icon-terminal {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf120;');
-}
-.icon-code {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf121;');
-}
-.icon-reply-all {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf122;');
-}
-.icon-mail-reply-all {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf122;');
-}
-.icon-star-half-empty {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf123;');
-}
-.icon-star-half-full {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf123;');
-}
-.icon-location-arrow {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf124;');
-}
-.icon-crop {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf125;');
-}
-.icon-code-fork {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf126;');
-}
-.icon-unlink {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf127;');
-}
-.icon-question {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf128;');
-}
-.icon-info {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf129;');
-}
-.icon-exclamation {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12a;');
-}
-.icon-superscript {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12b;');
-}
-.icon-subscript {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12c;');
-}
-.icon-eraser {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12d;');
-}
-.icon-puzzle-piece {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12e;');
-}
-.icon-microphone {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf130;');
-}
-.icon-microphone-off {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf131;');
-}
-.icon-shield {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf132;');
-}
-.icon-calendar-empty {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf133;');
-}
-.icon-fire-extinguisher {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf134;');
-}
-.icon-rocket {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf135;');
-}
-.icon-maxcdn {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf136;');
-}
-.icon-chevron-sign-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf137;');
-}
-.icon-chevron-sign-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf138;');
-}
-.icon-chevron-sign-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf139;');
-}
-.icon-chevron-sign-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13a;');
-}
-.icon-html5 {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13b;');
-}
-.icon-css3 {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13c;');
-}
-.icon-anchor {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13d;');
-}
-.icon-unlock-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13e;');
-}
-.icon-bullseye {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf140;');
-}
-.icon-ellipsis-horizontal {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf141;');
-}
-.icon-ellipsis-vertical {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf142;');
-}
-.icon-rss-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf143;');
-}
-.icon-play-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf144;');
-}
-.icon-ticket {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf145;');
-}
-.icon-minus-sign-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf146;');
-}
-.icon-check-minus {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf147;');
-}
-.icon-level-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf148;');
-}
-.icon-level-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf149;');
-}
-.icon-check-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14a;');
-}
-.icon-edit-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14b;');
-}
-.icon-external-link-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14c;');
-}
-.icon-share-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14d;');
-}
-.icon-compass {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14e;');
-}
-.icon-collapse {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf150;');
-}
-.icon-collapse-top {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf151;');
-}
-.icon-expand {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf152;');
-}
-.icon-eur {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf153;');
-}
-.icon-euro {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf153;');
-}
-.icon-gbp {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf154;');
-}
-.icon-usd {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf155;');
-}
-.icon-dollar {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf155;');
-}
-.icon-inr {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf156;');
-}
-.icon-rupee {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf156;');
-}
-.icon-jpy {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf157;');
-}
-.icon-yen {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf157;');
-}
-.icon-cny {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf158;');
-}
-.icon-renminbi {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf158;');
-}
-.icon-krw {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf159;');
-}
-.icon-won {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf159;');
-}
-.icon-btc {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15a;');
-}
-.icon-bitcoin {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15a;');
-}
-.icon-file {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15b;');
-}
-.icon-file-text {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15c;');
-}
-.icon-sort-by-alphabet {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15d;');
-}
-.icon-sort-by-alphabet-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15e;');
-}
-.icon-sort-by-attributes {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf160;');
-}
-.icon-sort-by-attributes-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf161;');
-}
-.icon-sort-by-order {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf162;');
-}
-.icon-sort-by-order-alt {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf163;');
-}
-.icon-thumbs-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf164;');
-}
-.icon-thumbs-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf165;');
-}
-.icon-youtube-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf166;');
-}
-.icon-youtube {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf167;');
-}
-.icon-xing {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf168;');
-}
-.icon-xing-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf169;');
-}
-.icon-youtube-play {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16a;');
-}
-.icon-dropbox {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16b;');
-}
-.icon-stackexchange {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16c;');
-}
-.icon-instagram {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16d;');
-}
-.icon-flickr {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16e;');
-}
-.icon-adn {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf170;');
-}
-.icon-bitbucket {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf171;');
-}
-.icon-bitbucket-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf172;');
-}
-.icon-tumblr {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf173;');
-}
-.icon-tumblr-sign {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf174;');
-}
-.icon-long-arrow-down {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf175;');
-}
-.icon-long-arrow-up {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf176;');
-}
-.icon-long-arrow-left {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf177;');
-}
-.icon-long-arrow-right {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf178;');
-}
-.icon-apple {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf179;');
-}
-.icon-windows {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17a;');
-}
-.icon-android {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17b;');
-}
-.icon-linux {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17c;');
-}
-.icon-dribbble {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17d;');
-}
-.icon-skype {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17e;');
-}
-.icon-foursquare {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf180;');
-}
-.icon-trello {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf181;');
-}
-.icon-female {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf182;');
-}
-.icon-male {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf183;');
-}
-.icon-gittip {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf184;');
-}
-.icon-sun {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf185;');
-}
-.icon-moon {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf186;');
-}
-.icon-archive {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf187;');
-}
-.icon-bug {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf188;');
-}
-.icon-vk {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf189;');
-}
-.icon-weibo {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf18a;');
-}
-.icon-renren {
-  *zoom: expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf18b;');
-}
diff --git a/plugins/system/t3/base-bs3/fonts/font-awesome/css/font-awesome-ie7.min.css b/plugins/system/t3/base-bs3/fonts/font-awesome/css/font-awesome-ie7.min.css
deleted file mode 100644
index d3dae63..0000000
--- a/plugins/system/t3/base-bs3/fonts/font-awesome/css/font-awesome-ie7.min.css
+++ /dev/null
@@ -1,384 +0,0 @@
-.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;}
-.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;}
-.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;}
-.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;}
-.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;}
-a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
-.icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf000;');}
-.icon-music{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf001;');}
-.icon-search{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf002;');}
-.icon-envelope-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf003;');}
-.icon-heart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf004;');}
-.icon-star{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf005;');}
-.icon-star-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf006;');}
-.icon-user{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf007;');}
-.icon-film{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf008;');}
-.icon-th-large{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf009;');}
-.icon-th{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00a;');}
-.icon-th-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00b;');}
-.icon-ok{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00c;');}
-.icon-remove{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00d;');}
-.icon-zoom-in{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf00e;');}
-.icon-zoom-out{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf010;');}
-.icon-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf011;');}
-.icon-power-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf011;');}
-.icon-signal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf012;');}
-.icon-cog{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf013;');}
-.icon-gear{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf013;');}
-.icon-trash{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf014;');}
-.icon-home{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf015;');}
-.icon-file-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf016;');}
-.icon-time{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf017;');}
-.icon-road{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf018;');}
-.icon-download-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf019;');}
-.icon-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01a;');}
-.icon-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01b;');}
-.icon-inbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01c;');}
-.icon-play-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01d;');}
-.icon-repeat{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01e;');}
-.icon-rotate-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf01e;');}
-.icon-refresh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf021;');}
-.icon-list-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf022;');}
-.icon-lock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf023;');}
-.icon-flag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf024;');}
-.icon-headphones{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf025;');}
-.icon-volume-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf026;');}
-.icon-volume-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf027;');}
-.icon-volume-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf028;');}
-.icon-qrcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf029;');}
-.icon-barcode{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02a;');}
-.icon-tag{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02b;');}
-.icon-tags{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02c;');}
-.icon-book{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02d;');}
-.icon-bookmark{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02e;');}
-.icon-print{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf02f;');}
-.icon-camera{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf030;');}
-.icon-font{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf031;');}
-.icon-bold{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf032;');}
-.icon-italic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf033;');}
-.icon-text-height{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf034;');}
-.icon-text-width{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf035;');}
-.icon-align-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf036;');}
-.icon-align-center{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf037;');}
-.icon-align-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf038;');}
-.icon-align-justify{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf039;');}
-.icon-list{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03a;');}
-.icon-indent-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03b;');}
-.icon-indent-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03c;');}
-.icon-facetime-video{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03d;');}
-.icon-picture{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf03e;');}
-.icon-pencil{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf040;');}
-.icon-map-marker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf041;');}
-.icon-adjust{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf042;');}
-.icon-tint{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf043;');}
-.icon-edit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf044;');}
-.icon-share{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf045;');}
-.icon-check{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf046;');}
-.icon-move{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf047;');}
-.icon-step-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf048;');}
-.icon-fast-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf049;');}
-.icon-backward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04a;');}
-.icon-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04b;');}
-.icon-pause{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04c;');}
-.icon-stop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04d;');}
-.icon-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf04e;');}
-.icon-fast-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf050;');}
-.icon-step-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf051;');}
-.icon-eject{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf052;');}
-.icon-chevron-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf053;');}
-.icon-chevron-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf054;');}
-.icon-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf055;');}
-.icon-minus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf056;');}
-.icon-remove-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf057;');}
-.icon-ok-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf058;');}
-.icon-question-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf059;');}
-.icon-info-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05a;');}
-.icon-screenshot{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05b;');}
-.icon-remove-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05c;');}
-.icon-ok-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05d;');}
-.icon-ban-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf05e;');}
-.icon-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf060;');}
-.icon-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf061;');}
-.icon-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf062;');}
-.icon-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf063;');}
-.icon-share-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf064;');}
-.icon-mail-forward{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf064;');}
-.icon-resize-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf065;');}
-.icon-resize-small{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf066;');}
-.icon-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf067;');}
-.icon-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf068;');}
-.icon-asterisk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf069;');}
-.icon-exclamation-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06a;');}
-.icon-gift{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06b;');}
-.icon-leaf{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06c;');}
-.icon-fire{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06d;');}
-.icon-eye-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf06e;');}
-.icon-eye-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf070;');}
-.icon-warning-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf071;');}
-.icon-plane{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf072;');}
-.icon-calendar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf073;');}
-.icon-random{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf074;');}
-.icon-comment{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf075;');}
-.icon-magnet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf076;');}
-.icon-chevron-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf077;');}
-.icon-chevron-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf078;');}
-.icon-retweet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf079;');}
-.icon-shopping-cart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07a;');}
-.icon-folder-close{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07b;');}
-.icon-folder-open{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07c;');}
-.icon-resize-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07d;');}
-.icon-resize-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf07e;');}
-.icon-bar-chart{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf080;');}
-.icon-twitter-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf081;');}
-.icon-facebook-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf082;');}
-.icon-camera-retro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf083;');}
-.icon-key{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf084;');}
-.icon-cogs{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf085;');}
-.icon-gears{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf085;');}
-.icon-comments{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf086;');}
-.icon-thumbs-up-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf087;');}
-.icon-thumbs-down-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf088;');}
-.icon-star-half{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf089;');}
-.icon-heart-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08a;');}
-.icon-signout{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08b;');}
-.icon-linkedin-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08c;');}
-.icon-pushpin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08d;');}
-.icon-external-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf08e;');}
-.icon-signin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf090;');}
-.icon-trophy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf091;');}
-.icon-github-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf092;');}
-.icon-upload-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf093;');}
-.icon-lemon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf094;');}
-.icon-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf095;');}
-.icon-check-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf096;');}
-.icon-unchecked{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf096;');}
-.icon-bookmark-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf097;');}
-.icon-phone-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf098;');}
-.icon-twitter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf099;');}
-.icon-facebook{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09a;');}
-.icon-github{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09b;');}
-.icon-unlock{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09c;');}
-.icon-credit-card{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09d;');}
-.icon-rss{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf09e;');}
-.icon-hdd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a0;');}
-.icon-bullhorn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a1;');}
-.icon-bell{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a2;');}
-.icon-certificate{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a3;');}
-.icon-hand-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a4;');}
-.icon-hand-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a5;');}
-.icon-hand-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a6;');}
-.icon-hand-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a7;');}
-.icon-circle-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a8;');}
-.icon-circle-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0a9;');}
-.icon-circle-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0aa;');}
-.icon-circle-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ab;');}
-.icon-globe{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ac;');}
-.icon-wrench{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ad;');}
-.icon-tasks{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ae;');}
-.icon-filter{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b0;');}
-.icon-briefcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b1;');}
-.icon-fullscreen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0b2;');}
-.icon-group{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c0;');}
-.icon-link{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c1;');}
-.icon-cloud{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c2;');}
-.icon-beaker{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c3;');}
-.icon-cut{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c4;');}
-.icon-copy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c5;');}
-.icon-paper-clip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c6;');}
-.icon-paperclip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c6;');}
-.icon-save{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c7;');}
-.icon-sign-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c8;');}
-.icon-reorder{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0c9;');}
-.icon-list-ul{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ca;');}
-.icon-list-ol{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0cb;');}
-.icon-strikethrough{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0cc;');}
-.icon-underline{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0cd;');}
-.icon-table{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ce;');}
-.icon-magic{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d0;');}
-.icon-truck{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d1;');}
-.icon-pinterest{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d2;');}
-.icon-pinterest-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d3;');}
-.icon-google-plus-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d4;');}
-.icon-google-plus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d5;');}
-.icon-money{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d6;');}
-.icon-caret-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d7;');}
-.icon-caret-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d8;');}
-.icon-caret-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0d9;');}
-.icon-caret-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0da;');}
-.icon-columns{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0db;');}
-.icon-sort{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0dc;');}
-.icon-sort-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0dd;');}
-.icon-sort-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0de;');}
-.icon-envelope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e0;');}
-.icon-linkedin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e1;');}
-.icon-undo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e2;');}
-.icon-rotate-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e2;');}
-.icon-legal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e3;');}
-.icon-dashboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e4;');}
-.icon-comment-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e5;');}
-.icon-comments-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e6;');}
-.icon-bolt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e7;');}
-.icon-sitemap{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e8;');}
-.icon-umbrella{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0e9;');}
-.icon-paste{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ea;');}
-.icon-lightbulb{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0eb;');}
-.icon-exchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ec;');}
-.icon-cloud-download{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ed;');}
-.icon-cloud-upload{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0ee;');}
-.icon-user-md{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f0;');}
-.icon-stethoscope{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f1;');}
-.icon-suitcase{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f2;');}
-.icon-bell-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f3;');}
-.icon-coffee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f4;');}
-.icon-food{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f5;');}
-.icon-file-text-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f6;');}
-.icon-building{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f7;');}
-.icon-hospital{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f8;');}
-.icon-ambulance{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0f9;');}
-.icon-medkit{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fa;');}
-.icon-fighter-jet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fb;');}
-.icon-beer{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fc;');}
-.icon-h-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fd;');}
-.icon-plus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf0fe;');}
-.icon-double-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf100;');}
-.icon-double-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf101;');}
-.icon-double-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf102;');}
-.icon-double-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf103;');}
-.icon-angle-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf104;');}
-.icon-angle-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf105;');}
-.icon-angle-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf106;');}
-.icon-angle-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf107;');}
-.icon-desktop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf108;');}
-.icon-laptop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf109;');}
-.icon-tablet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10a;');}
-.icon-mobile-phone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10b;');}
-.icon-circle-blank{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10c;');}
-.icon-quote-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10d;');}
-.icon-quote-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf10e;');}
-.icon-spinner{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf110;');}
-.icon-circle{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf111;');}
-.icon-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf112;');}
-.icon-mail-reply{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf112;');}
-.icon-github-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf113;');}
-.icon-folder-close-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf114;');}
-.icon-folder-open-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf115;');}
-.icon-expand-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf116;');}
-.icon-collapse-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf117;');}
-.icon-smile{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf118;');}
-.icon-frown{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf119;');}
-.icon-meh{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11a;');}
-.icon-gamepad{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11b;');}
-.icon-keyboard{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11c;');}
-.icon-flag-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11d;');}
-.icon-flag-checkered{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf11e;');}
-.icon-terminal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf120;');}
-.icon-code{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf121;');}
-.icon-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf122;');}
-.icon-mail-reply-all{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf122;');}
-.icon-star-half-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf123;');}
-.icon-star-half-full{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf123;');}
-.icon-location-arrow{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf124;');}
-.icon-crop{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf125;');}
-.icon-code-fork{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf126;');}
-.icon-unlink{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf127;');}
-.icon-question{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf128;');}
-.icon-info{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf129;');}
-.icon-exclamation{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12a;');}
-.icon-superscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12b;');}
-.icon-subscript{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12c;');}
-.icon-eraser{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12d;');}
-.icon-puzzle-piece{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf12e;');}
-.icon-microphone{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf130;');}
-.icon-microphone-off{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf131;');}
-.icon-shield{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf132;');}
-.icon-calendar-empty{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf133;');}
-.icon-fire-extinguisher{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf134;');}
-.icon-rocket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf135;');}
-.icon-maxcdn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf136;');}
-.icon-chevron-sign-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf137;');}
-.icon-chevron-sign-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf138;');}
-.icon-chevron-sign-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf139;');}
-.icon-chevron-sign-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13a;');}
-.icon-html5{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13b;');}
-.icon-css3{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13c;');}
-.icon-anchor{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13d;');}
-.icon-unlock-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf13e;');}
-.icon-bullseye{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf140;');}
-.icon-ellipsis-horizontal{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf141;');}
-.icon-ellipsis-vertical{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf142;');}
-.icon-rss-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf143;');}
-.icon-play-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf144;');}
-.icon-ticket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf145;');}
-.icon-minus-sign-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf146;');}
-.icon-check-minus{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf147;');}
-.icon-level-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf148;');}
-.icon-level-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf149;');}
-.icon-check-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14a;');}
-.icon-edit-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14b;');}
-.icon-external-link-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14c;');}
-.icon-share-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14d;');}
-.icon-compass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf14e;');}
-.icon-collapse{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf150;');}
-.icon-collapse-top{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf151;');}
-.icon-expand{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf152;');}
-.icon-eur{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf153;');}
-.icon-euro{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf153;');}
-.icon-gbp{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf154;');}
-.icon-usd{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf155;');}
-.icon-dollar{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf155;');}
-.icon-inr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf156;');}
-.icon-rupee{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf156;');}
-.icon-jpy{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf157;');}
-.icon-yen{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf157;');}
-.icon-cny{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf158;');}
-.icon-renminbi{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf158;');}
-.icon-krw{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf159;');}
-.icon-won{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf159;');}
-.icon-btc{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15a;');}
-.icon-bitcoin{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15a;');}
-.icon-file{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15b;');}
-.icon-file-text{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15c;');}
-.icon-sort-by-alphabet{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15d;');}
-.icon-sort-by-alphabet-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf15e;');}
-.icon-sort-by-attributes{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf160;');}
-.icon-sort-by-attributes-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf161;');}
-.icon-sort-by-order{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf162;');}
-.icon-sort-by-order-alt{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf163;');}
-.icon-thumbs-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf164;');}
-.icon-thumbs-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf165;');}
-.icon-youtube-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf166;');}
-.icon-youtube{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf167;');}
-.icon-xing{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf168;');}
-.icon-xing-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf169;');}
-.icon-youtube-play{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16a;');}
-.icon-dropbox{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16b;');}
-.icon-stackexchange{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16c;');}
-.icon-instagram{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16d;');}
-.icon-flickr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf16e;');}
-.icon-adn{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf170;');}
-.icon-bitbucket{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf171;');}
-.icon-bitbucket-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf172;');}
-.icon-tumblr{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf173;');}
-.icon-tumblr-sign{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf174;');}
-.icon-long-arrow-down{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf175;');}
-.icon-long-arrow-up{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf176;');}
-.icon-long-arrow-left{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf177;');}
-.icon-long-arrow-right{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf178;');}
-.icon-apple{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf179;');}
-.icon-windows{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17a;');}
-.icon-android{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17b;');}
-.icon-linux{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17c;');}
-.icon-dribbble{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17d;');}
-.icon-skype{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf17e;');}
-.icon-foursquare{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf180;');}
-.icon-trello{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf181;');}
-.icon-female{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf182;');}
-.icon-male{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf183;');}
-.icon-gittip{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf184;');}
-.icon-sun{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf185;');}
-.icon-moon{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf186;');}
-.icon-archive{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf187;');}
-.icon-bug{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf188;');}
-.icon-vk{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf189;');}
-.icon-weibo{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf18a;');}
-.icon-renren{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf18b;');}
diff --git a/plugins/system/t3/base-bs3/html/com_contact/contact/default_form.php b/plugins/system/t3/base-bs3/html/com_contact/contact/default_form.php
index f12a356..799c7e2 100644
--- a/plugins/system/t3/base-bs3/html/com_contact/contact/default_form.php
+++ b/plugins/system/t3/base-bs3/html/com_contact/contact/default_form.php
@@ -13,6 +13,7 @@
 JHtml::_('behavior.formvalidation');
 
 $regex = '@class="([^"]*)"@';
+$lbreg = '@" class="([^"]*)"@';
 $label = 'class="$1 col-sm-2 control-label"';
 $input = 'class="$1 form-control"';
 
@@ -69,7 +70,7 @@
 							<?php if ($field->hidden) : ?>
 								<?php echo $field->input;?>
 							<?php else:?>
-								<?php echo preg_replace($regex, $label, $field->label); ?>
+								<?php echo preg_replace($lbreg, '" ' . $label, $field->label); ?>
 								<div class="col-sm-10">
 								<?php if (!$field->required && $field->type != "Spacer") : ?>
 									<span class="optional"><?php echo JText::_('COM_CONTACT_OPTIONAL');?></span>
diff --git a/plugins/system/t3/base-bs3/html/com_finder/search/default_form.php b/plugins/system/t3/base-bs3/html/com_finder/search/default_form.php
index 3ed8053..eca5a69 100644
--- a/plugins/system/t3/base-bs3/html/com_finder/search/default_form.php
+++ b/plugins/system/t3/base-bs3/html/com_finder/search/default_form.php
@@ -59,9 +59,18 @@
 		 */
 <?php if ($this->params->get('show_autosuggest', 1)) : ?>
 	<?php JHtml::_('script', 'com_finder/autocompleter.js', false, true); ?>
-	var url = '<?php echo JRoute::_('index.php?option=com_finder&task=suggestions.display&format=json&tmpl=component', false); ?>';
-	var completer = new Autocompleter.Request.JSON(document.getElementById("q"), url, {'postVar': 'q'});
+		var url = '<?php echo JRoute::_('index.php?option=com_finder&task=suggestions.display&format=json&tmpl=component', false); ?>';
+		var completer = new Autocompleter.Request.JSON(document.getElementById("q"), url, {'postVar': 'q'});
 <?php endif; ?>
+
+
+<?php if(!$this->params->get('allow_empty_search')) : ?>
+		/* T3 document */
+		$('#q').change(function(){
+			$('#smartsearch-btn').toggleClass('disabled', $.trim(this.value).length);
+		});
+<?php endif; ?>
+
 	});
 </script>
 
@@ -85,15 +94,15 @@
 		</div>
 		<div class="form-group">
 			<?php if ($this->escape($this->query->input) != '' || $this->params->get('allow_empty_search')):?>
-				<button name="Search" type="submit" class="btn btn-primary"><span class="fa fa-search"></span> <?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
+				<button id="smartsearch-btn" name="Search" type="submit" class="btn btn-primary"><span class="fa fa-search"></span> <?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
 			<?php else: ?>
-				<button name="Search" type="submit" class="btn btn-primary disabled"><span class="fa fa-search"></span> <?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
+				<button id="smartsearch-btn" name="Search" type="submit" class="btn btn-primary disabled"><span class="fa fa-search"></span> <?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
 			<?php endif; ?>
 			<?php if ($this->params->get('show_advanced', 1)) : ?>
-				<a href="#advancedSearch" data-toggle="collapse" class="btn"><span class="fa fa-list"></span> <?php echo JText::_('COM_FINDER_ADVANCED_SEARCH_TOGGLE'); ?></a>
+				<a href="#advancedSearch" data-toggle="collapse" class="btn btn-default"><span class="fa fa-list"></span> <?php echo JText::_('COM_FINDER_ADVANCED_SEARCH_TOGGLE'); ?></a>
 			<?php endif; ?>
 		</div>
-</fieldset>
+	</fieldset>
 
 	<?php if ($this->params->get('show_advanced', 1)) : ?>
 		<div id="advancedSearch" class="collapse">
diff --git a/plugins/system/t3/base-bs3/html/layouts/index.html b/plugins/system/t3/base-bs3/html/layouts/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/associations.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/associations.php
new file mode 100644
index 0000000..b6c3695
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/associations.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$items = $displayData;
+
+if (!empty($items)) : ?>
+	<ul class="item-associations">
+		<?php foreach ($items as $id => $item) : ?>
+				<li>
+					<?php echo $item->link; ?>
+				</li>
+		<?php endforeach; ?>
+	</ul>
+<?php endif;
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/blog_style_default_item_title.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/blog_style_default_item_title.php
new file mode 100644
index 0000000..7b85c45
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/blog_style_default_item_title.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create a shortcut for params.
+$params = $displayData->params;
+$canEdit = $displayData->params->get('access-edit');
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::_('behavior.framework');
+?>
+
+	<?php if ($params->get('show_title') || $displayData->state == 0 || ($params->get('show_author') && !empty($displayData->author ))) : ?>
+		<div class="page-header">
+
+			<?php if ($params->get('show_title')) : ?>
+				<h2>
+					<?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
+						<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($displayData->slug, $displayData->catid)); ?>">
+						<?php echo $this->escape($displayData->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($displayData->title); ?>
+					<?php endif; ?>
+				</h2>
+			<?php endif; ?>
+
+			<?php if ($displayData->state == 0) : ?>
+				<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+			<?php endif; ?>
+			<?php if (strtotime($displayData->publish_up) > strtotime(JFactory::getDate())) : ?>
+				<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+			<?php endif; ?>
+			<?php if ((strtotime($displayData->publish_down) < strtotime(JFactory::getDate())) && $displayData->publish_down != '0000-00-00 00:00:00') : ?>
+				<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+		<?php endif; ?>
+		</div>
+	<?php endif; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/blog_style_default_links.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/blog_style_default_links.php
new file mode 100644
index 0000000..873e502
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/blog_style_default_links.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ol class="nav nav-tabs nav-stacked">
+<?php foreach ($displayData->get('link_items') as $item) : ?>
+	<li>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catslug)); ?>">
+			<?php echo $item->title; ?></a>
+	</li>
+<?php endforeach; ?>
+</ol>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/categories_default.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/categories_default.php
new file mode 100644
index 0000000..2de373b
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/categories_default.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="categories-list<?php echo $displayData->pageclass_sfx;?>">
+<?php if ($displayData->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $displayData->escape($displayData->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+
+<?php if ($displayData->params->get('show_base_description')) : ?>
+	<?php //If there is a description in the menu parameters use that; ?>
+		<?php if($displayData->params->get('categories_description')) : ?>
+			<div class="category-desc base-desc">
+			<?php echo JHtml::_('content.prepare', $displayData->params->get('categories_description'), '',  $displayData->get('extension') . '.categories'); ?>
+			</div>
+		<?php else : ?>
+			<?php //Otherwise get one from the database if it exists. ?>
+			<?php  if ($displayData->parent->description) : ?>
+				<div class="category-desc base-desc">
+					<?php echo JHtml::_('content.prepare', $displayData->parent->description, '', $displayData->parent->extension . '.categories'); ?>
+				</div>
+			<?php endif; ?>
+		<?php endif; ?>
+	<?php endif; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/categories_default_items.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/categories_default_items.php
new file mode 100644
index 0000000..d8bb18e
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/categories_default_items.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = ' class="first"';
+JHtml::_('bootstrap.tooltip');
+
+$item = $displayData->item;
+$items = $displayData->get('items');
+$params = $displayData->params;
+$extension = $displayData->get('extension');
+$className = substr($extension, 4);
+// This will work for the core components but not necessarily for other components
+// that may have different pluralisation rules.
+if (substr($className, -1) == 's')
+{
+	$className = rtrim($className, 's');
+}
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/category_default.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/category_default.php
new file mode 100644
index 0000000..8be45cc
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/category_default.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+// Note that this layout opens a div with the page class suffix. If you do not use the category children
+// layout you need to close this div either by overriding this file or in your main layout.
+$params  = $displayData->params;
+$extension = $displayData->get('category')->extension;
+$canEdit = $params->get('access-edit');
+$className = substr($extension, 4);
+// This will work for the core components but not necessarily for other components
+// that may have different pluralisation rules.
+if (substr($className, -1) == 's')
+{
+	$className = rtrim($className, 's');
+}
+$tagsData  = $displayData->get('category')->tags->itemTags;
+?>
+<div>
+	<div class="<?php echo $className .'-category' . $displayData->pageclass_sfx;?>">
+		<?php if ($params->get('show_page_heading')) : ?>
+			<h1>
+				<?php echo $displayData->escape($params->get('page_heading')); ?>
+			</h1>
+		<?php endif; ?>
+		<?php if($params->get('show_category_title', 1)) : ?>
+			<h2>
+				<?php echo JHtml::_('content.prepare', $displayData->get('category')->title, '', $extension.'.category'); ?>
+			</h2>
+		<?php endif; ?>
+		<?php if ($displayData->get('show_tags', 1)) : ?>
+			<?php echo JLayoutHelper::render('joomla.content.tags', $tagsData); ?>
+		<?php endif; ?>
+		<?php if ($params->get('show_description', 1) || $params->def('show_description_image', 1)) : ?>
+			<div class="category-desc">
+				<?php if ($params->get('show_description_image') && $displayData->get('category')->getParams()->get('image')) : ?>
+					<img src="<?php echo $displayData->get('category')->getParams()->get('image'); ?>"/>
+				<?php endif; ?>
+				<?php if ($params->get('show_description') && $displayData->get('category')->description) : ?>
+					<?php echo JHtml::_('content.prepare', $displayData->get('category')->description, '', $extension .'.category'); ?>
+				<?php endif; ?>
+				<div class="clr"></div>
+			</div>
+		<?php endif; ?>
+		<?php echo $displayData->loadTemplate($displayData->subtemplatename); ?>
+
+		<?php if ($displayData->get('children') && $displayData->maxLevel != 0) : ?>
+			<div class="cat-children">
+				<h3>
+					<?php echo JTEXT::_('JGLOBAL_SUBCATEGORIES'); ?>
+				</h3>
+
+				<?php echo $displayData->loadTemplate('children'); ?>
+			</div>
+		<?php endif; ?>
+	</div>
+</div>
+
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/icons.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/icons.php
new file mode 100644
index 0000000..3009b6f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/icons.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$canEdit = $displayData['params']->get('access-edit');
+
+?>
+
+<div class="icons">
+	<?php if (empty($displayData['print'])) : ?>
+
+		<?php if ($canEdit || $displayData['params']->get('show_print_icon') || $displayData['params']->get('show_email_icon')) : ?>
+			<div class="btn-group pull-right">
+				<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <span class="icon-cog"></span> <span class="caret"></span> </a>
+				<?php // Note the actions class is deprecated. Use dropdown-menu instead. ?>
+				<ul class="dropdown-menu">
+					<?php if ($displayData['params']->get('show_print_icon')) : ?>
+						<li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+					<?php if ($displayData['params']->get('show_email_icon')) : ?>
+						<li class="email-icon"> <?php echo JHtml::_('icon.email', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<li class="edit-icon"> <?php echo JHtml::_('icon.edit', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+				</ul>
+			</div>
+		<?php endif; ?>
+
+	<?php else : ?>
+
+		<div class="pull-right">
+			<?php echo JHtml::_('icon.print_screen', $displayData['item'], $displayData['params']); ?>
+		</div>
+
+	<?php endif; ?>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/content/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/author.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/author.php
new file mode 100644
index 0000000..d61ded2
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/author.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+<dd class="createdby">
+	<?php $author = $displayData['item']->author; ?>
+	<?php $author = ($displayData['item']->created_by_alias ? $displayData['item']->created_by_alias : $author); ?>
+	<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $displayData['item']->contact_link, $author)); ?>
+	<?php else :?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+	<?php endif; ?>
+</dd>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/block.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/block.php
new file mode 100644
index 0000000..a9102d9
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/block.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$blockPosition = $displayData['params']->get('info_block_position', 0);
+
+?>
+	<dl class="article-info  muted">
+
+		<?php if ($displayData['position'] == 'above' && ($blockPosition == 0 || $blockPosition == 2)
+				|| $displayData['position'] == 'below' && ($blockPosition == 1)
+				) : ?>
+
+			<dt class="article-info-term">
+				<?php // TODO: implement info_block_show_title param to hide article info title ?>
+				<?php if ($displayData['params']->get('info_block_show_title', 1)) : ?>
+					<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
+				<?php endif; ?>
+			</dt>
+
+			<?php if ($displayData['params']->get('show_author') && !empty($displayData['item']->author )) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.author', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.parent_category', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_category')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.category', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_publish_date')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.publish_date', $displayData); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<?php if ($displayData['position'] == 'above' && ($blockPosition == 0)
+				|| $displayData['position'] == 'below' && ($blockPosition == 1 || $blockPosition == 2)
+				) : ?>
+			<?php if ($displayData['params']->get('show_create_date')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.create_date', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_modify_date')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.modify_date', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_hits')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.hits', $displayData); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+	</dl>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/category.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/category.php
new file mode 100644
index 0000000..69ba8b7
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/category.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="category-name">
+				<?php $title = $this->escape($displayData['item']->category_title);
+				$url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->catslug)).'">'.$title.'</a>';?>
+				<?php if ($displayData['params']->get('link_category') && $displayData['item']->catslug) : ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+				<?php endif; ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/create_date.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/create_date.php
new file mode 100644
index 0000000..3dcffe3
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/create_date.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="create">
+					<span class="icon-calendar"></span>
+					<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $displayData['item']->created, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/hits.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/hits.php
new file mode 100644
index 0000000..2ed5fe8
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/hits.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="hits">
+					<span class="icon-eye-open"></span>
+					<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/modify_date.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/modify_date.php
new file mode 100644
index 0000000..1aabd33
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/modify_date.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="modified">
+				<span class="icon-calendar"></span>
+				<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $displayData['item']->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/parent_category.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/parent_category.php
new file mode 100644
index 0000000..7d31df9
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/parent_category.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="parent-category-name">
+				<?php $title = $this->escape($displayData['item']->parent_title);
+				$url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->parent_slug)).'">'.$title.'</a>';?>
+				<?php if ($displayData['params']->get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
+					<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+				<?php else : ?>
+					<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+				<?php endif; ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/publish_date.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/publish_date.php
new file mode 100644
index 0000000..057e7dc
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/info_block/publish_date.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+			<dd class="published">
+				<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $displayData['item']->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/intro_image.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/intro_image.php
new file mode 100644
index 0000000..fbb2f6a
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/intro_image.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$params  = $displayData->params;
+?>
+<?php $images = json_decode($displayData->images); ?>
+<?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
+	<?php $imgfloat = (empty($images->float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
+	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
+	<?php if ($images->image_intro_caption):
+		echo 'class="caption"'.' title="' .htmlspecialchars($images->image_intro_caption) .'"';
+	endif; ?>
+	src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>"/> </div>
+<?php endif; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/options_default.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/options_default.php
new file mode 100644
index 0000000..c80ac8e
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/options_default.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.framework');
+
+?>
+<fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : 'form-horizontal'; ?>">
+	<legend><?php echo $displayData->name ?></legend>
+	<?php if (!empty($displayData->description)): ?>
+		<p><?php echo $displayData->description; ?></p>
+	<?php endif; ?>
+	<?php
+	$fieldsnames = explode(',', $displayData->fieldsname);
+	foreach($fieldsnames as $fieldname)
+	{
+		foreach ($displayData->form->getFieldset($fieldname) as $field)
+		{
+			$classnames = 'control-group';
+			$rel = '';
+			$showon = $displayData->form->getFieldAttribute($field->fieldname, 'showon');
+			if (!empty($showon))
+			{
+				JHtml::_('jquery.framework');
+				JHtml::_('script', 'jui/cms.js', false, true);
+
+				$id = $displayData->form->getFormControl();
+				$showon = explode(':', $showon, 2);
+				$classnames .= ' showon_' . implode(' showon_', explode(',', $showon[1]));
+				$rel = ' rel="showon_' . $id . '['. $showon[0] . ']"';
+			}
+	?>
+		<div class="<?php echo $classnames; ?>"<?php echo $rel; ?>>
+			<?php if (!isset($displayData->showlabel) || $displayData->showlabel): ?>
+				<div class="control-label"><?php echo $field->label; ?></div>
+			<?php endif; ?>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php
+		}
+	}
+?>
+</fieldset>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/content/tags.php b/plugins/system/t3/base-bs3/html/layouts/joomla/content/tags.php
new file mode 100644
index 0000000..7fbf495
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/content/tags.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Cms
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php');
+
+?>
+<?php if (!empty($displayData)) : ?>
+	<div class="tags">
+		<?php foreach ($displayData as $i => $tag) : ?>
+			<?php if (in_array($tag->access, JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id')))) : ?>
+				<?php $tagParams = new JRegistry($tag->params); ?>
+				<?php $link_class = $tagParams->get('tag_link_class', 'label label-info'); ?>
+				<span class="tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i ?>">
+					<a href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($tag->tag_id . '-' . $tag->alias)) ?>" class="<?php echo $link_class; ?>">
+						<?php echo $this->escape($tag->title); ?>
+					</a>
+				</span>&nbsp;
+			<?php endif; ?>
+		<?php endforeach; ?>
+	</div>
+<?php endif; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/associations.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/associations.php
new file mode 100644
index 0000000..cdf9832
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/associations.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// JLayout for standard handling of associations fields in the administrator items edit screens.
+echo $displayData->getForm()->getControlGroups('item_associations');
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/details.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/details.php
new file mode 100644
index 0000000..27cec29
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/details.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @deprecated  3.2
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+// JLayout for standard handling of the details sidebar in administrator edit screens.
+$title = $displayData->getForm()->getValue('title');
+$published = $displayData->getForm()->getField('published');
+$saveHistory = $displayData->get('state')->get('params')->get('save_history', 0);
+?>
+<div class="span2">
+	<h4><?php echo JText::_('JDETAILS'); ?></h4>
+	<hr />
+	<fieldset class="form-vertical">
+		<?php if (empty($title)) : ?>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $displayData->getForm()->getValue('name'); ?>
+				</div>
+			</div>
+		<?php else : ?>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $displayData->getForm()->getValue('title'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<?php if ($published) : ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $displayData->getForm()->getLabel('published'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $displayData->getForm()->getInput('published'); ?>
+				</div>
+			</div>
+		<?php else : ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $displayData->getForm()->getLabel('state'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $displayData->getForm()->getInput('state'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('access'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('access'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('featured'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('featured'); ?>
+			</div>
+		</div>
+		<?php if (JLanguageMultilang::isEnabled()) : ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $displayData->getForm()->getLabel('language'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $displayData->getForm()->getInput('language'); ?>
+				</div>
+			</div>
+		<?php else : ?>
+		<input type="hidden" name="language" value="<?php echo $displayData->getForm()->getValue('language'); ?>" />
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('tags'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('tags'); ?>
+			</div>
+		</div>
+		<?php if ($saveHistory) : ?>
+			<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('version_note'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('version_note'); ?>
+			</div>
+			</div>
+		<?php endif; ?>
+	</fieldset>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/fieldset.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/fieldset.php
new file mode 100644
index 0000000..952305b
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/fieldset.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$name = $displayData->get('fieldset');
+$fieldSet = $form->getFieldset($name);
+
+if (empty($fieldSet))
+{
+	return;
+}
+
+$ignoreFields = $displayData->get('ignore_fields') ? : array();
+$extraFields = $displayData->get('extra_fields') ? : array();
+
+if ($displayData->get('show_options', 1))
+{
+	if (isset($fieldSet->description) && trim($fieldSet->description))
+	{
+		echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	}
+
+	if (isset($extraFields[$name]))
+	{
+		foreach ($extraFields[$name] as $f)
+		{
+			if (in_array($f, $ignoreFields))
+			{
+				continue;
+			}
+			if ($form->getField($f))
+			{
+				$fieldSet[] = $form->getField($f);
+			}
+		}
+	}
+
+	$html = array();
+
+	foreach ($fieldSet as $field)
+	{
+		$html[] = $field->getControlGroup();
+	}
+
+	echo implode('', $html);
+}
+else
+{
+	$html = array();
+	$html[] = '<div style="display:none;">';
+	foreach ($fieldSet as $field)
+	{
+		$html[] = $field->input;
+	}
+	$html[] = '</div>';
+
+	echo implode('', $html);
+}
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/frontediting_modules.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/frontediting_modules.php
new file mode 100644
index 0000000..86a2c61
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/frontediting_modules.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// JLayout for standard handling of the edit modules:
+
+$moduleHtml   =& $displayData['moduleHtml'];
+$mod          = $displayData['module'];
+$position     = $displayData['position'];
+$menusEditing = $displayData['menusediting'];
+
+
+if (preg_match('/<(?:div|span|nav|ul|ol|h\d) [^>]*class="[^"]* jmoddiv"/', $moduleHtml))
+{
+	// Module has already module edit button:
+	return;
+}
+
+// Add css class jmoddiv and data attributes for module-editing URL and for the tooltip:
+$editUrl = JUri::base() . 'administrator/index.php?option=com_modules&view=module&layout=edit&id=' . (int) $mod->id;
+
+// Add class, editing URL and tooltip, and if module of type menu, also the tooltip for editing the menu item:
+$count = 0;
+$moduleHtml = preg_replace(
+	// Replace first tag of module with a class
+	'/^(\s*<(?:div|span|nav|ul|ol|h\d) [^>]*class="[^"]*)"/',
+	// By itself, adding class jmoddiv and data attributes for the url and tooltip:
+	'\\1 jmoddiv" data-jmodediturl="' . $editUrl . '" data-jmodtip="'
+	.	JHtml::tooltipText(
+			JText::_('JLIB_HTML_EDIT_MODULE'),
+			htmlspecialchars($mod->title) . '<br />' . sprintf(JText::_('JLIB_HTML_EDIT_MODULE_IN_POSITION'), htmlspecialchars($position)),
+			0
+		)
+	. '"'
+	// And if menu editing is enabled and allowed and it's a menu module, add data attributes for menu editing:
+	.	($menusEditing && $mod->module == 'mod_menu' ?
+			'" data-jmenuedittip="' . JHtml::tooltipText('JLIB_HTML_EDIT_MENU_ITEM', 'JLIB_HTML_EDIT_MENU_ITEM_ID') . '"'
+			:
+			''
+		),
+	$moduleHtml,
+	1,
+	$count
+);
+
+if ($count)
+{
+	// Load once booststrap tooltip and add stylesheet and javascript to head:
+	JHtml::_('bootstrap.tooltip');
+	JHtml::_('bootstrap.popover');
+
+	JHtml::_('stylesheet', 'system/frontediting.css', array(), true);
+	JHtml::_('script', 'system/frontediting.js', false, true);
+}
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/global.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/global.php
new file mode 100644
index 0000000..983e7e3
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/global.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+$input = $app->input;
+$component = $input->getCmd('option', 'com_content');
+if ($component == 'com_categories')
+{
+	$extension	= $input->getCmd('extension', 'com_content');
+	$parts		= explode('.', $extension);
+	$component	= $parts[0];
+}
+$saveHistory = JComponentHelper::getParams($component)->get('save_history', 0);
+
+$fields = $displayData->get('fields') ?: array(
+	array('category', 'catid'),
+	array('parent', 'parent_id'),
+	'tags',
+	array('published', 'state', 'enabled'),
+	'featured',
+	'sticky',
+	'access',
+	'language',
+	'note',
+	'version_note'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+// Multilanguage check:
+/*if (!JLanguageMultilang::isEnabled())
+{
+	$hiddenFields[] = 'language';
+}*/
+if (!$saveHistory)
+{
+	$hiddenFields[] = 'version_note';
+}
+
+$html = array();
+$html[] = '<fieldset class="form-vertical">';
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			$html[] = $form->getControlGroup($f);
+			break;
+		}
+	}
+}
+
+$html[] = '</fieldset>';
+
+echo implode('', $html);
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/item_title.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/item_title.php
new file mode 100644
index 0000000..1930253
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/item_title.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Cms
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @deprecated  3.2
+ */
+
+defined('JPATH_BASE') or die;
+$title = $displayData->getForm()->getValue('title');
+$name = $displayData->getForm()->getValue('name');
+
+?>
+
+<?php if ($title) : ?>
+	<h4><?php echo $title; ?></h4>
+<?php endif; ?>
+
+<?php if ($name) : ?>
+	<h4><?php echo $name; ?></h4>
+<?php endif;
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/metadata.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/metadata.php
new file mode 100644
index 0000000..02d5631
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/metadata.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$form = $displayData->getForm();
+
+// JLayout for standard handling of metadata fields in the administrator content edit screens.
+$fieldSets = $form->getFieldsets('metadata');
+?>
+
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+	<?php endif; ?>
+
+	<?php
+	// Include the real fields in this panel.
+	if ($name == 'jmetadata')
+	{
+		echo $form->getControlGroup('metadesc');
+		echo $form->getControlGroup('metakey');
+		echo $form->getControlGroup('xreference');
+	}
+
+	foreach ($form->getFieldset($name) as $field)
+	{
+		if ($field->name != 'jform[metadata][tags][]')
+		{
+			echo $field->getControlGroup();
+		}
+	} ?>
+<?php endforeach; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/params.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/params.php
new file mode 100644
index 0000000..527b21f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/params.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$fieldSets = $form->getFieldsets('params');
+if (empty($fieldSets))
+{
+	$fieldSets = $form->getFieldsets('attribs');
+}
+
+if (empty($fieldSets))
+{
+	return;
+}
+
+$ignoreFieldsets = $displayData->get('ignore_fieldsets') ?: array();
+$ignoreFields = $displayData->get('ignore_fields') ?: array();
+$extraFields = $displayData->get('extra_fields') ?: array();
+
+if (!empty($displayData->hiddenFieldsets))
+{
+	// These are required to preserve data on save when fields are not displayed.
+	$hiddenFieldsets = $displayData->hiddenFieldsets ?: array();
+}
+
+if (!empty($displayData->configFieldsets))
+{
+	// These are required to configure showing and hiding fields in the editor.
+	$configFieldsets = $displayData->configFieldsets ?: array();
+}
+
+if ($displayData->get('show_options', 1))
+{
+	foreach ($fieldSets as $name => $fieldSet)
+	{
+		if (in_array($name, $ignoreFieldsets) || (!empty($configFieldsets) && in_array($name, $configFieldsets))
+				|| !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets))
+		{
+			continue;
+		}
+
+		if (!empty($fieldSet->label))
+		{
+			$label = JText::_($fieldSet->label, true);
+		}
+		else
+		{
+			$label = strtoupper('JGLOBAL_FIELDSET_' . $name);
+			if (JText::_($label, true) == $label)
+			{
+				$label = strtoupper($app->input->get('option') . '_' . $name . '_FIELDSET_LABEL');
+			}
+			$label = JText::_($label, true);
+		}
+
+		echo JHtml::_('bootstrap.addTab', 'myTab', 'attrib-' . $name, $label);
+
+		$displayData->fieldset = $name;
+		echo JLayoutHelper::render('joomla.edit.fieldset', $displayData);
+
+		echo JHtml::_('bootstrap.endTab');
+	}
+}
+else
+{
+	$html = array();
+	$html[] = '<div style="display:none;">';
+	foreach ($fieldSets as $name => $fieldSet)
+	{
+		if (in_array($name, $ignoreFieldsets))
+		{
+			continue;
+		}
+
+		if (in_array($name, $hiddenFieldsets))
+		{
+			foreach ($form->getFieldset($name) as $field)
+			{
+				echo $field->input;
+			}
+		}
+	}
+	$html[] = '</div>';
+
+	echo implode('', $html);
+}
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/publishingdata.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/publishingdata.php
new file mode 100644
index 0000000..e737578
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/publishingdata.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'publish_up',
+	'publish_down',
+	array('created', 'created_time'),
+	array('created_by', 'created_user_id'),
+	'created_by_alias',
+	array('modified', 'modified_time'),
+	array('modified_by', 'modified_user_id'),
+	'version',
+	'hits',
+	'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			echo $form->getControlGroup($f);
+			break;
+		}
+	}
+}
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/edit/title_alias.php b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/title_alias.php
new file mode 100644
index 0000000..93fd0fb
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/edit/title_alias.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Cms
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$form = $displayData->getForm();
+
+$title = $form->getField('title') ? 'title' : ($form->getField('name') ? 'name' : '');
+
+?>
+<div class="form-inline form-inline-header">
+	<?php
+	echo $title ? $form->getControlGroup($title) : '';
+	echo $form->getControlGroup('alias');
+	?>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupclose.php b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupclose.php
new file mode 100644
index 0000000..1f2eb2b
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+	</ul>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupopen.php b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupopen.php
new file mode 100644
index 0000000..d51482c
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupopen.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<h2 class="nav-header"><?php echo JFilterOutput::ampReplace(JText::_($displayData)); ?></h2>
+<ul class="j-links-group nav nav-list">
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupsclose.php b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupsclose.php
new file mode 100644
index 0000000..1f8eb24
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupsclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupseparator.php b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupseparator.php
new file mode 100644
index 0000000..f661627
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupseparator.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="j-links-separator"></div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupsopen.php b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupsopen.php
new file mode 100644
index 0000000..5a74c90
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/links/groupsopen.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="j-links-groups">
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/links/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/links/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/links/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/links/link.php b/plugins/system/t3/base-bs3/html/layouts/joomla/links/link.php
new file mode 100644
index 0000000..402a2cd
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/links/link.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
+$target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
+$onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"');
+$title   = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"');
+$text    = empty($displayData['text']) ? '' : ('<span class="j-links-link">' . $displayData['text'] . '</span>')
+
+?>
+<li<?php echo $id; ?>>
+	<a href="<?php echo JFilterOutput::ampReplace($displayData['link']); ?>"<?php echo $target . $onclick . $title; ?>>
+		<i class="icon-<?php echo $displayData['image']; ?>"></i> <?php echo $text; ?>
+	</a>
+</li>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/quickicons/icon.php b/plugins/system/t3/base-bs3/html/layouts/joomla/quickicons/icon.php
new file mode 100644
index 0000000..caae785
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/quickicons/icon.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
+$target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
+$onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"');
+$title   = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"');
+$text    = empty($displayData['text']) ? '' : ('<span>' . $displayData['text'] . '</span>')
+
+?>
+<div class="row-fluid"<?php echo $id; ?>>
+	<div class="span12">
+		<a href="<?php echo $displayData['link']; ?>"<?php echo $target . $onclick . $title; ?>>
+			<i class="icon-<?php echo $displayData['image']; ?>"></i> <?php echo $text; ?>
+		</a>
+	</div>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/quickicons/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/quickicons/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/quickicons/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default.php b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default.php
new file mode 100644
index 0000000..4082d26
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+// Set some basic options
+$customOptions = array(
+	'filtersHidden'       => isset($data['options']['filtersHidden']) ? $data['options']['filtersHidden'] : empty($data['view']->activeFilters),
+	'defaultLimit'        => isset($data['options']['defaultLimit']) ? $data['options']['defaultLimit'] : JFactory::getApplication()->getCfg('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'orderFieldSelector'  => '#list_fullordering'
+);
+
+$data['options'] = array_unique(array_merge($customOptions, $data['options']));
+
+$formSelector = !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm';
+
+// Load search tools
+JHtml::_('searchtools.form', $formSelector, $data['options']);
+
+?>
+<div class="js-stools clearfix">
+	<div class="clearfix">
+		<div class="js-stools-container-bar">
+			<?php echo JLayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
+		</div>
+		<div class="js-stools-container-list hidden-phone hidden-tablet">
+			<?php echo JLayoutHelper::render('joomla.searchtools.default.list', $data); ?>
+		</div>
+	</div>
+	<!-- Filters div -->
+	<div class="js-stools-container-filters hidden-phone clearfix">
+		<?php echo JLayoutHelper::render('joomla.searchtools.default.filters', $data); ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/bar.php b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/bar.php
new file mode 100644
index 0000000..b971bd0
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/bar.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+if (is_array($data['options']))
+{
+	$data['options'] = new JRegistry($data['options']);
+}
+
+// Options
+$filterButton = $data['options']->get('filterButton', true);
+$searchButton = $data['options']->get('searchButton', true);
+
+$filters = $data['view']->filterForm->getGroup('filter');
+?>
+
+<?php if (!empty($filters['filter_search'])) : ?>
+	<?php if ($searchButton) : ?>
+		<label for="filter_search" class="element-invisible">
+			<?php echo JText::_('JSEARCH_FILTER'); ?>
+		</label>
+		<div class="btn-wrapper input-append">
+			<?php echo $filters['filter_search']->input; ?>
+			<button type="submit" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>">
+				<i class="icon-search"></i>
+			</button>
+		</div>
+		<?php if ($filterButton) : ?>
+			<div class="btn-wrapper hidden-phone">
+				<button type="button" class="btn hasTooltip js-stools-btn-filter" title="<?php echo JHtml::tooltipText('JSEARCH_TOOLS_DESC'); ?>">
+					<?php echo JText::_('JSEARCH_TOOLS');?> <i class="caret"></i>
+				</button>
+			</div>
+		<?php endif; ?>
+		<div class="btn-wrapper">
+			<button type="button" class="btn hasTooltip js-stools-btn-clear" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_CLEAR'); ?>">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR');?>
+			</button>
+		</div>
+	<?php endif; ?>
+<?php endif;
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/filters.php b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/filters.php
new file mode 100644
index 0000000..e8b356d
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/filters.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Load the form filters
+$filters = $data['view']->filterForm->getGroup('filter');
+?>
+<?php if ($filters) : ?>
+	<?php foreach ($filters as $fieldName => $field) : ?>
+		<?php if ($fieldName != 'filter_search') : ?>
+			<div class="js-stools-field-filter">
+				<?php echo $field->input; ?>
+			</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/list.php b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/list.php
new file mode 100644
index 0000000..5350f6d
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/default/list.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Load the form list fields
+$list = $data['view']->filterForm->getGroup('list');
+?>
+<?php if ($list) : ?>
+	<div class="ordering-select hidden-phone">
+		<?php foreach ($list as $fieldName => $field) : ?>
+			<div class="js-stools-field-list">
+				<?php echo $field->input; ?>
+			</div>
+		<?php endforeach; ?>
+	</div>
+<?php endif; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/grid/sort.php b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/grid/sort.php
new file mode 100644
index 0000000..045c030
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/searchtools/grid/sort.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+$metatitle = JHtml::tooltipText(JText::_($data->tip ? $data->tip : $data->title), JText::_('JGLOBAL_CLICK_TO_SORT_THIS_COLUMN'), 0);
+JHtml::_('bootstrap.tooltip');
+?>
+<a href="#" onclick="return false;" class="js-stools-column-order hasTooltip" data-order="<?php echo $data->order; ?>" data-direction="<?php echo strtoupper($data->direction); ?>" data-name="<?php echo JText::_($data->title); ?>" title="<?php echo $metatitle; ?>">
+	<?php if (!empty($data->icon)) : ?>
+		<i class="<?php echo $data->icon; ?>"></i>
+	<?php endif; ?>
+	<?php if (!empty($data->title)) : ?>
+		<?php echo JText::_($data->title); ?>
+	<?php endif; ?>
+	<?php if ($data->order == $data->selected) : ?>
+		<i class="<?php echo $data->orderIcon; ?>"></i>
+	<?php endif; ?>
+</a>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/sidebars/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/sidebars/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/sidebars/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/sidebars/submenu.php b/plugins/system/t3/base-bs3/html/layouts/joomla/sidebars/submenu.php
new file mode 100644
index 0000000..99088f9
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/sidebars/submenu.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+<div id="sidebar">
+	<div class="sidebar-nav">
+		<?php if ($displayData->displayMenu) : ?>
+		<ul id="submenu" class="nav nav-list">
+			<?php foreach ($displayData->list as $item) :
+			if (isset ($item[2]) && $item[2] == 1) : ?>
+				<li class="active">
+			<?php else : ?>
+				<li>
+			<?php endif;
+			if ($displayData->hide) : ?>
+				<a class="nolink"><?php echo $item[0]; ?></a>
+			<?php else :
+				if (strlen($item[1])) : ?>
+					<a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
+				<?php else : ?>
+					<?php echo $item[0]; ?>
+				<?php endif;
+			endif; ?>
+			</li>
+			<?php endforeach; ?>
+		</ul>
+		<?php endif; ?>
+		<?php if ($displayData->displayMenu && $displayData->displayFilters) : ?>
+		<hr />
+		<?php endif; ?>
+		<?php if ($displayData->displayFilters) : ?>
+		<div class="filter-select hidden-phone">
+			<h4 class="page-header"><?php echo JText::_('JSEARCH_FILTER_LABEL');?></h4>
+			<?php foreach ($displayData->filters as $filter) : ?>
+				<label for="<?php echo $filter['name']; ?>" class="element-invisible"><?php echo $filter['label']; ?></label>
+				<select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="span12 small" onchange="this.form.submit()">
+					<?php if (!$filter['noDefault']) : ?>
+						<option value=""><?php echo $filter['label']; ?></option>
+					<?php endif; ?>
+					<?php echo $filter['options']; ?>
+				</select>
+				<hr class="hr-condensed" />
+			<?php endforeach; ?>
+		</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/buttons.php b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/buttons.php
new file mode 100644
index 0000000..04ae3cc
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/buttons.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$buttons = $displayData;
+
+// Load modal popup behavior
+JHtml::_('behavior.modal', 'a.modal-button');
+?>
+<div id="editor-xtd-buttons" class="btn-toolbar pull-left">
+	<?php if ($buttons) : ?>
+		<?php foreach ($buttons as $button) : ?>
+			<?php echo JLayoutHelper::render('joomla.tinymce.buttons.button', $button); ?>
+		<?php endforeach; ?>
+	<?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/buttons/button.php b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/buttons/button.php
new file mode 100644
index 0000000..7d9d024
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/buttons/button.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$button = $displayData;
+
+?>
+<?php if ($button->get('name')) : ?>
+	<?php
+		$class    = ($button->get('class')) ? $button->get('class') : null;
+		$class	 .= ($button->get('modal')) ? ' modal-button' : null;
+		$href     = ($button->get('link')) ? ' href="' . JUri::base() . $button->get('link') . '"' : null;
+		$onclick  = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : ' onclick="IeCursorFix(); return false;"';
+		$title    = ($button->get('title')) ? $button->get('title') : $button->get('text');
+	?>
+	<a class="<?php echo $class; ?>" title="<?php echo $title; ?>" <?php echo $href . $onclick; ?> rel="<?php echo $button->get('options'); ?>">
+		<i class="icon-<?php echo $button->get('name'); ?>"></i> <?php echo $button->get('text'); ?>
+	</a>
+<?php endif;
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/textarea.php b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/textarea.php
new file mode 100644
index 0000000..d91cb79
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/textarea.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$data = $displayData;
+
+?>
+<textarea
+	name="<?php echo $data->name; ?>"
+	id="<?php echo $data->id; ?>"
+	cols="<?php echo $data->cols; ?>"
+	rows="<?php echo $data->rows; ?>"
+	style="width: <?php echo $data->width; ?>; height: <?php echo $data->height; ?>;"
+	class="mce_editable"
+>
+	<?php echo $data->content; ?>
+</textarea>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/togglebutton.php b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/togglebutton.php
new file mode 100644
index 0000000..f15b359
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/tinymce/togglebutton.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$name = $displayData;
+
+?>
+<div class="toggle-editor btn-toolbar pull-right clearfix">
+	<div class="btn-group">
+		<a class="btn" href="#"
+			onclick="tinyMCE.execCommand('mceToggleEditor', false, '<?php echo $name; ?>');return false;"
+			title="<?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>"
+		>
+			<i class="icon-eye"></i> <?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>
+		</a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/base.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/base.php
new file mode 100644
index 0000000..1f0bb5d
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/base.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="btn-wrapper" <?php echo $displayData['id']; ?>>
+	<?php echo $displayData['action']; ?>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/batch.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/batch.php
new file mode 100644
index 0000000..65fd2d6
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/batch.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = $displayData['title'];
+
+?>
+<button data-toggle="modal" data-target="#collapseModal" class="btn btn-small">
+	<i class="icon-checkbox-partial" title="<?php echo $title; ?>"></i>
+	<?php echo $title; ?>
+</button>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/confirm.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/confirm.php
new file mode 100644
index 0000000..cc63357
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/confirm.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/containerclose.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/containerclose.php
new file mode 100644
index 0000000..1f8eb24
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/containerclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+</div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/containeropen.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/containeropen.php
new file mode 100644
index 0000000..196ecae
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/containeropen.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="btn-toolbar" id="<?php echo $displayData['id']; ?>">
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/help.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/help.php
new file mode 100644
index 0000000..5c377c5
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/help.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" rel="help" class="btn btn-small">
+	<span class="icon-question-sign"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/iconclass.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/iconclass.php
new file mode 100644
index 0000000..9785851
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/iconclass.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+icon-<?php echo $displayData['icon']; ?>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/index.html b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/link.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/link.php
new file mode 100644
index 0000000..eba13cc
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/link.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="location.href='<?php echo $doTask; ?>';" class="btn btn-small">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/popup.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/popup.php
new file mode 100644
index 0000000..5c76d9b
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/popup.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+$name   = $displayData['name'];
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small modal" data-toggle="modal" data-target="#modal-<?php echo $name; ?>">
+	<i class="icon-cog"></i>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/separator.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/separator.php
new file mode 100644
index 0000000..e8bbb4c
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/separator.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = $displayData['class'];
+$style = $displayData['style'];
+
+?>
+<div class="btn-group <?php echo $class; ?>"<?php echo $style; ?>></div>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/slider.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/slider.php
new file mode 100644
index 0000000..a639f9a
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/slider.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask  = $displayData['doTask'];
+$class   = $displayData['class'];
+$text    = $displayData['text'];
+$name    = $displayData['name'];
+$onClose = $displayData['onClose'];
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small" data-toggle="collapse" data-target="#collapse-<?php echo $name; ?>"<?php echo $onClose; ?>>
+	<i class="icon-cog"></i>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/standard.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/standard.php
new file mode 100644
index 0000000..8f5a0f5
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/standard.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask   = $displayData['doTask'];
+$class    = $displayData['class'];
+$text     = $displayData['text'];
+$btnClass = $displayData['btnClass'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" class="<?php echo $btnClass; ?>">
+	<span class="<?php echo trim($class); ?>"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/title.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/title.php
new file mode 100644
index 0000000..b1e24e8
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/title.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$icon = empty($displayData['icon']) ? 'generic' : preg_replace('#\.[^ .]*$#', '', $displayData['icon']);
+?>
+<h1 class="page-title">
+	<span class="icon-<?php echo $icon; ?>"></span>
+	<?php echo $displayData['title']; ?>
+</h1>
diff --git a/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/versions.php b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/versions.php
new file mode 100644
index 0000000..6add897
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/joomla/toolbar/versions.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<a rel="{handler: 'iframe', size: {x: <?php echo $displayData['height']; ?>, y: <?php echo $displayData['width']; ?>}}"
+	href="index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id=<?php echo (int) $displayData['itemId']; ?>&amp;type_id=<?php echo $displayData['typeId']; ?>&amp;type_alias=<?php echo $displayData['typeAlias']; ?>&amp;<?php echo JSession::getFormToken(); ?>=1"
+	title="<?php echo $displayData['title']; ?>" class="btn btn-small modal_jform_contenthistory">
+	<i class="icon-archive"></i> <?php echo $displayData['title']; ?>
+</a>
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/addtab.php b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/addtab.php
new file mode 100644
index 0000000..1412206
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/addtab.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id = empty($displayData['id']) ? '' : $displayData['id'];
+$active = empty($displayData['active']) ? '' : $displayData['active'];
+
+?>
+
+<div id="<?php echo $id; ?>" class="tab-pane<?php echo $active; ?>">
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/addtabscript.php b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/addtabscript.php
new file mode 100644
index 0000000..e2c50cf
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/addtabscript.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+$id = empty($displayData['id']) ? '' : $displayData['id'];
+$active = empty($displayData['active']) ? '' : $displayData['active'];
+$title = empty($displayData['title']) ? '' : $displayData['title'];
+
+
+echo "(function($){
+				$(document).ready(function() {
+					// Handler for .ready() called.
+					var tab = $('<li class=\"$active\"><a href=\"#$id\" data-toggle=\"tab\">$title</a></li>');
+					$('#" . $selector . "Tabs').append(tab);
+				});
+			})(jQuery);";
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/endtab.php b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/endtab.php
new file mode 100644
index 0000000..370f8ce
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/endtab.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/endtabset.php b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/endtabset.php
new file mode 100644
index 0000000..370f8ce
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/endtabset.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/index.html b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/starttabset.php b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/starttabset.php
new file mode 100644
index 0000000..50d8963
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/starttabset.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+
+?>
+
+<ul class="nav nav-tabs" id="<?php echo $selector; ?>Tabs"></ul>
+<div class="tab-content" id="<?php echo $selector; ?>Content">
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
new file mode 100644
index 0000000..238cdd7
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+
+echo "(function($){
+					$('#$selector a').click(function (e)
+					{
+						e.preventDefault();
+						$(this).tab('show');
+					});
+				})(jQuery);";
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/index.html b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/html/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/cms/index.html b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/cms/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/layouts/libraries/index.html b/plugins/system/t3/base-bs3/html/layouts/libraries/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base-bs3/html/layouts/libraries/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base-bs3/html/mod_breadcrumbs/default.php b/plugins/system/t3/base-bs3/html/mod_breadcrumbs/default.php
index 8b245b9..9e6c950 100644
--- a/plugins/system/t3/base-bs3/html/mod_breadcrumbs/default.php
+++ b/plugins/system/t3/base-bs3/html/mod_breadcrumbs/default.php
@@ -9,23 +9,22 @@
 
 defined('_JEXEC') or die;
 
-if(version_compare(JVERSION, '3.0', 'ge')){
+if (version_compare(JVERSION, '3.0', 'ge')) {
 	JHtml::_('bootstrap.tooltip');
 }
 ?>
 
 <ol class="breadcrumb <?php echo $moduleclass_sfx; ?>">
 	<?php
-	if ($params->get('showHere', 1))
-	{
-		echo '<li class="active"><span class="hasTooltip"><i class="fa fa-map-marker" data-toggle="tooltip" title="' .JText::_('MOD_BREADCRUMBS_HERE').'"></i></span></li>';
+	if ($params->get('showHere', 1)) {
+		echo '<li class="active">' . JText::_('MOD_BREADCRUMBS_HERE') . '&#160;</li>';
+	} else {
+		echo '<li class="active"><span class="hasTooltip"><i class="fa fa-map-marker" data-toggle="tooltip" title="' . JText::_('MOD_BREADCRUMBS_HERE') . '"></i></span></li>';
 	}
 
 	// Get rid of duplicated entries on trail including home page when using multilanguage
-	for ($i = 0; $i < $count; $i++)
-	{
-		if ($i == 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link == $list[$i - 1]->link)
-		{
+	for ($i = 0; $i < $count; $i++) {
+		if ($i == 1 && !empty($list[$i]->link) && !empty($list[$i - 1]->link) && $list[$i]->link == $list[$i - 1]->link) {
 			unset($list[$i]);
 		}
 	}
@@ -37,34 +36,28 @@
 
 	// Generate the trail
 	foreach ($list as $key => $item) :
-	// Make a link if not the last item in the breadcrumbs
-	$show_last = $params->get('showLast', 1);
-	if ($key != $last_item_key)
-	{
-		// Render all but last item - along with separator
-		echo '<li>';
-		if (!empty($item->link))
-		{
-			echo '<a href="' . $item->link . '" class="pathway">' . $item->name . '</a>';
-		}
-		else
-		{
-			echo '<span>' . $item->name . '</span>';
-		}
+		// Make a link if not the last item in the breadcrumbs
+		$show_last = $params->get('showLast', 1);
+	
+		if ($key != $last_item_key) {
+			// Render all but last item - along with separator
+			echo '<li>';
+			if (!empty($item->link)) {
+				echo '<a href="' . $item->link . '" class="pathway">' . $item->name . '</a>';
+			} else {
+				echo '<span>' . $item->name . '</span>';
+			}
 
-		if (($key != $penult_item_key) || $show_last)
-		{
-			echo '<span class="divider">' . $separator . '</span>';
-		}
+			if (($key != $penult_item_key) || $show_last) {
+				echo '<span class="divider">' . $separator . '</span>';
+			}
 
-		echo '</li>';
-	}
-	elseif ($show_last)
-	{
-		// Render last item if reqd.
-		echo '<li>';
-		echo '<span>' . $item->name . '</span>';
-		echo '</li>';
-	}
+			echo '</li>';
+		} elseif ($show_last) {
+			// Render last item if reqd.
+			echo '<li>';
+			echo '<span>' . $item->name . '</span>';
+			echo '</li>';
+		}
 	endforeach; ?>
 </ol>
diff --git a/plugins/system/t3/base-bs3/html/mod_search/default.php b/plugins/system/t3/base-bs3/html/mod_search/default.php
index 618c890..b5387b6 100644
--- a/plugins/system/t3/base-bs3/html/mod_search/default.php
+++ b/plugins/system/t3/base-bs3/html/mod_search/default.php
@@ -9,46 +9,44 @@
 
 defined('_JEXEC') or die;
 ?>
-<form class="form-search" action="<?php echo JRoute::_('index.php');?>" method="post">
-	<div class="search<?php echo $moduleclass_sfx ?>">
+<div class="search<?php echo $moduleclass_sfx ?>">
+	<form action="<?php echo JRoute::_('index.php');?>" method="post" class="form-inline form-search">
 		<?php
-			$output = '<label for="mod-search-searchword">'.$label.'</label><input name="searchword" id="mod-search-searchword" maxlength="'.$maxlength.'"  class="form-control '.$moduleclass_sfx.'" type="text" size="'.$width.'" placeholder="'.$text.'" />';
+			$output = '<label for="mod-search-searchword" class="element-invisible">' . $label . '</label> ';
+			$output .= '<input name="searchword" id="mod-search-searchword" maxlength="' . $maxlength . '"  class="form-control" type="text" size="' . $width . '" placeholder="' . $text . '" />';
 
 			if ($button) :
 				if ($imagebutton) :
-					$button = ' <input type="image" value="' . $button_text . '" class="button' . $moduleclass_sfx.'" src="' . $img . '" onclick="this.form.searchword.focus();"/>';
+					$btn_output = ' <input type="image" value="' . $button_text . '" class="button" src="' . $img . '" onclick="this.form.searchword.focus();"/>';
 				else :
-					$button = ' <button class="button' . $moduleclass_sfx . ' btn btn-primary" onclick="this.form.searchword.focus();">' . $button_text . '</button>';
+					$btn_output = ' <button class="button btn btn-primary" onclick="this.form.searchword.focus();">' . $button_text . '</button>';
 				endif;
-			else :
-				$button = '';
-			endif;
 
-			switch ($button_pos) :
-				case 'top' :
-					$button = $button.'<br />';
-					$output = $button.$output;
-					break;
+				switch ($button_pos) :
+					case 'top' :
+						$output = $btn_output . '<br />' . $output;
+						break;
+
+					case 'bottom' :
+						$output .= '<br />' . $btn_output;
+						break;
 
-				case 'bottom' :
-					$button = '<br />'.$button;
-					$output = $output.$button;
-					break;
+					case 'right' :
+						$output .= $btn_output;
+						break;
 
-				case 'right' :
-					$output = $output.$button;
-					break;
+					case 'left' :
+					default :
+						$output = $btn_output . $output;
+						break;
+				endswitch;
 
-				case 'left' :
-				default :
-					$output = $button.$output;
-					break;
-			endswitch;
+			endif;
 
 			echo $output;
 		?>
-	<input type="hidden" name="task" value="search" />
-	<input type="hidden" name="option" value="com_search" />
-	<input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" />
-	</div>
-</form>
+		<input type="hidden" name="task" value="search" />
+		<input type="hidden" name="option" value="com_search" />
+		<input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" />
+	</form>
+</div>
diff --git a/plugins/system/t3/base-bs3/js/nav-collapse.js b/plugins/system/t3/base-bs3/js/nav-collapse.js
index 5b78a0f..03c9a32 100644
--- a/plugins/system/t3/base-bs3/js/nav-collapse.js
+++ b/plugins/system/t3/base-bs3/js/nav-collapse.js
@@ -26,7 +26,7 @@ jQuery(document).ready(function ($) {
             $placeholder = $navwrapper.prev('.navbar-collapse');
 
             if(!$placeholder.length){
-                $placeholder = $navwrapper.closet('.container, .t3-mainnav').find('.navbar-collapse');
+                $placeholder = $navwrapper.closest('.container, .t3-mainnav').find('.navbar-collapse');
             }
             
             var lis = $menu.find('li[data-id]'),
diff --git a/plugins/system/t3/base-bs3/js/off-canvas.js b/plugins/system/t3/base-bs3/js/off-canvas.js
index 0101496..ca616d6 100644
--- a/plugins/system/t3/base-bs3/js/off-canvas.js
+++ b/plugins/system/t3/base-bs3/js/off-canvas.js
@@ -113,10 +113,17 @@ jQuery (document).ready(function($){
     };
 
     var oc_hide = function () {
-        $wrapper.removeClass ('off-canvas-open');
+        
+        //remove events
         $wrapper.off ('tap', oc_hide);
         $close.off ('click', oc_hide);
         $offcanvas.off ('click', stopBubble);
+
+        //delay for click action
+        setTimeout(function(){
+            $wrapper.removeClass ('off-canvas-open');
+        }, 100);
+
         setTimeout (function (){
             $wrapper.removeClass ($btn.data('effect')).removeClass ('off-canvas-'+direction);
             $wrapper.scrollTop (0);
diff --git a/plugins/system/t3/base-bs3/js/respond.min.js b/plugins/system/t3/base-bs3/js/respond.min.js
index 870019b..80a7b69 100644
--- a/plugins/system/t3/base-bs3/js/respond.min.js
+++ b/plugins/system/t3/base-bs3/js/respond.min.js
@@ -1,5 +1,5 @@
-/*! Respond.js v1.4.0: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
  * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
  *  */
 
-!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@.*keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]+\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
diff --git a/plugins/system/t3/base-bs3/less/megamenu.less b/plugins/system/t3/base-bs3/less/megamenu.less
index 709c5b2..5814e2e 100644
--- a/plugins/system/t3/base-bs3/less/megamenu.less
+++ b/plugins/system/t3/base-bs3/less/megamenu.less
@@ -319,11 +319,11 @@
       
       .mega {
         > .mega-dropdown-menu {
-          .scale(~"0, 0");
+          .scale(0, 0);
           .transform-origin(20% 20%);
         }
         &.open > .mega-dropdown-menu {
-          .scale(~"1, 1");
+          .scale(1, 1);
         }
       }
 
@@ -349,22 +349,22 @@
       
       .mega {
         & > .mega-dropdown-menu {
-          .scale(~"0, 1");
+          .scale(0, 1);
           .transform-origin(10% 0);
         }      
         &.open > .mega-dropdown-menu {
-          .scale(~"1, 1");
+          .scale(1, 1);
         }
       }
 
       .level0 {
 
         > .mega > .mega-dropdown-menu {
-          .scale(~"1, 0");
+          .scale(1, 0);
         }
 
         .open > .mega-dropdown-menu {
-          .scale(~"1, 1");
+          .scale(1, 1);
         }
 
         > .mega-align-center {
@@ -411,6 +411,7 @@
             min-width: 200px;
             margin-top: 0;
             margin-left: -500px;
+            width: 100%;
           }
         }
         
diff --git a/plugins/system/t3/base-bs3/params/template.xml b/plugins/system/t3/base-bs3/params/template.xml
index 02accf5..648aa4b 100644
--- a/plugins/system/t3/base-bs3/params/template.xml
+++ b/plugins/system/t3/base-bs3/params/template.xml
@@ -199,6 +199,7 @@
 						 description="T3_NAVIGATION_MM_GROUP_DESC"/>
 
 			<field name="navigation_type" type="radio" class="t3onoff" default="megamenu"
+						 global="1"
 						 label="T3_NAVIGATION_MM_ENABLE_LABEL"
 						 description="T3_NAVIGATION_MM_ENABLE_DESC">
 				<option value="t3bootstrap" class="off">JNO</option>
diff --git a/plugins/system/t3/base/html/com_finder/search/default_form.php b/plugins/system/t3/base/html/com_finder/search/default_form.php
index 324a716..ad5be58 100644
--- a/plugins/system/t3/base/html/com_finder/search/default_form.php
+++ b/plugins/system/t3/base/html/com_finder/search/default_form.php
@@ -8,28 +8,26 @@
  */
 
 defined('_JEXEC') or die;
-
-//load Fx.Slide
-JHtml::_('behavior.framework', true);
 ?>
 
 <script type="text/javascript">
-	window.addEvent('domready', function() {
-<?php if ($this->params->get('show_advanced', 1)): ?>
+	jQuery(function($) {
+<?php if ($this->params->get('show_advanced', 1)) : ?>
 		/*
 		 * This segment of code adds the slide effect to the advanced search box.
 		 */
-		if (document.id('advanced-search') != null) {
-			var searchSlider = new Fx.Slide('advanced-search');
-
-			<?php if (!$this->params->get('expand_advanced', 0)): ?>
-			searchSlider.hide();
+		var $searchSlider = $('#advanced-search');
+		if ($searchSlider.length)
+		{
+			<?php if (!$this->params->get('expand_advanced', 0)) : ?>
+			$searchSlider.hide();
 			<?php endif; ?>
 
-			document.id('advanced-search-toggle').addEvent('click', function(e) {
-				e = new Event(e);
-				e.stop();
-				searchSlider.toggle();
+			$('#advanced-search-toggle').on('click', function(e)
+			{
+				e.stopPropagation();
+				e.preventDefault();
+				$searchSlider.slideToggle();
 			});
 		}
 
@@ -37,32 +35,42 @@
 		 * This segment of code disables select boxes that have no value when the
 		 * form is submitted so that the URL doesn't get blown up with null values.
 		 */
-		if (document.id('finder-search') != null) {
-			document.id('finder-search').addEvent('submit', function(e){
-				e = new Event(e);
-				e.stop();
+		if ($('#finder-search').length)
+		{
+			$('#finder-search').on('submit', function(e){
+				e.stopPropagation();
 
-				if (document.id('advanced-search') != null) {
+				if ($searchSlider.length)
+				{
 					// Disable select boxes with no value selected.
-					document.id('advanced-search').getElements('select').each(function(s){
-						if (!s.getProperty('value')) {
-							s.setProperty('disabled', 'disabled');
-						}
-					});
+					$searchSlider.find('select').each(function(index, el) {
+						var $el = $(el);
+			        	if(!$el.val()){
+			        		$el.attr('disabled', 'disabled');
+			        	}
+        			});
 				}
 
-				document.id('finder-search').submit();
 			});
 		}
 <?php endif; ?>
 		/*
 		 * This segment of code sets up the autocompleter.
 		 */
-<?php if ($this->params->get('show_autosuggest', 1)): ?>
-	<?php JHtml::script('com_finder/autocompleter.js', false, true); ?>
+<?php if ($this->params->get('show_autosuggest', 1)) : ?>
+	<?php JHtml::_('script', 'com_finder/autocompleter.js', false, true); ?>
 	var url = '<?php echo JRoute::_('index.php?option=com_finder&task=suggestions.display&format=json&tmpl=component', false); ?>';
-	var completer = new Autocompleter.Request.JSON(document.id('q'), url, {'postVar': 'q'});
+	var completer = new Autocompleter.Request.JSON(document.getElementById("q"), url, {'postVar': 'q'});
 <?php endif; ?>
+
+
+<?php if(!$this->params->get('allow_empty_search')) : ?>
+		/* T3 document */
+		$('#q').change(function(){
+			$('#smartsearch-btn').toggleClass('disabled', $.trim(this.value).length);
+		});
+<?php endif; ?>
+
 	});
 </script>
 
@@ -83,20 +91,19 @@
 		</label>
 		<input type="text" name="q" id="q" size="30" value="<?php echo $this->escape($this->query->input); ?>" class="input" />
 		<?php if ($this->escape($this->query->input) != '' || $this->params->get('allow_empty_search')):?>
-			<button name="Search" type="submit" class="button"><i class="icon-search"></i><?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
+			<button id="smartsearch-btn" name="Search" type="submit" class="button"><i class="icon-search"></i><?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
 		<?php else: ?>
-			<button name="Search" type="" class="btn"><?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
+			<button id="smartsearch-btn" name="Search" type="" class="btn disabled"><?php echo JText::_('JSEARCH_FILTER_SUBMIT');?></button>
 		<?php endif; ?>
 
 		<?php if ($this->params->get('show_advanced', 1)): ?>
-			<a id="advanced-search-toggle" class="btn"><i class="icon-list"></i><?php echo JText::_('COM_FINDER_ADVANCED_SEARCH_TOGGLE'); ?></a>
+			<a href="#advancedSearch" data-toggle="collapse" class="btn"><i class="icon-list"></i><?php echo JText::_('COM_FINDER_ADVANCED_SEARCH_TOGGLE'); ?></a>
 		<?php endif ?>
-
-</fieldset>
+	</fieldset>
 
 	<?php if ($this->params->get('show_advanced', 1)): ?>
 		
-		<div id="advanced-search">
+		<div id="advancedSearch" class="collapse">
 			<?php if ($this->params->get('show_advanced_tips', 1)): ?>
 				<div class="advanced-search-tip">
 					<?php echo JText::_('COM_FINDER_ADVANCED_TIPS'); ?>
diff --git a/plugins/system/t3/base/html/layouts/index.html b/plugins/system/t3/base/html/layouts/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/associations.php b/plugins/system/t3/base/html/layouts/joomla/content/associations.php
new file mode 100644
index 0000000..b6c3695
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/associations.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$items = $displayData;
+
+if (!empty($items)) : ?>
+	<ul class="item-associations">
+		<?php foreach ($items as $id => $item) : ?>
+				<li>
+					<?php echo $item->link; ?>
+				</li>
+		<?php endforeach; ?>
+	</ul>
+<?php endif;
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/blog_style_default_item_title.php b/plugins/system/t3/base/html/layouts/joomla/content/blog_style_default_item_title.php
new file mode 100644
index 0000000..7b85c45
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/blog_style_default_item_title.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Create a shortcut for params.
+$params = $displayData->params;
+$canEdit = $displayData->params->get('access-edit');
+JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
+JHtml::_('behavior.framework');
+?>
+
+	<?php if ($params->get('show_title') || $displayData->state == 0 || ($params->get('show_author') && !empty($displayData->author ))) : ?>
+		<div class="page-header">
+
+			<?php if ($params->get('show_title')) : ?>
+				<h2>
+					<?php if ($params->get('link_titles') && $params->get('access-view')) : ?>
+						<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($displayData->slug, $displayData->catid)); ?>">
+						<?php echo $this->escape($displayData->title); ?></a>
+					<?php else : ?>
+						<?php echo $this->escape($displayData->title); ?>
+					<?php endif; ?>
+				</h2>
+			<?php endif; ?>
+
+			<?php if ($displayData->state == 0) : ?>
+				<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
+			<?php endif; ?>
+			<?php if (strtotime($displayData->publish_up) > strtotime(JFactory::getDate())) : ?>
+				<span class="label label-warning"><?php echo JText::_('JNOTPUBLISHEDYET'); ?></span>
+			<?php endif; ?>
+			<?php if ((strtotime($displayData->publish_down) < strtotime(JFactory::getDate())) && $displayData->publish_down != '0000-00-00 00:00:00') : ?>
+				<span class="label label-warning"><?php echo JText::_('JEXPIRED'); ?></span>
+		<?php endif; ?>
+		</div>
+	<?php endif; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/blog_style_default_links.php b/plugins/system/t3/base/html/layouts/joomla/content/blog_style_default_links.php
new file mode 100644
index 0000000..873e502
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/blog_style_default_links.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<ol class="nav nav-tabs nav-stacked">
+<?php foreach ($displayData->get('link_items') as $item) : ?>
+	<li>
+		<a href="<?php echo JRoute::_(ContentHelperRoute::getArticleRoute($item->slug, $item->catslug)); ?>">
+			<?php echo $item->title; ?></a>
+	</li>
+<?php endforeach; ?>
+</ol>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/categories_default.php b/plugins/system/t3/base/html/layouts/joomla/content/categories_default.php
new file mode 100644
index 0000000..2de373b
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/categories_default.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+<div class="categories-list<?php echo $displayData->pageclass_sfx;?>">
+<?php if ($displayData->params->get('show_page_heading')) : ?>
+<h1>
+	<?php echo $displayData->escape($displayData->params->get('page_heading')); ?>
+</h1>
+<?php endif; ?>
+
+<?php if ($displayData->params->get('show_base_description')) : ?>
+	<?php //If there is a description in the menu parameters use that; ?>
+		<?php if($displayData->params->get('categories_description')) : ?>
+			<div class="category-desc base-desc">
+			<?php echo JHtml::_('content.prepare', $displayData->params->get('categories_description'), '',  $displayData->get('extension') . '.categories'); ?>
+			</div>
+		<?php else : ?>
+			<?php //Otherwise get one from the database if it exists. ?>
+			<?php  if ($displayData->parent->description) : ?>
+				<div class="category-desc base-desc">
+					<?php echo JHtml::_('content.prepare', $displayData->parent->description, '', $displayData->parent->extension . '.categories'); ?>
+				</div>
+			<?php endif; ?>
+		<?php endif; ?>
+	<?php endif; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/categories_default_items.php b/plugins/system/t3/base/html/layouts/joomla/content/categories_default_items.php
new file mode 100644
index 0000000..d8bb18e
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/categories_default_items.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = ' class="first"';
+JHtml::_('bootstrap.tooltip');
+
+$item = $displayData->item;
+$items = $displayData->get('items');
+$params = $displayData->params;
+$extension = $displayData->get('extension');
+$className = substr($extension, 4);
+// This will work for the core components but not necessarily for other components
+// that may have different pluralisation rules.
+if (substr($className, -1) == 's')
+{
+	$className = rtrim($className, 's');
+}
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/category_default.php b/plugins/system/t3/base/html/layouts/joomla/content/category_default.php
new file mode 100644
index 0000000..8be45cc
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/category_default.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+// Note that this layout opens a div with the page class suffix. If you do not use the category children
+// layout you need to close this div either by overriding this file or in your main layout.
+$params  = $displayData->params;
+$extension = $displayData->get('category')->extension;
+$canEdit = $params->get('access-edit');
+$className = substr($extension, 4);
+// This will work for the core components but not necessarily for other components
+// that may have different pluralisation rules.
+if (substr($className, -1) == 's')
+{
+	$className = rtrim($className, 's');
+}
+$tagsData  = $displayData->get('category')->tags->itemTags;
+?>
+<div>
+	<div class="<?php echo $className .'-category' . $displayData->pageclass_sfx;?>">
+		<?php if ($params->get('show_page_heading')) : ?>
+			<h1>
+				<?php echo $displayData->escape($params->get('page_heading')); ?>
+			</h1>
+		<?php endif; ?>
+		<?php if($params->get('show_category_title', 1)) : ?>
+			<h2>
+				<?php echo JHtml::_('content.prepare', $displayData->get('category')->title, '', $extension.'.category'); ?>
+			</h2>
+		<?php endif; ?>
+		<?php if ($displayData->get('show_tags', 1)) : ?>
+			<?php echo JLayoutHelper::render('joomla.content.tags', $tagsData); ?>
+		<?php endif; ?>
+		<?php if ($params->get('show_description', 1) || $params->def('show_description_image', 1)) : ?>
+			<div class="category-desc">
+				<?php if ($params->get('show_description_image') && $displayData->get('category')->getParams()->get('image')) : ?>
+					<img src="<?php echo $displayData->get('category')->getParams()->get('image'); ?>"/>
+				<?php endif; ?>
+				<?php if ($params->get('show_description') && $displayData->get('category')->description) : ?>
+					<?php echo JHtml::_('content.prepare', $displayData->get('category')->description, '', $extension .'.category'); ?>
+				<?php endif; ?>
+				<div class="clr"></div>
+			</div>
+		<?php endif; ?>
+		<?php echo $displayData->loadTemplate($displayData->subtemplatename); ?>
+
+		<?php if ($displayData->get('children') && $displayData->maxLevel != 0) : ?>
+			<div class="cat-children">
+				<h3>
+					<?php echo JTEXT::_('JGLOBAL_SUBCATEGORIES'); ?>
+				</h3>
+
+				<?php echo $displayData->loadTemplate('children'); ?>
+			</div>
+		<?php endif; ?>
+	</div>
+</div>
+
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/icons.php b/plugins/system/t3/base/html/layouts/joomla/content/icons.php
new file mode 100644
index 0000000..3009b6f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/icons.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$canEdit = $displayData['params']->get('access-edit');
+
+?>
+
+<div class="icons">
+	<?php if (empty($displayData['print'])) : ?>
+
+		<?php if ($canEdit || $displayData['params']->get('show_print_icon') || $displayData['params']->get('show_email_icon')) : ?>
+			<div class="btn-group pull-right">
+				<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <span class="icon-cog"></span> <span class="caret"></span> </a>
+				<?php // Note the actions class is deprecated. Use dropdown-menu instead. ?>
+				<ul class="dropdown-menu">
+					<?php if ($displayData['params']->get('show_print_icon')) : ?>
+						<li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+					<?php if ($displayData['params']->get('show_email_icon')) : ?>
+						<li class="email-icon"> <?php echo JHtml::_('icon.email', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+					<?php if ($canEdit) : ?>
+						<li class="edit-icon"> <?php echo JHtml::_('icon.edit', $displayData['item'], $displayData['params']); ?> </li>
+					<?php endif; ?>
+				</ul>
+			</div>
+		<?php endif; ?>
+
+	<?php else : ?>
+
+		<div class="pull-right">
+			<?php echo JHtml::_('icon.print_screen', $displayData['item'], $displayData['params']); ?>
+		</div>
+
+	<?php endif; ?>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/index.html b/plugins/system/t3/base/html/layouts/joomla/content/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/author.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/author.php
new file mode 100644
index 0000000..d61ded2
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/author.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+<dd class="createdby">
+	<?php $author = $displayData['item']->author; ?>
+	<?php $author = ($displayData['item']->created_by_alias ? $displayData['item']->created_by_alias : $author); ?>
+	<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $displayData['item']->contact_link, $author)); ?>
+	<?php else :?>
+		<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+	<?php endif; ?>
+</dd>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/block.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/block.php
new file mode 100644
index 0000000..a9102d9
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/block.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$blockPosition = $displayData['params']->get('info_block_position', 0);
+
+?>
+	<dl class="article-info  muted">
+
+		<?php if ($displayData['position'] == 'above' && ($blockPosition == 0 || $blockPosition == 2)
+				|| $displayData['position'] == 'below' && ($blockPosition == 1)
+				) : ?>
+
+			<dt class="article-info-term">
+				<?php // TODO: implement info_block_show_title param to hide article info title ?>
+				<?php if ($displayData['params']->get('info_block_show_title', 1)) : ?>
+					<?php echo JText::_('COM_CONTENT_ARTICLE_INFO'); ?>
+				<?php endif; ?>
+			</dt>
+
+			<?php if ($displayData['params']->get('show_author') && !empty($displayData['item']->author )) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.author', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.parent_category', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_category')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.category', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_publish_date')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.publish_date', $displayData); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+
+		<?php if ($displayData['position'] == 'above' && ($blockPosition == 0)
+				|| $displayData['position'] == 'below' && ($blockPosition == 1 || $blockPosition == 2)
+				) : ?>
+			<?php if ($displayData['params']->get('show_create_date')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.create_date', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_modify_date')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.modify_date', $displayData); ?>
+			<?php endif; ?>
+
+			<?php if ($displayData['params']->get('show_hits')) : ?>
+				<?php echo JLayoutHelper::render('joomla.content.info_block.hits', $displayData); ?>
+			<?php endif; ?>
+		<?php endif; ?>
+	</dl>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/category.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/category.php
new file mode 100644
index 0000000..69ba8b7
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/category.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="category-name">
+				<?php $title = $this->escape($displayData['item']->category_title);
+				$url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->catslug)).'">'.$title.'</a>';?>
+				<?php if ($displayData['params']->get('link_category') && $displayData['item']->catslug) : ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $url); ?>
+				<?php else : ?>
+					<?php echo JText::sprintf('COM_CONTENT_CATEGORY', $title); ?>
+				<?php endif; ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/create_date.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/create_date.php
new file mode 100644
index 0000000..3dcffe3
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/create_date.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="create">
+					<span class="icon-calendar"></span>
+					<?php echo JText::sprintf('COM_CONTENT_CREATED_DATE_ON', JHtml::_('date', $displayData['item']->created, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/hits.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/hits.php
new file mode 100644
index 0000000..2ed5fe8
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/hits.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="hits">
+					<span class="icon-eye-open"></span>
+					<?php echo JText::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/index.html b/plugins/system/t3/base/html/layouts/joomla/content/info_block/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/modify_date.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/modify_date.php
new file mode 100644
index 0000000..1aabd33
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/modify_date.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="modified">
+				<span class="icon-calendar"></span>
+				<?php echo JText::sprintf('COM_CONTENT_LAST_UPDATED', JHtml::_('date', $displayData['item']->modified, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/parent_category.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/parent_category.php
new file mode 100644
index 0000000..7d31df9
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/parent_category.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+			<dd class="parent-category-name">
+				<?php $title = $this->escape($displayData['item']->parent_title);
+				$url = '<a href="'.JRoute::_(ContentHelperRoute::getCategoryRoute($displayData['item']->parent_slug)).'">'.$title.'</a>';?>
+				<?php if ($displayData['params']->get('link_parent_category') && !empty($displayData['item']->parent_slug)) : ?>
+					<?php echo JText::sprintf('COM_CONTENT_PARENT', $url); ?>
+				<?php else : ?>
+					<?php echo JText::sprintf('COM_CONTENT_PARENT', $title); ?>
+				<?php endif; ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/info_block/publish_date.php b/plugins/system/t3/base/html/layouts/joomla/content/info_block/publish_date.php
new file mode 100644
index 0000000..057e7dc
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/info_block/publish_date.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+?>
+			<dd class="published">
+				<span class="icon-calendar"></span> <?php echo JText::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', JHtml::_('date', $displayData['item']->publish_up, JText::_('DATE_FORMAT_LC3'))); ?>
+			</dd>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/intro_image.php b/plugins/system/t3/base/html/layouts/joomla/content/intro_image.php
new file mode 100644
index 0000000..fbb2f6a
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/intro_image.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+$params  = $displayData->params;
+?>
+<?php $images = json_decode($displayData->images); ?>
+<?php if (isset($images->image_intro) && !empty($images->image_intro)) : ?>
+	<?php $imgfloat = (empty($images->float_intro)) ? $params->get('float_intro') : $images->float_intro; ?>
+	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
+	<?php if ($images->image_intro_caption):
+		echo 'class="caption"'.' title="' .htmlspecialchars($images->image_intro_caption) .'"';
+	endif; ?>
+	src="<?php echo htmlspecialchars($images->image_intro); ?>" alt="<?php echo htmlspecialchars($images->image_intro_alt); ?>"/> </div>
+<?php endif; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/options_default.php b/plugins/system/t3/base/html/layouts/joomla/content/options_default.php
new file mode 100644
index 0000000..c80ac8e
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/options_default.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+JHtml::_('behavior.framework');
+
+?>
+<fieldset class="<?php echo !empty($displayData->formclass) ? $displayData->formclass : 'form-horizontal'; ?>">
+	<legend><?php echo $displayData->name ?></legend>
+	<?php if (!empty($displayData->description)): ?>
+		<p><?php echo $displayData->description; ?></p>
+	<?php endif; ?>
+	<?php
+	$fieldsnames = explode(',', $displayData->fieldsname);
+	foreach($fieldsnames as $fieldname)
+	{
+		foreach ($displayData->form->getFieldset($fieldname) as $field)
+		{
+			$classnames = 'control-group';
+			$rel = '';
+			$showon = $displayData->form->getFieldAttribute($field->fieldname, 'showon');
+			if (!empty($showon))
+			{
+				JHtml::_('jquery.framework');
+				JHtml::_('script', 'jui/cms.js', false, true);
+
+				$id = $displayData->form->getFormControl();
+				$showon = explode(':', $showon, 2);
+				$classnames .= ' showon_' . implode(' showon_', explode(',', $showon[1]));
+				$rel = ' rel="showon_' . $id . '['. $showon[0] . ']"';
+			}
+	?>
+		<div class="<?php echo $classnames; ?>"<?php echo $rel; ?>>
+			<?php if (!isset($displayData->showlabel) || $displayData->showlabel): ?>
+				<div class="control-label"><?php echo $field->label; ?></div>
+			<?php endif; ?>
+			<div class="controls"><?php echo $field->input; ?></div>
+		</div>
+	<?php
+		}
+	}
+?>
+</fieldset>
diff --git a/plugins/system/t3/base/html/layouts/joomla/content/tags.php b/plugins/system/t3/base/html/layouts/joomla/content/tags.php
new file mode 100644
index 0000000..7fbf495
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/content/tags.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package     Joomla.Cms
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+JLoader::register('TagsHelperRoute', JPATH_BASE . '/components/com_tags/helpers/route.php');
+
+?>
+<?php if (!empty($displayData)) : ?>
+	<div class="tags">
+		<?php foreach ($displayData as $i => $tag) : ?>
+			<?php if (in_array($tag->access, JAccess::getAuthorisedViewLevels(JFactory::getUser()->get('id')))) : ?>
+				<?php $tagParams = new JRegistry($tag->params); ?>
+				<?php $link_class = $tagParams->get('tag_link_class', 'label label-info'); ?>
+				<span class="tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i ?>">
+					<a href="<?php echo JRoute::_(TagsHelperRoute::getTagRoute($tag->tag_id . '-' . $tag->alias)) ?>" class="<?php echo $link_class; ?>">
+						<?php echo $this->escape($tag->title); ?>
+					</a>
+				</span>&nbsp;
+			<?php endif; ?>
+		<?php endforeach; ?>
+	</div>
+<?php endif; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/associations.php b/plugins/system/t3/base/html/layouts/joomla/edit/associations.php
new file mode 100644
index 0000000..cdf9832
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/associations.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// JLayout for standard handling of associations fields in the administrator items edit screens.
+echo $displayData->getForm()->getControlGroups('item_associations');
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/details.php b/plugins/system/t3/base/html/layouts/joomla/edit/details.php
new file mode 100644
index 0000000..27cec29
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/details.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @deprecated  3.2
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+
+// JLayout for standard handling of the details sidebar in administrator edit screens.
+$title = $displayData->getForm()->getValue('title');
+$published = $displayData->getForm()->getField('published');
+$saveHistory = $displayData->get('state')->get('params')->get('save_history', 0);
+?>
+<div class="span2">
+	<h4><?php echo JText::_('JDETAILS'); ?></h4>
+	<hr />
+	<fieldset class="form-vertical">
+		<?php if (empty($title)) : ?>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $displayData->getForm()->getValue('name'); ?>
+				</div>
+			</div>
+		<?php else : ?>
+			<div class="control-group">
+				<div class="controls">
+					<?php echo $displayData->getForm()->getValue('title'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<?php if ($published) : ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $displayData->getForm()->getLabel('published'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $displayData->getForm()->getInput('published'); ?>
+				</div>
+			</div>
+		<?php else : ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $displayData->getForm()->getLabel('state'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $displayData->getForm()->getInput('state'); ?>
+				</div>
+			</div>
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('access'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('access'); ?>
+			</div>
+		</div>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('featured'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('featured'); ?>
+			</div>
+		</div>
+		<?php if (JLanguageMultilang::isEnabled()) : ?>
+			<div class="control-group">
+				<div class="control-label">
+					<?php echo $displayData->getForm()->getLabel('language'); ?>
+				</div>
+				<div class="controls">
+					<?php echo $displayData->getForm()->getInput('language'); ?>
+				</div>
+			</div>
+		<?php else : ?>
+		<input type="hidden" name="language" value="<?php echo $displayData->getForm()->getValue('language'); ?>" />
+		<?php endif; ?>
+		<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('tags'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('tags'); ?>
+			</div>
+		</div>
+		<?php if ($saveHistory) : ?>
+			<div class="control-group">
+			<div class="control-label">
+				<?php echo $displayData->getForm()->getLabel('version_note'); ?>
+			</div>
+			<div class="controls">
+				<?php echo $displayData->getForm()->getInput('version_note'); ?>
+			</div>
+			</div>
+		<?php endif; ?>
+	</fieldset>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/fieldset.php b/plugins/system/t3/base/html/layouts/joomla/edit/fieldset.php
new file mode 100644
index 0000000..952305b
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/fieldset.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$name = $displayData->get('fieldset');
+$fieldSet = $form->getFieldset($name);
+
+if (empty($fieldSet))
+{
+	return;
+}
+
+$ignoreFields = $displayData->get('ignore_fields') ? : array();
+$extraFields = $displayData->get('extra_fields') ? : array();
+
+if ($displayData->get('show_options', 1))
+{
+	if (isset($fieldSet->description) && trim($fieldSet->description))
+	{
+		echo '<p class="alert alert-info">' . $this->escape(JText::_($fieldSet->description)) . '</p>';
+	}
+
+	if (isset($extraFields[$name]))
+	{
+		foreach ($extraFields[$name] as $f)
+		{
+			if (in_array($f, $ignoreFields))
+			{
+				continue;
+			}
+			if ($form->getField($f))
+			{
+				$fieldSet[] = $form->getField($f);
+			}
+		}
+	}
+
+	$html = array();
+
+	foreach ($fieldSet as $field)
+	{
+		$html[] = $field->getControlGroup();
+	}
+
+	echo implode('', $html);
+}
+else
+{
+	$html = array();
+	$html[] = '<div style="display:none;">';
+	foreach ($fieldSet as $field)
+	{
+		$html[] = $field->input;
+	}
+	$html[] = '</div>';
+
+	echo implode('', $html);
+}
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/frontediting_modules.php b/plugins/system/t3/base/html/layouts/joomla/edit/frontediting_modules.php
new file mode 100644
index 0000000..86a2c61
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/frontediting_modules.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// JLayout for standard handling of the edit modules:
+
+$moduleHtml   =& $displayData['moduleHtml'];
+$mod          = $displayData['module'];
+$position     = $displayData['position'];
+$menusEditing = $displayData['menusediting'];
+
+
+if (preg_match('/<(?:div|span|nav|ul|ol|h\d) [^>]*class="[^"]* jmoddiv"/', $moduleHtml))
+{
+	// Module has already module edit button:
+	return;
+}
+
+// Add css class jmoddiv and data attributes for module-editing URL and for the tooltip:
+$editUrl = JUri::base() . 'administrator/index.php?option=com_modules&view=module&layout=edit&id=' . (int) $mod->id;
+
+// Add class, editing URL and tooltip, and if module of type menu, also the tooltip for editing the menu item:
+$count = 0;
+$moduleHtml = preg_replace(
+	// Replace first tag of module with a class
+	'/^(\s*<(?:div|span|nav|ul|ol|h\d) [^>]*class="[^"]*)"/',
+	// By itself, adding class jmoddiv and data attributes for the url and tooltip:
+	'\\1 jmoddiv" data-jmodediturl="' . $editUrl . '" data-jmodtip="'
+	.	JHtml::tooltipText(
+			JText::_('JLIB_HTML_EDIT_MODULE'),
+			htmlspecialchars($mod->title) . '<br />' . sprintf(JText::_('JLIB_HTML_EDIT_MODULE_IN_POSITION'), htmlspecialchars($position)),
+			0
+		)
+	. '"'
+	// And if menu editing is enabled and allowed and it's a menu module, add data attributes for menu editing:
+	.	($menusEditing && $mod->module == 'mod_menu' ?
+			'" data-jmenuedittip="' . JHtml::tooltipText('JLIB_HTML_EDIT_MENU_ITEM', 'JLIB_HTML_EDIT_MENU_ITEM_ID') . '"'
+			:
+			''
+		),
+	$moduleHtml,
+	1,
+	$count
+);
+
+if ($count)
+{
+	// Load once booststrap tooltip and add stylesheet and javascript to head:
+	JHtml::_('bootstrap.tooltip');
+	JHtml::_('bootstrap.popover');
+
+	JHtml::_('stylesheet', 'system/frontediting.css', array(), true);
+	JHtml::_('script', 'system/frontediting.js', false, true);
+}
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/global.php b/plugins/system/t3/base/html/layouts/joomla/edit/global.php
new file mode 100644
index 0000000..983e7e3
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/global.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+$input = $app->input;
+$component = $input->getCmd('option', 'com_content');
+if ($component == 'com_categories')
+{
+	$extension	= $input->getCmd('extension', 'com_content');
+	$parts		= explode('.', $extension);
+	$component	= $parts[0];
+}
+$saveHistory = JComponentHelper::getParams($component)->get('save_history', 0);
+
+$fields = $displayData->get('fields') ?: array(
+	array('category', 'catid'),
+	array('parent', 'parent_id'),
+	'tags',
+	array('published', 'state', 'enabled'),
+	'featured',
+	'sticky',
+	'access',
+	'language',
+	'note',
+	'version_note'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+// Multilanguage check:
+/*if (!JLanguageMultilang::isEnabled())
+{
+	$hiddenFields[] = 'language';
+}*/
+if (!$saveHistory)
+{
+	$hiddenFields[] = 'version_note';
+}
+
+$html = array();
+$html[] = '<fieldset class="form-vertical">';
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			$html[] = $form->getControlGroup($f);
+			break;
+		}
+	}
+}
+
+$html[] = '</fieldset>';
+
+echo implode('', $html);
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/index.html b/plugins/system/t3/base/html/layouts/joomla/edit/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/item_title.php b/plugins/system/t3/base/html/layouts/joomla/edit/item_title.php
new file mode 100644
index 0000000..1930253
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/item_title.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Cms
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ *
+ * @deprecated  3.2
+ */
+
+defined('JPATH_BASE') or die;
+$title = $displayData->getForm()->getValue('title');
+$name = $displayData->getForm()->getValue('name');
+
+?>
+
+<?php if ($title) : ?>
+	<h4><?php echo $title; ?></h4>
+<?php endif; ?>
+
+<?php if ($name) : ?>
+	<h4><?php echo $name; ?></h4>
+<?php endif;
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/metadata.php b/plugins/system/t3/base/html/layouts/joomla/edit/metadata.php
new file mode 100644
index 0000000..02d5631
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/metadata.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$form = $displayData->getForm();
+
+// JLayout for standard handling of metadata fields in the administrator content edit screens.
+$fieldSets = $form->getFieldsets('metadata');
+?>
+
+<?php foreach ($fieldSets as $name => $fieldSet) : ?>
+	<?php if (isset($fieldSet->description) && trim($fieldSet->description)) : ?>
+		<p class="alert alert-info"><?php echo $this->escape(JText::_($fieldSet->description)); ?></p>
+	<?php endif; ?>
+
+	<?php
+	// Include the real fields in this panel.
+	if ($name == 'jmetadata')
+	{
+		echo $form->getControlGroup('metadesc');
+		echo $form->getControlGroup('metakey');
+		echo $form->getControlGroup('xreference');
+	}
+
+	foreach ($form->getFieldset($name) as $field)
+	{
+		if ($field->name != 'jform[metadata][tags][]')
+		{
+			echo $field->getControlGroup();
+		}
+	} ?>
+<?php endforeach; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/params.php b/plugins/system/t3/base/html/layouts/joomla/edit/params.php
new file mode 100644
index 0000000..527b21f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/params.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$fieldSets = $form->getFieldsets('params');
+if (empty($fieldSets))
+{
+	$fieldSets = $form->getFieldsets('attribs');
+}
+
+if (empty($fieldSets))
+{
+	return;
+}
+
+$ignoreFieldsets = $displayData->get('ignore_fieldsets') ?: array();
+$ignoreFields = $displayData->get('ignore_fields') ?: array();
+$extraFields = $displayData->get('extra_fields') ?: array();
+
+if (!empty($displayData->hiddenFieldsets))
+{
+	// These are required to preserve data on save when fields are not displayed.
+	$hiddenFieldsets = $displayData->hiddenFieldsets ?: array();
+}
+
+if (!empty($displayData->configFieldsets))
+{
+	// These are required to configure showing and hiding fields in the editor.
+	$configFieldsets = $displayData->configFieldsets ?: array();
+}
+
+if ($displayData->get('show_options', 1))
+{
+	foreach ($fieldSets as $name => $fieldSet)
+	{
+		if (in_array($name, $ignoreFieldsets) || (!empty($configFieldsets) && in_array($name, $configFieldsets))
+				|| !empty($hiddenFieldsets) && in_array($name, $hiddenFieldsets))
+		{
+			continue;
+		}
+
+		if (!empty($fieldSet->label))
+		{
+			$label = JText::_($fieldSet->label, true);
+		}
+		else
+		{
+			$label = strtoupper('JGLOBAL_FIELDSET_' . $name);
+			if (JText::_($label, true) == $label)
+			{
+				$label = strtoupper($app->input->get('option') . '_' . $name . '_FIELDSET_LABEL');
+			}
+			$label = JText::_($label, true);
+		}
+
+		echo JHtml::_('bootstrap.addTab', 'myTab', 'attrib-' . $name, $label);
+
+		$displayData->fieldset = $name;
+		echo JLayoutHelper::render('joomla.edit.fieldset', $displayData);
+
+		echo JHtml::_('bootstrap.endTab');
+	}
+}
+else
+{
+	$html = array();
+	$html[] = '<div style="display:none;">';
+	foreach ($fieldSets as $name => $fieldSet)
+	{
+		if (in_array($name, $ignoreFieldsets))
+		{
+			continue;
+		}
+
+		if (in_array($name, $hiddenFieldsets))
+		{
+			foreach ($form->getFieldset($name) as $field)
+			{
+				echo $field->input;
+			}
+		}
+	}
+	$html[] = '</div>';
+
+	echo implode('', $html);
+}
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/publishingdata.php b/plugins/system/t3/base/html/layouts/joomla/edit/publishingdata.php
new file mode 100644
index 0000000..e737578
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/publishingdata.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$app = JFactory::getApplication();
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'publish_up',
+	'publish_down',
+	array('created', 'created_time'),
+	array('created_by', 'created_user_id'),
+	'created_by_alias',
+	array('modified', 'modified_time'),
+	array('modified_by', 'modified_user_id'),
+	'version',
+	'hits',
+	'id'
+);
+
+$hiddenFields = $displayData->get('hidden_fields') ?: array();
+
+foreach ($fields as $field)
+{
+	$field = is_array($field) ? $field : array($field);
+	foreach ($field as $f)
+	{
+		if ($form->getField($f))
+		{
+			if (in_array($f, $hiddenFields))
+			{
+				$form->setFieldAttribute($f, 'type', 'hidden');
+			}
+
+			echo $form->getControlGroup($f);
+			break;
+		}
+	}
+}
diff --git a/plugins/system/t3/base/html/layouts/joomla/edit/title_alias.php b/plugins/system/t3/base/html/layouts/joomla/edit/title_alias.php
new file mode 100644
index 0000000..93fd0fb
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/edit/title_alias.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @package     Joomla.Cms
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$form = $displayData->getForm();
+
+$title = $form->getField('title') ? 'title' : ($form->getField('name') ? 'name' : '');
+
+?>
+<div class="form-inline form-inline-header">
+	<?php
+	echo $title ? $form->getControlGroup($title) : '';
+	echo $form->getControlGroup('alias');
+	?>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/index.html b/plugins/system/t3/base/html/layouts/joomla/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/links/groupclose.php b/plugins/system/t3/base/html/layouts/joomla/links/groupclose.php
new file mode 100644
index 0000000..1f2eb2b
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/links/groupclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+	</ul>
diff --git a/plugins/system/t3/base/html/layouts/joomla/links/groupopen.php b/plugins/system/t3/base/html/layouts/joomla/links/groupopen.php
new file mode 100644
index 0000000..d51482c
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/links/groupopen.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<h2 class="nav-header"><?php echo JFilterOutput::ampReplace(JText::_($displayData)); ?></h2>
+<ul class="j-links-group nav nav-list">
diff --git a/plugins/system/t3/base/html/layouts/joomla/links/groupsclose.php b/plugins/system/t3/base/html/layouts/joomla/links/groupsclose.php
new file mode 100644
index 0000000..1f8eb24
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/links/groupsclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/links/groupseparator.php b/plugins/system/t3/base/html/layouts/joomla/links/groupseparator.php
new file mode 100644
index 0000000..f661627
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/links/groupseparator.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="j-links-separator"></div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/links/groupsopen.php b/plugins/system/t3/base/html/layouts/joomla/links/groupsopen.php
new file mode 100644
index 0000000..5a74c90
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/links/groupsopen.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="j-links-groups">
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/links/index.html b/plugins/system/t3/base/html/layouts/joomla/links/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/links/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/links/link.php b/plugins/system/t3/base/html/layouts/joomla/links/link.php
new file mode 100644
index 0000000..402a2cd
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/links/link.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
+$target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
+$onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"');
+$title   = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"');
+$text    = empty($displayData['text']) ? '' : ('<span class="j-links-link">' . $displayData['text'] . '</span>')
+
+?>
+<li<?php echo $id; ?>>
+	<a href="<?php echo JFilterOutput::ampReplace($displayData['link']); ?>"<?php echo $target . $onclick . $title; ?>>
+		<i class="icon-<?php echo $displayData['image']; ?>"></i> <?php echo $text; ?>
+	</a>
+</li>
diff --git a/plugins/system/t3/base/html/layouts/joomla/quickicons/icon.php b/plugins/system/t3/base/html/layouts/joomla/quickicons/icon.php
new file mode 100644
index 0000000..caae785
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/quickicons/icon.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id      = empty($displayData['id']) ? '' : (' id="' . $displayData['id'] . '"');
+$target  = empty($displayData['target']) ? '' : (' target="' . $displayData['target'] . '"');
+$onclick = empty($displayData['onclick']) ? '' : (' onclick="' . $displayData['onclick'] . '"');
+$title   = empty($displayData['title']) ? '' : (' title="' . $this->escape($displayData['title']) . '"');
+$text    = empty($displayData['text']) ? '' : ('<span>' . $displayData['text'] . '</span>')
+
+?>
+<div class="row-fluid"<?php echo $id; ?>>
+	<div class="span12">
+		<a href="<?php echo $displayData['link']; ?>"<?php echo $target . $onclick . $title; ?>>
+			<i class="icon-<?php echo $displayData['image']; ?>"></i> <?php echo $text; ?>
+		</a>
+	</div>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/quickicons/index.html b/plugins/system/t3/base/html/layouts/joomla/quickicons/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/quickicons/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/searchtools/default.php b/plugins/system/t3/base/html/layouts/joomla/searchtools/default.php
new file mode 100644
index 0000000..4082d26
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/searchtools/default.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+// Set some basic options
+$customOptions = array(
+	'filtersHidden'       => isset($data['options']['filtersHidden']) ? $data['options']['filtersHidden'] : empty($data['view']->activeFilters),
+	'defaultLimit'        => isset($data['options']['defaultLimit']) ? $data['options']['defaultLimit'] : JFactory::getApplication()->getCfg('list_limit', 20),
+	'searchFieldSelector' => '#filter_search',
+	'orderFieldSelector'  => '#list_fullordering'
+);
+
+$data['options'] = array_unique(array_merge($customOptions, $data['options']));
+
+$formSelector = !empty($data['options']['formSelector']) ? $data['options']['formSelector'] : '#adminForm';
+
+// Load search tools
+JHtml::_('searchtools.form', $formSelector, $data['options']);
+
+?>
+<div class="js-stools clearfix">
+	<div class="clearfix">
+		<div class="js-stools-container-bar">
+			<?php echo JLayoutHelper::render('joomla.searchtools.default.bar', $data); ?>
+		</div>
+		<div class="js-stools-container-list hidden-phone hidden-tablet">
+			<?php echo JLayoutHelper::render('joomla.searchtools.default.list', $data); ?>
+		</div>
+	</div>
+	<!-- Filters div -->
+	<div class="js-stools-container-filters hidden-phone clearfix">
+		<?php echo JLayoutHelper::render('joomla.searchtools.default.filters', $data); ?>
+	</div>
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/searchtools/default/bar.php b/plugins/system/t3/base/html/layouts/joomla/searchtools/default/bar.php
new file mode 100644
index 0000000..b971bd0
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/searchtools/default/bar.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Receive overridable options
+$data['options'] = !empty($data['options']) ? $data['options'] : array();
+
+if (is_array($data['options']))
+{
+	$data['options'] = new JRegistry($data['options']);
+}
+
+// Options
+$filterButton = $data['options']->get('filterButton', true);
+$searchButton = $data['options']->get('searchButton', true);
+
+$filters = $data['view']->filterForm->getGroup('filter');
+?>
+
+<?php if (!empty($filters['filter_search'])) : ?>
+	<?php if ($searchButton) : ?>
+		<label for="filter_search" class="element-invisible">
+			<?php echo JText::_('JSEARCH_FILTER'); ?>
+		</label>
+		<div class="btn-wrapper input-append">
+			<?php echo $filters['filter_search']->input; ?>
+			<button type="submit" class="btn hasTooltip" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_SUBMIT'); ?>">
+				<i class="icon-search"></i>
+			</button>
+		</div>
+		<?php if ($filterButton) : ?>
+			<div class="btn-wrapper hidden-phone">
+				<button type="button" class="btn hasTooltip js-stools-btn-filter" title="<?php echo JHtml::tooltipText('JSEARCH_TOOLS_DESC'); ?>">
+					<?php echo JText::_('JSEARCH_TOOLS');?> <i class="caret"></i>
+				</button>
+			</div>
+		<?php endif; ?>
+		<div class="btn-wrapper">
+			<button type="button" class="btn hasTooltip js-stools-btn-clear" title="<?php echo JHtml::tooltipText('JSEARCH_FILTER_CLEAR'); ?>">
+				<?php echo JText::_('JSEARCH_FILTER_CLEAR');?>
+			</button>
+		</div>
+	<?php endif; ?>
+<?php endif;
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/searchtools/default/filters.php b/plugins/system/t3/base/html/layouts/joomla/searchtools/default/filters.php
new file mode 100644
index 0000000..e8b356d
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/searchtools/default/filters.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Load the form filters
+$filters = $data['view']->filterForm->getGroup('filter');
+?>
+<?php if ($filters) : ?>
+	<?php foreach ($filters as $fieldName => $field) : ?>
+		<?php if ($fieldName != 'filter_search') : ?>
+			<div class="js-stools-field-filter">
+				<?php echo $field->input; ?>
+			</div>
+		<?php endif; ?>
+	<?php endforeach; ?>
+<?php endif; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/searchtools/default/list.php b/plugins/system/t3/base/html/layouts/joomla/searchtools/default/list.php
new file mode 100644
index 0000000..5350f6d
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/searchtools/default/list.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+// Load the form list fields
+$list = $data['view']->filterForm->getGroup('list');
+?>
+<?php if ($list) : ?>
+	<div class="ordering-select hidden-phone">
+		<?php foreach ($list as $fieldName => $field) : ?>
+			<div class="js-stools-field-list">
+				<?php echo $field->input; ?>
+			</div>
+		<?php endforeach; ?>
+	</div>
+<?php endif; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/searchtools/grid/sort.php b/plugins/system/t3/base/html/layouts/joomla/searchtools/grid/sort.php
new file mode 100644
index 0000000..045c030
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/searchtools/grid/sort.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+$data = $displayData;
+
+$metatitle = JHtml::tooltipText(JText::_($data->tip ? $data->tip : $data->title), JText::_('JGLOBAL_CLICK_TO_SORT_THIS_COLUMN'), 0);
+JHtml::_('bootstrap.tooltip');
+?>
+<a href="#" onclick="return false;" class="js-stools-column-order hasTooltip" data-order="<?php echo $data->order; ?>" data-direction="<?php echo strtoupper($data->direction); ?>" data-name="<?php echo JText::_($data->title); ?>" title="<?php echo $metatitle; ?>">
+	<?php if (!empty($data->icon)) : ?>
+		<i class="<?php echo $data->icon; ?>"></i>
+	<?php endif; ?>
+	<?php if (!empty($data->title)) : ?>
+		<?php echo JText::_($data->title); ?>
+	<?php endif; ?>
+	<?php if ($data->order == $data->selected) : ?>
+		<i class="<?php echo $data->orderIcon; ?>"></i>
+	<?php endif; ?>
+</a>
diff --git a/plugins/system/t3/base/html/layouts/joomla/sidebars/index.html b/plugins/system/t3/base/html/layouts/joomla/sidebars/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/sidebars/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/sidebars/submenu.php b/plugins/system/t3/base/html/layouts/joomla/sidebars/submenu.php
new file mode 100644
index 0000000..99088f9
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/sidebars/submenu.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+?>
+<div id="sidebar">
+	<div class="sidebar-nav">
+		<?php if ($displayData->displayMenu) : ?>
+		<ul id="submenu" class="nav nav-list">
+			<?php foreach ($displayData->list as $item) :
+			if (isset ($item[2]) && $item[2] == 1) : ?>
+				<li class="active">
+			<?php else : ?>
+				<li>
+			<?php endif;
+			if ($displayData->hide) : ?>
+				<a class="nolink"><?php echo $item[0]; ?></a>
+			<?php else :
+				if (strlen($item[1])) : ?>
+					<a href="<?php echo JFilterOutput::ampReplace($item[1]); ?>"><?php echo $item[0]; ?></a>
+				<?php else : ?>
+					<?php echo $item[0]; ?>
+				<?php endif;
+			endif; ?>
+			</li>
+			<?php endforeach; ?>
+		</ul>
+		<?php endif; ?>
+		<?php if ($displayData->displayMenu && $displayData->displayFilters) : ?>
+		<hr />
+		<?php endif; ?>
+		<?php if ($displayData->displayFilters) : ?>
+		<div class="filter-select hidden-phone">
+			<h4 class="page-header"><?php echo JText::_('JSEARCH_FILTER_LABEL');?></h4>
+			<?php foreach ($displayData->filters as $filter) : ?>
+				<label for="<?php echo $filter['name']; ?>" class="element-invisible"><?php echo $filter['label']; ?></label>
+				<select name="<?php echo $filter['name']; ?>" id="<?php echo $filter['name']; ?>" class="span12 small" onchange="this.form.submit()">
+					<?php if (!$filter['noDefault']) : ?>
+						<option value=""><?php echo $filter['label']; ?></option>
+					<?php endif; ?>
+					<?php echo $filter['options']; ?>
+				</select>
+				<hr class="hr-condensed" />
+			<?php endforeach; ?>
+		</div>
+		<?php endif; ?>
+	</div>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/tinymce/buttons.php b/plugins/system/t3/base/html/layouts/joomla/tinymce/buttons.php
new file mode 100644
index 0000000..04ae3cc
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/tinymce/buttons.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$buttons = $displayData;
+
+// Load modal popup behavior
+JHtml::_('behavior.modal', 'a.modal-button');
+?>
+<div id="editor-xtd-buttons" class="btn-toolbar pull-left">
+	<?php if ($buttons) : ?>
+		<?php foreach ($buttons as $button) : ?>
+			<?php echo JLayoutHelper::render('joomla.tinymce.buttons.button', $button); ?>
+		<?php endforeach; ?>
+	<?php endif; ?>
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/tinymce/buttons/button.php b/plugins/system/t3/base/html/layouts/joomla/tinymce/buttons/button.php
new file mode 100644
index 0000000..7d9d024
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/tinymce/buttons/button.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$button = $displayData;
+
+?>
+<?php if ($button->get('name')) : ?>
+	<?php
+		$class    = ($button->get('class')) ? $button->get('class') : null;
+		$class	 .= ($button->get('modal')) ? ' modal-button' : null;
+		$href     = ($button->get('link')) ? ' href="' . JUri::base() . $button->get('link') . '"' : null;
+		$onclick  = ($button->get('onclick')) ? ' onclick="' . $button->get('onclick') . '"' : ' onclick="IeCursorFix(); return false;"';
+		$title    = ($button->get('title')) ? $button->get('title') : $button->get('text');
+	?>
+	<a class="<?php echo $class; ?>" title="<?php echo $title; ?>" <?php echo $href . $onclick; ?> rel="<?php echo $button->get('options'); ?>">
+		<i class="icon-<?php echo $button->get('name'); ?>"></i> <?php echo $button->get('text'); ?>
+	</a>
+<?php endif;
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/tinymce/textarea.php b/plugins/system/t3/base/html/layouts/joomla/tinymce/textarea.php
new file mode 100644
index 0000000..d91cb79
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/tinymce/textarea.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$data = $displayData;
+
+?>
+<textarea
+	name="<?php echo $data->name; ?>"
+	id="<?php echo $data->id; ?>"
+	cols="<?php echo $data->cols; ?>"
+	rows="<?php echo $data->rows; ?>"
+	style="width: <?php echo $data->width; ?>; height: <?php echo $data->height; ?>;"
+	class="mce_editable"
+>
+	<?php echo $data->content; ?>
+</textarea>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/tinymce/togglebutton.php b/plugins/system/t3/base/html/layouts/joomla/tinymce/togglebutton.php
new file mode 100644
index 0000000..f15b359
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/tinymce/togglebutton.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$name = $displayData;
+
+?>
+<div class="toggle-editor btn-toolbar pull-right clearfix">
+	<div class="btn-group">
+		<a class="btn" href="#"
+			onclick="tinyMCE.execCommand('mceToggleEditor', false, '<?php echo $name; ?>');return false;"
+			title="<?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>"
+		>
+			<i class="icon-eye"></i> <?php echo JText::_('PLG_TINY_BUTTON_TOGGLE_EDITOR'); ?>
+		</a>
+	</div>
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/base.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/base.php
new file mode 100644
index 0000000..1f0bb5d
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/base.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="btn-wrapper" <?php echo $displayData['id']; ?>>
+	<?php echo $displayData['action']; ?>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/batch.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/batch.php
new file mode 100644
index 0000000..65fd2d6
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/batch.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$title = $displayData['title'];
+
+?>
+<button data-toggle="modal" data-target="#collapseModal" class="btn btn-small">
+	<i class="icon-checkbox-partial" title="<?php echo $title; ?>"></i>
+	<?php echo $title; ?>
+</button>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/confirm.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/confirm.php
new file mode 100644
index 0000000..cc63357
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/confirm.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/containerclose.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/containerclose.php
new file mode 100644
index 0000000..1f8eb24
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/containerclose.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+</div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/containeropen.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/containeropen.php
new file mode 100644
index 0000000..196ecae
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/containeropen.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<div class="btn-toolbar" id="<?php echo $displayData['id']; ?>">
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/help.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/help.php
new file mode 100644
index 0000000..5c377c5
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/help.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" rel="help" class="btn btn-small">
+	<span class="icon-question-sign"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/iconclass.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/iconclass.php
new file mode 100644
index 0000000..9785851
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/iconclass.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+icon-<?php echo $displayData['icon']; ?>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/index.html b/plugins/system/t3/base/html/layouts/joomla/toolbar/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/link.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/link.php
new file mode 100644
index 0000000..eba13cc
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/link.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+
+?>
+<button onclick="location.href='<?php echo $doTask; ?>';" class="btn btn-small">
+	<span class="<?php echo $class; ?>"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/popup.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/popup.php
new file mode 100644
index 0000000..5c76d9b
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/popup.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask = $displayData['doTask'];
+$class  = $displayData['class'];
+$text   = $displayData['text'];
+$name   = $displayData['name'];
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small modal" data-toggle="modal" data-target="#modal-<?php echo $name; ?>">
+	<i class="icon-cog"></i>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/separator.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/separator.php
new file mode 100644
index 0000000..e8bbb4c
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/separator.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$class = $displayData['class'];
+$style = $displayData['style'];
+
+?>
+<div class="btn-group <?php echo $class; ?>"<?php echo $style; ?>></div>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/slider.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/slider.php
new file mode 100644
index 0000000..a639f9a
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/slider.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask  = $displayData['doTask'];
+$class   = $displayData['class'];
+$text    = $displayData['text'];
+$name    = $displayData['name'];
+$onClose = $displayData['onClose'];
+?>
+<button onclick="<?php echo $doTask; ?>" class="btn btn-small" data-toggle="collapse" data-target="#collapse-<?php echo $name; ?>"<?php echo $onClose; ?>>
+	<i class="icon-cog"></i>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/standard.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/standard.php
new file mode 100644
index 0000000..8f5a0f5
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/standard.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$doTask   = $displayData['doTask'];
+$class    = $displayData['class'];
+$text     = $displayData['text'];
+$btnClass = $displayData['btnClass'];
+
+?>
+<button onclick="<?php echo $doTask; ?>" class="<?php echo $btnClass; ?>">
+	<span class="<?php echo trim($class); ?>"></span>
+	<?php echo $text; ?>
+</button>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/title.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/title.php
new file mode 100644
index 0000000..b1e24e8
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/title.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$icon = empty($displayData['icon']) ? 'generic' : preg_replace('#\.[^ .]*$#', '', $displayData['icon']);
+?>
+<h1 class="page-title">
+	<span class="icon-<?php echo $icon; ?>"></span>
+	<?php echo $displayData['title']; ?>
+</h1>
diff --git a/plugins/system/t3/base/html/layouts/joomla/toolbar/versions.php b/plugins/system/t3/base/html/layouts/joomla/toolbar/versions.php
new file mode 100644
index 0000000..6add897
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/joomla/toolbar/versions.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+?>
+<a rel="{handler: 'iframe', size: {x: <?php echo $displayData['height']; ?>, y: <?php echo $displayData['width']; ?>}}"
+	href="index.php?option=com_contenthistory&amp;view=history&amp;layout=modal&amp;tmpl=component&amp;item_id=<?php echo (int) $displayData['itemId']; ?>&amp;type_id=<?php echo $displayData['typeId']; ?>&amp;type_alias=<?php echo $displayData['typeAlias']; ?>&amp;<?php echo JSession::getFormToken(); ?>=1"
+	title="<?php echo $displayData['title']; ?>" class="btn btn-small modal_jform_contenthistory">
+	<i class="icon-archive"></i> <?php echo $displayData['title']; ?>
+</a>
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/addtab.php b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/addtab.php
new file mode 100644
index 0000000..1412206
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/addtab.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$id = empty($displayData['id']) ? '' : $displayData['id'];
+$active = empty($displayData['active']) ? '' : $displayData['active'];
+
+?>
+
+<div id="<?php echo $id; ?>" class="tab-pane<?php echo $active; ?>">
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/addtabscript.php b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/addtabscript.php
new file mode 100644
index 0000000..e2c50cf
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/addtabscript.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+$id = empty($displayData['id']) ? '' : $displayData['id'];
+$active = empty($displayData['active']) ? '' : $displayData['active'];
+$title = empty($displayData['title']) ? '' : $displayData['title'];
+
+
+echo "(function($){
+				$(document).ready(function() {
+					// Handler for .ready() called.
+					var tab = $('<li class=\"$active\"><a href=\"#$id\" data-toggle=\"tab\">$title</a></li>');
+					$('#" . $selector . "Tabs').append(tab);
+				});
+			})(jQuery);";
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/endtab.php b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/endtab.php
new file mode 100644
index 0000000..370f8ce
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/endtab.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/endtabset.php b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/endtabset.php
new file mode 100644
index 0000000..370f8ce
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/endtabset.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+?>
+
+</div>
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/index.html b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/starttabset.php b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/starttabset.php
new file mode 100644
index 0000000..50d8963
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/starttabset.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+
+?>
+
+<ul class="nav nav-tabs" id="<?php echo $selector; ?>Tabs"></ul>
+<div class="tab-content" id="<?php echo $selector; ?>Content">
\ No newline at end of file
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
new file mode 100644
index 0000000..238cdd7
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/bootstrap/starttabsetscript.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$selector = empty($displayData['selector']) ? '' : $displayData['selector'];
+
+echo "(function($){
+					$('#$selector a').click(function (e)
+					{
+						e.preventDefault();
+						$(this).tab('show');
+					});
+				})(jQuery);";
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/html/index.html b/plugins/system/t3/base/html/layouts/libraries/cms/html/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/html/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/libraries/cms/index.html b/plugins/system/t3/base/html/layouts/libraries/cms/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/cms/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/layouts/libraries/index.html b/plugins/system/t3/base/html/layouts/libraries/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/base/html/layouts/libraries/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/base/html/mod_breadcrumbs/default.php b/plugins/system/t3/base/html/mod_breadcrumbs/default.php
index c4d6393..e67901e 100644
--- a/plugins/system/t3/base/html/mod_breadcrumbs/default.php
+++ b/plugins/system/t3/base/html/mod_breadcrumbs/default.php
@@ -16,9 +16,10 @@
 
 <ul class="breadcrumb <?php echo $moduleclass_sfx; ?>">
 	<?php
-	if ($params->get('showHere', 1))
-	{
-		echo '<li class="active"><span class="divider hasTooltip"><i class="icon-map-marker" data-toggle="tooltip" title="' .JText::_('MOD_BREADCRUMBS_HERE').'"></i></span></li>';
+	if ($params->get('showHere', 1)) {
+		echo '<li class="active">' . JText::_('MOD_BREADCRUMBS_HERE') . '&#160;</li>';
+	} else {
+		echo '<li class="active"><span class="hasTooltip"><i class="fa fa-map-marker" data-toggle="tooltip" title="' . JText::_('MOD_BREADCRUMBS_HERE') . '"></i></span></li>';
 	}
 
 	// Get rid of duplicated entries on trail including home page when using multilanguage
diff --git a/plugins/system/t3/base/html/mod_search/default.php b/plugins/system/t3/base/html/mod_search/default.php
index 8d728f0..2b1cf5b 100644
--- a/plugins/system/t3/base/html/mod_search/default.php
+++ b/plugins/system/t3/base/html/mod_search/default.php
@@ -9,46 +9,44 @@
 
 defined('_JEXEC') or die;
 ?>
-<form class="form-search" action="<?php echo JRoute::_('index.php');?>" method="post">
-	<div class="search<?php echo $moduleclass_sfx ?>">
+<div class="search<?php echo $moduleclass_sfx ?>">
+	<form action="<?php echo JRoute::_('index.php');?>" method="post" class="form-inline form-search">
 		<?php
-			$output = '<label for="mod-search-searchword">'.$label.'</label><input name="searchword" id="mod-search-searchword" maxlength="'.$maxlength.'"  class="input'.$moduleclass_sfx.'" type="text" size="'.$width.'" placeholder="'.$text.'" />';
+			$output = '<label for="mod-search-searchword" class="element-invisible">' . $label . '</label> ';
+			$output .= '<input name="searchword" id="mod-search-searchword" maxlength="' . $maxlength . '"  class="input" type="text" size="' . $width . '" placeholder="' . $text . '" />';
 
 			if ($button) :
 				if ($imagebutton) :
-					$button = ' <input type="image" value="' . $button_text . '" class="button' . $moduleclass_sfx.'" src="' . $img . '" onclick="this.form.searchword.focus();"/>';
+					$btn_output = ' <input type="image" value="' . $button_text . '" class="button" src="' . $img . '" onclick="this.form.searchword.focus();"/>';
 				else :
-					$button = ' <button class="button' . $moduleclass_sfx . ' btn btn-primary" onclick="this.form.searchword.focus();">' . $button_text . '</button>';
+					$btn_output = ' <button class="button btn btn-primary" onclick="this.form.searchword.focus();">' . $button_text . '</button>';
 				endif;
-			else :
-				$button = '';
-			endif;
 
-			switch ($button_pos) :
-				case 'top' :
-					$button = $button.'<br />';
-					$output = $button.$output;
-					break;
+				switch ($button_pos) :
+					case 'top' :
+						$output = $btn_output . '<br />' . $output;
+						break;
+
+					case 'bottom' :
+						$output .= '<br />' . $btn_output;
+						break;
 
-				case 'bottom' :
-					$button = '<br />'.$button;
-					$output = $output.$button;
-					break;
+					case 'right' :
+						$output .= $btn_output;
+						break;
 
-				case 'right' :
-					$output = $output.$button;
-					break;
+					case 'left' :
+					default :
+						$output = $btn_output . $output;
+						break;
+				endswitch;
 
-				case 'left' :
-				default :
-					$output = $button.$output;
-					break;
-			endswitch;
+			endif;
 
 			echo $output;
 		?>
-	<input type="hidden" name="task" value="search" />
-	<input type="hidden" name="option" value="com_search" />
-	<input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" />
-	</div>
-</form>
+		<input type="hidden" name="task" value="search" />
+		<input type="hidden" name="option" value="com_search" />
+		<input type="hidden" name="Itemid" value="<?php echo $mitemid; ?>" />
+	</form>
+</div>
diff --git a/plugins/system/t3/base/js/respond.min.js b/plugins/system/t3/base/js/respond.min.js
index 870019b..80a7b69 100644
--- a/plugins/system/t3/base/js/respond.min.js
+++ b/plugins/system/t3/base/js/respond.min.js
@@ -1,5 +1,5 @@
-/*! Respond.js v1.4.0: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
  * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
  *  */
 
-!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@.*keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]+\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
diff --git a/plugins/system/t3/base/params/template.xml b/plugins/system/t3/base/params/template.xml
index 9e35790..70f851c 100644
--- a/plugins/system/t3/base/params/template.xml
+++ b/plugins/system/t3/base/params/template.xml
@@ -195,6 +195,7 @@
 			</field>
 
 			<field name="navigation_type" type="list" class="btn-group" default="joomla"
+						 global="1"
 						 label="T3_NAVIGATION_TYPE_LABEL"
 						 description="T3_NAVIGATION_TYPE_DESC">
 				<option value="joomla">Joomla Module</option>
diff --git a/plugins/system/t3/includes/admin/megamenu.php b/plugins/system/t3/includes/admin/megamenu.php
index ad004a0..be96a40 100644
--- a/plugins/system/t3/includes/admin/megamenu.php
+++ b/plugins/system/t3/includes/admin/megamenu.php
@@ -322,4 +322,57 @@ public static function megamenu()
 		
 		exit;
 	}
+
+	/**
+	 * Copy from Joomla 3.x
+	 */
+	public static function tooltipText($title = '', $content = '', $translate = 1, $escape = 1)
+	{
+	  // Return empty in no title or content is given.
+	  if ($title == '' && $content == '')
+	  {
+	    return '';
+	  }
+
+	  // Split title into title and content if the title contains '::' (old Mootools format).
+	  if ($content == '' && !(strpos($title, '::') === false))
+	  {
+	    list($title, $content) = explode('::', $title, 2);
+	  }
+
+	  // Pass texts through the JText.
+	  if ($translate)
+	  {
+	    $title = JText::_($title);
+	    $content = JText::_($content);
+	  }
+
+	  // Escape the texts.
+	  if ($escape)
+	  {
+	    $title = str_replace('"', '&quot;', $title);
+	    $content = str_replace('"', '&quot;', $content);
+	  }
+
+	  // Return only the content if no title is given.
+	  if ($title == '')
+	  {
+	    return $content;
+	  }
+
+	  // Return only the title if title and text are the same.
+	  if ($title == $content)
+	  {
+	    return '<strong>' . $title . '</strong>';
+	  }
+
+	  // Return the formated sting combining the title and  content.
+	  if ($content != '')
+	  {
+	    return '<strong>' . $title . '</strong><br />' . $content;
+	  }
+
+	  // Return only the title.
+	  return $title;
+	}
 }
diff --git a/plugins/system/t3/includes/core/t3.php b/plugins/system/t3/includes/core/t3.php
index 7367339..bac5d58 100644
--- a/plugins/system/t3/includes/core/t3.php
+++ b/plugins/system/t3/includes/core/t3.php
@@ -132,6 +132,12 @@ public static function init ($xml) {
 				if (!class_exists('JModuleHelper', false)) T3::import ('joomla25/modulehelper');
 				// JPagination
 				if (!class_exists('JPagination', false)) T3::import ('joomla25/pagination');
+
+				//register layout
+				JLoader::register('JLayout',       T3_ADMIN_PATH . '/includes/joomla25/layout/layout.php');
+				JLoader::register('JLayoutBase',   T3_ADMIN_PATH . '/includes/joomla25/layout/base.php');
+				JLoader::register('JLayoutFile',   T3_ADMIN_PATH . '/includes/joomla25/layout/file.php');
+				JLoader::register('JLayoutHelper', T3_ADMIN_PATH . '/includes/joomla25/layout/helper.php');
 			}
 
 			// import renderer
diff --git a/plugins/system/t3/includes/core/template.php b/plugins/system/t3/includes/core/template.php
index 35027f7..d3ada64 100644
--- a/plugins/system/t3/includes/core/template.php
+++ b/plugins/system/t3/includes/core/template.php
@@ -840,7 +840,7 @@ function addHead()
 		// TEMPLATE CSS
 		$this->addCss('template', false);
 
-		if (!$responsive) {
+		if (!$responsive && $this->responcls) {
 			$this->addCss('non-responsive'); //no responsive
 
 			$nonrespwidth = $this->getParam('non_responsive_width', '970px');
diff --git a/plugins/system/t3/includes/gfont/T3GFont.php b/plugins/system/t3/includes/gfont/T3GFont.php
deleted file mode 100644
index 46176b1..0000000
--- a/plugins/system/t3/includes/gfont/T3GFont.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-/** 
- *------------------------------------------------------------------------------
- * @package       T3 Framework for Joomla!
- *------------------------------------------------------------------------------
- * @copyright     Copyright (C) 2004-2013 JoomlArt.com. All Rights Reserved.
- * @license       GNU General Public License version 2 or later; see LICENSE.txt
- * @authors       JoomlArt, JoomlaBamboo, (contribute to this project at github 
- *                & Google group to become co-author)
- * @Google group: https://groups.google.com/forum/#!forum/t3fw
- * @Link:         http://t3-framework.org 
- *------------------------------------------------------------------------------
- */
-
-// no direct access
-defined('_JEXEC') or die('Restricted access');
-
-/**
- * T3 Google Service utility class
- *
- * @package     T3
- * @subpackage  Google service
- */
-
-class T3GService
-{
-	
-	protected static $gfontcache = 'gfont.dat';
-
-	/**
-	 * Get font properties by name
-	 *
-	 * @return void
-	 */
-	public static function getFontProperties()
-	{
-		$input = JFactory::getApplication()->input;
-
-		$template = $input->getCmd('template');
-		$fontname = $input->getCmd('fontname');
-		
-		// Get gfont path
-		$fontpath = self::getFontPath($template);
-		// Get font data
-		if ($fontpath !== false) {
-			$data = @file_get_contents($fontpath);
-			// Check to update font
-			$idx  = strpos($data, '#');
-			if ($idx !== false) {
-				// Seperate time & json font list
-				$time = (int) substr($data, 0, $idx);
-				$data = substr($data, $idx + 1);
-				// Check if not update 3 days => update
-				if (time() - $time > 3 * 86400) {
-					// Get local font path
-					$fontpath = self::getFontPath($template, self::$gfontcache, true);
-					// Update font list
-					$status   = self::updateFontList($fontpath);
-					// If success, re-get font list
-					if ($status) {
-						$data = @file_get_contents($fontpath);
-						$idx  = strpos($data, '#');
-						if ($idx !== false) {
-							$data = substr($data, $idx + 1);
-						}
-					}
-				}
-			}
-
-			$result = '';
-
-			if($data){
-				// Parse fonts information
-				$font   = json_decode($data);
-				$items  = $font->items;
-				// Find suitable font by fontname
-				foreach ($items as $item) {
-					if (strcasecmp($fontname, $item->family) == 0) {
-						$result = $item;
-						break;
-					}
-				}
-			}
-
-		} else {
-			$result = '';
-		}
-		
-		echo json_encode($result);
-		exit;
-	}
-	
-	
-	/**
-	 * Get font list
-	 *
-	 * @return void
-	 */
-	function getFontList()
-	{
-		$input = JFactory::getApplication()->input;
-
-		$template = $input->getCmd('template');
-		$fontname = $input->getCmd('fontname');
-
-		// Get gfont path
-		$fontpath = self::getFontPath($template);
-		if ($fontpath !== false) {
-			// Get font list
-			$data = @file_get_contents($fontpath);
-			// Remove time before json data
-			$idx  = strpos($data, '#');
-			if ($idx !== false) {
-				$data = substr($data, $idx + 1);
-			}
-			// Parse data
-			$font    = json_decode($data);
-			$items   = $font->items;
-			$result  = array();
-			$pattern = '/^' . $fontname . '.*/i';
-			// Find suitable font by fontname
-			foreach ($items as $item) {
-				if (preg_match($pattern, $item->family)) {
-					$result[] = $item->family;
-				}
-			}
-		} else {
-			$result = array();
-		}
-
-		echo json_encode($result);
-		exit;
-	}
-	
-	/**
-	 * Get gfont path
-	 *
-	 * @param string $template  Template name
-	 * @param string $filename  Filename include extension
-	 * @param bool   $local     Indicate get local path or not
-	 *
-	 * @return mixed  Gfont file path if found, otherwise FALSE
-	 */
-	function getFontPath($template, $filename = false)
-	{
-		if(!$filename){
-			$filename = self::$gfontcache;
-		}
-
-		// Check to sure that template is using new folder structure
-		// If etc folder exists, considered as template is using new folder structure
-		$filepath = JPATH_SITE . '/templates/' . $template . '/etc';
-		if (@is_dir($filepath)) {
-			$filepath .= '/' . $filename;
-		}
-
-		// Check file exists or not
-		if (@is_file($filepath)) {
-			return $filepath;
-		}
-
-		// Check file in base
-		$filepath = T3_PATH . '/etc/' . $filename;
-		if (@is_file($filepath)) {
-			return $filepath;
-		}
-		
-		// Can not find google font file
-		return false;
-	}
-	
-	/**
-	 * Update font list from google web font page
-	 *
-	 * @param string $path  File path store font list
-	 *
-	 * @return bool  TRUE if update success, otherwise FALSE
-	 */
-	function updateFontList($path)
-	{
-		$key     = 'AIzaSyA6_mK8ERGaR4_dhK6tJVEdvJPQEdwULWg';
-		$url     = 'https://www.googleapis.com/webfonts/v1/webfonts?key=' . $key;
-		$content = @file_get_contents($url);
-		if (!empty($content)) {
-			$content = time() . '#' . $content;
-			$result  = file_put_contents($path, $content);
-			return ($result !== false);
-		}
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/plugins/system/t3/includes/joomla25/layout/base.php b/plugins/system/t3/includes/joomla25/layout/base.php
new file mode 100644
index 0000000..dd7f319
--- /dev/null
+++ b/plugins/system/t3/includes/joomla25/layout/base.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Base class for rendering a display layout
+ *
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ * @see         http://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since       3.0
+ */
+class JLayoutBase implements JLayout
+{
+	/**
+	 * Options object
+	 *
+	 * @var    JRegistry
+	 * @since  3.2
+	 */
+	protected $options = null;
+
+	/**
+	 * Debug information messages
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $debugMessages = array();
+
+	/**
+	 * Set the options
+	 *
+	 * @param   mixed  $options  Array / JRegistry object with the options to load
+	 *
+	 * @return  JLayoutBase  Instance of $this to allow chaining.
+	 *
+	 * @since   3.2
+	 */
+	public function setOptions($options = null)
+	{
+		// Received JRegistry
+		if ($options instanceof JRegistry)
+		{
+			$this->options = $options;
+		}
+		// Received array
+		elseif (is_array($options))
+		{
+			$this->options = new JRegistry($options);
+		}
+		else
+		{
+			$this->options = new JRegistry;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the options
+	 *
+	 * @return  JRegistry  Object with the options
+	 *
+	 * @since   3.2
+	 */
+	public function getOptions()
+	{
+		// Always return a JRegistry instance
+		if (!($this->options instanceof JRegistry))
+		{
+			$this->resetOptions();
+		}
+
+		return $this->options;
+	}
+
+	/**
+	 * Function to empty all the options
+	 *
+	 * @return  JLayoutBase  Instance of $this to allow chaining.
+	 *
+	 * @since   3.2
+	 */
+	public function resetOptions()
+	{
+		return $this->setOptions(null);
+	}
+
+	/**
+	 * Method to escape output.
+	 *
+	 * @param   string  $output  The output to escape.
+	 *
+	 * @return  string  The escaped output.
+	 *
+	 * @since   3.0
+	 */
+	public function escape($output)
+	{
+		return htmlspecialchars($output, ENT_COMPAT, 'UTF-8');
+	}
+
+	/**
+	 * Get the debug messages array
+	 *
+	 * @return  array
+	 *
+	 * @since   3.2
+	 */
+	public function getDebugMessages()
+	{
+		return $this->debugMessages;
+	}
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 *
+	 * @return  string  The necessary HTML to display the layout
+	 *
+	 * @since   3.0
+	 */
+	public function render($displayData)
+	{
+		return '';
+	}
+
+	/**
+	 * Render the list of debug messages
+	 *
+	 * @return  string  Output text/HTML code
+	 *
+	 * @since   3.2
+	 */
+	public function renderDebugMessages()
+	{
+		return implode($this->debugMessages, "\n");
+	}
+
+	/**
+	 * Add a debug message to the debug messages array
+	 *
+	 * @param   string  $message  Message to save
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function addDebugMessage($message)
+	{
+		$this->debugMessages[] = $message;
+	}
+}
diff --git a/plugins/system/t3/includes/joomla25/layout/file.php b/plugins/system/t3/includes/joomla25/layout/file.php
new file mode 100644
index 0000000..83f7e75
--- /dev/null
+++ b/plugins/system/t3/includes/joomla25/layout/file.php
@@ -0,0 +1,438 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Base class for rendering a display layout
+ * loaded from from a layout file
+ *
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ * @see         http://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since       3.0
+ */
+class JLayoutFile extends JLayoutBase
+{
+	/**
+	 * @var    string  Dot separated path to the layout file, relative to base path
+	 * @since  3.0
+	 */
+	protected $layoutId = '';
+
+	/**
+	 * @var    string  Base path to use when loading layout files
+	 * @since  3.0
+	 */
+	protected $basePath = null;
+
+	/**
+	 * @var    string  Full path to actual layout files, after possible template override check
+	 * @since  3.0.3
+	 */
+	protected $fullPath = null;
+
+	/**
+	 * Paths to search for layouts
+	 *
+	 * @var    array
+	 * @since  3.2
+	 */
+	protected $includePaths = array();
+
+	/**
+	 * Method to instantiate the file-based layout.
+	 *
+	 * @param   string  $layoutId  Dot separated path to the layout file, relative to base path
+	 * @param   string  $basePath  Base path to use when loading layout files
+	 * @param   mixed   $options   Optional custom options to load. JRegistry or array format [@since 3.2]
+	 *
+	 * @since   3.0
+	 */
+	public function __construct($layoutId, $basePath = null, $options = null)
+	{
+		// Initialise / Load options
+		$this->setOptions($options);
+
+		// Main properties
+		$this->setLayout($layoutId);
+		$this->basePath = $basePath;
+
+		// Init Enviroment
+		$this->setComponent($this->options->get('component', 'auto'));
+		$this->setClient($this->options->get('client', 'auto'));
+	}
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 *
+	 * @return  string  The necessary HTML to display the layout
+	 *
+	 * @since   3.0
+	 */
+	public function render($displayData)
+	{
+		$layoutOutput = '';
+
+		// Check possible overrides, and build the full path to layout file
+		$path = $this->getPath();
+
+		if ($this->options->get('debug', false))
+		{
+			echo "<pre>" . $this->renderDebugMessages() . "</pre>";
+		}
+
+		// If there exists such a layout file, include it and collect its output
+		if (!empty($path))
+		{
+			ob_start();
+			include $path;
+			$layoutOutput = ob_get_contents();
+			ob_end_clean();
+		}
+
+		return $layoutOutput;
+	}
+
+	/**
+	 * Method to finds the full real file path, checking possible overrides
+	 *
+	 * @return  string  The full path to the layout file
+	 *
+	 * @since   3.0
+	 */
+	protected function getPath()
+	{
+		JLoader::import('joomla.filesystem.path');
+
+		if (is_null($this->fullPath) && !empty($this->layoutId))
+		{
+			$this->addDebugMessage('<strong>Layout:</strong> ' . $this->layoutId);
+
+			// Refresh paths
+			$this->refreshIncludePaths();
+
+			$this->addDebugMessage('<strong>Include Paths:</strong> ' . print_r($this->includePaths, true));
+
+			$suffixes = $this->options->get('suffixes', array());
+
+			// Search for suffixed versions. Example: tags.j31.php
+			if (!empty($suffixes))
+			{
+				$this->addDebugMessage('<strong>Suffixes:</strong> ' . print_r($suffixes, true));
+
+				foreach ($suffixes as $suffix)
+				{
+					$rawPath  = str_replace('.', '/', $this->layoutId) . '.' . $suffix . '.php';
+					$this->addDebugMessage('<strong>Searching layout for:</strong> ' . $rawPath);
+
+					if ($this->fullPath = JPath::find($this->includePaths, $rawPath))
+					{
+						$this->addDebugMessage('<strong>Found layout:</strong> ' . $this->fullPath);
+
+						return $this->fullPath;
+					}
+				}
+			}
+
+			// Standard version
+			$rawPath  = str_replace('.', '/', $this->layoutId) . '.php';
+			$this->addDebugMessage('<strong>Searching layout for:</strong> ' . $rawPath);
+
+			$this->fullPath = JPath::find($this->includePaths, $rawPath);
+
+			if ($this->fullPath = JPath::find($this->includePaths, $rawPath))
+			{
+				$this->addDebugMessage('<strong>Found layout:</strong> ' . $this->fullPath);
+			}
+		}
+
+		return $this->fullPath;
+	}
+
+	/**
+	 * Add one path to include in layout search. Proxy of addIncludePaths()
+	 *
+	 * @param   string  $path  The path to search for layouts
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function addIncludePath($path)
+	{
+		$this->addIncludePaths($path);
+	}
+
+	/**
+	 * Add one or more paths to include in layout search
+	 *
+	 * @param   string  $paths  The path or array of paths to search for layouts
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function addIncludePaths($paths)
+	{
+		if (!empty($paths))
+		{
+			if (is_array($paths))
+			{
+				$this->includePaths = array_unique(array_merge($paths, $this->includePaths));
+			}
+			else
+			{
+				array_unshift($this->includePaths, $paths);
+			}
+		}
+	}
+
+	/**
+	 * Remove one path from the layout search
+	 *
+	 * @param   string  $path  The path to remove from the layout search
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function removeIncludePath($path)
+	{
+		$this->removeIncludePaths($path);
+	}
+
+	/**
+	 * Remove one or more paths to exclude in layout search
+	 *
+	 * @param   string  $paths  The path or array of paths to remove for the layout search
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function removeIncludePaths($paths)
+	{
+		if (!empty($paths))
+		{
+			$paths = (array) $paths;
+
+			$this->includePaths = array_diff($this->includePaths, $paths);
+		}
+	}
+
+	/**
+	 * Validate that the active component is valid
+	 *
+	 * @param   string  $option  URL Option of the component. Example: com_content
+	 *
+	 * @return  boolean
+	 *
+	 * @since   3.2
+	 */
+	protected function validComponent($option = null)
+	{
+		// By default we will validate the active component
+		$component = ($option !== null) ? $option : $this->options->get('component', null);
+
+		if (!empty($component))
+		{
+			// Valid option format
+			if (substr_count($component, 'com_'))
+			{
+				// Latest check: component exists and is enabled
+				return JComponentHelper::isEnabled($component);
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Method to change the component where search for layouts
+	 *
+	 * @param   string  $option  URL Option of the component. Example: com_content
+	 *
+	 * @return  mixed  Component option string | null for none
+	 *
+	 * @since   3.2
+	 */
+	public function setComponent($option)
+	{
+		$component = null;
+
+		switch ((string) $option)
+		{
+			case 'none':
+				$component = null;
+				break;
+
+			case 'auto':
+				if (defined('JPATH_COMPONENT'))
+				{
+					$parts = explode('/', JPATH_COMPONENT);
+					$component = end($parts);
+				}
+
+				break;
+
+			default:
+				$component = $option;
+				break;
+		}
+
+		// Extra checks
+		if (!$this->validComponent($component))
+		{
+			$component = null;
+		}
+
+		$this->options->set('component', $component);
+
+		// Refresh include paths
+		$this->refreshIncludePaths();
+	}
+
+	/**
+	 * Function to initialise the application client
+	 *
+	 * @param   mixed  $client  Frontend: 'site' or 0 | Backend: 'admin' or 1
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function setClient($client)
+	{
+		// Force string conversion to avoid unexpected states
+		switch ((string) $client)
+		{
+			case 'site':
+			case '0':
+				$client = 0;
+				break;
+
+			case 'admin':
+			case '1':
+				$client = 1;
+				break;
+
+			default:
+				$client = (int) JFactory::getApplication()->isAdmin();
+				break;
+		}
+
+		$this->options->set('client', $client);
+
+		// Refresh include paths
+		$this->refreshIncludePaths();
+	}
+
+	/**
+	 * Change the layout
+	 *
+	 * @param   string  $layoutId  Layout to render
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function setLayout($layoutId)
+	{
+		$this->layoutId = $layoutId;
+		$this->fullPath = null;
+	}
+
+	/**
+	 * Refresh the list of include paths
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	protected function refreshIncludePaths()
+	{
+		// Reset includePaths
+		$this->includePaths = array();
+
+		// (1 - lower priority) Frontend base layouts
+		
+		// T3 extend => Should be end here
+		//$this->addIncludePaths(JPATH_ROOT . '/layouts');
+		$this->addIncludePaths(T3_PATH . '/html/layouts');
+
+		// (2) Standard Joomla! layouts overriden
+		$this->addIncludePaths(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/layouts');
+
+		// Component layouts & overrides if exist
+		$component = $this->options->get('component', null);
+
+		if (!empty($component))
+		{
+			// (3) Component path
+			if ($this->options->get('client') == 0)
+			{
+				$this->addIncludePaths(JPATH_SITE . '/components/' . $component . '/layouts');
+			}
+			else
+			{
+				$this->addIncludePaths(JPATH_ADMINISTRATOR . '/components/' . $component . '/layouts');
+			}
+
+			// (4) Component template overrides path
+			$this->addIncludePath(JPATH_THEMES . '/' . JFactory::getApplication()->getTemplate() . '/html/layouts/' . $component);
+		}
+
+		// (5 - highest priority) Received a custom high priority path ?
+		if (!is_null($this->basePath))
+		{
+			$this->addIncludePath(rtrim($this->basePath, DIRECTORY_SEPARATOR));
+		}
+	}
+
+	/**
+	 * Change the debug mode
+	 *
+	 * @param   boolean  $debug  Enable / Disable debug
+	 *
+	 * @return  void
+	 *
+	 * @since   3.2
+	 */
+	public function setDebug($debug)
+	{
+		$this->options->set('debug', (boolean) $debug);
+	}
+
+	/**
+	 * Render a layout with the same include paths & options
+	 *
+	 * @param   object  $layoutId     Object which properties are used inside the layout file to build displayed output
+	 * @param   mixed   $displayData  Data to be rendered
+	 *
+	 * @return  string  The necessary HTML to display the layout
+	 *
+	 * @since   3.2
+	 */
+	public function sublayout($layoutId, $displayData)
+	{
+		// Sublayouts are searched in a subfolder with the name of the current layout
+		if (!empty($this->layoutId))
+		{
+			$layoutId = $this->layoutId . '.' . $layoutId;
+		}
+
+		$sublayout = new static($layoutId, $this->basePath, $this->options);
+		$sublayout->includePaths = $this->includePaths;
+
+		return $sublayout->render($displayData);
+	}
+}
diff --git a/plugins/system/t3/includes/joomla25/layout/helper.php b/plugins/system/t3/includes/joomla25/layout/helper.php
new file mode 100644
index 0000000..e8ea900
--- /dev/null
+++ b/plugins/system/t3/includes/joomla25/layout/helper.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Helper to render a JLayout object, storing a base path
+ *
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ * @see         http://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since       3.1
+ */
+class JLayoutHelper
+{
+	/**
+	 * A default base path that will be used if none is provided when calling the render method.
+	 * Note that JLayoutFile itself will defaults to JPATH_ROOT . '/layouts' if no basePath is supplied at all
+	 *
+	 * @var    string
+	 * @since  3.1
+	 */
+	public static $defaultBasePath = '';
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   string  $layoutFile   Dot separated path to the layout file, relative to base path
+	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 * @param   string  $basePath     Base path to use when loading layout files
+	 * @param   mixed   $options      Optional custom options to load. JRegistry or array format
+	 *
+	 * @return  string
+	 *
+	 * @since   3.1
+	 */
+	public static function render($layoutFile, $displayData = null, $basePath = '', $options = null)
+	{
+		$basePath = empty($basePath) ? self::$defaultBasePath : $basePath;
+
+		// Make sure we send null to JLayoutFile if no path set
+		$basePath = empty($basePath) ? null : $basePath;
+		$layout = new JLayoutFile($layoutFile, $basePath, $options);
+		$renderedLayout = $layout->render($displayData);
+
+		return $renderedLayout;
+	}
+}
diff --git a/plugins/system/t3/includes/joomla25/layout/index.html b/plugins/system/t3/includes/joomla25/layout/index.html
new file mode 100644
index 0000000..2efb97f
--- /dev/null
+++ b/plugins/system/t3/includes/joomla25/layout/index.html
@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>
diff --git a/plugins/system/t3/includes/joomla25/layout/layout.php b/plugins/system/t3/includes/joomla25/layout/layout.php
new file mode 100644
index 0000000..499f7d0
--- /dev/null
+++ b/plugins/system/t3/includes/joomla25/layout/layout.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ *
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('JPATH_BASE') or die;
+
+/**
+ * Interface to handle display layout
+ *
+ * @package     Joomla.Libraries
+ * @subpackage  Layout
+ * @see         http://docs.joomla.org/Sharing_layouts_across_views_or_extensions_with_JLayout
+ * @since       3.0
+ */
+interface JLayout
+{
+	/**
+	 * Method to escape output.
+	 *
+	 * @param   string  $output  The output to escape.
+	 *
+	 * @return  string  The escaped output.
+	 *
+	 * @since   3.0
+	 */
+	public function escape($output);
+
+	/**
+	 * Method to render the layout.
+	 *
+	 * @param   object  $displayData  Object which properties are used inside the layout file to build displayed output
+	 *
+	 * @return  string  The rendered layout.
+	 *
+	 * @since   3.0
+	 */
+	public function render($displayData);
+}
diff --git a/plugins/system/t3/includes/lessphp/less.php b/plugins/system/t3/includes/lessphp/less.php
index 16498ff..9b9c762 100644
--- a/plugins/system/t3/includes/lessphp/less.php
+++ b/plugins/system/t3/includes/lessphp/less.php
@@ -15,7 +15,6 @@
 // No direct access
 defined('_JEXEC') or die();
 
-T3::import('lessphp/less/cache');
 T3::import('lessphp/less/less');
 
 /**
@@ -154,10 +153,7 @@ public static function compileCss($path, $topath = '')
 		//check system
 		self::requirement();
 
-		//reset import dirs
-		Less_Cache::$import_dirs = array();
 		$parser = new Less_Parser();
-
 		$app    = JFactory::getApplication();
 		$tpl    = T3_TEMPLATE;
 		$theme  = $app->getUserState('vars_theme');
@@ -579,10 +575,7 @@ public static function divide($path)
 		//check system
 		self::requirement();
 
-		//reset import dirs
-		Less_Cache::$import_dirs = array();
 		$parser = new Less_Parser();
-
 		$app    = JFactory::getApplication();
 		$doc    = JFactory::getDocument();
 		$tpl    = T3_TEMPLATE;
diff --git a/plugins/system/t3/includes/lessphp/less/cache.php b/plugins/system/t3/includes/lessphp/less/cache.php
index 07559a8..50f1436 100644
--- a/plugins/system/t3/includes/lessphp/less/cache.php
+++ b/plugins/system/t3/includes/lessphp/less/cache.php
@@ -1,52 +1,54 @@
 <?php
 
+require_once( dirname(__FILE__).'/version.php');
 
 class Less_Cache{
 
 	public static $cache_dir = false;		// directory less.php can use for storing data
-	public static $import_dirs = array();
-	private static $use_cache = true;
 
-    const cache_version = '1513';
-	protected static $clean_cache = true;
 
-
-	public static function Get( $less_files, $parser_options = array() ){
+	/**
+	 * Save and reuse the results of compiled less files.
+	 * The first call to Get() will generate css and save it.
+	 * Subsequent calls to Get() with the same arguments will return the same css filename
+	 *
+	 * @param array $less_files Array of .less files to compile
+	 * @param array $parser_options Array of compiler options
+	 * @param boolean $use_cache Set to false to regenerate the css file
+	 * @return string Name of the css file
+	 */
+	public static function Get( $less_files, $parser_options = array(), $use_cache = true ){
 
 		//check $cache_dir
-		if( empty(self::$cache_dir) ){
+		if( empty(Less_Cache::$cache_dir) ){
 			throw new Exception('cache_dir not set');
-			return false;
 		}
 
-		self::$cache_dir = str_replace('\\','/',self::$cache_dir);
-		self::$cache_dir = rtrim(self::$cache_dir,'/').'/';
+		Less_Cache::$cache_dir = str_replace('\\','/',Less_Cache::$cache_dir);
+		Less_Cache::$cache_dir = rtrim(Less_Cache::$cache_dir,'/').'/';
 
-		if( !is_dir(self::$cache_dir) ){
+		if( !is_dir(Less_Cache::$cache_dir) ){
 			throw new Exception('cache_dir does not exist');
-			return false;
 		}
 
 		// generate name for compiled css file
 		$less_files = (array)$less_files;
 		$hash = md5(json_encode($less_files));
- 		$list_file = self::$cache_dir.'lessphp_'.$hash.'.list';
+ 		$list_file = Less_Cache::$cache_dir.'lessphp_'.$hash.'.list';
 
 
-		if( self::$use_cache === true ){
+		if( $use_cache === true ){
 
 	 		// check cached content
-			$compiled_file = false;
-			$less_cache = false;
 	 		if( file_exists($list_file) ){
 
 
 				$list = explode("\n",file_get_contents($list_file));
 				$compiled_name = self::CompiledName($list);
-				$compiled_file = self::$cache_dir.$compiled_name;
+				$compiled_file = Less_Cache::$cache_dir.$compiled_name;
 				if( file_exists($compiled_file) ){
-					touch($list_file);
-					touch($compiled_file);
+					@touch($list_file);
+					@touch($compiled_file);
 					return $compiled_name;
 				}
 			}
@@ -66,20 +68,24 @@ public static function Get( $less_files, $parser_options = array() ){
 
 		//save the css
 		$compiled_name = self::CompiledName( $less_files );
-		file_put_contents( self::$cache_dir.$compiled_name, $compiled );
+		file_put_contents( Less_Cache::$cache_dir.$compiled_name, $compiled );
 
 
 		//clean up
 		self::CleanCache();
-		self::$use_cache = true;
 
 		return $compiled_name;
-
 	}
 
+	/**
+	 * Force the compiler to regenerate the cached css file
+	 *
+	 * @param array $less_files Array of .less files to compile
+	 * @param array $parser_options Array of compiler options
+	 * @return string Name of the css file
+	 */
 	public static function Regen( $less_files, $parser_options = array() ){
-		self::$use_cache = false;
-		return self::Get( $less_files, $parser_options );
+		return self::Get( $less_files, $parser_options, false );
 	}
 
 	public static function Cache( &$less_files, $parser_options = array() ){
@@ -91,10 +97,8 @@ public static function Cache( &$less_files, $parser_options = array() ){
 			require_once($file);
 		}
 
-
+		$parser_options['cache_dir'] = Less_Cache::$cache_dir;
 		$parser = new Less_Parser($parser_options);
-		$parser->SetCacheDir( self::$cache_dir );
-		$parser->SetImportDirs( self::$import_dirs );
 
 
 		// combine files
@@ -121,7 +125,7 @@ public static function Cache( &$less_files, $parser_options = array() ){
 	private static function CompiledName( $files ){
 
 		//save the file list
-		$temp = array(self::cache_version);
+		$temp = array(Less_Version::cache_version);
 		foreach($files as $file){
 			$temp[] = filemtime($file)."\t".filesize($file)."\t".$file;
 		}
@@ -130,6 +134,32 @@ private static function CompiledName( $files ){
 	}
 
 
+	public static function SetCacheDir( $dir ){
+
+		Less_Cache::$cache_dir = null;
+
+		if( is_string($dir) ){
+
+			if( !file_exists($dir) ){
+				if( !mkdir($dir) ){
+					throw new Less_Exception_Parser('Less.php cache directory couldn\'t be created: '.$dir);
+				}
+
+			}elseif( !is_dir($dir) ){
+				throw new Less_Exception_Parser('Less.php cache directory doesn\'t exist: '.$dir);
+
+			}elseif( !is_writable($dir) ){
+				throw new Less_Exception_Parser('Less.php cache directory isn\'t writable: '.$dir);
+
+			}
+
+			$dir = str_replace('\\','/',$dir);
+			Less_Cache::$cache_dir = rtrim($dir,'/').'/';
+		}
+		return true;
+	}
+
+
 	public static function CleanCache(){
 		static $clean = false;
 
@@ -137,14 +167,14 @@ public static function CleanCache(){
 			return;
 		}
 
-		$files = scandir(self::$cache_dir);
+		$files = scandir(Less_Cache::$cache_dir);
 		if( $files ){
 			$check_time = time() - 604800;
 			foreach($files as $file){
 				if( strpos($file,'lessphp_') !== 0 ){
 					continue;
 				}
-				$full_path = self::$cache_dir.'/'.$file;
+				$full_path = Less_Cache::$cache_dir.'/'.$file;
 				if( filemtime($full_path) > $check_time ){
 					continue;
 				}
diff --git a/plugins/system/t3/includes/lessphp/less/less.php b/plugins/system/t3/includes/lessphp/less/less.php
index 49a443f..e8c8c6b 100644
--- a/plugins/system/t3/includes/lessphp/less/less.php
+++ b/plugins/system/t3/includes/lessphp/less/less.php
@@ -1,50 +1,99 @@
 <?php
 
-class Less_Parser extends Less_Cache{
+require_once( dirname(__FILE__).'/cache.php');
 
-
-	private $input;		// LeSS input string
-	private $input_len;	// input string length
-	private $pos;		// current index in `input`
-	private $memo;		// temporarily holds `i`, when backtracking
+/**
+ * Class for parsing and compiling less files into css
+ *
+ * @method void Less_Tree_Alpha()
+ * @method void Less_Tree_Anonymous()
+ * @method void Less_Tree_Assignment()
+ * @method void Less_Tree_Attribute()
+ * @method void Less_Tree_Call()
+ * @method void Less_Tree_Color()
+ * @method void Less_Tree_Comment()
+ * @method void Less_Tree_Condition()
+ * @method void Less_Tree_Dimension()
+ * @method void Less_Tree_Directive()
+ * @method void Less_Tree_Element()
+ * @method void Less_Tree_Extend()
+ * @method void Less_Tree_Expression()
+ * @method void Less_Tree_Import()
+ * @method void Less_Tree_Javascript()
+ * @method void Less_Tree_Keyword()
+ * @method void Less_Tree_Media()
+ * @method void Less_Tree_Mixin_Call()
+ * @method void Less_Tree_Mixin_Definition()
+ * @method void Less_Tree_Negative()
+ * @method void Less_Tree_Operation()
+ * @method void Less_Tree_Paren()
+ * @method void Less_Tree_Quoted()
+ * @method void Less_Tree_Rule()
+ * @method void Less_Tree_Ruleset()
+ * @method void Less_Tree_Selector()
+ * @method void Less_Tree_UnicodeDescriptor()
+ * @method void Less_Tree_Url()
+ * @method void Less_Tree_Value()
+ * @method void Less_Tree_Variable()
+ *
+ */
+class Less_Parser{
 
 
 	/**
-	 * @var string
+	 * Default parser options
 	 */
-	private $path;
+	public static $default_options = array(
+		'compress'				=> false,			// option - whether to compress
+		'strictUnits'			=> false,			// whether units need to evaluate correctly
+		'strictMath'			=> false,			// whether math has to be within parenthesis
+		'relativeUrls'			=> true,			// option - whether to adjust URL's to be relative
+
+		'import_dirs'			=> array(),
+		'import_callback'		=> null,
+		'cache_dir'				=> null,
+		'cache_method'			=> 'php', 			//false, 'serialize', 'php', 'var_export';
+
+		'sourceMap'				=> false,			// whether to output a source map
+		'sourceMapBasepath'		=> null,
+		'sourceMapWriteTo'		=> null,
+		'sourceMapURL'			=> null,
+
+		'plugins'				=> array(),
+	);
 
-	/**
-	 * @var string
-	 */
-	private $filename;
+	public static $options = array();
 
 
-	/**
-	 *
-	 */
-	const version = '1.5.1.1';
-	const less_version = '1.5.1';
+	private $input;		// Less input string
+	private $input_len;	// input string length
+	private $pos;		// current index in `input`
+	private $memo;		// temporarily holds `i`, when backtracking
+	private $farthest;
 
 	/**
 	 * @var Less_Environment
 	 */
 	private $env;
+
 	private $rules = array();
 
 	private static $imports = array();
 
 	public static $has_extends = false;
 
-	public $cache_method = 'php'; //false, 'serialize', 'php', 'var_export';
-
 	public static $next_id = 0;
 
-	private $options = array();
+	/**
+	 * Filename to contents of all parsed the files
+	 *
+	 * @var array
+	 */
+	public static $contentsMap = array();
 
 
 	/**
-	 * @param Environment|null $env
+	 * @param Less_Environment|array|null $env
 	 */
 	public function __construct( $env = null ){
 
@@ -54,21 +103,29 @@ public function __construct( $env = null ){
 		if( $env instanceof Less_Environment ){
 			$this->env = $env;
 		}else{
-			$this->env = new Less_Environment( $env );
-			$this->options = $env;
+
+			//reset
+			self::$imports = array();
+			self::$has_extends = false;
 			self::$imports = array();
-			self::$import_dirs = array();
+			self::$contentsMap = array();
+			$this->SetOptions(Less_Parser::$default_options);
+
+
+			//set new options
+			$this->env = new Less_Environment( $env );
+			$this->env->Init();
 			if( is_array($env) ){
 				$this->SetOptions($env);
 			}
 		}
 
-		$this->pos = 0;
+		$this->pos = $this->farthest = 0;
 	}
 
 	/**
 	 * Set one or more compiler options
-	 *  options: import_dirs, compress, cache_dir, cache_method, strictUnits
+	 *  options: import_dirs, cache_dir, cache_method
 	 *
 	 */
 	public function SetOptions( $options ){
@@ -87,18 +144,16 @@ public function SetOption($option,$value){
 
 			case 'import_dirs':
 				$this->SetImportDirs($value);
-			break;
+			return;
 
 			case 'cache_dir':
-				$this->SetCacheDir($value);
-			break;
-
-			case 'cache_method':
-				if( in_array($value, array('php','serialize','var_export')) ){
-					$this->cache_method = $value;
+				if( is_string($value) ){
+					Less_Cache::SetCacheDir($value);
 				}
-			break;
+			return;
 		}
+
+		Less_Parser::$options[$option] = $value;
 	}
 
 
@@ -122,39 +177,23 @@ public function getCss(){
 		$root->firstRoot = true;
 
 
-		//$importVisitor = new Less_importVisitor();
-		//$importVisitor->run($root);
-
-		//obj($root);
+		$this->PreVisitors($root);
 
 		self::$has_extends = false;
-
 		$evaldRoot = $root->compile($this->env);
 
+		$this->PostVisitors($evaldRoot);
 
-		$joinSelector = new Less_Visitor_joinSelector();
-		$joinSelector->run($evaldRoot);
-
-
-		if( self::$has_extends ){
-			$extendsVisitor = new Less_Visitor_processExtends();
-			$extendsVisitor->run($evaldRoot);
-		}
-
-		$toCSSVisitor = new Less_Visitor_toCSS( $this->env );
-		$toCSSVisitor->run($evaldRoot);
-
-
-		if( $this->env->sourceMap ){
-			$generator = new Less_SourceMap_Generator($evaldRoot, $this->env->getContentsMap(), $this->options );
+		if( Less_Parser::$options['sourceMap'] ){
+			$generator = new Less_SourceMap_Generator($evaldRoot, Less_Parser::$contentsMap, Less_Parser::$options );
 			// will also save file
 			// FIXME: should happen somewhere else?
-			$css = $generator->generateCSS($this->env);
+			$css = $generator->generateCSS();
 		}else{
-			$css = $evaldRoot->toCSS($this->env);
+			$css = $evaldRoot->toCSS();
 		}
 
-		if( Less_Environment::$compress ){
+		if( Less_Parser::$options['compress'] ){
 			$css = preg_replace('/(^(\s)+)|((\s)+$)/', '', $css);
 		}
 
@@ -165,22 +204,75 @@ public function getCss(){
 		return $css;
 	}
 
+	/**
+	 * Run pre-compile visitors
+	 *
+	 */
+	private function PreVisitors($root){
+
+		$preEvalVisitors = array();
+		for($i = 0; $i < count($preEvalVisitors); $i++ ){
+			$preEvalVisitors[$i]->run($root);
+		}
+
+		if( Less_Parser::$options['plugins'] ){
+			foreach(Less_Parser::$options['plugins'] as $plugin){
+				if( property_exists($plugin,'isPreEvalVisitor') && $plugin->isPreEvalVisitor ){
+					$plugin->run($root);
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Run post-compile visitors
+	 *
+	 */
+	private function PostVisitors($evaldRoot){
+
+		$visitors = array();
+		$visitors[] = new Less_Visitor_joinSelector();
+		if( self::$has_extends ){
+			$visitors[] = new Less_Visitor_processExtends();
+		}
+		$visitors[] = new Less_Visitor_toCSS();
+
+
+		if( Less_Parser::$options['plugins'] ){
+			foreach(Less_Parser::$options['plugins'] as $plugin){
+				if( property_exists($plugin,'isPreEvalVisitor') && $plugin->isPreEvalVisitor ){
+					continue;
+				}
+
+				if( property_exists($plugin,'isPreVisitor') && $plugin->isPreVisitor ){
+					array_unshift( $visitors, $plugin);
+				}else{
+					$visitors[] = $plugin;
+				}
+			}
+		}
+
+
+		for($i = 0; $i < count($visitors); $i++ ){
+			$visitors[$i]->run($evaldRoot);
+		}
+
+	}
+
 
 	/**
 	 * Parse a Less string into css
 	 *
 	 * @param string $str The string to convert
-	 * @param bool $returnRoot Indicates whether the return value should be a css string a root node
 	 * @return Less_Tree_Ruleset|Less_Parser
 	 */
 	public function parse($str){
 
-		if( $this->env->sourceMap ){
-			$this->env->setFileContent($key, $string);
-		}
-
 		$this->input = $str;
 		$this->_parse();
+
+		return $this;
 	}
 
 
@@ -196,53 +288,75 @@ public function parse($str){
 	public function parseFile( $filename, $uri_root = '', $returnRoot = false){
 
 		if( !file_exists($filename) ){
-			throw new Less_Exception_Parser(sprintf('File `%s` not found.', $filename));
+			$this->Error(sprintf('File `%s` not found.', $filename));
 		}
 
 		$previousFileInfo = $this->env->currentFileInfo;
 		$this->SetFileInfo($filename, $uri_root);
 
-		$previousImportDirs = self::$import_dirs;
 		self::AddParsedFile($filename);
 
-		$this->env->setFileContent($filename);
-
-		$return = null;
 		if( $returnRoot ){
 			$rules = $this->GetRules( $filename );
 			$return = new Less_Tree_Ruleset(array(), $rules );
 		}else{
 			$this->_parse( $filename );
+			$return = $this;
 		}
 
 		if( $previousFileInfo ){
 			$this->env->currentFileInfo = $previousFileInfo;
 		}
-		self::$import_dirs = $previousImportDirs;
 
 		return $return;
 	}
 
 
+	/**
+	 * Allows a user to set variables values
+	 * @param array $vars
+	 * @return Less_Parser
+	 */
+	public function ModifyVars( $vars ){
+
+		$this->input = $this->serializeVars( $vars );
+		$this->_parse();
+
+		return $this;
+	}
+
+
+	/**
+	 * @param string $filename
+	 */
 	public function SetFileInfo( $filename, $uri_root = ''){
 
-		$this->path = pathinfo($filename, PATHINFO_DIRNAME);
-		$this->filename = Less_Environment::normalizePath($filename);
+		$filename = Less_Environment::normalizePath($filename);
+		$dirname = preg_replace('/[^\/\\\\]*$/','',$filename);
 
-		$dirname = preg_replace('/[^\/\\\\]*$/','',$this->filename);
+		if( !empty($uri_root) ){
+			$uri_root = rtrim($uri_root,'/').'/';
+		}
 
 		$currentFileInfo = array();
-		$currentFileInfo['currentDirectory'] = $dirname;
-		$currentFileInfo['filename'] = $filename;
-		$currentFileInfo['rootpath'] = $dirname;
-		$currentFileInfo['entryPath'] = $dirname;
 
-		if( empty($uri_root) ){
-			$currentFileInfo['uri_root'] = $uri_root;
+		//entry info
+		if( isset($this->env->currentFileInfo) ){
+			$currentFileInfo['entryPath'] = $this->env->currentFileInfo['entryPath'];
+			$currentFileInfo['entryUri'] = $this->env->currentFileInfo['entryUri'];
+			$currentFileInfo['rootpath'] = $this->env->currentFileInfo['rootpath'];
+
 		}else{
-			$currentFileInfo['uri_root'] = rtrim($uri_root,'/').'/';
+			$currentFileInfo['entryPath'] = $dirname;
+			$currentFileInfo['entryUri'] = $uri_root;
+			$currentFileInfo['rootpath'] = $dirname;
 		}
 
+		$currentFileInfo['currentDirectory'] = $dirname;
+		$currentFileInfo['currentUri'] = $uri_root.basename($filename);
+		$currentFileInfo['filename'] = $filename;
+		$currentFileInfo['uri_root'] = $uri_root;
+
 
 		//inherit reference
 		if( isset($this->env->currentFileInfo['reference']) && $this->env->currentFileInfo['reference'] ){
@@ -250,10 +364,13 @@ public function SetFileInfo( $filename, $uri_root = ''){
 		}
 
 		$this->env->currentFileInfo = $currentFileInfo;
-
-		self::$import_dirs = array_merge( array( $dirname => $currentFileInfo['uri_root'] ), self::$import_dirs );
 	}
 
+
+	/**
+	 * @deprecated 1.5.1.2
+	 *
+	 */
 	public function SetCacheDir( $dir ){
 
 		if( !file_exists($dir) ){
@@ -270,12 +387,19 @@ public function SetCacheDir( $dir ){
 
 		}else{
 			$dir = str_replace('\\','/',$dir);
-			self::$cache_dir = rtrim($dir,'/').'/';
+			Less_Cache::$cache_dir = rtrim($dir,'/').'/';
 			return true;
 		}
 	}
 
+
+	/**
+	 * Set a list of directories or callbacks the parser should use for determining import paths
+	 *
+	 * @param array $dirs
+	 */
 	public function SetImportDirs( $dirs ){
+		Less_Parser::$options['import_dirs'] = array();
 
 		foreach($dirs as $path => $uri_root){
 
@@ -291,11 +415,14 @@ public function SetImportDirs( $dirs ){
 				}
 			}
 
-			self::$import_dirs[$path] = $uri_root;
+			Less_Parser::$options['import_dirs'][$path] = $uri_root;
 		}
 	}
 
-	private function _parse( $file_path = false ){
+	/**
+	 * @param string $file_path
+	 */
+	private function _parse( $file_path = null ){
 		$this->rules = array_merge($this->rules, $this->GetRules( $file_path ));
 	}
 
@@ -304,16 +431,17 @@ private function _parse( $file_path = false ){
 	 * Return the results of parsePrimary for $file_path
 	 * Use cache and save cached results if possible
 	 *
+	 * @param string|null $file_path
 	 */
 	private function GetRules( $file_path ){
 
 		$cache_file = false;
 		if( $file_path ){
-			if( $this->cache_method ){
+			if( Less_Parser::$options['cache_method'] ){
 				$cache_file = $this->CacheFile( $file_path );
 
 				if( $cache_file && file_exists($cache_file) ){
-					switch($this->cache_method){
+					switch(Less_Parser::$options['cache_method']){
 
 						// Using serialize
 						// Faster but uses more memory
@@ -337,23 +465,28 @@ private function GetRules( $file_path ){
 			$this->input = file_get_contents( $file_path );
 		}
 
-		$this->pos = 0;
+		$this->pos = $this->farthest = 0;
 
 		// Remove potential UTF Byte Order Mark
 		$this->input = preg_replace('/\\G\xEF\xBB\xBF/', '', $this->input);
 		$this->input_len = strlen($this->input);
 
+		$this->setFileContent();
+
 		$rules = $this->parsePrimary();
 
+		if( $this->pos < $this->input_len ){
+			throw new Less_Exception_Chunk($this->input, null, $this->farthest, $this->env->currentFileInfo);
+		}
 
 		// free up a little memory
 		unset($this->input, $this->pos);
 
 
 		//save the cache
-		if( $cache_file && $this->cache_method ){
+		if( $cache_file ){
 
-			switch($this->cache_method){
+			switch(Less_Parser::$options['cache_method']){
 				case 'serialize':
 					file_put_contents( $cache_file, serialize($rules) );
 				break;
@@ -368,10 +501,7 @@ private function GetRules( $file_path ){
 				break;
 			}
 
-			if( self::$clean_cache ){
-				self::CleanCache();
-			}
-
+			Less_Cache::CleanCache();
 		}
 
 		return $rules;
@@ -380,7 +510,7 @@ private function GetRules( $file_path ){
 
 	public function CacheFile( $file_path ){
 
-		if( $file_path && self::$cache_dir ){
+		if( $file_path && Less_Cache::$cache_dir ){
 
 			$env = get_object_vars($this->env);
 			unset($env['frames']);
@@ -390,9 +520,9 @@ public function CacheFile( $file_path ){
 			$parts[] = filesize( $file_path );
 			$parts[] = filemtime( $file_path );
 			$parts[] = $env;
-			$parts[] = self::cache_version;
-			$parts[] = $this->cache_method;
-			return self::$cache_dir.'lessphp_'.base_convert( sha1(json_encode($parts) ), 16, 36).'.lesscache';
+			$parts[] = Less_Version::cache_version;
+			$parts[] = Less_Parser::$options['cache_method'];
+			return Less_Cache::$cache_dir.'lessphp_'.base_convert( sha1(json_encode($parts) ), 16, 36).'.lesscache';
 		}
 	}
 
@@ -405,6 +535,9 @@ static function AllParsedFiles(){
 		return self::$imports;
 	}
 
+	/**
+	 * @param string $file
+	 */
 	static function FileParsed($file){
 		return in_array($file,self::$imports);
 	}
@@ -415,6 +548,7 @@ function save() {
 	}
 
 	private function restore() {
+		$this->farthest = $this->pos;
 		$this->pos = $this->memo;
 	}
 
@@ -426,8 +560,8 @@ private function isWhitespace($offset = 0) {
 	/**
 	 * Parse from a token, regexp or string, and move forward if match
 	 *
-	 * @param string $tok
-	 * @return null|bool|object
+	 * @param array $toks
+	 * @return array
 	 */
 	private function match($toks){
 
@@ -463,6 +597,11 @@ private function match($toks){
 		}
 	}
 
+	/**
+	 * @param string[] $toks
+	 *
+	 * @return string
+	 */
 	private function MatchFuncs($toks){
 
 		foreach($toks as $tok){
@@ -496,20 +635,25 @@ private function MatchReg($tok){
 	 * Same as match(), but don't change the state of the parser,
 	 * just return the match.
 	 *
-	 * @param $tok
-	 * @param int $offset
-	 * @return bool
+	 * @param string $tok
+	 * @return integer
 	 */
 	public function PeekReg($tok){
 		return preg_match($tok, $this->input, $match, 0, $this->pos);
 	}
 
+	/**
+	 * @param string $tok
+	 */
 	public function PeekChar($tok){
 		return ($this->input[$this->pos] === $tok );
 		//return ($this->pos < $this->input_len) && ($this->input[$this->pos] === $tok );
 	}
 
 
+	/**
+	 * @param integer $length
+	 */
 	public function skipWhitespace($length){
 
 		$this->pos += $length;
@@ -524,19 +668,26 @@ public function skipWhitespace($length){
 	}
 
 
+	/**
+	 * @param string $tok
+	 * @param string|null $msg
+	 */
 	public function expect($tok, $msg = NULL) {
 		$result = $this->match( array($tok) );
 		if (!$result) {
-			throw new Less_Exception_Parser( $msg	? "Expected '" . $tok . "' got '" . $this->input[$this->pos] . "'" : $msg );
+			$this->Error( $msg	? "Expected '" . $tok . "' got '" . $this->input[$this->pos] . "'" : $msg );
 		} else {
 			return $result;
 		}
 	}
 
+	/**
+	 * @param string $tok
+	 */
 	public function expectChar($tok, $msg = null ){
 		$result = $this->MatchChar($tok);
 		if( !$result ){
-			throw new Less_Exception_Parser( $msg ? "Expected '" . $tok . "' got '" . $this->input[$this->pos] . "'" : $msg );
+			$this->Error( $msg ? "Expected '" . $tok . "' got '" . $this->input[$this->pos] . "'" : $msg );
 		}else{
 			return $result;
 		}
@@ -602,7 +753,8 @@ private function parsePrimary(){
 				continue;
 			}
 
-			$node = $this->MatchFuncs( array( 'parseMixinDefinition', 'parseRule', 'parseRuleset', 'parseMixinCall', 'parseComment', 'parseDirective'));
+			//$node = $this->MatchFuncs( array( 'parseMixinDefinition', 'parseRule', 'parseRuleset', 'parseMixinCall', 'parseComment', 'parseDirective'));
+			$node = $this->MatchFuncs( array( 'parseMixinDefinition', 'parseNameValue', 'parseRule', 'parseRuleset', 'parseMixinCall', 'parseComment', 'parseDirective'));
 
 			if( $node ){
 				$root[] = $node;
@@ -641,7 +793,7 @@ private function parseComment(){
 	private function parseComments(){
 		$comments = array();
 
-		while( true ){
+		while( $this->pos < $this->input_len ){
 			$comment = $this->parseComment();
 			if( !$comment ){
 				break;
@@ -661,17 +813,16 @@ private function parseComments(){
 	//	 "milky way" 'he\'s the one!'
 	//
 	private function parseEntitiesQuoted() {
-		$j = 0;
+		$j = $this->pos;
 		$e = false;
 		$index = $this->pos;
 
-		if ($this->PeekChar('~')) {
+		if( $this->input[$this->pos] === '~' ){
 			$j++;
 			$e = true; // Escaped strings
 		}
 
-		$char = $this->input[$this->pos+$j];
-		if( $char != '"' && $char !== "'" ){
+		if( $this->input[$j] != '"' && $this->input[$j] !== "'" ){
 			return;
 		}
 
@@ -686,6 +837,7 @@ private function parseEntitiesQuoted() {
 		return;
 	}
 
+
 	//
 	// A catch-all word, such as:
 	//
@@ -712,9 +864,7 @@ private function FromKeyword( $keyword ){
 		}
 
 		if( $keyword === 'transparent' ){
-			$transparent = $this->Less_Tree_Color( array(0, 0, 0), 0);
-			$transparent->isTransparentKeyword = true;
-			return $transparent;
+			return $this->Less_Tree_Color( array(0, 0, 0), 0, true);
 		}
 	}
 
@@ -999,50 +1149,60 @@ function parseExtend($isRule = false){
 	// selector for now.
 	//
 	private function parseMixinCall(){
-		$elements = array();
-		$index = $this->pos;
-		$important = false;
-		$args = null;
-		$c = null;
 
 		$char = $this->input[$this->pos];
 		if( $char !== '.' && $char !== '#' ){
 			return;
 		}
 
+		$index = $this->pos;
 		$this->save(); // stop us absorbing part of an invalid selector
 
-		while( true ){
-			$e = $this->MatchReg('/\\G[#.](?:[\w-]|\\\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/');
-			if( !$e ){
-				break;
+		$elements = $this->parseMixinCallElements();
+
+		if( $elements ){
+
+			if( $this->MatchChar('(') ){
+				$returned = $this->parseMixinArgs(true);
+				$args = $returned['args'];
+				$this->expectChar(')');
+			}else{
+				$args = array();
 			}
-			$elements[] = $this->Less_Tree_Element($c, $e[0], $this->pos, $this->env->currentFileInfo);
-			$c = $this->MatchChar('>');
-		}
 
-		if( $this->MatchChar('(') ){
-			$returned = $this->parseMixinArgs(true);
-			$args = $returned['args'];
-			$this->expectChar(')');
-		}
+			$important = $this->parseImportant();
 
-		if( !$args ){
-			$args = array();
+			if( $this->parseEnd() ){
+				return $this->Less_Tree_Mixin_Call( $elements, $args, $index, $this->env->currentFileInfo, $important);
+			}
 		}
 
-		if( $this->parseImportant() ){
-			$important = true;
-		}
+		$this->restore();
+	}
+
+
+	private function parseMixinCallElements(){
+		$elements = array();
+		$c = null;
 
-		if( $elements && ($this->MatchChar(';') || $this->PeekChar('}')) ){
-			return Less_Parser::Less_Tree_Mixin_Call( $elements, $args, $index, $this->env->currentFileInfo, $important);
+		while( true ){
+			$elemIndex = $this->pos;
+			$e = $this->MatchReg('/\\G[#.](?:[\w-]|\\\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/');
+			if( !$e ){
+				break;
+			}
+			$elements[] = $this->Less_Tree_Element($c, $e[0], $elemIndex, $this->env->currentFileInfo);
+			$c = $this->MatchChar('>');
 		}
 
-		$this->restore();
+		return $elements;
 	}
 
 
+
+	/**
+	 * @param boolean $isCall
+	 */
 	private function parseMixinArgs( $isCall ){
 		$expressions = array();
 		$argsSemiColon = array();
@@ -1050,8 +1210,7 @@ private function parseMixinArgs( $isCall ){
 		$argsComma = array();
 		$expressionContainsNamed = null;
 		$name = null;
-		$nameLoop = null;
-		$returner = array('args'=>null, 'variadic'=> false);
+		$returner = array('args'=>array(), 'variadic'=> false);
 
 		while( true ){
 			if( $isCall ){
@@ -1074,7 +1233,6 @@ private function parseMixinArgs( $isCall ){
 				$arg = $this->MatchFuncs( array('parseEntitiesVariable','parseEntitiesLiteral','parseEntitiesKeyword') );
 			}
 
-
 			if( !$arg ){
 				break;
 			}
@@ -1097,12 +1255,12 @@ private function parseMixinArgs( $isCall ){
 			}
 
 
-			if( $val && $val instanceof Less_Tree_Variable ){
+			if( $val instanceof Less_Tree_Variable ){
 
 				if( $this->MatchChar(':') ){
 					if( $expressions ){
 						if( $isSemiColonSeperated ){
-							throw new Less_Exception_Parser('Cannot mix ; and , as delimiter types');
+							$this->Error('Cannot mix ; and , as delimiter types');
 						}
 						$expressionContainsNamed = true;
 					}
@@ -1138,7 +1296,7 @@ private function parseMixinArgs( $isCall ){
 			if( $this->MatchChar(';') || $isSemiColonSeperated ){
 
 				if( $expressionContainsNamed ){
-					throw new Less_Exception_Parser('Cannot mix ; and , as delimiter types');
+					$this->Error('Cannot mix ; and , as delimiter types');
 				}
 
 				$isSemiColonSeperated = true;
@@ -1159,6 +1317,7 @@ private function parseMixinArgs( $isCall ){
 	}
 
 
+
 	//
 	// A Mixin definition, with a list of parameters
 	//
@@ -1179,12 +1338,10 @@ private function parseMixinArgs( $isCall ){
 	// the `{...}` block.
 	//
 	private function parseMixinDefinition(){
-		$params = array();
-		$variadic = false;
 		$cond = null;
 
 		$char = $this->input[$this->pos];
-		if( ($char !== '.' && $char !== '#') || ($char === '{' && $this->Peek('/\\G[^{]*\}/')) ){
+		if( ($char !== '.' && $char !== '#') || ($char === '{' && $this->PeekReg('/\\G[^{]*\}/')) ){
 			return;
 		}
 
@@ -1215,10 +1372,10 @@ private function parseMixinDefinition(){
 			$ruleset = $this->parseBlock();
 
 			if( is_array($ruleset) ){
-				return Less_Parser::Less_Tree_Mixin_Definition( $name, $params, $ruleset, $cond, $variadic);
-			} else {
-				$this->restore();
+				return $this->Less_Tree_Mixin_Definition( $name, $params, $ruleset, $cond, $variadic);
 			}
+
+			$this->restore();
 		}
 	}
 
@@ -1280,6 +1437,7 @@ private function parseAlpha(){
 	//
 	private function parseElement(){
 		$c = $this->parseCombinator();
+		$index = $this->pos;
 
 		$e = $this->match( array('/\\G(?:\d+\.\d+|\d+)%/', '/\\G(?:[.#]?|:*)(?:[\w-]|[^\x00-\x9f]|\\\\(?:[A-Fa-f0-9]{1,6} ?|[^A-Fa-f0-9]))+/',
 			'#*', '#&', 'parseAttribute', '/\\G\([^()@]+\)/', '/\\G[\.#](?=@)/', 'parseEntitiesVariableCurly') );
@@ -1293,7 +1451,7 @@ private function parseElement(){
 		}
 
 		if( !is_null($e) ){
-			return $this->Less_Tree_Element( $c, $e, $this->pos, $this->env->currentFileInfo);
+			return $this->Less_Tree_Element( $c, $e, $index, $this->env->currentFileInfo);
 		}
 	}
 
@@ -1307,15 +1465,21 @@ private function parseElement(){
 	//
 	private function parseCombinator(){
 		$c = $this->input[$this->pos];
-		if ($c === '>' || $c === '+' || $c === '~' || $c === '|') {
+		if ($c === '>' || $c === '+' || $c === '~' || $c === '|' || $c === '^' ){
 
-			$this->skipWhitespace(1);
+			$this->pos++;
+			if( $this->input[$this->pos] === '^' ){
+				$c = '^^';
+				$this->pos++;
+			}
 
-			return $this->Less_Tree_Combinator( $c);
-		}elseif( $this->pos > 0 && $this->isWhitespace(-1) ){
-			return $this->Less_Tree_Combinator(' ');
-		} else {
-			return $this->Less_Tree_Combinator();
+			$this->skipWhitespace(0);
+
+			return $c;
+		}
+
+		if( $this->pos > 0 && $this->isWhitespace(-1) ){
+			return ' ';
 		}
 	}
 
@@ -1341,6 +1505,9 @@ private function parseSelector( $isLess = false ){
 		$condition = null;
 		$when = false;
 		$extend = false;
+		$e = null;
+		$c = null;
+		$index = $this->pos;
 
 		while( ($isLess && ($extend = $this->parseExtend())) || ($isLess && ($when = $this->MatchReg('/\\Gwhen/') )) || ($e = $this->parseElement()) ){
 			if( $when ){
@@ -1362,9 +1529,11 @@ private function parseSelector( $isLess = false ){
 		}
 
 		if( $elements ){
-			return $this->Less_Tree_Selector( $elements, $extendList, $condition, $this->pos, $this->env->currentFileInfo);
+			return $this->Less_Tree_Selector( $elements, $extendList, $condition, $index, $this->env->currentFileInfo);
+		}
+		if( $extendList ) {
+			$this->Error('Extend must be used to extend a selector, it cannot be used on its own');
 		}
-		if( $extendList ) { throw new Less_Exception_Parser('Extend must be used to extend a selector, it cannot be used on its own'); }
 	}
 
 	private function parseTag(){
@@ -1374,7 +1543,6 @@ private function parseTag(){
 	private function parseAttribute(){
 
 		$val = null;
-		$op = null;
 
 		if( !$this->MatchChar('[') ){
 			return;
@@ -1400,8 +1568,11 @@ private function parseAttribute(){
 	// It's a wrapper around the `primary` rule, with added `{}`.
 	//
 	private function parseBlock(){
-		if ($this->MatchChar('{') && (is_array($content = $this->parsePrimary())) && $this->MatchChar('}')) {
-			return $content;
+		if( $this->MatchChar('{') ){
+			$content = $this->parsePrimary();
+			if( $this->MatchChar('}') ){
+				return $content;
+			}
 		}
 	}
 
@@ -1419,26 +1590,75 @@ private function parseRuleset(){
 			}
 			$selectors[] = $s;
 			$this->parseComments();
+
+			if( $s->condition && count($selectors) > 1 ){
+				$this->Error('Guards are only currently allowed on a single selector.');
+			}
+
 			if( !$this->MatchChar(',') ){
 				break;
 			}
 			if( $s->condition ){
-				//error("Guards are only currently allowed on a single selector.");
+				$this->Error('Guards are only currently allowed on a single selector.');
 			}
 			$this->parseComments();
 		}
 
 
-		if( $selectors && (is_array($rules = $this->parseBlock())) ){
-			return $this->Less_Tree_Ruleset( $selectors, $rules, $this->env->strictImports);
-		} else {
-			// Backtrack
-			$this->pos = $start;
+		if( $selectors ){
+			$rules = $this->parseBlock();
+			if( is_array($rules) ){
+				return $this->Less_Tree_Ruleset( $selectors, $rules ); //Less_Environment::$strictImports
+			}
+		}
+
+		// Backtrack
+		$this->pos = $start;
+	}
+
+	/**
+	 * Custom less.php parse function for finding simple name-value css pairs
+	 * ex: width:100px;
+	 *
+	 */
+	private function parseNameValue(){
+
+		$index = $this->pos;
+		$this->save();
+
+
+		//$match = $this->MatchReg('/\\G([a-zA-Z\-]+)\s*:\s*((?:\'")?[a-zA-Z0-9\-% \.,!]+?(?:\'")?)\s*([;}])/');
+		$match = $this->MatchReg('/\\G([a-zA-Z\-]+)\s*:\s*([\'"]?[#a-zA-Z0-9\-%\.,]+?[\'"]?) *(! *important)?\s*([;}])/');
+		if( $match ){
+
+			if( $match[4] == '}' ){
+				$this->pos = $index + strlen($match[0])-1;
+			}
+
+			// less.js doesn't handle color keywords consistently
+			//$color = $this->fromKeyword($match[2]);
+			//if( $color ){
+			//	return $this->Less_Tree_Rule( $match[1], $color, $match[3], null, $index, $this->env->currentFileInfo);
+			//}
+
+			//if( $match[2][0] == '@' ){
+			//	$match[2] = new Less_Tree_Variable($match[2], $index, $this->env->currentFileInfo );
+			//	return $this->Less_Tree_Rule( $match[1], $match[2], $match[3], null, $index, $this->env->currentFileInfo);
+			//}
+
+			if( $match[3] ){
+				$match[2] .= ' !important';
+			}
+
+			return $this->Less_Tree_NameValue( $match[1], $match[2], $index, $this->env->currentFileInfo);
 		}
+
+		$this->restore();
 	}
 
 
 	private function parseRule( $tryAnonymous = null ){
+
 		$merge = false;
 		$start = $this->pos;
 		$this->save();
@@ -1453,7 +1673,7 @@ private function parseRule( $tryAnonymous = null ){
 
 			// prefer to try to parse first if its a variable or we are compressing
 			// but always fallback on the other one
-			if( !$tryAnonymous && $name[0] === '@' ){
+			if( !$tryAnonymous && is_string($name) && $name[0] === '@' ){
 				$value = $this->MatchFuncs( array('parseValue','parseAnonymousValue'));
 			}else{
 				$value = $this->MatchFuncs( array('parseAnonymousValue','parseValue'));
@@ -1461,9 +1681,10 @@ private function parseRule( $tryAnonymous = null ){
 
 			$important = $this->parseImportant();
 
-			if( substr($name,-1) === '+' ){
-				$merge = true;
-				$name = substr($name, 0, -1 );
+			// a name returned by this.ruleProperty() is always an array of the form:
+			// ["", "string-1", ..., "string-n", ""] or ["", "string-1", ..., "string-n", "+"]
+			if( is_array($name) ){
+				$merge = (array_pop($name) === '+');
 			}
 
 			if( $value && $this->parseEnd() ){
@@ -1496,28 +1717,24 @@ function parseAnonymousValue(){
 	// stored in `import`, which we pass to the Import constructor.
 	//
 	private function parseImport(){
-		$index = $this->pos;
 
 		$this->save();
 
 		$dir = $this->MatchReg('/\\G@import?\s+/');
 
-		$options = array();
 		if( $dir ){
 			$options = $this->parseImportOptions();
-			if( !$options ){
-				$options = array();
-			}
-		}
+			$path = $this->MatchFuncs( array('parseEntitiesQuoted','parseEntitiesUrl'));
 
-		if( $dir && ($path = $this->MatchFuncs( array('parseEntitiesQuoted','parseEntitiesUrl'))) ){
-			$features = $this->parseMediaFeatures();
-			if( $this->MatchChar(';') ){
-				if( $features ){
-					$features = $this->Less_Tree_Value( $features);
-				}
+			if( $path ){
+				$features = $this->parseMediaFeatures();
+				if( $this->MatchChar(';') ){
+					if( $features ){
+						$features = $this->Less_Tree_Value( $features);
+					}
 
-				return $this->Less_Tree_Import( $path, $features, $options, $this->pos, $this->env->currentFileInfo );
+					return $this->Less_Tree_Import( $path, $features, $options, $this->pos, $this->env->currentFileInfo );
+				}
 			}
 		}
 
@@ -1529,7 +1746,9 @@ private function parseImportOptions(){
 		$options = array();
 
 		// list of options, surrounded by parens
-		if( !$this->MatchChar('(') ){ return null; }
+		if( !$this->MatchChar('(') ){
+			return $options;
+		}
 		do{
 			$optionName = $this->parseImportOption();
 			if( $optionName ){
@@ -1608,10 +1827,11 @@ private function parseMediaFeatures() {
 	}
 
 	private function parseMedia() {
-		if ($this->MatchReg('/\\G@media/')) {
+		if( $this->MatchReg('/\\G@media/') ){
 			$features = $this->parseMediaFeatures();
+			$rules = $this->parseBlock();
 
-			if ($rules = $this->parseBlock()) {
+			if( is_array($rules) ){
 				return $this->Less_Tree_Media( $rules, $features, $this->pos, $this->env->currentFileInfo);
 			}
 		}
@@ -1624,13 +1844,12 @@ private function parseMedia() {
 	//
 	private function parseDirective(){
 		$hasBlock = false;
-		$hasIdentifier = false;
-		$hasExpression = false;
 
-		if (! $this->PeekChar('@')) {
+		if( !$this->PeekChar('@') ){
 			return;
 		}
 
+		$index = $this->pos;
 		$value = $this->MatchFuncs(array('parseImport','parseMedia'));
 		if( $value ){
 			return $value;
@@ -1649,59 +1868,39 @@ private function parseDirective(){
 			$nonVendorSpecificName = "@" . substr($name, $pos + 1);
 		}
 
-		switch($nonVendorSpecificName) {
-			case "@font-face":
-				$hasBlock = true;
-				break;
-			case "@viewport":
-			case "@top-left":
-			case "@top-left-corner":
-			case "@top-center":
-			case "@top-right":
-			case "@top-right-corner":
-			case "@bottom-left":
-			case "@bottom-left-corner":
-			case "@bottom-center":
-			case "@bottom-right":
-			case "@bottom-right-corner":
-			case "@left-top":
-			case "@left-middle":
-			case "@left-bottom":
-			case "@right-top":
-			case "@right-middle":
-			case "@right-bottom":
-				$hasBlock = true;
-				break;
-			case "@host":
-			case "@page":
-			case "@document":
-			case "@supports":
-			case "@keyframes":
-				$hasBlock = true;
-				$hasIdentifier = true;
-				break;
-			case "@namespace":
-				$hasExpression = true;
-				break;
-		}
+		static $has_blocks = array( '@font-face' => true, '@viewport' => true, '@top-left' => true, '@top-left-corner' => true,
+			'@top-center' => true, 	'@top-right' => true, '@top-right-corner' => true, '@bottom-left' => true, '@bottom-left-corner' => true,
+			'@bottom-center' => true, '@bottom-right' => true, '@bottom-right-corner' => true, '@left-top' => true, '@left-middle' => true,
+			'@left-bottom' => true, '@right-top' => true, '@right-middle' => true, '@right-bottom' => true
+			);
 
-		if( $hasIdentifier ){
+		static $has_identifier = array( '@host' => true, '@page' => true, '@document' => true, '@supports' => true, '@keyframes' => true );
+
+		static $has_expression = array( '@namespace' => true);
+
+
+		if( isset($has_identifier[$nonVendorSpecificName]) ){
+			$hasBlock = true;
 			$identifier = $this->MatchReg('/\\G[^{]+/');
 			if( $identifier ){
 				$name .= " " .trim($identifier[0]);
 			}
+
+		}elseif( isset($has_blocks[$nonVendorSpecificName]) ){
+			$hasBlock = true;
 		}
 
 
 		if( $hasBlock ){
-
-			if ($rules = $this->parseBlock()) {
-				return $this->Less_Tree_Directive($name, $rules, $this->pos, $this->env->currentFileInfo);
+			$rules = $this->parseBlock();
+			if( is_array($rules) ){
+				return $this->Less_Tree_Directive($name, $rules, $index, $this->env->currentFileInfo);
 			}
 		}else{
-			$value = $hasExpression ? $this->parseExpression() : $this->parseEntity();
+
+			$value = isset($has_expression[$nonVendorSpecificName]) ? $this->parseExpression() : $this->parseEntity();
 			if( $value && $this->MatchChar(';') ){
-				return $this->Less_Tree_Directive($name, $value, $this->pos, $this->env->currentFileInfo);
+				return $this->Less_Tree_Directive($name, $value, $index, $this->env->currentFileInfo);
 			}
 		}
 
@@ -1744,23 +1943,29 @@ private function parseImportant (){
 	private function parseSub (){
 
 		if( $this->MatchChar('(') ){
-			if( $a = $this->parseAddition() ){
-				$e = $this->Less_Tree_Expression( array($a) );
+			$a = $this->parseAddition();
+			if( $a ){
 				$this->expectChar(')');
-				$e->parens = true;
-				return $e;
+				return $this->Less_Tree_Expression( array($a), true ); //instead of $e->parens = true so the value is cached
 			}
 		}
 	}
 
+
+	/**
+	 * Parses multiplication operation
+	 *
+	 * @return Less_Tree_Operation|null
+	 */
 	function parseMultiplication(){
-		$operation = false;
-		$m = $this->parseOperand();
-		if( $m ){
-			$isSpaced = $this->isWhitespace( -1 );
+
+		$return = $m = $this->parseOperand();
+		if( $return ){
 			while( true ){
 
-				if( $this->PeekReg('/\\G\/[*\/]/') ){
+				$isSpaced = $this->isWhitespace( -1 );
+
+				if( $this->PeekReg('/\\G\/[*\/]/') ){
 					break;
 				}
 
@@ -1778,28 +1983,37 @@ function parseMultiplication(){
 
 				$m->parensInOp = true;
 				$a->parensInOp = true;
-				$operation = $this->Less_Tree_Operation( $op, array( $operation ? $operation : $m, $a ), $isSpaced );
-				$isSpaced = $this->isWhitespace( -1 );
+				$return = $this->Less_Tree_Operation( $op, array( $return, $a ), $isSpaced );
 			}
-			return ($operation ? $operation : $m);
 		}
+		return $return;
+
 	}
 
+
+	/**
+	 * Parses an addition operation
+	 *
+	 * @return Less_Tree_Operation|null
+	 */
 	private function parseAddition (){
-		$operation = false;
-		$m = $this->parseMultiplication();
-		if( $m ){
-			$isSpaced = $this->isWhitespace( -1 );
 
+		$return = $m = $this->parseMultiplication();
+		if( $return ){
 			while( true ){
+
+				$isSpaced = $this->isWhitespace( -1 );
+
 				$op = $this->MatchReg('/\\G[-+]\s+/');
 				if( $op ){
 					$op = $op[0];
-				}elseif( !$isSpaced ){
-					$op = $this->match(array('#+','#-'));
-				}
-				if( !$op ){
-					break;
+				}else{
+					if( !$isSpaced ){
+						$op = $this->match(array('#+','#-'));
+					}
+					if( !$op ){
+						break;
+					}
 				}
 
 				$a = $this->parseMultiplication();
@@ -1809,27 +2023,35 @@ private function parseAddition (){
 
 				$m->parensInOp = true;
 				$a->parensInOp = true;
-				$operation = $this->Less_Tree_Operation($op, array($operation ? $operation : $m, $a), $isSpaced);
-				$isSpaced = $this->isWhitespace( -1 );
+				$return = $this->Less_Tree_Operation($op, array($return, $a), $isSpaced);
 			}
-			return $operation ? $operation : $m;
 		}
+
+		return $return;
 	}
 
+
+	/**
+	 * Parses the conditions
+	 *
+	 * @return Less_Tree_Condition|null
+	 */
 	private function parseConditions() {
 		$index = $this->pos;
-		$condition = null;
-		$a = $this->parseCondition();
+		$return = $a = $this->parseCondition();
 		if( $a ){
-			while( $this->PeekReg('/\\G,\s*(not\s*)?\(/') && $this->MatchChar(',') ){
+			while( true ){
+				if( !$this->PeekReg('/\\G,\s*(not\s*)?\(/') ||  !$this->MatchChar(',') ){
+					break;
+				}
 				$b = $this->parseCondition();
 				if( !$b ){
 					break;
 				}
 
-				$condition = $this->Less_Tree_Condition('or', $condition ? $condition : $a, $b, $index);
+				$return = $this->Less_Tree_Condition('or', $return, $b, $index);
 			}
-			return $condition ? $condition : $a;
+			return $return;
 		}
 	}
 
@@ -1849,7 +2071,7 @@ private function parseCondition() {
 				if( $b ){
 					$c = $this->Less_Tree_Condition($op[0], $a, $b, $index, $negate);
 				} else {
-					throw new Less_Exception_Parser('Unexpected expression');
+					$this->Error('Unexpected expression');
 				}
 			} else {
 				$c = $this->Less_Tree_Condition('=', $a, $this->Less_Tree_Keyword('true'), $index, $negate);
@@ -1859,10 +2081,11 @@ private function parseCondition() {
 		}
 	}
 
-	//
-	// An operand is anything that can be part of an operation,
-	// such as a Color, or a Variable
-	//
+	/**
+	 * An operand is anything that can be part of an operation,
+	 * such as a Color, or a Variable
+	 *
+	 */
 	private function parseOperand (){
 
 		$negate = false;
@@ -1885,13 +2108,16 @@ private function parseOperand (){
 		return $o;
 	}
 
-	//
-	// Expressions either represent mathematical operations,
-	// or white-space delimited Entities.
-	//
-	//	 1px solid black
-	//	 @var * 2
-	//
+
+	/**
+	 * Expressions either represent mathematical operations,
+	 * or white-space delimited Entities.
+	 *
+	 *	 1px solid black
+	 *	 @var * 2
+	 *
+	 * @return Less_Tree_Expression|null
+	 */
 	private function parseExpression (){
 		$entities = array();
 
@@ -1914,6 +2140,13 @@ private function parseExpression (){
 		}
 	}
 
+
+	/**
+	 * Parse a property
+	 * eg: 'min-width', 'orientation', etc
+	 *
+	 * @return string
+	 */
 	private function parseProperty (){
 		$name = $this->MatchReg('/\\G(\*?-?[_a-zA-Z0-9-]+)\s*:/');
 		if( $name ){
@@ -1921,24 +2154,72 @@ private function parseProperty (){
 		}
 	}
 
+
+	/**
+	 * Parse a rule property
+	 * eg: 'color', 'width', 'height', etc
+	 *
+	 * @return string
+	 */
 	private function parseRuleProperty(){
-		$name = $this->MatchReg('/\\G(\*?-?[_a-zA-Z0-9-]+)\s*(\+?)\s*:/');
-		if( $name ){
-			return $name[1] . (isset($name[2]) ? $name[2] : '');
+		$offset = $this->pos;
+		$name = array();
+		$index = array();
+		$length = 0;
+
+		$this->rulePropertyMatch('/\\G(\*?)/', $offset, $length, $index, $name );
+		while( $this->rulePropertyMatch('/\\G((?:[\w-]+)|(?:@\{[\w-]+\}))/', $offset, $length, $index, $name )); // !
+
+		if( (count($name) > 1) && $this->rulePropertyMatch('/\\G\s*(\+?)\s*:/', $offset, $length, $index, $name) ){
+			// at last, we have the complete match now. move forward,
+			// convert @{var}s to tree.Variable(s) and return:
+			$this->skipWhitespace($length);
+
+			foreach($name as $k => $name_k ){
+				if( $name[$k] && is_string($name[$k]) && $name[$k][0] === '@' ){
+					$name[$k] = $this->Less_Tree_Variable('@' . substr($name[$k],2,-1), $index[$k], $this->env->currentFileInfo );
+				}
+			}
+
+			return $name;
+		}
+	}
+
+	private function rulePropertyMatch( $re, &$offset, &$length,  &$index, &$name ){
+		preg_match($re, $this->input, $a, 0, $offset);
+		if( $a ){
+			$index[] = $this->pos + $length;
+			$length += strlen($a[0]);
+			$offset += strlen($a[0]);
+			$name[] = $a[1];
+			return true;
 		}
 	}
 
+	public function serializeVars( $vars ){
+		$s = '';
+
+		foreach($vars as $name => $value){
+			$s .= (($name[0] === '@') ? '' : '@') . $name .': '. $value . ((substr($value,-1) === ';') ? '' : ';');
+		}
+
+		return $s;
+	}
+
+
 	/**
 	 * Some versions of php have trouble with method_exists($a,$b) if $a is not an object
 	 *
+	 * @param string $b
 	 */
 	public static function is_method($a,$b){
 		return is_object($a) && method_exists($a,$b);
 	}
 
+
 	/**
-	 *
-	 * Round 1.499999 to 1 instead of 2
+	 * Round numbers similarly to javascript
+	 * eg: 1.499999 to 1 instead of 2
 	 *
 	 */
 	public static function round($i, $precision = 0){
@@ -1955,6 +2236,12 @@ public static function round($i, $precision = 0){
 		}
 	}
 
+
+	/**
+	 * Create Less_Tree_* objects and optionally generate a cache string
+	 *
+	 * @return mixed
+	 */
 	public function __call($class,$args){
 
 		//$pre_args = $args;
@@ -1998,7 +2285,7 @@ public function __call($class,$args){
 
 
 		//caching
-		if( self::$cache_dir ){
+		if( Less_Cache::$cache_dir ){
 			$obj->cache_string = ' new '.$class.'(';
 			$comma = '';
 			foreach($args as $arg){
@@ -2006,11 +2293,23 @@ public function __call($class,$args){
 				$comma = ', ';
 			}
 			$obj->cache_string .= ')';
+
+
+			if( strpos($obj->cache_string,'=> ,') !== false ){
+				msg($args);
+				die('found');
+			}
 		}
 
 		return $obj;
 	}
 
+
+	/**
+	 * Convert an argument to a string for use in the parser cache
+	 *
+	 * @return string
+	 */
 	public static function ArgString($arg){
 
 		$type = gettype($arg);
@@ -2033,6 +2332,25 @@ public static function ArgString($arg){
 		}
 
 	}
+
+	public function Error($msg){
+		throw new Less_Exception_Parser($msg, null, $this->farthest, $this->env->currentFileInfo);
+	}
+
+
+
+	/**
+	 * Sets file contents to the map
+	 *
+	 * @param string $filePath
+	 */
+	public function setFileContent(){
+
+		if( Less_Parser::$options['sourceMap'] && $this->env->currentFileInfo ){
+			$uri = $this->env->currentFileInfo['currentUri'];
+			Less_Parser::$contentsMap[$uri] = $this->input;
+		}
+	}
 }
 
 
@@ -2042,13 +2360,7 @@ public static function ArgString($arg){
 
 class Less_Colors {
 
-	public static $colors;
-
-	private static function all() {
-		if (self::$colors)
-			return self::$colors;
-
-		self::$colors = array(
+	public static $colors = array(
 			'aliceblue'=>'#f0f8ff',
 			'antiquewhite'=>'#faebd7',
 			'aqua'=>'#00ffff',
@@ -2197,18 +2509,14 @@ private static function all() {
 			'yellow'=>'#ffff00',
 			'yellowgreen'=>'#9acd32'
 		);
-		return self::$colors;
-	}
 
 	public static function hasOwnProperty($color) {
-		$colors = self::all();
-		return isset($colors[$color]);
+		return isset(self::$colors[$color]);
 	}
 
 
 	public static function color($color) {
-		$colors = self::all();
-		return $colors[$color];
+		return self::$colors[$color];
 	}
 
 }
@@ -2219,29 +2527,23 @@ public static function color($color) {
 
 class Less_Environment{
 
-	public $paths = array();			// option - unmodified - paths to search for imports on
-	static $files = array();			// list of files that have been imported, used for import-once
-	public $relativeUrls = true;		// option - whether to adjust URL's to be relative
-	public $rootpath;					// option - rootpath to append to URL's
-	public $strictImports = null;		// option -
-	public $insecure;					// option - whether to allow imports from insecure ssl hosts
-	public static $compress = false;	// option - whether to compress
-	public $processImports;				// option - whether to process imports. if false then imports will not be imported
-	public $javascriptEnabled;			// option - whether JavaScript is enabled. if undefined, defaults to true
-	public $useFileCache;				// browser only - whether to use the per file session cache
-	public $currentFileInfo;			// information about the current file - for error reporting and importing and making urls relative etc.
+	//public $paths = array();				// option - unmodified - paths to search for imports on
+	//public static $files = array();		// list of files that have been imported, used for import-once
+	//public $rootpath;						// option - rootpath to append to URL's
+	//public static $strictImports = null;	// option -
+	//public $insecure;						// option - whether to allow imports from insecure ssl hosts
+	//public $processImports;				// option - whether to process imports. if false then imports will not be imported
+	//public $javascriptEnabled;			// option - whether JavaScript is enabled. if undefined, defaults to true
+	//public $useFileCache;					// browser only - whether to use the per file session cache
+	public $currentFileInfo;				// information about the current file - for error reporting and importing and making urls relative etc.
 
-	/**
-	 * @var array
-	 */
-	public $frames = array();
+	public $importMultiple = false; 		// whether we are currently importing multiple copies
 
 
 	/**
-	 * @var bool
+	 * @var array
 	 */
-	public $debug = false;
-
+	public $frames = array();
 
 	/**
 	 * @var array
@@ -2253,102 +2555,69 @@ class Less_Environment{
 	 */
 	public $mediaPath = array();
 
-	public $selectors = array();
-
-	public $charset;
-
-	public $parensStack = array();
-
-	public $strictMath = false;
-
-	public $strictUnits = false;
+	public static $parensStack = 0;
 
-	public $tabLevel = 0;
+	public static $tabLevel = 0;
 
-	public $lastRule = false;
+	public static $lastRule = false;
 
-	public $importMultiple = false;
+	public static $_outputMap;
 
-	/**
-	 * Source map flag
-	 *
-	 * @var boolean
-	 */
-	public $sourceMap = false;
+	public static $mixin_stack = 0;
 
-	/**
-	 * Filename to contents of all parsed the files
-	 *
-	 * @var array
-	 */
-	public static $contentsMap = array();
 
+	public function Init(){
 
+		self::$parensStack = 0;
+		self::$tabLevel = 0;
+		self::$lastRule = false;
+		self::$mixin_stack = 0;
 
-	public static $comma_space;
-	public static $colon_space;
-	public static $firstSelector;
+		if( Less_Parser::$options['compress'] ){
 
-	public function __construct( $options = null ){
-		$this->frames = array();
+			Less_Environment::$_outputMap = array(
+				','	=> ',',
+				': ' => ':',
+				''  => '',
+				' ' => ' ',
+				':' => ' :',
+				'+' => '+',
+				'~' => '~',
+				'>' => '>',
+				'|' => '|',
+		        '^' => '^',
+		        '^^' => '^^'
+			);
 
+		}else{
 
-		if( isset($options['compress']) ){
-			self::$compress = (bool)$options['compress'];
-		}
-		if( isset($options['strictUnits']) ){
-			$this->strictUnits = (bool)$options['strictUnits'];
-		}
-		if( isset($options['sourceMap']) ){
-			$this->sourceMap = (bool)$options['sourceMap'];
-		}
-		if( isset($options['relativeUrls']) ){
-			$this->relativeUrls = (bool)$options['relativeUrls'];
-		}
+			Less_Environment::$_outputMap = array(
+				','	=> ', ',
+				': ' => ': ',
+				''  => '',
+				' ' => ' ',
+				':' => ' :',
+				'+' => ' + ',
+				'~' => ' ~ ',
+				'>' => ' > ',
+				'|' => '|',
+		        '^' => ' ^ ',
+		        '^^' => ' ^^ '
+			);
 
-		if( self::$compress ){
-			self::$comma_space = ',';
-			self::$colon_space = ':';
-		}else{
-			self::$comma_space = ', ';
-			self::$colon_space = ': ';
 		}
 	}
 
 
-	//may want to just use the __clone()?
 	public function copyEvalEnv($frames = array() ){
-
-		$evalCopyProperties = array(
-			//'silent',      // whether to swallow errors and warnings
-			//'verbose',     // whether to log more activity
-			//'yuicompress', // whether to compress with the outside tool yui compressor
-			//'ieCompat',    // whether to enforce IE compatibility (IE8 data-uri)
-			'strictMath',  // whether math has to be within parenthesis
-			'strictUnits', // whether units need to evaluate correctly
-			//'cleancss',    // whether to compress with clean-css
-			//'sourceMap',   // whether to output a source map
-			//'importMultiple'// whether we are currently importing multiple copies
-			);
-
 		$new_env = new Less_Environment();
-		foreach($evalCopyProperties as $property){
-			$new_env->$property = $this->$property;
-		}
 		$new_env->frames = $frames;
 		return $new_env;
 	}
 
-	public function inParenthesis(){
-		$this->parensStack[] = true;
-	}
-
-	public function outOfParenthesis() {
-		array_pop($this->parensStack);
-	}
 
-	public function isMathOn() {
-        return $this->strictMath ? ($this->parensStack && count($this->parensStack)) : true;
+	public static function isMathOn(){
+		return !Less_Parser::$options['strictMath'] || Less_Environment::$parensStack;
 	}
 
 	public static function isPathRelative($path){
@@ -2399,21 +2668,6 @@ static function normalizePath($path){
 	}
 
 
-	/**
-	 * @return bool
-	 */
-	public function getDebug(){
-		return $this->debug;
-	}
-
-	/**
-	 * @param $debug
-	 * @return void
-	 */
-	public function setDebug($debug){
-		$this->debug = $debug;
-	}
-
 	public function unshiftFrame($frame){
 		array_unshift($this->frames, $frame);
 	}
@@ -2430,42 +2684,25 @@ public function addFrames(array $frames){
 		$this->frames = array_merge($this->frames, $frames);
 	}
 
-
-	/**
-	 * Returns the contents map
-	 *
-	 * @return array
-	 */
-	public function getContentsMap(){
-		return self::$contentsMap;
-	}
-
-	/**
-	 * Sets file contents to the map
-	 *
-	 * @param string $filePath
-	 * @param string $content
-	 * @return Less_Environment
-	 */
-	public function setFileContent($filePath){
-		if( $this->sourceMap && $filePath ){
-			self::$contentsMap[$filePath] = file_get_contents($filePath);
-		}
-	}
 }
  
 
 
 class Less_Functions{
 
+	public $env;
+	public $currentFileInfo;
+
 	function __construct($env, $currentFileInfo = null ){
 		$this->env = $env;
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
 
-	//tree.operate()
-	static public function operate ($env, $op, $a, $b){
+	/**
+	 * @param string $op
+	 */
+	static public function operate( $op, $a, $b ){
 		switch ($op) {
 			case '+': return $a + $b;
 			case '-': return $a - $b;
@@ -2474,8 +2711,8 @@ static public function operate ($env, $op, $a, $b){
 		}
 	}
 
-	static public function clamp($val){
-		return min(1, max(0, $val));
+	static public function clamp($val, $max = 1){
+		return min( max($val, 0), $max);
 	}
 
 	static public function number($n){
@@ -2489,7 +2726,7 @@ static public function number($n){
 		}
 	}
 
-	static public function scaled($n, $size = 256 ){
+	static public function scaled($n, $size = 255 ){
 		if( $n instanceof Less_Tree_Dimension && $n->unit->is('%') ){
 			return (float)$n->value * $size / 100;
 		} else {
@@ -2530,6 +2767,9 @@ public function hsla($h, $s, $l, $a){
 							$a);
 	}
 
+	/**
+	 * @param double $h
+	 */
 	function hsla_hue($h, $m1, $m2){
 		$h = $h < 0 ? $h + 1 : ($h > 1 ? $h - 1 : $h);
 		if	  ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
@@ -2542,6 +2782,9 @@ public function hsv($h, $s, $v) {
 		return $this->hsva($h, $s, $v, 1.0);
 	}
 
+	/**
+	 * @param double $a
+	 */
 	public function hsva($h, $s, $v, $a) {
 		$h = ((Less_Functions::number($h) % 360) / 360 ) * 360;
 		$s = Less_Functions::number($s);
@@ -2635,6 +2878,9 @@ public function saturate($color, $amount = null){
 		return $this->hsla($hsl['h'], $hsl['s'], $hsl['l'], $hsl['a']);
 	}
 
+	/**
+	 * @param Less_Tree_Dimension $amount
+	 */
 	public function desaturate($color, $amount){
 		$hsl = $color->toHSL();
 
@@ -2705,6 +2951,10 @@ public function spin($color, $amount){
 	// Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
 	// http://sass-lang.com
 	//
+
+	/**
+	 * @param Less_Tree_Color $color1
+	 */
 	public function mix($color1, $color2, $weight = null){
 		if (!$weight) {
 			$weight = new Less_Tree_Dimension('50', '%');
@@ -2733,16 +2983,16 @@ public function greyscale($color){
 	}
 
 
-	public function contrast( $color, $dark = false, $light = false, $threshold = false) {
+	public function contrast( $color, $dark = null, $light = null, $threshold = null){
 		// filter: contrast(3.2);
 		// should be kept as is, so check for color
 		if( !property_exists($color,'rgb') ){
 			return null;
 		}
-		if( $light === false ){
+		if( !$light ){
 			$light = $this->rgba(255, 255, 255, 1.0);
 		}
-		if( $dark === false ){
+		if( !$dark ){
 			$dark = $this->rgba(0, 0, 0, 1.0);
 		}
 		//Figure out which is actually light and dark!
@@ -2751,13 +3001,13 @@ public function contrast( $color, $dark = false, $light = false, $threshold = fa
 			$light = $dark;
 			$dark = $t;
 		}
-		if( $threshold === false ){
+		if( !$threshold ){
 			$threshold = 0.43;
 		} else {
 			$threshold = Less_Functions::number($threshold);
 		}
 
-		if( ($color->luma() * $color->alpha) < $threshold ){
+		if( $color->luma() < $threshold ){
 			return $light;
 		} else {
 			return $dark;
@@ -2765,7 +3015,10 @@ public function contrast( $color, $dark = false, $light = false, $threshold = fa
 	}
 
 	public function e ($str){
-		return new Less_Tree_Anonymous($str instanceof Less_Tree_JavaScript ? $str->evaluated : $str);
+		if( is_string($str) ){
+			return new Less_Tree_Anonymous($str);
+		}
+		return new Less_Tree_Anonymous($str instanceof Less_Tree_JavaScript ? $str->expression : $str->value);
 	}
 
 	public function escape ($str){
@@ -2873,18 +3126,27 @@ private function _math() {
 		}
 	}
 
+	/**
+	 * @param boolean $isMin
+	 */
 	function _minmax( $isMin, $args ){
 
-		switch( count($args) ){
-			case 0: throw new Less_Exception_Compiler( 'one or more arguments required');
-			case 1: return $args[0];
+		$arg_count = count($args);
+
+		if( $arg_count < 1 ){
+			throw new Less_Exception_Compiler( 'one or more arguments required');
+
+		}elseif( $arg_count === 1 ){
+			return $args[0];
+
 		}
 
+
 		$order = array();	// elems only contains original argument values.
 		$values = array();	// key is the unit.toString() for unified tree.Dimension values,
 							// value is the index into the order array.
 
-		for( $i = 0; $i < count($args); $i++ ){
+		for( $i = 0; $i < $arg_count; $i++ ){
 			$current = $args[$i];
 			if( !($current instanceof Less_Tree_Dimension) ){
 				$order[] = $current;
@@ -2910,20 +3172,22 @@ function _minmax( $isMin, $args ){
 		}
 
 		foreach($order as $k => $a){
-			$order[$k] = $a->toCSS( $this->env );
+			$order[$k] = $a->toCSS();
 		}
 
-		$args = implode( Less_Environment::$comma_space, $order);
+		$args = implode( Less_Environment::$_outputMap[','], $order);
 
 		return new Less_Tree_Anonymous( ($isMin ? 'min' : 'max') . '(' . $args . ')');
 	}
 
 	public function min(){
-		return $this->_minmax(true, func_get_args() );
+		$args = func_get_args();
+		return $this->_minmax( true, $args );
 	}
 
 	public function max(){
-		return $this->_minmax(false, func_get_args() );
+		$args = func_get_args();
+		return $this->_minmax( false, $args );
 	}
 
 	public function argb($color) {
@@ -2984,82 +3248,20 @@ public function isem($n) {
 		return $this->isunit($n, 'em');
 	}
 
+	/**
+	 * @param string $unit
+	 */
 	public function isunit( $n, $unit ){
 		return ($n instanceof Less_Tree_Dimension) && $n->unit->is( ( property_exists($unit,'value') ? $unit->value : $unit) ) ? new Less_Tree_Keyword('true') : new Less_Tree_Keyword('false');
 	}
 
+	/**
+	 * @param string $type
+	 */
 	private function _isa($n, $type) {
 		return is_a($n, $type) ? new Less_Tree_Keyword('true') : new Less_Tree_Keyword('false');
 	}
 
-	/* Blending modes */
-
-	public function multiply($color1, $color2) {
-		$r = $color1->rgb[0] * $color2->rgb[0] / 255;
-		$g = $color1->rgb[1] * $color2->rgb[1] / 255;
-		$b = $color1->rgb[2] * $color2->rgb[2] / 255;
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function screen($color1, $color2) {
-		$r = 255 - (255 - $color1->rgb[0]) * (255 - $color2->rgb[0]) / 255;
-		$g = 255 - (255 - $color1->rgb[1]) * (255 - $color2->rgb[1]) / 255;
-		$b = 255 - (255 - $color1->rgb[2]) * (255 - $color2->rgb[2]) / 255;
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function overlay($color1, $color2) {
-		$r = $color1->rgb[0] < 128 ? 2 * $color1->rgb[0] * $color2->rgb[0] / 255 : 255 - 2 * (255 - $color1->rgb[0]) * (255 - $color2->rgb[0]) / 255;
-		$g = $color1->rgb[1] < 128 ? 2 * $color1->rgb[1] * $color2->rgb[1] / 255 : 255 - 2 * (255 - $color1->rgb[1]) * (255 - $color2->rgb[1]) / 255;
-		$b = $color1->rgb[2] < 128 ? 2 * $color1->rgb[2] * $color2->rgb[2] / 255 : 255 - 2 * (255 - $color1->rgb[2]) * (255 - $color2->rgb[2]) / 255;
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function softlight($color1, $color2) {
-		$t = $color2->rgb[0] * $color1->rgb[0] / 255;
-		$r = $t + $color1->rgb[0] * (255 - (255 - $color1->rgb[0]) * (255 - $color2->rgb[0]) / 255 - $t) / 255;
-		$t = $color2->rgb[1] * $color1->rgb[1] / 255;
-		$g = $t + $color1->rgb[1] * (255 - (255 - $color1->rgb[1]) * (255 - $color2->rgb[1]) / 255 - $t) / 255;
-		$t = $color2->rgb[2] * $color1->rgb[2] / 255;
-		$b = $t + $color1->rgb[2] * (255 - (255 - $color1->rgb[2]) * (255 - $color2->rgb[2]) / 255 - $t) / 255;
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function hardlight($color1, $color2) {
-		$r = $color2->rgb[0] < 128 ? 2 * $color2->rgb[0] * $color1->rgb[0] / 255 : 255 - 2 * (255 - $color2->rgb[0]) * (255 - $color1->rgb[0]) / 255;
-		$g = $color2->rgb[1] < 128 ? 2 * $color2->rgb[1] * $color1->rgb[1] / 255 : 255 - 2 * (255 - $color2->rgb[1]) * (255 - $color1->rgb[1]) / 255;
-		$b = $color2->rgb[2] < 128 ? 2 * $color2->rgb[2] * $color1->rgb[2] / 255 : 255 - 2 * (255 - $color2->rgb[2]) * (255 - $color1->rgb[2]) / 255;
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function difference($color1, $color2) {
-		$r = abs($color1->rgb[0] - $color2->rgb[0]);
-		$g = abs($color1->rgb[1] - $color2->rgb[1]);
-		$b = abs($color1->rgb[2] - $color2->rgb[2]);
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function exclusion($color1, $color2) {
-		$r = $color1->rgb[0] + $color2->rgb[0] * (255 - $color1->rgb[0] - $color1->rgb[0]) / 255;
-		$g = $color1->rgb[1] + $color2->rgb[1] * (255 - $color1->rgb[1] - $color1->rgb[1]) / 255;
-		$b = $color1->rgb[2] + $color2->rgb[2] * (255 - $color1->rgb[2] - $color1->rgb[2]) / 255;
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function average($color1, $color2) {
-		$r = ($color1->rgb[0] + $color2->rgb[0]) / 2;
-		$g = ($color1->rgb[1] + $color2->rgb[1]) / 2;
-		$b = ($color1->rgb[2] + $color2->rgb[2]) / 2;
-		return $this->rgb($r, $g, $b);
-	}
-
-	public function negation($color1, $color2) {
-		$r = 255 - abs(255 - $color2->rgb[0] - $color1->rgb[0]);
-		$g = 255 - abs(255 - $color2->rgb[1] - $color1->rgb[1]);
-		$b = 255 - abs(255 - $color2->rgb[2] - $color1->rgb[2]);
-		return $this->rgb($r, $g, $b);
-	}
-
 	public function tint($color, $amount) {
 		return $this->mix( $this->rgb(255,255,255), $color, $amount);
 	}
@@ -3094,7 +3296,6 @@ function datauri($mimetypeNode, $filePathNode = null ) {
 
 		$filePath = ( $filePathNode ? $filePathNode->value : null );
 		$mimetype = $mimetypeNode->value;
-		$useBase64 = false;
 
 		$args = 2;
 		if( !$filePath ){
@@ -3105,10 +3306,10 @@ function datauri($mimetypeNode, $filePathNode = null ) {
 		$filePath = str_replace('\\','/',$filePath);
 		if( Less_Environment::isPathRelative($filePath) ){
 
-			if( $this->env->relativeUrls ){
-				$temp = $this->env->currentFileInfo['currentDirectory'];
+			if( Less_Parser::$options['relativeUrls'] ){
+				$temp = $this->currentFileInfo['currentDirectory'];
 			} else {
-				$temp = $this->env->currentFileInfo['entryPath'];
+				$temp = $this->currentFileInfo['entryPath'];
 			}
 
 			if( !empty($temp) ){
@@ -3160,7 +3361,7 @@ function datauri($mimetypeNode, $filePathNode = null ) {
 
 		if( $buf ){
 			$buf = $useBase64 ? base64_encode($buf) : rawurlencode($buf);
-			$filePath = "'data:" . $mimetype . ',' . $buf . "'";
+			$filePath = '"data:' . $mimetype . ',' . $buf . '"';
 		}
 
 		return new Less_Tree_Url( new Less_Tree_Anonymous($filePath) );
@@ -3180,8 +3381,7 @@ function svggradient( $direction ){
 		$gradientType = 'linear';
 		$rectangleDimension = 'x="0" y="0" width="1" height="1"';
 		$useBase64 = true;
-		$renderEnv = new Less_Environment();
-		$directionValue = $direction->toCSS($renderEnv);
+		$directionValue = $direction->toCSS();
 
 
 		switch( $directionValue ){
@@ -3224,7 +3424,7 @@ function svggradient( $direction ){
 				throw new Less_Exception_Compiler( $throw_message );
 			}
 			if( $position ){
-				$positionValue = $position->toCSS($renderEnv);
+				$positionValue = $position->toCSS();
 			}elseif( $i === 0 ){
 				$positionValue = '0%';
 			}else{
@@ -3238,19 +3438,18 @@ function svggradient( $direction ){
 
 
 		if( $useBase64 ){
-			// only works in node, needs interface to what is supported in environment
-			try{
-				$returner = base64_encode($returner);
-			}catch(Exception $e){
-				$useBase64 = false;
-			}
+			$returner = "'data:image/svg+xml;base64,".base64_encode($returner)."'";
+		}else{
+			$returner = "'data:image/svg+xml,".$returner."'";
 		}
 
-		$returner = "'data:image/svg+xml" . ($useBase64 ? ";base64" : "") . "," . $returner . "'";
 		return new Less_Tree_URL( new Less_Tree_Anonymous( $returner ) );
 	}
 
 
+	/**
+	 * @param string $type
+	 */
 	private static function Expected( $type, $arg ){
 
 		$debug = debug_backtrace();
@@ -3258,7 +3457,7 @@ private static function Expected( $type, $arg ){
 		$last = array_shift($debug);
 		$last = array_intersect_key($last,array('function'=>'','class'=>'','line'=>''));
 
-		$message = 'Object of type '.get_class($arg).' passed to darken function. Expecting `Color`. '.$arg->toCSS().'. '.print_r($last,true);
+		$message = 'Object of type '.get_class($arg).' passed to darken function. Expecting `'.$type.'`. '.$arg->toCSS().'. '.print_r($last,true);
 		throw new Less_Exception_Compiler($message);
 
 	}
@@ -3274,84 +3473,216 @@ public static function encodeURIComponent($string){
 		return strtr(rawurlencode($string), $revert);
 	}
 
-}
- 
-
-//less.js : lib/less/functions.js
-
-class Less_Mime{
 
-	// this map is intentionally incomplete
-	// if you want more, install 'mime' dep
-	static $_types = array(
-	        '.htm' => 'text/html',
-	        '.html'=> 'text/html',
-	        '.gif' => 'image/gif',
-	        '.jpg' => 'image/jpeg',
-	        '.jpeg'=> 'image/jpeg',
-	        '.png' => 'image/png'
-	        );
+	// Color Blending
+	// ref: http://www.w3.org/TR/compositing-1
 
-	static function lookup( $filepath ){
-		$parts = explode('.',$filepath);
-		$ext = '.'.strtolower(array_pop($parts));
+	public function colorBlend( $mode, $color1, $color2 ){
+		$ab = $color1->alpha;	// backdrop
+		$as = $color2->alpha;	// source
+		$r = array();			// result
 
-		if( !isset(self::$_types[$ext]) ){
-			return null;
+		$ar = $as + $ab * (1 - $as);
+		for( $i = 0; $i < 3; $i++ ){
+			$cb = $color1->rgb[$i] / 255;
+			$cs = $color2->rgb[$i] / 255;
+			$cr = call_user_func( $mode, $cb, $cs );
+			if( $ar ){
+				$cr = ($as * $cs + $ab * ($cb - $as * ($cb + $cs - $cr))) / $ar;
+			}
+			$r[$i] = $cr * 255;
 		}
-		return self::$_types[$ext];
-	}
 
-	static function charsets_lookup( $type = false ){
-		// assumes all text types are UTF-8
-		return $type && preg_match('/^text\//',$type) ? 'UTF-8' : '';
+		return new Less_Tree_Color($r, $ar);
 	}
-} 
 
-class Less_Tree{
+	public function multiply($color1, $color2 ){
+		return $this->colorBlend( array($this,'colorBlendMultiply'),  $color1, $color2 );
+	}
 
-	public function toCSS($env = null){
-		$output = new Less_Output();
-		$this->genCSS($env, $output);
-		return $output->toString();
+	private function colorBlendMultiply($cb, $cs){
+		return $cb * $cs;
 	}
 
+	public function screen($color1, $color2 ){
+		return $this->colorBlend( array($this,'colorBlendScreen'),  $color1, $color2 );
+	}
 
-	public static function outputRuleset($env, $output, $rules ){
+	private function colorBlendScreen( $cb, $cs){
+		return $cb + $cs - $cb * $cs;
+	}
 
-		$ruleCnt = count($rules);
-		$env->tabLevel++;
+	public function overlay($color1, $color2){
+		return $this->colorBlend( array($this,'colorBlendOverlay'),  $color1, $color2 );
+	}
 
+	private function colorBlendOverlay($cb, $cs ){
+		$cb *= 2;
+		return ($cb <= 1)
+			? $this->colorBlendMultiply($cb, $cs)
+			: $this->colorBlendScreen($cb - 1, $cs);
+	}
 
-		// Compressed
-		if( Less_Environment::$compress ){
-			$output->add('{');
-			for( $i = 0; $i < $ruleCnt; $i++ ){
-				$rules[$i]->genCSS( $env, $output );
-			}
+	public function softlight($color1, $color2){
+		return $this->colorBlend( array($this,'colorBlendSoftlight'),  $color1, $color2 );
+	}
 
-			$output->add( '}' );
-			$env->tabLevel--;
-			return;
+	private function colorBlendSoftlight($cb, $cs ){
+		$d = 1;
+		$e = $cb;
+		if( $cs > 0.5 ){
+			$e = 1;
+			$d = ($cb > 0.25) ? sqrt($cb)
+				: ((16 * $cb - 12) * $cb + 4) * $cb;
 		}
+		return $cb - (1 - 2 * $cs) * $e * ($d - $cb);
+	}
 
+	public function hardlight($color1, $color2){
+		return $this->colorBlend( array($this,'colorBlendHardlight'),  $color1, $color2 );
+	}
 
-		// Non-compressed
-		$tabSetStr = "\n".str_repeat( '  ' , $env->tabLevel-1 );
+	private function colorBlendHardlight( $cb, $cs ){
+		return $this->colorBlendOverlay($cs, $cb);
+	}
+
+	public function difference($color1, $color2) {
+		return $this->colorBlend( array($this,'colorBlendDifference'),  $color1, $color2 );
+	}
+
+	private function colorBlendDifference( $cb, $cs ){
+		return abs($cb - $cs);
+	}
+
+	public function exclusion( $color1, $color2 ){
+		return $this->colorBlend( array($this,'colorBlendExclusion'),  $color1, $color2 );
+	}
+
+	private function colorBlendExclusion( $cb, $cs ){
+		return $cb + $cs - 2 * $cb * $cs;
+	}
+
+	public function average($color1, $color2){
+		return $this->colorBlend( array($this,'colorBlendAverage'),  $color1, $color2 );
+	}
+
+	// non-w3c functions:
+	function colorBlendAverage($cb, $cs ){
+		return ($cb + $cs) / 2;
+	}
+
+	public function negation($color1, $color2 ){
+		return $this->colorBlend( array($this,'colorBlendNegation'),  $color1, $color2 );
+	}
+
+	function colorBlendNegation($cb, $cs){
+		return 1 - abs($cb + $cs - 1);
+	}
+
+	// ~ End of Color Blending
+
+}
+ 
+
+//less.js : lib/less/functions.js
+
+class Less_Mime{
+
+	// this map is intentionally incomplete
+	// if you want more, install 'mime' dep
+	static $_types = array(
+	        '.htm' => 'text/html',
+	        '.html'=> 'text/html',
+	        '.gif' => 'image/gif',
+	        '.jpg' => 'image/jpeg',
+	        '.jpeg'=> 'image/jpeg',
+	        '.png' => 'image/png'
+	        );
+
+	static function lookup( $filepath ){
+		$parts = explode('.',$filepath);
+		$ext = '.'.strtolower(array_pop($parts));
+
+		if( !isset(self::$_types[$ext]) ){
+			return null;
+		}
+		return self::$_types[$ext];
+	}
+
+	static function charsets_lookup( $type = null ){
+		// assumes all text types are UTF-8
+		return $type && preg_match('/^text\//',$type) ? 'UTF-8' : '';
+	}
+} 
+
+class Less_Tree{
+
+	public $cache_string;
+
+	public function toCSS(){
+		$output = new Less_Output();
+		$this->genCSS($output);
+		return $output->toString();
+	}
+
+
+    /**
+     * Generate CSS by adding it to the output object
+     *
+     * @param Less_Output $output The output
+     * @return void
+     */
+    public function genCSS($output){}
+
+
+	/**
+	 * @param Less_Tree_Ruleset[] $rules
+	 */
+	public static function outputRuleset( $output, $rules ){
+
+		$ruleCnt = count($rules);
+		Less_Environment::$tabLevel++;
+
+
+		// Compressed
+		if( Less_Parser::$options['compress'] ){
+			$output->add('{');
+			for( $i = 0; $i < $ruleCnt; $i++ ){
+				$rules[$i]->genCSS( $output );
+			}
+
+			$output->add( '}' );
+			Less_Environment::$tabLevel--;
+			return;
+		}
+
+
+		// Non-compressed
+		$tabSetStr = "\n".str_repeat( '  ' , Less_Environment::$tabLevel-1 );
 		$tabRuleStr = $tabSetStr.'  ';
 
 		$output->add( " {" );
 		for($i = 0; $i < $ruleCnt; $i++ ){
 			$output->add( $tabRuleStr );
-			$rules[$i]->genCSS( $env, $output );
+			$rules[$i]->genCSS( $output );
 		}
-		$env->tabLevel--;
+		Less_Environment::$tabLevel--;
 		$output->add( $tabSetStr.'}' );
 
 	}
 
 	public function accept($visitor){}
 
+
+	public static function ReferencedArray($rules){
+		foreach($rules as $rule){
+			if( method_exists($rule, 'markReferenced') ){
+				$rule->markReferenced();
+			}
+		}
+	}
+
+
 	/**
 	 * Requires php 5.3+
 	 */
@@ -3551,7 +3882,7 @@ abstract class Less_Configurable {
 	 * If $options is an object it will be converted into an array by called
 	 * it's toArray method.
 	 *
-	 * @throws InvalidArgumentException
+	 * @throws Exception
 	 * @param array|object $options
 	 *
 	 */
@@ -3605,25 +3936,30 @@ public function __construct($val){
 
 	public function compile($env){
 
-		if( !is_string($this->value) ){ return new Less_Tree_Alpha( $this->value->compile($env) ); }
+		if( is_object($this->value) ){
+			$this->value = $this->value->compile($env);
+		}
 
 		return $this;
 	}
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 
 		$output->add( "alpha(opacity=" );
 
 		if( is_string($this->value) ){
 			$output->add( $this->value );
 		}else{
-			$this->value->genCSS($env, $output);
+			$this->value->genCSS( $output);
 		}
 
 		$output->add( ')' );
 	}
 
-	public function toCSS($env = null){
+	public function toCSS(){
 		return "alpha(opacity=" . (is_string($this->value) ? $this->value : $this->value->toCSS()) . ")";
 	}
 
@@ -3634,17 +3970,24 @@ public function toCSS($env = null){
 class Less_Tree_Anonymous extends Less_Tree{
 	public $value;
 	public $quote;
+	public $index;
+	public $mapLines;
+	public $currentFileInfo;
 	public $type = 'Anonymous';
 
+	/**
+	 * @param integer $index
+	 * @param boolean $mapLines
+	 */
 	public function __construct($value, $index = null, $currentFileInfo = null, $mapLines = null ){
-		$this->value = is_object($value) ? $value->value : $value;
+		$this->value = $value;
 		$this->index = $index;
 		$this->mapLines = $mapLines;
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-	public function compile($env){
-		return $this;
+	public function compile(){
+		return new Less_Tree_Anonymous($this->value, $this->index, $this->currentFileInfo, $this->mapLines);
 	}
 
 	function compare($x){
@@ -3662,11 +4005,14 @@ function compare($x){
 		return $left < $right ? -1 : 1;
 	}
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 		$output->add( $this->value, $this->currentFileInfo, $this->index, $this->mapLines );
 	}
 
-	public function toCSS($env = null){
+	public function toCSS(){
 		return $this->value;
 	}
 
@@ -3689,25 +4035,20 @@ function accept( $visitor ){
 		$this->value = $visitor->visitObj( $this->value );
 	}
 
-
 	public function compile($env) {
-		if( Less_Parser::is_method($this->value,'compile') ){
-			return new Less_Tree_Assignment( $this->key, $this->value->compile($env));
-		}
-		return $this;
+		return new Less_Tree_Assignment( $this->key, $this->value->compile($env));
 	}
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 		$output->add( $this->key . '=' );
-		if( is_string($this->value) ){
-			$output->add( $this->value );
-		}else{
-			$this->value->genCSS( $env, $output );
-		}
+		$this->value->genCSS( $output );
 	}
 
-	public function toCss($env = null){
-		return $this->key . '=' . (is_string($this->value) ? $this->value : $this->value->toCSS());
+	public function toCss(){
+		return $this->key . '=' . $this->value->toCSS();
 	}
 }
  
@@ -3728,22 +4069,32 @@ function __construct($key, $op, $value){
 
 	function compile($env){
 
+		$key_obj = is_object($this->key);
+		$val_obj = is_object($this->value);
+
+		if( !$key_obj && !$val_obj ){
+			return $this;
+		}
+
 		return new Less_Tree_Attribute(
-			is_object($this->key) ? $this->key->compile($env) : $this->key ,
+			$key_obj ? $this->key->compile($env) : $this->key ,
 			$this->op,
-			is_object($this->value) ? $this->value->compile($env) : $this->value);
+			$val_obj ? $this->value->compile($env) : $this->value);
 	}
 
-	function genCSS( $env, $output ){
-		$output->add( $this->toCSS($env) );
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
+		$output->add( $this->toCSS() );
 	}
 
-	function toCSS($env = null){
+	function toCSS(){
 		$value = $this->key;
 
 		if( $this->op ){
 			$value .= $this->op;
-			$value .= (is_object($this->value) ? $this->value->toCSS($env) : $this->value);
+			$value .= (is_object($this->value) ? $this->value->toCSS() : $this->value);
 		}
 
 		return '[' . $value . ']';
@@ -3787,7 +4138,7 @@ function accept( $visitor ){
     // we try to pass a variable to a function, like: `saturate(@color)`.
     // The function should receive the value, not the variable.
     //
-    public function compile($env){
+    public function compile($env=null){
 		$args = array();
 		foreach($this->args as $a){
 			$args[] = $a->compile($env);
@@ -3806,9 +4157,12 @@ public function compile($env){
 			case 'svg-gradient':
 			$name = 'svggradient';
 			break;
-		}
 
+			case 'default':
+			return Less_Tree_DefaultFunc::compile();
+		}
 
+		//echo '<h4>'.$name.'</h4>';
 		if( method_exists('Less_Functions',$name) ){ // 1.
 			try {
 				$func = new Less_Functions($env, $this->currentFileInfo);
@@ -3826,12 +4180,15 @@ public function compile($env){
 		return new Less_Tree_Call( $this->name, $args, $this->index, $this->currentFileInfo );
     }
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 
 		$output->add( $this->name . '(', $this->currentFileInfo, $this->index );
 		$args_len = count($this->args);
 		for($i = 0; $i < $args_len; $i++ ){
-			$this->args[$i]->genCSS($env, $output );
+			$this->args[$i]->genCSS( $output );
 			if( $i + 1 < $args_len ){
 				$output->add( ', ' );
 			}
@@ -3840,8 +4197,8 @@ public function genCSS( $env, $output ){
 		$output->add( ')' );
 	}
 
-    public function toCSS($env = null){
-        return $this->compile($env)->toCSS();
+    public function toCSS(){
+        return $this->compile()->toCSS();
     }
 
 }
@@ -3849,11 +4206,20 @@ public function toCSS($env = null){
 
 
 class Less_Tree_Color extends Less_Tree{
-	var $rgb;
-	var $alpha;
+	public $rgb;
+	public $alpha;
+	public $isTransparentKeyword;
 	public $type = 'Color';
 
-	public function __construct($rgb, $a = 1){
+	public function __construct($rgb, $a = 1, $isTransparentKeyword = null ){
+
+		if( $isTransparentKeyword ){
+			$this->rgb = $rgb;
+			$this->alpha = $a;
+			$this->isTransparentKeyword = true;
+			return;
+		}
+
 		$this->rgb = array();
 		if( is_array($rgb) ){
 			$this->rgb = $rgb;
@@ -3869,35 +4235,40 @@ public function __construct($rgb, $a = 1){
 		$this->alpha = is_numeric($a) ? $a : 1;
 	}
 
-    public function compile($env = null){
-        return $this;
-    }
+	public function compile(){
+		return $this;
+	}
 
 	public function luma(){
 		return (0.2126 * $this->rgb[0] / 255) + (0.7152 * $this->rgb[1] / 255) + (0.0722 * $this->rgb[2] / 255);
 	}
 
-	public function genCSS( $env, $output ){
-		$output->add( $this->toCSS($env) );
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	public function genCSS( $output ){
+		$output->add( $this->toCSS() );
 	}
 
-    public function toCSS($env = null, $doNotCompress = false ){
-		$compress = Less_Environment::$compress && !$doNotCompress;
-
+	public function toCSS( $doNotCompress = false ){
+		$compress = Less_Parser::$options['compress'] && !$doNotCompress;
 
-	    //
-	    // If we have some transparency, the only way to represent it
-	    // is via `rgba`. Otherwise, we use the hex representation,
-	    // which has better compatibility with older browsers.
-	    // Values are capped between `0` and `255`, rounded and zero-padded.
-	    //
-    	if( $this->alpha < 1.0 ){
-            if( $this->alpha === 0 && isset($this->isTransparentKeyword) && $this->isTransparentKeyword ){
-                return 'transparent';
-            }
 
+		//
+		// If we have some transparency, the only way to represent it
+		// is via `rgba`. Otherwise, we use the hex representation,
+		// which has better compatibility with older browsers.
+		// Values are capped between `0` and `255`, rounded and zero-padded.
+		//
+		if( $this->alpha < 1 ){
+			if( $this->alpha === 0 && isset($this->isTransparentKeyword) && $this->isTransparentKeyword ){
+				return 'transparent';
+			}
 
-			$values = array_map('round', $this->rgb);
+			$values = array();
+			foreach($this->rgb as $c){
+				$values[] = Less_Functions::clamp( round($c), 255);
+			}
 			$values[] = $this->alpha;
 
 			$glue = ($compress ? ',' : ', ');
@@ -3916,37 +4287,43 @@ public function toCSS($env = null, $doNotCompress = false ){
 
 			return $color;
 		}
-    }
+	}
 
-    //
-    // Operations have to be done per-channel, if not,
-    // channels will spill onto each other. Once we have
-    // our result, in the form of an integer triplet,
-    // we create a new Color node to hold the result.
-    //
-    public function operate($env, $op, $other) {
-        $result = array();
+	//
+	// Operations have to be done per-channel, if not,
+	// channels will spill onto each other. Once we have
+	// our result, in the form of an integer triplet,
+	// we create a new Color node to hold the result.
+	//
+
+	/**
+	 * @param string $op
+	 */
+	public function operate( $op, $other) {
+		$rgb = array();
+		$alpha = $this->alpha * (1 - $other->alpha) + $other->alpha;
+		for ($c = 0; $c < 3; $c++) {
+			$rgb[$c] = Less_Functions::operate( $op, $this->rgb[$c], $other->rgb[$c]);
+		}
+		return new Less_Tree_Color($rgb, $alpha);
 
-        if (! ($other instanceof Less_Tree_Color)) {
-            $other = $other->toColor();
-        }
 
-        for ($c = 0; $c < 3; $c++) {
-            $result[$c] = Less_Functions::operate($env, $op, $this->rgb[$c], $other->rgb[$c]);
-        }
-        return new Less_Tree_Color($result, $this->alpha + $other->alpha);
-    }
 
-    public function toRGB(){
-		$color = '';
-		foreach($this->rgb as $i){
-			$i = Less_Parser::round($i);
-			$i = ($i > 255 ? 255 : ($i < 0 ? 0 : $i));
-			$i = dechex($i);
-			$color .= str_pad($i, 2, '0', STR_PAD_LEFT);
+		$result = array();
+
+		if (! ($other instanceof Less_Tree_Color)) {
+			$other = $other->toColor();
 		}
-		return '#'.$color;
-    }
+
+		for ($c = 0; $c < 3; $c++) {
+			$result[$c] = Less_Functions::operate( $op, $this->rgb[$c], $other->rgb[$c]);
+		}
+		return new Less_Tree_Color($result, $this->alpha + $other->alpha);
+	}
+
+	public function toRGB(){
+		return $this->toHex($this->rgb);
+	}
 
 	public function toHSL(){
 		$r = $this->rgb[0] / 255;
@@ -3959,15 +4336,14 @@ public function toHSL(){
 		$l = ($max + $min) / 2;
 		$d = $max - $min;
 
-		if( $max === $min ){
-			$h = $s = 0;
-		} else {
+		$h = $s = 0;
+		if( $max !== $min ){
 			$s = $l > 0.5 ? $d / (2 - $max - $min) : $d / ($max + $min);
 
 			switch ($max) {
 				case $r: $h = ($g - $b) / $d + ($g < $b ? 6 : 0); break;
-				case $g: $h = ($b - $r) / $d + 2;                 break;
-				case $b: $h = ($r - $g) / $d + 4;                 break;
+				case $g: $h = ($b - $r) / $d + 2;				 break;
+				case $b: $h = ($r - $g) / $d + 4;				 break;
 			}
 			$h /= 6;
 		}
@@ -3993,9 +4369,8 @@ function toHSV() {
 			$s = $d / $max;
 		}
 
-		if ($max === $min) {
-			$h = 0;
-		} else {
+		$h = 0;
+		if( $max !== $min ){
 			switch($max){
 				case $r: $h = ($g - $b) / $d + ($g < $b ? 6 : 0); break;
 				case $g: $h = ($b - $r) / $d + 2; break;
@@ -4008,86 +4383,49 @@ function toHSV() {
 
 	public function toARGB(){
 		$argb = array_merge( (array) Less_Parser::round($this->alpha * 255), $this->rgb);
-
-		$temp = '';
-		foreach($argb as $i){
-			$i = Less_Parser::round($i);
-			$i = dechex($i > 255 ? 255 : ($i < 0 ? 0 : $i));
-			$temp .= str_pad($i, 2, '0', STR_PAD_LEFT);
-		}
-		return '#' . $temp;
+		return $this->toHex( $argb );
 	}
 
-    public function compare($x){
+	public function compare($x){
 
 		if( !property_exists( $x, 'rgb' ) ){
 			return -1;
 		}
 
 
-        return ($x->rgb[0] === $this->rgb[0] &&
-            $x->rgb[1] === $this->rgb[1] &&
-            $x->rgb[2] === $this->rgb[2] &&
-            $x->alpha === $this->alpha) ? 0 : -1;
-    }
-
+		return ($x->rgb[0] === $this->rgb[0] &&
+			$x->rgb[1] === $this->rgb[1] &&
+			$x->rgb[2] === $this->rgb[2] &&
+			$x->alpha === $this->alpha) ? 0 : -1;
+	}
 
-	public static function fromKeyword( $keyword ){
+	function toHex( $v ){
 
-		if( Less_Colors::hasOwnProperty($keyword) ){
-			// detect named color
-			return new Less_Tree_Color(substr(Less_Colors::color($keyword), 1));
+		$ret = '#';
+		foreach($v as $c){
+			$c = Less_Functions::clamp( Less_Parser::round($c), 255);
+			if( $c < 16 ){
+				$ret .= '0';
+			}
+			$ret .= dechex($c);
 		}
 
-		if( $keyword === 'transparent' ){
-			$transparent = new Less_Tree_Color( array(0, 0, 0), 0);
-			$transparent->isTransparentKeyword = true;
-			return $transparent;
-		}
+		return $ret;
 	}
 
-}
- 
-
-
-class Less_Tree_Combinator extends Less_Tree{
 
-	public $value;
-	public $type = 'Combinator';
+	/**
+	 * @param string $keyword
+	 */
+	public static function fromKeyword( $keyword ){
 
-	public function __construct($value = null) {
-		if( $value == ' ' ){
-			$this->value = ' ';
-		}else {
-			$this->value = trim($value);
+		if( Less_Colors::hasOwnProperty($keyword) ){
+			// detect named color
+			return new Less_Tree_Color(substr(Less_Colors::color($keyword), 1));
 		}
-	}
-
-	static $_outputMap = array(
-		''  => '',
-		' ' => ' ',
-		':' => ' :',
-		'+' => ' + ',
-		'~' => ' ~ ',
-		'>' => ' > ',
-		'|' => '|'
-	);
 
-	static $_outputMapCompressed = array(
-		''  => '',
-		' ' => ' ',
-		':' => ' :',
-		'+' => '+',
-		'~' => '~',
-		'>' => '>',
-		'|' => '|'
-	);
-
-	function genCSS($env, $output ){
-		if( Less_Environment::$compress ){
-			$output->add( self::$_outputMapCompressed[$this->value] );
-		}else{
-			$output->add( self::$_outputMap[$this->value] );
+		if( $keyword === 'transparent' ){
+			return new Less_Tree_Color( array(0, 0, 0), 0, true);
 		}
 	}
 
@@ -4096,6 +4434,10 @@ function genCSS($env, $output ){
 
 class Less_Tree_Comment extends Less_Tree{
 
+	public $value;
+	public $silent;
+	public $isReferenced;
+	public $currentFileInfo;
 	public $type = 'Comment';
 
 	public function __construct($value, $silent, $index = null, $currentFileInfo = null ){
@@ -4104,20 +4446,23 @@ public function __construct($value, $silent, $index = null, $currentFileInfo = n
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 		//if( $this->debugInfo ){
 			//$output->add( tree.debugInfo($env, $this), $this->currentFileInfo, $this->index);
 		//}
 		$output->add( trim($this->value) );//TODO shouldn't need to trim, we shouldn't grab the \n
 	}
 
-	public function toCSS($env = null){
-		return Less_Environment::$compress ? '' : $this->value;
+	public function toCSS(){
+		return Less_Parser::$options['compress'] ? '' : $this->value;
 	}
 
-	public function isSilent( $env ){
+	public function isSilent(){
 		$isReference = ($this->currentFileInfo && isset($this->currentFileInfo['reference']) && (!isset($this->isReferenced) || !$this->isReferenced) );
-		$isCompressed = Less_Environment::$compress && !preg_match('/^\/\*!/', $this->value);
+		$isCompressed = Less_Parser::$options['compress'] && !preg_match('/^\/\*!/', $this->value);
 		return $this->silent || $isReference || $isCompressed;
 	}
 
@@ -4158,8 +4503,6 @@ public function compile($env) {
 		$a = $this->lvalue->compile($env);
 		$b = $this->rvalue->compile($env);
 
-		$i = $this->index;
-
 		switch( $this->op ){
 			case 'and':
 				$result = $a && $b;
@@ -4175,7 +4518,7 @@ public function compile($env) {
 				}elseif( Less_Parser::is_method($b, 'compare') ){
 					$result = $b->compare($a);
 				}else{
-					throw new Less_Exception_Compiler('Unable to perform comparison', $this->index);
+					throw new Less_Exception_Compiler('Unable to perform comparison', null, $this->index);
 				}
 
 				switch ($result) {
@@ -4200,12 +4543,41 @@ public function compile($env) {
 }
  
 
+class Less_Tree_DefaultFunc{
+
+	static $error_;
+	static $value_;
+
+	static function compile(){
+		if( self::$error_ ){
+			throw Exception(self::$error_);
+		}
+		if( self::$value_ != null ){
+			return self::$value_ ? new Less_Tree_Keyword('true') : new Less_Tree_Keyword('false');
+		}
+	}
+
+	static function value( $v ){
+		self::$value_ = $v;
+	}
+
+	static function error( $e ){
+		self::$error_ = $e;
+	}
+
+	static function reset(){
+		self::$value_ = self::$error_ = null;
+	}
+} 
+
 
 class Less_Tree_Dimension extends Less_Tree{
 
+	public $value;
+	public $unit;
 	public $type = 'Dimension';
 
-    public function __construct($value, $unit = false){
+    public function __construct($value, $unit = null){
         $this->value = floatval($value);
 
 		if( $unit && ($unit instanceof Less_Tree_Unit) ){
@@ -4221,7 +4593,7 @@ function accept( $visitor ){
 		$this->unit = $visitor->visitObj( $this->unit );
 	}
 
-    public function compile($env = null) {
+    public function compile(){
         return $this;
     }
 
@@ -4229,9 +4601,12 @@ public function toColor() {
         return new Less_Tree_Color(array($this->value, $this->value, $this->value));
     }
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 
-		if( ($env && $env->strictUnits) && !$this->unit->isSingular() ){
+		if( Less_Parser::$options['strictUnits'] && !$this->unit->isSingular() ){
 			throw new Less_Exception_Compiler("Multiple units in dimension. Correct the units or use the unit function. Bad unit: ".$this->unit->toString());
 		}
 
@@ -4244,7 +4619,7 @@ public function genCSS( $env, $output ){
 			$strValue = preg_replace('/\.?0+$/','', $strValue);
 		}
 
-		if( Less_Environment::$compress ){
+		if( Less_Parser::$options['compress'] ){
 			// Zero values doesn't need a unit
 			if( $value === 0 && $this->unit->isLength() ){
 				$output->add( $strValue );
@@ -4258,7 +4633,7 @@ public function genCSS( $env, $output ){
 		}
 
 		$output->add( $strValue );
-		$this->unit->genCSS($env, $output);
+		$this->unit->genCSS( $output );
 	}
 
     public function __toString(){
@@ -4268,9 +4643,13 @@ public function __toString(){
     // In an operation between two Dimensions,
     // we default to the first Dimension's unit,
     // so `1px + 2em` will yield `3px`.
-    public function operate($env, $op, $other){
 
-		$value = Less_Functions::operate($env, $op, $this->value, $other->value);
+    /**
+     * @param string $op
+     */
+    public function operate( $op, $other){
+
+		$value = Less_Functions::operate( $op, $this->value, $other->value);
 		$unit = clone $this->unit;
 
 		if( $op === '+' || $op === '-' ){
@@ -4283,11 +4662,11 @@ public function operate($env, $op, $other){
 			}else{
 				$other = $other->convertTo( $this->unit->usedUnits());
 
-				if( $env->strictUnits && $other->unit->toString() !== $unit->toCSS() ){
+				if( Less_Parser::$options['strictUnits'] && $other->unit->toString() !== $unit->toCSS() ){
 					throw new Less_Exception_Compiler("Incompatible units. Change the units or use the unit function. Bad units: '".$unit->toString() . "' and ".$other->unit->toString()+"'.");
 				}
 
-				$value = Less_Functions::operate($env, $op, $this->value, $other->value);
+				$value = Less_Functions::operate( $op, $this->value, $other->value);
 			}
 		}elseif( $op === '*' ){
 			$unit->numerator = array_merge($unit->numerator, $other->unit->numerator);
@@ -4351,8 +4730,7 @@ function convertTo($conversions) {
 			$group = Less_Tree_UnitConversions::${$groupName};
 
 			//numerator
-			$len = count($unit->numerator);
-			for($i=0; $i < $len; $i++ ){
+			foreach($unit->numerator as $i => $atomicUnit){
 				$atomicUnit = $unit->numerator[$i];
 				if( !isset($group[$atomicUnit]) ){
 					continue;
@@ -4364,8 +4742,7 @@ function convertTo($conversions) {
 			}
 
 			//denominator
-			$len = count($unit->denominator);
-			for($i=0; $i < $len; $i++ ){
+			foreach($unit->denominator as $i => $atomicUnit){
 				$atomicUnit = $unit->denominator[$i];
 				if( !isset($group[$atomicUnit]) ){
 					continue;
@@ -4390,6 +4767,8 @@ class Less_Tree_Directive extends Less_Tree{
 	public $value;
 	public $rules;
 	public $index;
+	public $isReferenced;
+	public $currentFileInfo;
 	public $type = 'Directive';
 
 	public function __construct($name, $value = null, $index = null, $currentFileInfo = null ){
@@ -4401,6 +4780,7 @@ public function __construct($name, $value = null, $index = null, $currentFileInf
 		} else {
 			$this->value = $value;
 		}
+		$this->index = $index;
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
@@ -4414,15 +4794,18 @@ function accept( $visitor ){
 		}
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 
 		$output->add( $this->name, $this->currentFileInfo, $this->index );
 
 		if( $this->rules ){
-			Less_Tree::outputRuleset( $env, $output, $this->rules);
+			Less_Tree::outputRuleset( $output, $this->rules);
 		}else{
 			$output->add( ' ' );
-			$this->value->genCSS( $env, $output );
+			$this->value->genCSS( $output );
 			$output->add( ';' );
 		}
 	}
@@ -4439,7 +4822,6 @@ public function compile($env){
 		return $evaldDirective;
 	}
 
-	// TODO: Not sure if this is right...
 	public function variable($name){
 		return $this->rules[0]->variable($name);
 	}
@@ -4453,12 +4835,7 @@ public function find($selector){
 	public function markReferenced(){
 		$this->isReferenced = true;
 		if( $this->rules ){
-			$rules = $this->rules[0]->rules;
-			for( $i = 0; $i < count($rules); $i++ ){
-				if( Less_Parser::is_method( $rules[$i], 'markReferenced') ){
-					$rules[$i]->markReferenced();
-				}
-			}
+			Less_Tree::ReferencedArray($this->rules[0]->rules);
 		}
 	}
 
@@ -4472,16 +4849,15 @@ class Less_Tree_Element extends Less_Tree{
 	public $combinator;
 	public $value = '';
 	public $index;
+	public $currentFileInfo;
 	public $type = 'Element';
 
+	public $value_is_object = false;
+
 	public function __construct($combinator, $value, $index = null, $currentFileInfo = null ){
-		if( ! ($combinator instanceof Less_Tree_Combinator)) {
-			$combinator = new Less_Tree_Combinator($combinator);
-		}
 
-		if( !is_null($value) ){
-			$this->value = $value;
-		}
+		$this->value = $value;
+		$this->value_is_object = is_object($value);
 
 		$this->combinator = $combinator;
 		$this->index = $index;
@@ -4489,35 +4865,45 @@ public function __construct($combinator, $value, $index = null, $currentFileInfo
 	}
 
 	function accept( $visitor ){
-		$this->combinator = $visitor->visitObj( $this->combinator );
-		if( is_object($this->value) ){ //object or string
+		if( $this->value_is_object ){ //object or string
 			$this->value = $visitor->visitObj( $this->value );
 		}
 	}
 
-	public function compile($env) {
-		return new Less_Tree_Element($this->combinator,
-			is_string($this->value) ? $this->value : $this->value->compile($env),
-			$this->index,
-			$this->currentFileInfo
-		);
+	public function compile($env){
+
+		if( Less_Environment::$mixin_stack ){
+			return new Less_Tree_Element($this->combinator, ($this->value_is_object ? $this->value->compile($env) : $this->value), $this->index, $this->currentFileInfo );
+		}
+
+		if( $this->value_is_object ){
+			$this->value = $this->value->compile($env);
+		}
+
+		return $this;
 	}
 
-	public function genCSS( $env, $output ){
-		$output->add( $this->toCSS($env), $this->currentFileInfo, $this->index );
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
+		$output->add( $this->toCSS(), $this->currentFileInfo, $this->index );
 	}
 
-	public function toCSS( $env = null ){
+	public function toCSS(){
 
-		$value = $this->value;
-		if( !is_string($value) ){
-			$value = $value->toCSS($env);
+		if( $this->value_is_object ){
+			$value = $this->value->toCSS();
+		}else{
+			$value = $this->value;
 		}
 
-		if( $value === '' && $this->combinator->value[0] === '&' ){
+
+		if( $value === '' && $this->combinator && $this->combinator === '&' ){
 			return '';
 		}
-		return $this->combinator->toCSS($env) . $value;
+
+		return Less_Environment::$_outputMap[$this->combinator] . $value;
 	}
 
 }
@@ -4530,8 +4916,9 @@ class Less_Tree_Expression extends Less_Tree{
 	public $parensInOp = false;
 	public $type = 'Expression';
 
-	public function __construct($value=null) {
+	public function __construct( $value, $parens = null ){
 		$this->value = $value;
+		$this->parens = $parens;
 	}
 
 	function accept( $visitor ){
@@ -4542,10 +4929,12 @@ public function compile($env) {
 
 		$inParenthesis = $this->parens && !$this->parensInOp;
 		$doubleParen = false;
+
 		if( $inParenthesis ) {
-			$env->inParenthesis();
+			Less_Environment::$parensStack++;
 		}
 
+		$returnValue = null;
 		if( $this->value ){
 
 			$count = count($this->value);
@@ -4575,18 +4964,21 @@ public function compile($env) {
 			$returnValue = $this;
 		}
 		if( $inParenthesis ){
-			$env->outOfParenthesis();
+			Less_Environment::$parensStack--;
 		}
-		if( $this->parens && $this->parensInOp && !$env->isMathOn() && !$doubleParen ){
+		if( $this->parens && $this->parensInOp && !Less_Environment::isMathOn() && !$doubleParen ){
 			$returnValue = new Less_Tree_Paren($returnValue);
 		}
 		return $returnValue;
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 		$val_len = count($this->value);
 		for( $i = 0; $i < $val_len; $i++ ){
-			$this->value[$i]->genCSS( $env, $output );
+			$this->value[$i]->genCSS( $output );
 			if( $i + 1 < $val_len ){
 				$output->add( ' ' );
 			}
@@ -4620,11 +5012,15 @@ class Less_Tree_Extend extends Less_Tree{
 	public $allowAfter;
 	public $firstExtendOnThisSelectorPath;
 	public $type = 'Extend';
+	public $ruleset;
 
 
 	public $object_id;
 	public $parent_ids = array();
 
+	/**
+	 * @param integer $index
+	 */
 	function __construct($selector, $option, $index){
 		static $i = 0;
 		$this->selector = $selector;
@@ -4652,7 +5048,9 @@ function accept( $visitor ){
 
 	function compile( $env ){
 		Less_Parser::$has_extends = true;
-		return new Less_Tree_Extend( $this->selector->compile($env), $this->option, $this->index);
+		$this->selector = $this->selector->compile($env);
+		return $this;
+		//return new Less_Tree_Extend( $this->selector->compile($env), $this->option, $this->index);
 	}
 
 	function findSelfSelectors( $selectors ){
@@ -4663,8 +5061,8 @@ function findSelfSelectors( $selectors ){
 			$selectorElements = $selectors[$i]->elements;
 			// duplicate the logic in genCSS function inside the selector node.
 			// future TODO - move both logics into the selector joiner visitor
-			if( $i && $selectorElements && $selectorElements[0]->combinator->value === "") {
-				$selectorElements[0]->combinator->value = ' ';
+			if( $i && $selectorElements && $selectorElements[0]->combinator === "") {
+				$selectorElements[0]->combinator = ' ';
 			}
 			$selfElements = array_merge( $selfElements, $selectors[$i]->elements );
 		}
@@ -4743,22 +5141,25 @@ function accept($visitor){
 		}
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 		if( $this->css ){
 
 			$output->add( '@import ', $this->currentFileInfo, $this->index );
 
-			$this->path->genCSS( $env, $output );
+			$this->path->genCSS( $output );
 			if( $this->features ){
 				$output->add( ' ' );
-				$this->features->genCSS( $env, $output );
+				$this->features->genCSS( $output );
 			}
 			$output->add( ';' );
 		}
 	}
 
-	function toCSS($env = null){
-		$features = $this->features ? ' ' . $this->features->toCSS($env) : '';
+	function toCSS(){
+		$features = $this->features ? ' ' . $this->features->toCSS() : '';
 
 		if ($this->css) {
 			return "@import " . $this->path->toCSS() . $features . ";\n";
@@ -4767,6 +5168,9 @@ function toCSS($env = null){
 		}
 	}
 
+	/**
+	 * @return string
+	 */
 	function getPath(){
 		if ($this->path instanceof Less_Tree_Quoted) {
 			$path = $this->path->value;
@@ -4800,59 +5204,37 @@ function compilePath($env) {
 			$path->value = Less_Environment::normalizePath($path->value);
 		}
 
+
+
 		return $path;
 	}
 
-	function compile($env) {
+	function compile( $env ){
 
 		$evald = $this->compileForImport($env);
-		$uri = $full_path = false;
 
 		//get path & uri
-		$evald_path = $evald->getPath();
-		if( $evald_path ){
-			foreach(Less_Parser::$import_dirs as $rootpath => $rooturi){
-				if( is_callable($rooturi) ){
-					list($path, $uri) = call_user_func($rooturi, $evald_path);
-					if( null !== $path ){
-						$full_path = $path;
-						break;
-					}
-				}else{
-					$path = $rootpath.$evald_path;
-					if( file_exists($path) ){
-						$full_path = Less_Environment::normalizePath($path);
-						$uri = Less_Environment::normalizePath(dirname($rooturi.$evald_path));
-						break;
-					}
-				}
-			}
+		$path_and_uri = null;
+		if( is_callable(Less_Parser::$options['import_callback']) ){
+			$path_and_uri = call_user_func(Less_Parser::$options['import_callback'],$evald);
 		}
 
-		if( !$full_path ){
-			$uri = $evald_path;
-			$full_path = $evald_path;
+		if( !$path_and_uri ){
+			$path_and_uri = $evald->PathAndUri();
 		}
 
-		//import once
-		$realpath = realpath($full_path);
-
-
-		if( $realpath && Less_Parser::FileParsed($realpath) ){
-			if( isset($this->currentFileInfo['reference']) ){
-				$evald->skip = true;
-			}elseif( !isset($evald->options['multiple']) && !$env->importMultiple ){
-				$evald->skip = true;
-			}
+		if( $path_and_uri ){
+			list($full_path, $uri) = $path_and_uri;
+		}else{
+			$full_path = $uri = $evald->getPath();
 		}
 
-		$features = ( $evald->features ? $evald->features->compile($env) : null );
 
-		if( $evald->skip ){
+		//import once
+		if( $evald->skip( $full_path, $env) ){
 			return array();
 		}
 
-
 		if( $this->options['inline'] ){
 			//todo needs to reference css file not import
 			//$contents = new Less_Tree_Anonymous($this->root, 0, array('filename'=>$this->importedFilename), true );
@@ -4865,14 +5247,78 @@ function compile($env) {
 			}
 
 			return array( $contents );
+		}
+
 
-		}elseif( $evald->css ){
-			$temp = $this->compilePath( $env);
+		// css ?
+		if( $evald->css ){
+			$features = ( $evald->features ? $evald->features->compile($env) : null );
 			return new Less_Tree_Import( $this->compilePath( $env), $features, $this->options, $this->index);
 		}
 
 
-		// options
+		return $this->ParseImport( $full_path, $uri, $env );
+	}
+
+
+	/**
+	 * Using the import directories, get the full absolute path and uri of the import
+	 *
+	 * @param Less_Tree_Import $evald
+	 */
+	function PathAndUri(){
+
+		$evald_path = $this->getPath();
+
+		if( $evald_path ){
+
+			$import_dirs = array();
+
+			if( Less_Environment::isPathRelative($evald_path) ){
+				//if the path is relative, the file should be in the current directory
+				$import_dirs[ $this->currentFileInfo['currentDirectory'] ] = $this->currentFileInfo['uri_root'];
+
+			}else{
+				//otherwise, the file should be relative to the server root
+				$import_dirs[ $this->currentFileInfo['entryPath'] ] = $this->currentFileInfo['entryUri'];
+
+				//if the user supplied entryPath isn't the actual root
+				$import_dirs[ $_SERVER['DOCUMENT_ROOT'] ] = '';
+
+			}
+
+			// always look in user supplied import directories
+			$import_dirs = array_merge( $import_dirs, Less_Parser::$options['import_dirs'] );
+
+
+			foreach( $import_dirs as $rootpath => $rooturi){
+				if( is_callable($rooturi) ){
+					list($path, $uri) = call_user_func($rooturi, $evald_path);
+					if( is_string($path) ){
+						$full_path = $path;
+						return array( $full_path, $uri );
+					}
+				}else{
+					$path = rtrim($rootpath,'/').'/'.ltrim($evald_path,'/');
+
+					if( file_exists($path) ){
+						$full_path = Less_Environment::normalizePath($path);
+						$uri = Less_Environment::normalizePath(dirname($rooturi.$evald_path));
+						return array( $full_path, $uri );
+					}
+				}
+			}
+		}
+	}
+
+
+	/**
+	 * Parse the import url and return the rules
+	 *
+	 * @return Less_Tree_Media|array
+	 */
+	function ParseImport( $full_path, $uri, $env ){
+
 		$import_env = clone $env;
 		if( (isset($this->options['reference']) && $this->options['reference']) || isset($this->currentFileInfo['reference']) ){
 			$import_env->currentFileInfo['reference'] = true;
@@ -4883,14 +5329,35 @@ function compile($env) {
 		}
 
 		$parser = new Less_Parser($import_env);
-		$evald->root = $parser->parseFile($full_path, $uri, true);
+		$root = $parser->parseFile($full_path, $uri, true);
 
 
-		$ruleset = new Less_Tree_Ruleset(array(), $evald->root->rules );
+		$ruleset = new Less_Tree_Ruleset(array(), $root->rules );
 		$ruleset->evalImports($import_env);
 
 		return $this->features ? new Less_Tree_Media($ruleset->rules, $this->features->value) : $ruleset->rules;
 	}
+
+
+	/**
+	 * Should the import be skipped?
+	 *
+	 * @return boolean|null
+	 */
+	private function Skip($path, $env){
+
+		$path = realpath($path);
+
+		if( $path && Less_Parser::FileParsed($path) ){
+
+			if( isset($this->currentFileInfo['reference']) ){
+				return true;
+			}
+
+			return !isset($this->options['multiple']) && !$env->importMultiple;
+		}
+
+	}
 }
 
  
@@ -4898,41 +5365,48 @@ function compile($env) {
 class Less_Tree_Javascript extends Less_Tree{
 
 	public $type = 'Javascript';
+	public $escaped;
+	public $expression;
+	public $index;
 
+	/**
+	 * @param boolean $index
+	 * @param boolean $escaped
+	 */
 	public function __construct($string, $index, $escaped){
 		$this->escaped = $escaped;
 		$this->expression = $string;
 		$this->index = $index;
 	}
 
-	public function compile($env){
-		return $this;
-	}
-
-	function genCSS( $env, $output ){
-		$output->add( '/* Sorry, can not do JavaScript evaluation in PHP... :( */' );
+	public function compile(){
+		return new Less_Tree_Anonymous('/* Sorry, can not do JavaScript evaluation in PHP... :( */');
 	}
 
-	public function toCSS($env = null){
-		return Less_Environment::$compress ? '' : '/* Sorry, can not do JavaScript evaluation in PHP... :( */';
-	}
 }
  
 
 
 class Less_Tree_Keyword extends Less_Tree{
 
+	public $value;
 	public $type = 'Keyword';
 
-	public function __construct($value=null){
+	/**
+	 * @param string $value
+	 */
+	public function __construct($value){
 		$this->value = $value;
 	}
 
-	public function compile($env){
+	public function compile(){
 		return $this;
 	}
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 		$output->add( $this->value );
 	}
 
@@ -4949,7 +5423,10 @@ public function compare($other) {
 class Less_Tree_Media extends Less_Tree{
 
 	public $features;
-	public $ruleset;
+	public $rules;
+	public $index;
+	public $currentFileInfo;
+	public $isReferenced;
 	public $type = 'Media';
 
 	public function __construct($value = array(), $features = array(), $index = null, $currentFileInfo = null ){
@@ -4970,11 +5447,14 @@ function accept( $visitor ){
 		$this->rules = $visitor->visitArray($this->rules);
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 
 		$output->add( '@media ', $this->currentFileInfo, $this->index );
-		$this->features->genCSS( $env, $output );
-		Less_Tree::outputRuleset( $env, $output, $this->rules);
+		$this->features->genCSS( $output );
+		Less_Tree::outputRuleset( $output, $this->rules);
 
 	}
 
@@ -4983,16 +5463,15 @@ public function compile($env) {
 		$media = new Less_Tree_Media(array(), array(), $this->index, $this->currentFileInfo );
 
 		$strictMathBypass = false;
-		if( $env->strictMath === false) {
+		if( Less_Parser::$options['strictMath'] === false) {
 			$strictMathBypass = true;
-			$env->strictMath = true;
+			Less_Parser::$options['strictMath'] = true;
 		}
-		try {
-			$media->features = $this->features->compile($env);
-		}catch(Exception $e){}
+
+		$media->features = $this->features->compile($env);
 
 		if( $strictMathBypass ){
-			$env->strictMath = false;
+			Less_Parser::$options['strictMath'] = false;
 		}
 
 		$env->mediaPath[] = $media;
@@ -5022,11 +5501,7 @@ public function emptySelectors(){
 
 	public function markReferenced(){
 		$this->isReferenced = true;
-		foreach($this->rules[0]->rules as $rule){
-			if( Less_Parser::is_method($rule,'markReferenced') ){
-				$rule->markReferenced();
-			}
-		}
+		Less_Tree::ReferencedArray($this->rules[0]->rules);
 	}
 
 	// evaltop
@@ -5141,15 +5616,14 @@ public function __construct($elements, $args, $index, $currentFileInfo, $importa
 	//}
 
 
-	/**
-	 * less.js: tree.mixin.Call.prototype()
-	 *
-	 */
 	public function compile($env){
 
 		$rules = array();
 		$match = false;
 		$isOneFound = false;
+		$candidates = array();
+		$defaultUsed = false;
+		$conditionResult = array();
 
 		$args = array();
 		foreach($this->arguments as $a){
@@ -5164,94 +5638,149 @@ public function compile($env){
 			}
 
 			$isOneFound = true;
+
+			// To make `default()` function independent of definition order we have two "subpasses" here.
+			// At first we evaluate each guard *twice* (with `default() == true` and `default() == false`),
+			// and build candidate list with corresponding flags. Then, when we know all possible matches,
+			// we make a final decision.
+
 			$mixins_len = count($mixins);
 			for( $m = 0; $m < $mixins_len; $m++ ){
 				$mixin = $mixins[$m];
 
-				$isRecursive = false;
-				foreach($env->frames as $recur_frame){
-					if( !($mixin instanceof Less_Tree_Mixin_Definition) ){
-						if( (isset($recur_frame->originalRuleset) && $mixin->ruleset_id === $recur_frame->originalRuleset)
-							|| ($mixin === $recur_frame) ){
-							$isRecursive = true;
-							break;
-						}
-					}
-				}
-				if( $isRecursive ){
+				if( $this->IsRecursive( $env, $mixin ) ){
 					continue;
 				}
 
-				if ($mixin->matchArgs($args, $env)) {
+				if( $mixin->matchArgs($args, $env) ){
 
-					//if( !($mixin instanceof Less_Tree_Ruleset || $mixin instanceof Less_Tree_Mixin_Definition) || $mixin->matchCondition($args, $env) ){
-					if( !Less_Parser::is_method($mixin,'matchCondition') || $mixin->matchCondition($args, $env) ){
-						try{
+					$candidate = array('mixin' => $mixin);
 
-							if( !($mixin instanceof Less_Tree_Mixin_Definition) ){
-								$mixin = new Less_Tree_Mixin_Definition('', array(), $mixin->rules, null, false);
-								$mixin->originalRuleset = $mixins[$m]->originalRuleset;
+					if( $mixin instanceof Less_Tree_Ruleset ){
+
+						for( $f = 0; $f < 2; $f++ ){
+							Less_Tree_DefaultFunc::value($f);
+							$conditionResult[$f] = $mixin->matchCondition( $args, $env);
+						}
+						if( $conditionResult[0] || $conditionResult[1] ){
+							if( $conditionResult[0] != $conditionResult[1] ){
+								if( $defaultUsed ){
+									// todo: ideally, it would make sense to also print the candidate
+									// mixin definitions that cause the conflict (current one and the
+									// mixin that set defaultUsed flag). But is there any easy method
+									// to get their filename/line/index info here?
+									throw Exception( 'Ambiguous use of `default()` found when matching for `'. $this->format($args) + '`' );
+								}
+
+								$defaultUsed						= true;
+								$candidate['matchIfDefault']		= true;
+								$candidate['matchIfDefaultValue']	= $conditionResult[1];
 							}
-							//if (this.important) {
-							//	isImportant = env.isImportant;
-							//	env.isImportant = true;
-							//}
-
-							$rules = array_merge($rules, $mixin->compile($env, $args, $this->important)->rules);
-							//if (this.important) {
-							//	env.isImportant = isImportant;
-							//}
-						} catch (Exception $e) {
-							//throw new Less_Exception_Compiler($e->getMessage(), $e->index, null, $this->currentFileInfo['filename']);
-							throw new Less_Exception_Compiler($e->getMessage(), null, null, $this->currentFileInfo['filename']);
+
+							$candidates[] = $candidate;
 						}
+					}else{
+						$candidates[] = $candidate;
 					}
+
 					$match = true;
 				}
+			}
 
+			Less_Tree_DefaultFunc::reset();
+
+			$candidates_length = count($candidates);
+			$length_1 = ($candidates_length == 1);
+
+			for( $m = 0; $m < $candidates_length; $m++){
+				$candidate = $candidates[$m];
+				if( !isset($candidate['matchIfDefault']) || (isset($candidate['matchIfDefaultValue']) && ($candidate['matchIfDefaultValue'] == $length_1)) ){
+					try{
+						$mixin = $candidate['mixin'];
+						if( !($mixin instanceof Less_Tree_Mixin_Definition) ){
+							$mixin = new Less_Tree_Mixin_Definition('', array(), $mixin->rules, null, false);
+							$mixin->originalRuleset = $mixins[$m]->originalRuleset;
+						}
+
+						//if (this.important) {
+						//	isImportant = env.isImportant;
+						//	env.isImportant = true;
+						//}
+						$rules = array_merge($rules, $mixin->compile($env, $args, $this->important)->rules);
+						//if (this.important) {
+						//	env.isImportant = isImportant;
+						//}
+					} catch (Exception $e) {
+						//throw new Less_Exception_Compiler($e->getMessage(), $e->index, null, $this->currentFileInfo['filename']);
+						throw new Less_Exception_Compiler($e->getMessage(), null, null, $this->currentFileInfo);
+					}
+				}
 			}
 
 			if( $match ){
 				if( !$this->currentFileInfo || !isset($this->currentFileInfo['reference']) || !$this->currentFileInfo['reference'] ){
-					foreach($rules as $rule){
-						if( Less_Parser::is_method($rule,'markReferenced') ){
-							$rule->markReferenced();
-						}
-					}
+					Less_Tree::ReferencedArray($rules);
 				}
 				return $rules;
 			}
 		}
 
-
 		if( $isOneFound ){
+			throw new Less_Exception_Compiler('No matching definition was found for `'.$this->Format( $args ).'`', null, $this->index, $this->currentFileInfo);
 
-			$message = array();
-			if( $args ){
-				foreach($args as $a){
-					$argValue = '';
-					if( $a['name'] ){
-						$argValue += $a['name']+':';
-					}
-					if( is_object($a['value']) ){
-						$argValue += $a['value']->toCSS();
-					}else{
-						$argValue += '???';
-					}
-					$message[] = $argValue;
+		}else{
+			throw new Less_Exception_Compiler(trim($this->selector->toCSS()) . " is undefined", null, $this->index);
+		}
+
+	}
+
+	/**
+	 * Format the args for use in exception messages
+	 *
+	 */
+	private function Format($args){
+		$message = array();
+		if( $args ){
+			foreach($args as $a){
+				$argValue = '';
+				if( $a['name'] ){
+					$argValue += $a['name']+':';
 				}
+				if( is_object($a['value']) ){
+					$argValue += $a['value']->toCSS();
+				}else{
+					$argValue += '???';
+				}
+				$message[] = $argValue;
 			}
-			$message = implode(', ',$message);
+		}
+		return implode(', ',$message);
+	}
 
 
-			throw new Less_Exception_Compiler('No matching definition was found for `'.
-				trim($this->selector->toCSS($env)) . '(' .$message.')',
-				$this->index, null, $this->currentFileInfo['filename']);
+	/**
+	 * Are we in a recursive mixin call?
+	 *
+	 * @return bool
+	 */
+	private function IsRecursive( $env, $mixin ){
 
-		}else{
-			throw new Less_Exception_Compiler(trim($this->selector->toCSS($env)) . " is undefined", $this->index);
+		foreach($env->frames as $recur_frame){
+			if( !($mixin instanceof Less_Tree_Mixin_Definition) ){
+
+				if( $mixin === $recur_frame ){
+					return true;
+				}
+
+				if( isset($recur_frame->originalRuleset) && $mixin->ruleset_id === $recur_frame->originalRuleset ){
+					return true;
+				}
+			}
 		}
+
+		return false;
 	}
+
 }
 
 
@@ -5305,18 +5834,14 @@ public function __construct($name, $params, $rules, $condition, $variadic = fals
 	//}
 
 
-	public function toCSS($env = null){
+	public function toCSS(){
 		return '';
 	}
 
 	// less.js : /lib/less/tree/mixin.js : tree.mixin.Definition.evalParams
 	public function compileParams($env, $mixinEnv, $args = array() , &$evaldArguments = array() ){
 		$frame = new Less_Tree_Ruleset(null, array());
-		$varargs;
 		$params = $this->params;
-		$val;
-		$name;
-		$isNamedFound;
 
 
 		$mixinEnv = clone $mixinEnv;
@@ -5328,13 +5853,12 @@ public function compileParams($env, $mixinEnv, $args = array() , &$evaldArgument
 			$arg = $args[$i];
 
 			if( $arg && $arg['name'] ){
-				$name = $arg['name'];
 				$isNamedFound = false;
 
 				foreach($params as $j => $param){
-					if( !isset($evaldArguments[$j]) && $name === $params[$j]['name']) {
+					if( !isset($evaldArguments[$j]) && $arg['name'] === $params[$j]['name']) {
 						$evaldArguments[$j] = $arg['value']->compile($env);
-						array_unshift($frame->rules, new Less_Tree_Rule( $name, $arg['value']->compile($env) ) );
+						array_unshift($frame->rules, new Less_Tree_Rule( $arg['name'], $arg['value']->compile($env) ) );
 						$isNamedFound = true;
 						break;
 					}
@@ -5361,7 +5885,6 @@ public function compileParams($env, $mixinEnv, $args = array() , &$evaldArgument
 			}
 
 			if (isset($param['name']) && $param['name']) {
-				$name = $param['name'];
 
 				if( isset($param['variadic']) && $args ){
 					$varargs = array();
@@ -5395,13 +5918,16 @@ public function compileParams($env, $mixinEnv, $args = array() , &$evaldArgument
 			$argIndex++;
 		}
 
-		asort($evaldArguments);
+		ksort($evaldArguments);
 
 		return $frame;
 	}
 
 	// less.js : /lib/less/tree/mixin.js : tree.mixin.Definition.eval
 	public function compile($env, $args = NULL, $important = NULL) {
+
+		Less_Environment::$mixin_stack++;
+
 		$_arguments = array();
 
 		$mixinFrames = array_merge($this->frames, $env->frames);
@@ -5417,9 +5943,7 @@ public function compile($env, $args = NULL, $important = NULL) {
 		array_unshift($frame->rules, new Less_Tree_Rule('@arguments', $ex->compile($env)));
 
 
-		$rules = array_slice($this->rules,0);
-
-		$ruleset = new Less_Tree_Ruleset(null, $rules);
+		$ruleset = new Less_Tree_Ruleset(null, $this->rules);
 		$ruleset->originalRuleset = $this->ruleset_id;
 
 
@@ -5429,6 +5953,9 @@ public function compile($env, $args = NULL, $important = NULL) {
 		if( $important ){
 			$ruleset = $ruleset->makeImportant();
 		}
+
+		Less_Environment::$mixin_stack--;
+
 		return $ruleset;
 	}
 
@@ -5449,11 +5976,7 @@ public function matchCondition($args, $env) {
 			)
 		);
 
-		if( !$this->condition->compile($compile_env) ){
-			return false;
-		}
-
-		return true;
+		return (bool)$this->condition->compile($compile_env);
 	}
 
 	public function matchArgs($args, $env = NULL){
@@ -5488,6 +6011,44 @@ public function matchArgs($args, $env = NULL){
 }
  
 
+/**
+ * A simple css name-value pair
+ * ex: width:100px;
+ *
+ * In bootstrap, there are about 600-1,000 simple name-value pairs (depending on how forgiving the match is) -vs- 6,020 dynamic rules (Less_Tree_Rule)
+ * Using the name-value object can speed up bootstrap compilation slightly, but it breaks color keyword interpretation: color:red -> color:#FF0000;
+ */
+class Less_Tree_NameValue extends Less_Tree{
+
+	public $name;
+	public $value;
+	public $index;
+	public $currentFileInfo;
+	public $type = 'NameValue';
+
+	public function __construct($name, $value = null, $index = null, $currentFileInfo = null ){
+		$this->name = $name;
+		$this->value = $value;
+		$this->index = $index;
+		$this->currentFileInfo = $currentFileInfo;
+	}
+
+	function genCSS( $output ){
+
+		$output->add(
+			$this->name
+			. Less_Environment::$_outputMap[': ']
+			. $this->value
+			. (((Less_Environment::$lastRule && Less_Parser::$options['compress'])) ? "" : ";")
+			, $this->currentFileInfo, $this->index);
+	}
+
+	public function compile ($env){
+		return $this;
+	}
+}
+ 
+
 
 class Less_Tree_Negative extends Less_Tree{
 
@@ -5502,13 +6063,16 @@ function __construct($node){
 	//	$this->value = $visitor->visit($this->value);
 	//}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 		$output->add( '-' );
-		$this->value->genCSS( $env, $output );
+		$this->value->genCSS( $output );
 	}
 
 	function compile($env) {
-		if( $env->isMathOn() ){
+		if( Less_Environment::isMathOn() ){
 			$ret = new Less_Tree_Operation('*', array( new Less_Tree_Dimension(-1), $this->value ) );
 			return $ret->compile($env);
 		}
@@ -5519,8 +6083,14 @@ function compile($env) {
 
 class Less_Tree_Operation extends Less_Tree{
 
+	public $op;
+	public $operands;
+	public $isSpaced;
 	public $type = 'Operation';
 
+	/**
+	 * @param string $op
+	 */
 	public function __construct($op, $operands, $isSpaced = false){
 		$this->op = trim($op);
 		$this->operands = $operands;
@@ -5536,31 +6106,32 @@ public function compile($env){
 		$b = $this->operands[1]->compile($env);
 
 
-		if( $env->isMathOn() ){
+		if( Less_Environment::isMathOn() ){
 
-			if( $a instanceof Less_Tree_Dimension ){
+			if( $a instanceof Less_Tree_Dimension && $b instanceof Less_Tree_Color ){
+				$a = $a->toColor();
 
-				if( $b instanceof Less_Tree_Color ){
-					if ($this->op === '*' || $this->op === '+') {
-						$temp = $b;
-						$b = $a;
-						$a = $temp;
-					} else {
-						throw new Less_Exception_Compiler("Operation on an invalid type");
-					}
-				}
-			}elseif( !($a instanceof Less_Tree_Color) ){
+			}elseif( $b instanceof Less_Tree_Dimension && $a instanceof Less_Tree_Color ){
+				$b = $b->toColor();
+
+			}
+
+			if( !method_exists($a,'operate') ){
 				throw new Less_Exception_Compiler("Operation on an invalid type");
 			}
 
-			return $a->operate($env,$this->op, $b);
-		} else {
-			return new Less_Tree_Operation($this->op, array($a, $b), $this->isSpaced );
+			return $a->operate( $this->op, $b);
 		}
+
+		return new Less_Tree_Operation($this->op, array($a, $b), $this->isSpaced );
 	}
 
-	function genCSS( $env, $output ){
-		$this->operands[0]->genCSS( $env, $output );
+
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
+		$this->operands[0]->genCSS( $output );
 		if( $this->isSpaced ){
 			$output->add( " " );
 		}
@@ -5568,7 +6139,7 @@ function genCSS( $env, $output ){
 		if( $this->isSpaced ){
 			$output->add( ' ' );
 		}
-		$this->operands[1]->genCSS( $env, $output );
+		$this->operands[1]->genCSS( $output );
 	}
 
 }
@@ -5587,9 +6158,12 @@ function accept($visitor){
 		$this->value = $visitor->visitObj($this->value);
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 		$output->add( '(' );
-		$this->value->genCSS( $env, $output );
+		$this->value->genCSS( $output );
 		$output->add( ')' );
 	}
 
@@ -5602,12 +6176,16 @@ public function compile($env) {
 
 
 class Less_Tree_Quoted extends Less_Tree{
+	public $escaped;
 	public $value;
-	public $content;
+	public $quote;
 	public $index;
 	public $currentFileInfo;
 	public $type = 'Quoted';
 
+	/**
+	 * @param string $str
+	 */
 	public function __construct($str, $content = '', $escaped = false, $index = false, $currentFileInfo = null ){
 		$this->escaped = $escaped;
 		$this->value = $content;
@@ -5616,7 +6194,10 @@ public function __construct($str, $content = '', $escaped = false, $index = fals
 		$this->currentFileInfo = $currentFileInfo;
 	}
 
-    public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+    public function genCSS( $output ){
 		if( !$this->escaped ){
 			$output->add( $this->quote, $this->currentFileInfo, $this->index );
         }
@@ -5632,7 +6213,7 @@ public function compile($env){
 		if( preg_match_all('/`([^`]+)`/', $this->value, $matches) ){
 			foreach($matches as $i => $match){
 				$js = new Less_Tree_JavaScript($matches[1], $this->index, true);
-				$js = $js->compile($env)->value;
+				$js = $js->compile()->value;
 				$value = str_replace($matches[0][$i], $js, $value);
 			}
 		}
@@ -5640,8 +6221,8 @@ public function compile($env){
 		if( preg_match_all('/@\{([\w-]+)\}/',$value,$matches) ){
 			foreach($matches[1] as $i => $match){
 				$v = new Less_Tree_Variable('@' . $match, $this->index, $this->currentFileInfo );
-				$v = $v->compile($env,true);
-				$v = ($v instanceof Less_Tree_Quoted) ? $v->value : $v->toCSS($env);
+				$v = $v->compile($env);
+				$v = ($v instanceof Less_Tree_Quoted) ? $v->value : $v->toCSS();
 				$value = str_replace($matches[0][$i], $v, $value);
 			}
 		}
@@ -5680,6 +6261,9 @@ class Less_Tree_Rule extends Less_Tree{
 	public $currentFileInfo;
 	public $type = 'Rule';
 
+	/**
+	 * @param string $important
+	 */
 	public function __construct($name, $value = null, $important = null, $merge = null, $index = null, $currentFileInfo = null,  $inline = false){
 		$this->name = $name;
 		$this->value = ($value instanceof Less_Tree_Value) ? $value : new Less_Tree_Value(array($value));
@@ -5688,48 +6272,62 @@ public function __construct($name, $value = null, $important = null, $merge = nu
 		$this->index = $index;
 		$this->currentFileInfo = $currentFileInfo;
 		$this->inline = $inline;
-		$this->variable = ($name[0] === '@');
+		$this->variable = ( is_string($name) && $name[0] === '@');
 	}
 
 	function accept($visitor) {
 		$this->value = $visitor->visitObj( $this->value );
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 
-		$output->add( $this->name . Less_Environment::$colon_space, $this->currentFileInfo, $this->index);
+		$output->add( $this->name . Less_Environment::$_outputMap[': '], $this->currentFileInfo, $this->index);
 		try{
-			$this->value->genCSS($env, $output);
+			$this->value->genCSS( $output);
 
 		}catch( Exception $e ){
 			$e->index = $this->index;
 			$e->filename = $this->currentFileInfo['filename'];
 			throw $e;
 		}
-		$output->add( $this->important . (($this->inline || ($env->lastRule && Less_Environment::$compress)) ? "" : ";"), $this->currentFileInfo, $this->index);
+		$output->add( $this->important . (($this->inline || (Less_Environment::$lastRule && Less_Parser::$options['compress'])) ? "" : ";"), $this->currentFileInfo, $this->index);
 	}
 
 	public function compile ($env){
 
-		$return = null;
-		$strictMathBypass = false;
-		if( $this->name === "font" && !$env->strictMath ){
-			$strictMathBypass = true;
-			$env->strictMath = true;
+		$name = '';
+		if( is_array($this->name) ){
+
+			foreach($this->name as $v){
+				if( is_object($v) ){
+					$name .= $v->compile($env)->value;
+				}else{
+					$name .= $v;
+				}
+			}
+		}else{
+			$name = $this->name;
 		}
 
-		$return = new Less_Tree_Rule($this->name,
-									$this->value->compile($env),
-									$this->important,
-									$this->merge,
-									$this->index,
-									$this->currentFileInfo,
-									$this->inline);
+		$strictMathBypass = Less_Parser::$options['strictMath'];
+		if( $name === "font" && !Less_Parser::$options['strictMath'] ){
+			Less_Parser::$options['strictMath'] = true;
+		}
 
-		if( $strictMathBypass ){
-			$env->strictMath = false;
+		// missing try ... catch
+		if( Less_Environment::$mixin_stack ){
+			$return = new Less_Tree_Rule($name, $this->value->compile($env), $this->important, $this->merge, $this->index, $this->currentFileInfo, $this->inline);
+		}else{
+			$this->name = $name;
+			$this->value = $this->value->compile($env);
+			$return = $this;
 		}
 
+		Less_Parser::$options['strictMath'] = $strictMathBypass;
+
 		return $return;
 	}
 
@@ -5756,7 +6354,8 @@ class Less_Tree_Ruleset extends Less_Tree{
 	public $paths;
 	public $firstRoot;
 	public $type = 'Ruleset';
-
+	public $multiMedia;
+	public $allExtends;
 
 	var $ruleset_id;
 	var $originalRuleset;
@@ -5792,32 +6391,7 @@ function accept( $visitor ){
 
 	public function compile($env){
 
-		$selectors = array();
-		if( $this->selectors ){
-			foreach($this->selectors as $s){
-				$selectors[] = $s->compile($env);
-			}
-		}
-		$ruleset = new Less_Tree_Ruleset($selectors, $this->rules, $this->strictImports);
-		$rules = array();
-
-		$ruleset->originalRuleset = $this->ruleset_id;
-
-		$ruleset->root = $this->root;
-		$ruleset->firstRoot = $this->firstRoot;
-		$ruleset->allowImports = $this->allowImports;
-
-		// push the current ruleset to the frames stack
-		$env->unshiftFrame($ruleset);
-
-		// currrent selectors
-		array_unshift($env->selectors,$this->selectors);
-
-
-		// Evaluate imports
-		if ($ruleset->root || $ruleset->allowImports || !$ruleset->strictImports) {
-			$ruleset->evalImports($env);
-		}
+		$ruleset = $this->PrepareRuleset($env);
 
 
 		// Store the frames around mixin definitions,
@@ -5825,7 +6399,7 @@ public function compile($env){
 		$ruleset_len = count($ruleset->rules);
 		for( $i = 0; $i < $ruleset_len; $i++ ){
 			if( $ruleset->rules[$i] instanceof Less_Tree_Mixin_Definition ){
-				$ruleset->rules[$i]->frames = array_slice($env->frames,0);
+				$ruleset->rules[$i]->frames = $env->frames;
 			}
 		}
 
@@ -5835,13 +6409,44 @@ public function compile($env){
 		}
 
 		// Evaluate mixin calls.
+		$this->EvalMixinCalls( $ruleset, $env, $ruleset_len );
+
+
+
+		for( $i=0; $i<$ruleset_len; $i++ ){
+			if(! ($ruleset->rules[$i] instanceof Less_Tree_Mixin_Definition) ){
+				$ruleset->rules[$i] = $ruleset->rules[$i]->compile($env);
+			}
+		}
+
+
+		// Pop the stack
+		$env->shiftFrame();
+
+		if ($mediaBlockCount) {
+			$len = count($env->mediaBlocks);
+			for($i = $mediaBlockCount; $i < $len; $i++ ){
+				$env->mediaBlocks[$i]->bubbleSelectors($ruleset->selectors);
+			}
+		}
+
+		return $ruleset;
+	}
+
+	/**
+	 * Compile Less_Tree_Mixin_Call objects
+	 *
+	 * @param Less_Tree_Ruleset $ruleset
+	 * @param integer $ruleset_len
+	 */
+	private function EvalMixinCalls( $ruleset, $env, &$ruleset_len ){
 		for($i=0; $i < $ruleset_len; $i++){
 			$rule = $ruleset->rules[$i];
 			if( $rule instanceof Less_Tree_Mixin_Call ){
-				$rules = $rule->compile($env);
+				$rule = $rule->compile($env);
 
 				$temp = array();
-				foreach($rules as $r){
+				foreach($rule as $r){
 					if( ($r instanceof Less_Tree_Rule) && $r->variable ){
 						// do not pollute the scope if the variable is
 						// already there. consider returning false here
@@ -5860,24 +6465,41 @@ public function compile($env){
 				$ruleset->resetCache();
 			}
 		}
+	}
 
 
-		for( $i=0; $i<$ruleset_len; $i++ ){
-			if(! ($ruleset->rules[$i] instanceof Less_Tree_Mixin_Definition) ){
-				$ruleset->rules[$i] = $ruleset->rules[$i]->compile($env);
+	/**
+	 * Compile the selectors and create a new ruleset object for the compile() method
+	 *
+	 */
+	private function PrepareRuleset($env){
+
+		$selectors = array();
+		if( $this->selectors ){
+			Less_Tree_DefaultFunc::error("it is currently only allowed in parametric mixin guards,");
+
+			foreach($this->selectors as $s){
+				$selectors[] = $s->compile($env);
 			}
+
+			Less_Tree_DefaultFunc::reset();
 		}
 
+		$ruleset = new Less_Tree_Ruleset($selectors, $this->rules, $this->strictImports);
 
-		// Pop the stack
-		$env->shiftFrame();
-		array_shift($env->selectors);
+		$ruleset->originalRuleset = $this->ruleset_id;
 
-		if ($mediaBlockCount) {
-			$len = count($env->mediaBlocks);
-			for($i = $mediaBlockCount; $i < $len; $i++ ){
-				$env->mediaBlocks[$i]->bubbleSelectors($selectors);
-			}
+		$ruleset->root = $this->root;
+		$ruleset->firstRoot = $this->firstRoot;
+		$ruleset->allowImports = $this->allowImports;
+
+		// push the current ruleset to the frames stack
+		$env->unshiftFrame($ruleset);
+
+
+		// Evaluate imports
+		if( $ruleset->root || $ruleset->allowImports ){ //|| !$ruleset->strictImports
+			$ruleset->evalImports($env);
 		}
 
 		return $ruleset;
@@ -5938,22 +6560,20 @@ function resetCache() {
 	}
 
 	public function variables(){
-
-		if( !$this->_variables ){
-			$this->_variables = array();
-			foreach( $this->rules as $r){
-				if ($r instanceof Less_Tree_Rule && $r->variable === true) {
-					$this->_variables[$r->name] = $r;
-				}
+		$this->_variables = array();
+		foreach( $this->rules as $r){
+			if ($r instanceof Less_Tree_Rule && $r->variable === true) {
+				$this->_variables[$r->name] = $r;
 			}
 		}
-
-		return $this->_variables;
 	}
 
 	public function variable($name){
-		$vars = $this->variables();
-		return isset($vars[$name]) ? $vars[$name] : null;
+
+		if( is_null($this->_variables) ){
+			$this->variables();
+		}
+		return isset($this->_variables[$name]) ? $this->_variables[$name] : null;
 	}
 
 	public function find( $selector, $self = null, $env = null){
@@ -5962,7 +6582,7 @@ public function find( $selector, $self = null, $env = null){
 			$self = $this->ruleset_id;
 		}
 
-		$key = $selector->toCSS($env);
+		$key = $selector->toCSS();
 
 		if( !array_key_exists($key, $this->lookups) ){
 			$this->lookups[$key] = array();
@@ -5970,7 +6590,8 @@ public function find( $selector, $self = null, $env = null){
 
 			foreach($this->rules as $rule){
 
-				if( ($rule instanceof Less_Tree_Ruleset) || ($rule instanceof Less_Tree_Mixin_Definition) ){
+				//if( ($rule instanceof Less_Tree_Ruleset) || ($rule instanceof Less_Tree_Mixin_Definition) ){
+				if( $rule instanceof Less_Tree_Ruleset ){
 
 					if( $rule->ruleset_id == $self ){
 						continue;
@@ -5994,21 +6615,29 @@ public function find( $selector, $self = null, $env = null){
 		return $this->lookups[$key];
 	}
 
-	public function genCSS( $env, $output ){
-		$ruleNodes = array();
-		$rulesetNodes = array();
-		$firstRuleset = true;
+
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 
 		if( !$this->root ){
-			$env->tabLevel++;
+			Less_Environment::$tabLevel++;
 		}
 
 		$tabRuleStr = $tabSetStr = '';
-		if( !Less_Environment::$compress && $env->tabLevel ){
-			$tabRuleStr = str_repeat( '  ' , $env->tabLevel );
-			$tabSetStr = str_repeat( '  ' , $env->tabLevel-1 );
+		if( !Less_Parser::$options['compress'] ){
+			if( Less_Environment::$tabLevel ){
+				$tabRuleStr = "\n".str_repeat( '  ' , Less_Environment::$tabLevel );
+				$tabSetStr = "\n".str_repeat( '  ' , Less_Environment::$tabLevel-1 );
+			}else{
+				$tabSetStr = $tabRuleStr = "\n";
+			}
 		}
 
+
+		$ruleNodes = array();
+		$rulesetNodes = array();
 		foreach($this->rules as $rule){
 
 			$class = get_class($rule);
@@ -6032,19 +6661,22 @@ public function genCSS( $env, $output ){
 			}
 			*/
 
-			for( $i = 0,$paths_len = count($this->paths); $i < $paths_len; $i++ ){
+			$paths_len = count($this->paths);
+			for( $i = 0; $i < $paths_len; $i++ ){
 				$path = $this->paths[$i];
-				Less_Environment::$firstSelector = true;
+				$firstSelector = true;
+
 				foreach($path as $p){
-					$p->genCSS($env, $output );
-					Less_Environment::$firstSelector = false;
+					$p->genCSS( $output, $firstSelector );
+					$firstSelector = false;
 				}
+
 				if( $i + 1 < $paths_len ){
-					$output->add( Less_Environment::$compress ? ',' : (",\n" . $tabSetStr) );
+					$output->add( ',' . $tabSetStr );
 				}
 			}
 
-			$output->add( (Less_Environment::$compress ? '{' : " {\n") . $tabRuleStr );
+			$output->add( (Less_Parser::$options['compress'] ? '{' : " {") . $tabRuleStr );
 		}
 
 		// Compile rules and rulesets
@@ -6056,46 +6688,43 @@ public function genCSS( $env, $output ){
 			// @page{ directive ends up with root elements inside it, a mix of rules and rulesets
 			// In this instance we do not know whether it is the last property
 			if( $i + 1 === $ruleNodes_len && (!$this->root || $rulesetNodes_len === 0 || $this->firstRoot ) ){
-				$env->lastRule = true;
+				Less_Environment::$lastRule = true;
 			}
 
-			if( is_object($rule) ){
-				if( method_exists($rule,'genCSS') ){
-					$rule->genCSS( $env, $output );
-				}elseif( property_exists($rule,'value') && $rule->value ){
-					$output->add( (string)$rule->value );
-				}
-			}
+			$rule->genCSS( $output );
 
-			if( !$env->lastRule ){
-				$output->add( Less_Environment::$compress ? '' : ("\n" . $tabRuleStr) );
+			if( !Less_Environment::$lastRule ){
+				$output->add( $tabRuleStr );
 			}else{
-				$env->lastRule = false;
+				Less_Environment::$lastRule = false;
 			}
 		}
 
 		if( !$this->root ){
-			$output->add( (Less_Environment::$compress ? '}' : "\n" . $tabSetStr . '}'));
-			$env->tabLevel--;
+			$output->add( $tabSetStr . '}' );
+			Less_Environment::$tabLevel--;
 		}
 
+		$firstRuleset = true;
+		$space = ($this->root ? $tabRuleStr : $tabSetStr);
 		for( $i = 0; $i < $rulesetNodes_len; $i++ ){
+
 			if( $ruleNodes_len && $firstRuleset ){
-				$output->add( (Less_Environment::$compress ? "" : "\n") . ($this->root ? $tabRuleStr : $tabSetStr) );
-			}
-			if( !$firstRuleset ){
-				$output->add( (Less_Environment::$compress ? "" : "\n") . ($this->root ? $tabRuleStr : $tabSetStr));
+				$output->add( $space );
+			}elseif( !$firstRuleset ){
+				$output->add( $space );
 			}
 			$firstRuleset = false;
-			$rulesetNodes[$i]->genCSS($env, $output);
+			$rulesetNodes[$i]->genCSS( $output);
 		}
 
-		if( !$output && !Less_Environment::$compress && $this->firstRoot ){
+		if( !Less_Parser::$options['compress'] && $this->firstRoot ){
 			$output->add( "\n" );
 		}
 
 	}
 
+
 	function markReferenced(){
 
 		foreach($this->selectors as $selector){
@@ -6279,24 +6908,28 @@ function mergeElementsOnToSelectors( $elements, &$selectors){
 class Less_Tree_Selector extends Less_Tree{
 
 	public $elements;
+	public $condition;
 	public $extendList = array();
 	public $_css;
 	public $index;
 	public $evaldCondition = false;
 	public $type = 'Selector';
 	public $currentFileInfo = array();
+	public $isReferenced;
 
 	public $elements_len = 0;
 
-	public function __construct($elements = null, $extendList=null , $condition = null, $index=null, $currentFileInfo=null, $isReferenced=null ){
-
+	public $_oelements;
+	public $_oelements_len;
 
+	/**
+	 * @param boolean $isReferenced
+	 */
+	public function __construct( $elements, $extendList = array() , $condition = null, $index=null, $currentFileInfo=null, $isReferenced=null ){
 
 		$this->elements = $elements;
 		$this->elements_len = count($elements);
-		if( $extendList ){
-			$this->extendList = $extendList;
-		}
+		$this->extendList = $extendList;
 		$this->condition = $condition;
 		if( $currentFileInfo ){
 			$this->currentFileInfo = $currentFileInfo;
@@ -6316,45 +6949,97 @@ function accept($visitor) {
 	}
 
 	function createDerived( $elements, $extendList = null, $evaldCondition = null ){
-		$evaldCondition = $evaldCondition != null ? $evaldCondition : $this->evaldCondition;
 		$newSelector = new Less_Tree_Selector( $elements, ($extendList ? $extendList : $this->extendList), $this->condition, $this->index, $this->currentFileInfo, $this->isReferenced);
-		$newSelector->evaldCondition = $evaldCondition;
+		$newSelector->evaldCondition = $evaldCondition ? $evaldCondition : $this->evaldCondition;
 		return $newSelector;
 	}
 
-	public function match($other) {
-		global $debug;
+	/*
+	public function match_old( $other ){
+		$elements = $this->elements;
+		$len = count($elements();
+
+		foreach(
+
+		$oelements = $other->elements.map( function(v) {
+			return v.combinator.value + (v.value.value || v.value);
+		}).join("").match('#[,&\#\.\w-]([\w-]|(\\.))*#');
+		// ^ regexp could be more simple but see test/less/css-escapes.less:17, doh!
 
-		if( !$other ){
+		if (!oelements) {
 			return 0;
 		}
 
-		$offset = 0;
-		$olen = $other->elements_len;
-		if( $olen ){
-			if( $other->elements[0]->value === "&" ){
-				$offset = 1;
-			}
-			$olen -= $offset;
+		if (oelements[0] === "&") {
+			oelements.shift();
 		}
 
-		if( $olen === 0 ){
+		olen = oelements.length;
+		if (olen === 0 || len < olen) {
 			return 0;
+		} else {
+			for (i = 0; i < olen; i++) {
+				if (elements[i].value !== oelements[i]) {
+					return 0;
+				}
+			}
 		}
+		return olen; // return number of matched elements
+	}
+	*/
 
-		if( $this->elements_len < $olen ){
+	// Performance issues with 1.6.1
+	// Compiling bootstrap almost doubled: from 4.5 seconds to 7.8 seconds
+	public function match( $other ){
+
+		if( is_null($other->_oelements) ){
+			$other->CacheElements();
+		}
+		if( !$other->_oelements || ($this->elements_len < $other->_oelements_len) ){
 			return 0;
 		}
 
-		for ($i = 0; $i < $olen; $i ++) {
-			if ($this->elements[$i]->value !== $other->elements[$i + $offset]->value) {
+		for( $i = 0; $i < $other->_oelements_len; $i++ ){
+			if( $this->elements[$i]->value !== $other->_oelements[$i]) {
 				return 0;
 			}
 		}
 
-		return $olen; // return number of matched selectors
+		return $other->_oelements_len; // return number of matched elements
+	}
+
+
+	public function CacheElements(){
+
+		$this->_oelements = array();
+		$css = '';
+
+		foreach($this->elements as $v){
+
+			$css .= $v->combinator;
+			if( !$v->value_is_object ){
+				$css .= $v->value;
+				continue;
+			}
+
+			if( !property_exists($v->value,'value') || !is_string($v->value->value) ){
+				return;
+			}
+			$css .= $v->value->value;
+		}
+
+		$this->_oelements_len = preg_match_all('/[,&#\.\w-](?:[\w-]|(?:\\\\.))*/', $css, $matches);
+		if( $this->_oelements_len ){
+			$this->_oelements = $matches[0];
+
+			if( $this->_oelements[0] === '&' ){
+				array_shift($this->_oelements);
+				$this->_oelements_len--;
+			}
+		}
 	}
 
+
 	public function compile($env) {
 
 		$elements = array();
@@ -6375,16 +7060,18 @@ public function compile($env) {
 		return $this->createDerived( $elements, $extendList, $evaldCondition );
 	}
 
-	function genCSS( $env, $output ){
 
-		if( !Less_Environment::$firstSelector && $this->elements[0]->combinator->value === "" ){
-			$output->add( ' ', $this->currentFileInfo, $this->index );
+	/**
+	 * @see Less_Tree::genCSS
+	 */
+	function genCSS( $output, $firstSelector = false ){
+
+		if( !$firstSelector && $this->elements[0]->combinator === "" ){
+			$output->add(' ', $this->currentFileInfo, $this->index);
 		}
-		if( !$this->_css ){
-			//TODO caching? speed comparison?
-			foreach($this->elements as $element){
-				$element->genCSS( $env, $output );
-			}
+
+		foreach($this->elements as $element){
+			$element->genCSS( $output );
 		}
 	}
 
@@ -6406,17 +7093,21 @@ function getIsOutput(){
 
 class Less_Tree_UnicodeDescriptor extends Less_Tree{
 
+	public $value;
 	public $type = 'UnicodeDescriptor';
 
 	public function __construct($value){
 		$this->value = $value;
 	}
 
-	public function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	public function genCSS( $output ){
 		$output->add( $this->value );
 	}
 
-	public function compile($env){
+	public function compile(){
 		return $this;
 	}
 }
@@ -6428,6 +7119,7 @@ class Less_Tree_Unit extends Less_Tree{
 
 	var $numerator = array();
 	var $denominator = array();
+	public $backupUnit;
 	public $type = 'Unit';
 
 	function __construct($numerator = array(), $denominator = array(), $backupUnit = null ){
@@ -6439,13 +7131,16 @@ function __construct($numerator = array(), $denominator = array(), $backupUnit =
 	function __clone(){
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 
 		if( $this->numerator ){
 			$output->add( $this->numerator[0] );
 		}elseif( $this->denominator ){
 			$output->add( $this->denominator[0] );
-		}elseif( (!$env || !$env->strictUnits) && $this->backupUnit ){
+		}elseif( !Less_Parser::$options['strictUnits'] && $this->backupUnit ){
 			$output->add( $this->backupUnit );
 			return ;
 		}
@@ -6459,6 +7154,9 @@ function toString(){
 		return $returnStr;
 	}
 
+	/**
+	 * @param Less_Tree_Unit $other
+	 */
 	function compare($other) {
 		return $this->is( $other->toString() ) ? 0 : -1;
 	}
@@ -6556,9 +7254,9 @@ function cancel(){
 
 class Less_Tree_UnitConversions{
 
-	static $groups = array('length','duration','angle');
+	public static $groups = array('length','duration','angle');
 
-	static $length = array(
+	public static $length = array(
 		'm'=> 1,
 		'cm'=> 0.01,
 		'mm'=> 0.001,
@@ -6567,12 +7265,12 @@ class Less_Tree_UnitConversions{
 		'pc'=> 0.004233333, //0.0254 / 72 * 12
 		);
 
-	static $duration = array(
+	public static $duration = array(
 		's'=> 1,
 		'ms'=> 0.001
 		);
 
-	static $angle = array(
+	public static $angle = array(
 		'rad' => 0.1591549430919,	// 1/(2*M_PI),
 		'deg' => 0.002777778, 		// 1/360,
 		'grad'=> 0.0025,			// 1/400,
@@ -6587,43 +7285,52 @@ class Less_Tree_Url extends Less_Tree{
 	public $attrs;
 	public $value;
 	public $currentFileInfo;
+	public $isEvald;
 	public $type = 'Url';
 
-	public function __construct($value, $currentFileInfo = null){
+	public function __construct($value, $currentFileInfo = null, $isEvald = null){
 		$this->value = $value;
 		$this->currentFileInfo = $currentFileInfo;
+		$this->isEvald = $isEvald;
 	}
 
 	function accept( $visitor ){
 		$this->value = $visitor->visitObj($this->value);
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 		$output->add( 'url(' );
-		$this->value->genCSS( $env, $output );
+		$this->value->genCSS( $output );
 		$output->add( ')' );
 	}
 
+	/**
+	 * @param Less_Functions $ctx
+	 */
 	public function compile($ctx){
 		$val = $this->value->compile($ctx);
 
-		// Add the base path if the URL is relative
-		if( property_exists($ctx,'relativeUrls')
-			&& $ctx->relativeUrls
-			&& $this->currentFileInfo
-			&& is_string($val->value)
-			&& Less_Environment::isPathRelative($val->value)
-		){
-			$rootpath = $this->currentFileInfo['uri_root'];
-			if ( !$val->quote ){
-				$rootpath = preg_replace('/[\(\)\'"\s]/', '\\$1', $rootpath );
+		if( !$this->isEvald ){
+			// Add the base path if the URL is relative
+			if( Less_Parser::$options['relativeUrls']
+				&& $this->currentFileInfo
+				&& is_string($val->value)
+				&& Less_Environment::isPathRelative($val->value)
+			){
+				$rootpath = $this->currentFileInfo['uri_root'];
+				if ( !$val->quote ){
+					$rootpath = preg_replace('/[\(\)\'"\s]/', '\\$1', $rootpath );
+				}
+				$val->value = $rootpath . $val->value;
 			}
-			$val->value = $rootpath . $val->value;
-		}
 
-		$val->value = Less_Environment::normalizePath( $val->value);
+			$val->value = Less_Environment::normalizePath( $val->value);
+		}
 
-		return new Less_Tree_URL($val, null);
+		return new Less_Tree_URL($val, $this->currentFileInfo, true);
 	}
 
 }
@@ -6633,8 +7340,9 @@ public function compile($ctx){
 class Less_Tree_Value extends Less_Tree{
 
 	public $type = 'Value';
+	public $value;
 
-	public function __construct($value=null){
+	public function __construct($value){
 		$this->value = $value;
 	}
 
@@ -6645,6 +7353,7 @@ function accept($visitor) {
 	public function compile($env){
 
 		$ret = array();
+		$i = 0;
 		foreach($this->value as $i => $v){
 			$ret[] = $v->compile($env);
 		}
@@ -6654,12 +7363,15 @@ public function compile($env){
 		return $ret[0];
 	}
 
-	function genCSS( $env, $output ){
+    /**
+     * @see Less_Tree::genCSS
+     */
+	function genCSS( $output ){
 		$len = count($this->value);
 		for($i = 0; $i < $len; $i++ ){
-			$this->value[$i]->genCSS( $env, $output);
+			$this->value[$i]->genCSS( $output );
 			if( $i+1 < $len ){
-				$output->add( Less_Environment::$comma_space );
+				$output->add( Less_Environment::$_outputMap[','] );
 			}
 		}
 	}
@@ -6676,6 +7388,9 @@ class Less_Tree_Variable extends Less_Tree{
 	public $evaluating = false;
 	public $type = 'Variable';
 
+    /**
+     * @param string $name
+     */
     public function __construct($name, $index, $currentFileInfo = null) {
         $this->name = $name;
         $this->index = $index;
@@ -6683,19 +7398,20 @@ public function __construct($name, $index, $currentFileInfo = null) {
     }
 
 	public function compile($env) {
-		$name = $this->name;
-		if (strpos($name, '@@') === 0) {
-			$v = new Less_Tree_Variable(substr($name, 1), $this->index + 1);
+
+		if( $this->name[1] === '@' ){
+			$v = new Less_Tree_Variable(substr($this->name, 1), $this->index + 1);
 			$name = '@' . $v->compile($env)->value;
+		}else{
+			$name = $this->name;
 		}
 
 		if ($this->evaluating) {
-			throw new Less_Exception_Compiler("Recursive variable definition for " . $name, $this->index, null, $this->currentFileInfo['filename']);
+			throw new Less_Exception_Compiler("Recursive variable definition for " . $name, null, $this->index, $this->currentFileInfo);
 		}
 
 		$this->evaluating = true;
 
-
 		foreach($env->frames as $frame){
 			if( $v = $frame->variable($name) ){
 				$this->evaluating = false;
@@ -6703,7 +7419,7 @@ public function compile($env) {
 			}
 		}
 
-		throw new Less_Exception_Compiler("variable " . $name . " is undefined", $this->index, null);
+		throw new Less_Exception_Compiler("variable " . $name . " is undefined", null, $this->index );
 	}
 
 }
@@ -6722,6 +7438,9 @@ function __construct(){
 		parent::__construct();
 	}
 
+	/**
+	 * @param Less_Tree_Ruleset $root
+	 */
 	function run($root){
 		$root = $this->visitObj($root);
 		$root->allExtends =& $this->allExtendsStack[0];
@@ -6800,7 +7519,7 @@ function visitMedia( $mediaNode ){
 		$this->allExtendsStack[] =& $mediaNode->allExtends;
 	}
 
-	function visitMediaOut( $mediaNode ){
+	function visitMediaOut(){
 		array_pop($this->allExtendsStack);
 	}
 
@@ -6809,7 +7528,7 @@ function visitDirective( $directiveNode ){
 		$this->allExtendsStack[] =& $directiveNode->allExtends;
 	}
 
-	function visitDirectiveOut( $directiveNode ){
+	function visitDirectiveOut(){
 		array_pop($this->allExtendsStack);
 	}
 }
@@ -6824,22 +7543,15 @@ class Less_Visitor_import extends Less_VisitorReplacing{
 	public $_importer;
 	public $importCount;
 
-	function __construct( $importer = null, $evalEnv = null ){
-		$this->_visitor = new Less_Visitor($this);
-		$this->_importer = $importer;
-		if( $evalEnv ){
-			$this->env = $evalEnv;
-		}else{
-			$this->env = new Less_Environment();
-		}
+	function __construct( $evalEnv ){
+		$this->env = $evalEnv;
 		$this->importCount = 0;
+		parent::__construct();
 	}
 
 
 	function run( $root ){
-		// process the contents
-		$this->_visitor->visitObj($root);
-
+		$root = $this->visitObj($root);
 		$this->isFinished = true;
 
 		//if( $this->importCount === 0) {
@@ -6847,28 +7559,77 @@ function run( $root ){
 		//}
 	}
 
-	function visitImport($importNode, &$visitArgs ){
+	function visitImport($importNode, &$visitDeeper ){
 		$importVisitor = $this;
+		$inlineCSS = $importNode->options['inline'];
 
-		$visitArgs['visitDeeper'] = false;
+		if( !$importNode->css || $inlineCSS ){
+			$evaldImportNode = $importNode->compileForImport($this->env);
 
-		if( $importNode->css ){
-			return $importNode;
-		}
+			if( $evaldImportNode && (!$evaldImportNode->css || $inlineCSS) ){
+				$importNode = $evaldImportNode;
+				$this->importCount++;
+				$env = clone $this->env;
 
-		$evaldImportNode = $importNode->compileForImport($this->env);
+				if( (isset($importNode->options['multiple']) && $importNode->options['multiple']) ){
+					$env->importMultiple = true;
+				}
+
+				//get path & uri
+				$path_and_uri = null;
+				if( is_callable(Less_Parser::$options['import_callback']) ){
+					$path_and_uri = call_user_func(Less_Parser::$options['import_callback'],$importNode);
+				}
+
+				if( !$path_and_uri ){
+					$path_and_uri = $importNode->PathAndUri();
+				}
+
+				if( $path_and_uri ){
+					list($full_path, $uri) = $path_and_uri;
+				}else{
+					$full_path = $uri = $importNode->getPath();
+				}
+
+
+				//import once
+				if( $importNode->skip( $full_path, $env) ){
+					return array();
+				}
+
+				if( $importNode->options['inline'] ){
+					//todo needs to reference css file not import
+					//$contents = new Less_Tree_Anonymous($importNode->root, 0, array('filename'=>$importNode->importedFilename), true );
+
+					Less_Parser::AddParsedFile($full_path);
+					$contents = new Less_Tree_Anonymous( file_get_contents($full_path), 0, array(), true );
+
+					if( $importNode->features ){
+						return new Less_Tree_Media( array($contents), $importNode->features->value );
+					}
+
+					return array( $contents );
+				}
+
+
+				// css ?
+				if( $importNode->css ){
+					$features = ( $importNode->features ? $importNode->features->compile($env) : null );
+					return new Less_Tree_Import( $importNode->compilePath( $env), $features, $importNode->options, $this->index);
+				}
+
+				return $importNode->ParseImport( $full_path, $uri, $env );
+			}
 
-		if( $evaldImportNode && !$evaldImportNode->css ){
-			$importNode = $evaldImportNode;
-			$this->importCount++;
 		}
 
+		$visitDeeper = false;
 		return $importNode;
 	}
 
 
-	function visitRule( $ruleNode, &$visitArgs ){
-		$visitArgs['visitDeeper'] = false;
+	function visitRule( $ruleNode, &$visitDeeper ){
+		$visitDeeper = false;
 		return $ruleNode;
 	}
 
@@ -6909,12 +7670,18 @@ function visitMediaOut($mediaNode) {
 	}
 
 }
-*/ 
+*/
+
+
+ 
 
 class Less_Visitor_joinSelector extends Less_Visitor{
 
 	public $contexts = array( array() );
 
+	/**
+	 * @param Less_Tree_Ruleset $root
+	 */
 	function run( $root ){
 		return $this->visitObj($root);
 	}
@@ -6943,7 +7710,7 @@ function visitRuleset( $rulesetNode ){
 			}
 
 			if( !count($selectors) ){
-				$rulesetNode->selectors = $selectors = null;
+				$rulesetNode->selectors = null;
 				$rulesetNode->rules = null;
 			}else{
 				$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
@@ -6956,14 +7723,14 @@ function visitRuleset( $rulesetNode ){
 		$this->contexts[] = $paths; //different from less.js. Placed after joinSelectors() so that $this->contexts will get correct $paths
 	}
 
-	function visitRulesetOut( $rulesetNode ){
+	function visitRulesetOut(){
 		array_pop($this->contexts);
 	}
 
 	function visitMedia($mediaNode) {
 		$context = end($this->contexts); //$context = $this->contexts[ count($this->contexts) - 1];
 
-		if( !count($context) || (is_object($context[0]) && @$context[0]->multiMedia) ){
+		if( !count($context) || (is_object($context[0]) && $context[0]->multiMedia) ){
 			$mediaNode->rules[0]->root = true;
 		}
 	}
@@ -6977,7 +7744,10 @@ class Less_Visitor_processExtends extends Less_Visitor{
 
 	public $allExtendsStack;
 
-	function run( $root ){
+	/**
+	 * @param Less_Tree_Ruleset $root
+	 */
+	public function run( $root ){
 		$extendFinder = new Less_Visitor_extendFinder();
 		$extendFinder->run( $root );
 		if( !$extendFinder->foundExtends) { return $root; }
@@ -6990,7 +7760,7 @@ function run( $root ){
 		return $this->visitObj( $root );
 	}
 
-	function doExtendChaining( $extendsList, $extendsListTarget, $iterationCount = 0){
+	private function doExtendChaining( $extendsList, $extendsListTarget, $iterationCount = 0){
 		//
 		// chaining is different from normal extension.. if we extend an extend then we are not just copying, altering and pasting
 		// the selector we would do normally, but we are also adding an extend with the same target selector
@@ -7065,12 +7835,15 @@ function doExtendChaining( $extendsList, $extendsListTarget, $iterationCount = 0
 			// try to detect circular references to stop a stack overflow.
 			// may no longer be needed.			$this->extendChainCount++;
 			if( $iterationCount > 100) {
-				$selectorOne = "{unable to calculate}";
-				$selectorTwo = "{unable to calculate}";
+
 				try{
 					$selectorOne = $extendsToAdd[0]->selfSelectors[0]->toCSS();
 					$selectorTwo = $extendsToAdd[0]->selector->toCSS();
-				}catch(Exception $e){}
+				}catch(Exception $e){
+					$selectorOne = "{unable to calculate}";
+					$selectorTwo = "{unable to calculate}";
+				}
+
 				throw new Less_Exception_Parser("extend circular reference detected. One of the circular extends is currently:"+$selectorOne+":extend(" + $selectorTwo+")");
 			}
 
@@ -7082,50 +7855,64 @@ function doExtendChaining( $extendsList, $extendsListTarget, $iterationCount = 0
 	}
 
 
-	function visitRule( $ruleNode, &$visitDeeper ){
+	protected function visitRule( $ruleNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-	function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
+	protected function visitMixinDefinition( $mixinDefinitionNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-	function visitSelector( $selectorNode, &$visitDeeper ){
+	protected function visitSelector( $selectorNode, &$visitDeeper ){
 		$visitDeeper = false;
 	}
 
-	function visitRuleset($rulesetNode){
+	protected function visitRuleset($rulesetNode){
 
 
 		if( $rulesetNode->root ){
 			return;
 		}
 
-		$allExtends = end($this->allExtendsStack);
+		$allExtends	= end($this->allExtendsStack);
 		$paths_len = count($rulesetNode->paths);
+		$all_extend_len = count($allExtends);
 
 		// look at each selector path in the ruleset, find any extend matches and then copy, find and replace
-		for( $extendIndex = 0, $all_extend_len = count($allExtends); $extendIndex < $all_extend_len; $extendIndex++ ){
+		for( $extendIndex = 0; $extendIndex < $all_extend_len; $extendIndex++ ){
 			for($pathIndex = 0; $pathIndex < $paths_len; $pathIndex++ ){
 
-				$selectorPath = $rulesetNode->paths[$pathIndex];
-
 				// extending extends happens initially, before the main pass
-				if( isset($rulesetNode->extendOnEveryPath) && $rulesetNode->extendOnEveryPath ){ continue; }
-				if( end($selectorPath)->extendList ){ continue; }
+				if( isset($rulesetNode->extendOnEveryPath) && $rulesetNode->extendOnEveryPath ){
+					continue;
+				}
 
-				$matches = $this->findMatch($allExtends[$extendIndex], $selectorPath);
+				$selectorPath = $rulesetNode->paths[$pathIndex];
 
-				if( $matches ){
-					foreach($allExtends[$extendIndex]->selfSelectors as $selfSelector ){
-						$rulesetNode->paths[] = $this->extendSelector($matches, $selectorPath, $selfSelector);
-					}
+				if( end($selectorPath)->extendList ){
+					continue;
 				}
+
+				$this->ExtendMatch( $rulesetNode, $allExtends[$extendIndex], $selectorPath);
+
+			}
+		}
+	}
+
+
+	private function ExtendMatch( $rulesetNode, $extend, $selectorPath ){
+		$matches = $this->findMatch($extend, $selectorPath);
+
+		if( $matches ){
+			foreach($extend->selfSelectors as $selfSelector ){
+				$rulesetNode->paths[] = $this->extendSelector($matches, $selectorPath, $selfSelector);
 			}
 		}
 	}
 
-	function findMatch($extend, $haystackSelectorPath ){
+
+
+	private function findMatch($extend, $haystackSelectorPath ){
 
 		//
 		// look through the haystack selector path to try and find the needle - extend.selector
@@ -7138,10 +7925,12 @@ function findMatch($extend, $haystackSelectorPath ){
 		$matches = array();
 
 		// loop through the haystack elements
-		for($haystackSelectorIndex = 0, $haystack_path_len = count($haystackSelectorPath); $haystackSelectorIndex < $haystack_path_len; $haystackSelectorIndex++ ){
+		$haystack_path_len = count($haystackSelectorPath);
+		for($haystackSelectorIndex = 0; $haystackSelectorIndex < $haystack_path_len; $haystackSelectorIndex++ ){
 			$hackstackSelector = $haystackSelectorPath[$haystackSelectorIndex];
 
-			for($hackstackElementIndex = 0, $haystack_elements_len = count($hackstackSelector->elements); $hackstackElementIndex < $haystack_elements_len; $hackstackElementIndex++ ){
+			$haystack_elements_len = count($hackstackSelector->elements);
+			for($hackstackElementIndex = 0; $hackstackElementIndex < $haystack_elements_len; $hackstackElementIndex++ ){
 
 				$haystackElement = $hackstackSelector->elements[$hackstackElementIndex];
 
@@ -7152,34 +7941,20 @@ function findMatch($extend, $haystackSelectorPath ){
 				}
 
 				for($i = 0; $i < $potentialMatches_len; $i++ ){
-					$potentialMatch = &$potentialMatches[$i];
 
-					// selectors add " " onto the first element. When we use & it joins the selectors together, but if we don't
-					// then each selector in haystackSelectorPath has a space before it added in the toCSS phase. so we need to work out
-					// what the resulting combinator will be
-					$targetCombinator = $haystackElement->combinator->value;
-					if( $targetCombinator === '' && $hackstackElementIndex === 0 ){
-						$targetCombinator = ' ';
-					}
+					$potentialMatch = &$potentialMatches[$i];
+					$potentialMatch = $this->PotentialMatch( $potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex );
 
-					// if we don't match, null our match to indicate failure
-					if( !$this->isElementValuesEqual( $needleElements[$potentialMatch['matched'] ]->value, $haystackElement->value) ||
-						($potentialMatch['matched'] > 0 && $needleElements[ $potentialMatch['matched'] ]->combinator->value !== $targetCombinator) ){
-						$potentialMatch = null;
-					} else {
-						$potentialMatch['matched']++;
-					}
 
 					// if we are still valid and have finished, test whether we have elements after and whether these are allowed
-					if( $potentialMatch ){
-
-						$potentialMatch['finished'] = ($potentialMatch['matched'] === $extend->selector->elements_len );
+					if( $potentialMatch && $potentialMatch['matched'] === $extend->selector->elements_len ){
+						$potentialMatch['finished'] = true;
 
-						if( $potentialMatch['finished'] &&
-							(!$extend->allowAfter && ($hackstackElementIndex+1 < $haystack_elements_len || $haystackSelectorIndex+1 < $haystack_path_len)) ){
+						if( !$extend->allowAfter && ($hackstackElementIndex+1 < $haystack_elements_len || $haystackSelectorIndex+1 < $haystack_path_len) ){
 							$potentialMatch = null;
 						}
 					}
+
 					// if null we remove, if not, we are still valid, so either push as a valid match or continue
 					if( $potentialMatch ){
 						if( $potentialMatch['finished'] ){
@@ -7190,66 +7965,122 @@ function findMatch($extend, $haystackSelectorPath ){
 							$potentialMatches_len = 0;
 							$matches[] = $potentialMatch;
 						}
-					} else {
-						array_splice($potentialMatches, $i, 1);
-						$potentialMatches_len--;
-						$i--;
+						continue;
 					}
+
+					array_splice($potentialMatches, $i, 1);
+					$potentialMatches_len--;
+					$i--;
 				}
 			}
 		}
 		return $matches;
 	}
 
-	function isElementValuesEqual( $elementValue1, $elementValue2 ){
+
+	/**
+	 * @param integer $hackstackElementIndex
+	 */
+	private function PotentialMatch( $potentialMatch, $needleElements, $haystackElement, $hackstackElementIndex ){
+
+		// selectors add " " onto the first element. When we use & it joins the selectors together, but if we don't
+		// then each selector in haystackSelectorPath has a space before it added in the toCSS phase. so we need to work out
+		// what the resulting combinator will be
+		$targetCombinator = $haystackElement->combinator;
+		if( $targetCombinator === '' && $hackstackElementIndex === 0 ){
+			$targetCombinator = ' ';
+		}
+
+		if( $potentialMatch['matched'] > 0 && $needleElements[ $potentialMatch['matched'] ]->combinator !== $targetCombinator ){
+			return null;
+		}
+
+		// if we don't match, null our match to indicate failure
+		if( !$this->isElementValuesEqual( $needleElements[$potentialMatch['matched'] ]->value, $haystackElement->value) ){
+			return null;
+		}
+
+		$potentialMatch['finished'] = false;
+		$potentialMatch['matched']++;
+
+		return $potentialMatch;
+	}
+
+
+	private function isElementValuesEqual( $elementValue1, $elementValue2 ){
 
 		if( $elementValue1 === $elementValue2 ){
 			return true;
 		}
+
 		if( is_string($elementValue1) || is_string($elementValue2) ) {
 			return false;
 		}
 
 		if( $elementValue1 instanceof Less_Tree_Attribute ){
+			return $this->isAttributeValuesEqual( $elementValue1, $elementValue2 );
+		}
 
-			if( $elementValue1->op !== $elementValue2->op || $elementValue1->key !== $elementValue2->key ){
-				return false;
-			}
+		$elementValue1 = $elementValue1->value;
+		if( $elementValue1 instanceof Less_Tree_Selector ){
+			return $this->isSelectorValuesEqual( $elementValue1, $elementValue2 );
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * @param Less_Tree_Selector $elementValue1
+	 */
+	private function isSelectorValuesEqual( $elementValue1, $elementValue2 ){
+
+		$elementValue2 = $elementValue2->value;
+		if( !($elementValue2 instanceof Less_Tree_Selector) || $elementValue1->elements_len !== $elementValue2->elements_len ){
+			return false;
+		}
 
-			if( !$elementValue1->value || !$elementValue2->value ){
-				if( $elementValue1->value || $elementValue2->value ) {
+		for( $i = 0; $i < $elementValue1->elements_len; $i++ ){
+
+			if( $elementValue1->elements[$i]->combinator !== $elementValue2->elements[$i]->combinator ){
+				if( $i !== 0 || ($elementValue1->elements[$i]->combinator || ' ') !== ($elementValue2->elements[$i]->combinator || ' ') ){
 					return false;
 				}
-				return true;
 			}
-			$elementValue1 = ($elementValue1->value->value ? $elementValue1->value->value : $elementValue1->value );
-			$elementValue2 = ($elementValue2->value->value ? $elementValue2->value->value : $elementValue2->value );
-			return $elementValue1 === $elementValue2;
-		}
 
-		$elementValue1 = $elementValue1->value;
-		if( $elementValue1 instanceof Less_Tree_Selector ){
-			$elementValue2 = $elementValue2->value;
-			if( !($elementValue2 instanceof Less_Tree_Selector) || $elementValue1->elements_len !== $elementValue2->elements_len ){
+			if( !$this->isElementValuesEqual($elementValue1->elements[$i]->value, $elementValue2->elements[$i]->value) ){
 				return false;
 			}
-			for( $i = 0; $i < $elementValue1->elements_len; $i++ ){
-				if( $elementValue1->elements[$i]->combinator->value !== $elementValue2->elements[$i]->combinator->value ){
-					if( $i !== 0 || ($elementValue1->elements[$i]->combinator->value || ' ') !== ($elementValue2->elements[$i]->combinator->value || ' ') ){
-						return false;
-					}
-				}
-				if( !$this->isElementValuesEqual($elementValue1->elements[$i]->value, $elementValue2->elements[$i]->value) ){
-					return false;
-				}
+		}
+
+		return true;
+	}
+
+
+	/**
+	 * @param Less_Tree_Attribute $elementValue1
+	 */
+	private function isAttributeValuesEqual( $elementValue1, $elementValue2 ){
+
+		if( $elementValue1->op !== $elementValue2->op || $elementValue1->key !== $elementValue2->key ){
+			return false;
+		}
+
+		if( !$elementValue1->value || !$elementValue2->value ){
+			if( $elementValue1->value || $elementValue2->value ) {
+				return false;
 			}
 			return true;
 		}
 
-		return false;
+		$elementValue1 = ($elementValue1->value->value ? $elementValue1->value->value : $elementValue1->value );
+		$elementValue2 = ($elementValue2->value->value ? $elementValue2->value->value : $elementValue2->value );
+
+		return $elementValue1 === $elementValue2;
 	}
 
-	function extendSelector($matches, $selectorPath, $replacementSelector){
+
+	private function extendSelector($matches, $selectorPath, $replacementSelector){
 
 		//for a set of matches, replace each match with the replacement selector
 
@@ -7263,6 +8094,7 @@ function extendSelector($matches, $selectorPath, $replacementSelector){
 
 			$match = $matches[$matchIndex];
 			$selector = $selectorPath[ $match['pathIndex'] ];
+
 			$firstElement = new Less_Tree_Element(
 				$match['initialCombinator'],
 				$replacementSelector->elements[0]->value,
@@ -7312,21 +8144,21 @@ function extendSelector($matches, $selectorPath, $replacementSelector){
 	}
 
 
-	function visitMedia( $mediaNode ){
+	protected function visitMedia( $mediaNode ){
 		$newAllExtends = array_merge( $mediaNode->allExtends, end($this->allExtendsStack) );
 		$this->allExtendsStack[] = $this->doExtendChaining($newAllExtends, $mediaNode->allExtends);
 	}
 
-	function visitMediaOut( $mediaNode ){
+	protected function visitMediaOut(){
 		array_pop( $this->allExtendsStack );
 	}
 
-	function visitDirective( $directiveNode ){
+	protected function visitDirective( $directiveNode ){
 		$newAllExtends = array_merge( $directiveNode->allExtends, end($this->allExtendsStack) );
 		$this->allExtendsStack[] = $this->doExtendChaining($newAllExtends, $directiveNode->allExtends);
 	}
 
-	function visitDirectiveOut( $directiveNode ){
+	protected function visitDirectiveOut(){
 		array_pop($this->allExtendsStack);
 	}
 
@@ -7334,11 +8166,15 @@ function visitDirectiveOut( $directiveNode ){
 
 class Less_Visitor_toCSS extends Less_VisitorReplacing{
 
-	function __construct($env){
-		$this->_env = $env;
+	private $charset;
+
+	function __construct(){
 		parent::__construct();
 	}
 
+	/**
+	 * @param Less_Tree_Ruleset $root
+	 */
 	function run( $root ){
 		return $this->visitObj($root);
 	}
@@ -7350,16 +8186,16 @@ function visitRule( $ruleNode ){
 		return $ruleNode;
 	}
 
-	function visitMixinDefinition( $mixinNode ){
+	function visitMixinDefinition(){
 		return array();
 	}
 
-	function visitExtend( $extendNode ){
+	function visitExtend(){
 		return array();
 	}
 
 	function visitComment( $commentNode ){
-		if( $commentNode->isSilent( $this->_env) ){
+		if( $commentNode->isSilent() ){
 			return array();
 		}
 		return $commentNode;
@@ -7386,7 +8222,7 @@ function visitDirective( $directiveNode ){
 			if( isset($this->charset) && $this->charset ){
 
 				//if( $directiveNode->debugInfo ){
-				//	$comment = new Less_Tree_Comment('/* ' . str_replace("\n",'',$directiveNode->toCSS($this->_env))." */\n");
+				//	$comment = new Less_Tree_Comment('/* ' . str_replace("\n",'',$directiveNode->toCSS())." */\n");
 				//	$comment->debugInfo = $directiveNode->debugInfo;
 				//	return $this->visit($comment);
 				//}
@@ -7399,8 +8235,13 @@ function visitDirective( $directiveNode ){
 		return $directiveNode;
 	}
 
-	function checkPropertiesInRoot( $rules ){
-		foreach($rules as $ruleNode){
+	function checkPropertiesInRoot( $rulesetNode ){
+
+		if( !$rulesetNode->firstRoot ){
+			return;
+		}
+
+		foreach($rulesetNode->rules as $ruleNode){
 			if( $ruleNode instanceof Less_Tree_Rule && !$ruleNode->variable ){
 				$msg = "properties must be inside selector blocks, they cannot be in the root. Index ".$ruleNode->index.($ruleNode->currentFileInfo ? (' Filename: '.$ruleNode->currentFileInfo['filename']) : null);
 				throw new Less_Exception_Compiler($msg);
@@ -7408,97 +8249,121 @@ function checkPropertiesInRoot( $rules ){
 		}
 	}
 
+
 	function visitRuleset( $rulesetNode, &$visitDeeper ){
 
 		$visitDeeper = false;
-		$rulesets = array();
-		if( $rulesetNode->firstRoot ){
-			$this->checkPropertiesInRoot( $rulesetNode->rules );
-		}
-		if( !$rulesetNode->root ){
 
-			$paths = array();
-			foreach($rulesetNode->paths as $p){
-				if( $p[0]->elements[0]->combinator->value === ' ' ){
-					$p[0]->elements[0]->combinator = new Less_Tree_Combinator('');
-				}
+		$this->checkPropertiesInRoot( $rulesetNode );
 
-				foreach($p as $pi){
-					if( $pi->getIsReferenced() && $pi->getIsOutput() ){
-						$paths[] = $p;
-						break;
-					}
-				}
-			}
+		if( $rulesetNode->root ){
+			return $this->visitRulesetRoot( $rulesetNode );
+		}
 
-			$rulesetNode->paths = $paths;
+		$rulesets = array();
+		$rulesetNode->paths = $this->visitRulesetPaths($rulesetNode);
 
-			// Compile rules and rulesets
-			$nodeRuleCnt = count($rulesetNode->rules);
-			for( $i = 0; $i < $nodeRuleCnt; ){
-				$rule = $rulesetNode->rules[$i];
 
-				if( property_exists($rule,'rules') ){
-					// visit because we are moving them out from being a child
-					$rulesets[] = $this->visitObj($rule);
-					array_splice($rulesetNode->rules,$i,1);
-					$nodeRuleCnt--;
-					continue;
-				}
-				$i++;
+		// Compile rules and rulesets
+		$nodeRuleCnt = count($rulesetNode->rules);
+		for( $i = 0; $i < $nodeRuleCnt; ){
+			$rule = $rulesetNode->rules[$i];
+
+			if( property_exists($rule,'rules') ){
+				// visit because we are moving them out from being a child
+				$rulesets[] = $this->visitObj($rule);
+				array_splice($rulesetNode->rules,$i,1);
+				$nodeRuleCnt--;
+				continue;
 			}
+			$i++;
+		}
 
 
-			// accept the visitor to remove rules and refactor itself
-			// then we can decide now whether we want it or not
-			if( $nodeRuleCnt > 0 ){
-				$rulesetNode->accept($this);
-
-				if( $rulesetNode->rules ){
+		// accept the visitor to remove rules and refactor itself
+		// then we can decide now whether we want it or not
+		if( $nodeRuleCnt > 0 ){
+			$rulesetNode->accept($this);
 
-					if( count($rulesetNode->rules) >  1 ){
-						$this->_mergeRules( $rulesetNode->rules );
-						$this->_removeDuplicateRules( $rulesetNode->rules );
-					}
+			if( $rulesetNode->rules ){
 
-					// now decide whether we keep the ruleset
-					if( $rulesetNode->paths ){
-						//array_unshift($rulesets, $rulesetNode);
-						array_splice($rulesets,0,0,array($rulesetNode));
-					}
+				if( count($rulesetNode->rules) >  1 ){
+					$this->_mergeRules( $rulesetNode->rules );
+					$this->_removeDuplicateRules( $rulesetNode->rules );
 				}
 
+				// now decide whether we keep the ruleset
+				if( $rulesetNode->paths ){
+					//array_unshift($rulesets, $rulesetNode);
+					array_splice($rulesets,0,0,array($rulesetNode));
+				}
 			}
 
-		}else{
-			$rulesetNode->accept( $this );
-			if( $rulesetNode->firstRoot || $rulesetNode->rules ){
-				return $rulesetNode;
-				//array_unshift($rulesets, $rulesetNode);
-			}
-			return $rulesets;
 		}
 
+
 		if( count($rulesets) === 1 ){
 			return $rulesets[0];
 		}
 		return $rulesets;
 	}
 
+
+	/**
+	 * Helper function for visitiRuleset
+	 *
+	 * return array|Less_Tree_Ruleset
+	 */
+	private function visitRulesetRoot( $rulesetNode ){
+		$rulesetNode->accept( $this );
+		if( $rulesetNode->firstRoot || $rulesetNode->rules ){
+			return $rulesetNode;
+		}
+		return array();
+	}
+
+
+	/**
+	 * Helper function for visitRuleset()
+	 *
+	 * @return array
+	 */
+	private function visitRulesetPaths($rulesetNode){
+
+		$paths = array();
+		foreach($rulesetNode->paths as $p){
+			if( $p[0]->elements[0]->combinator === ' ' ){
+				$p[0]->elements[0]->combinator = '';
+			}
+
+			foreach($p as $pi){
+				if( $pi->getIsReferenced() && $pi->getIsOutput() ){
+					$paths[] = $p;
+					break;
+				}
+			}
+		}
+
+		return $paths;
+	}
+
 	function _removeDuplicateRules( &$rules ){
 		// remove duplicates
 		$ruleCache = array();
 		for( $i = count($rules)-1; $i >= 0 ; $i-- ){
 			$rule = $rules[$i];
-			if( $rule instanceof Less_Tree_Rule ){
+			if( $rule instanceof Less_Tree_Rule || $rule instanceof Less_Tree_NameValue ){
+
 				if( !isset($ruleCache[$rule->name]) ){
 					$ruleCache[$rule->name] = $rule;
 				}else{
 					$ruleList =& $ruleCache[$rule->name];
-					if( $ruleList instanceof Less_Tree_Rule ){
-						$ruleList = $ruleCache[$rule->name] = array( $ruleCache[$rule->name]->toCSS($this->_env) );
+
+					if( $ruleList instanceof Less_Tree_Rule || $ruleList instanceof Less_Tree_NameValue ){
+						$ruleList = $ruleCache[$rule->name] = array( $ruleCache[$rule->name]->toCSS() );
 					}
-					$ruleCSS = $rule->toCSS($this->_env);
+
+					$ruleCSS = $rule->toCSS();
 					if( array_search($ruleCSS,$ruleList) !== false ){
 						array_splice($rules,$i,1);
 					}else{
@@ -7525,13 +8390,12 @@ function _mergeRules( &$rules ){
 
 				if( !isset($groups[$key]) ){
 					$groups[$key] = array();
-					$parts =& $groups[$key];
 				}else{
 					array_splice($rules, $i--, 1);
 					$rules_len--;
 				}
 
-				$parts[] = $rule;
+				$groups[$key][] = $rule;
 			}
 		}
 
@@ -7554,30 +8418,315 @@ function _mergeRules( &$rules ){
  
 
 
-class Less_Exception_Compiler extends Exception {
+class Less_Exception_Chunk extends Less_Exception_Parser{
+
+
+	protected $parserCurrentIndex = 0;
+
+	protected $emitFrom = 0;
+
 
-	private $filename;
+	/**
+	 * Constructor
+	 *
+	 * @param string $input
+	 * @param Exception $previous Previous exception
+	 * @param integer $index The current parser index
+	 * @param Less_FileInfo|string $currentFile The file
+	 * @param integer $code The exception code
+	 */
+	public function __construct($input, Exception $previous = null, $index = null, $currentFile = null, $code = 0){
+
+		$this->message = 'ParseError: Unexpected input'; //default message
+
+		$this->index = $index;
+		$this->currentFile = $currentFile;
+
+		$this->input = $input;
+		$this->input_len = strlen($input);
+
+		$this->Chunks();
+		$this->genMessage();
+	}
+
+
+	/**
+	 * See less.js chunks()
+	 * We don't actually need the chunks
+	 *
+	 */
+	function Chunks(){
+		$level = 0;
+		$parenLevel = 0;
+		$lastMultiCommentEndBrace = null;
+		$lastOpening = null;
+		$lastMultiComment = null;
+		//$chunks = array();
+		$currentChunkStartIndex = null;
+		$matched = null;
+		$lastParen = null;
+
+		for( $this->parserCurrentIndex = 0; $this->parserCurrentIndex < $this->input_len; $this->parserCurrentIndex++ ){
+			$cc = $this->CharCode($this->parserCurrentIndex);
+			if ((($cc >= 97) && ($cc <= 122)) || ($cc < 34)) {
+				// a-z or whitespace
+				continue;
+			}
+
+			switch ($cc) {
+
+				// (
+				case 40:
+					$parenLevel++;
+					$lastParen = $this->parserCurrentIndex;
+					continue;
+
+				// )
+				case 41:
+					$parenLevel--;
+					if( $parenLevel < 0 ){
+						return $this->fail("missing opening `(`");
+					}
+					continue;
+
+				// ;
+				case 59:
+					//if (!$parenLevel) { $this->emitChunk();	}
+					continue;
+
+				// {
+				case 123:
+					$level++;
+					$lastOpening = $this->parserCurrentIndex;
+					continue;
+
+				// }
+				case 125:
+					$level--;
+					if( $level < 0 ){
+						return $this->fail("missing opening `{`");
+
+					}
+					//if (!$level) { $this->emitChunk(); }
+					continue;
+				// \
+				case 92:
+					if ($this->parserCurrentIndex < $this->input_len - 1) { $this->parserCurrentIndex++; continue; }
+					return $this->fail("unescaped `\\`");
+
+				// ", ' and `
+				case 34:
+				case 39:
+				case 96:
+					$matched = 0;
+					$currentChunkStartIndex = $this->parserCurrentIndex;
+					for ($this->parserCurrentIndex = $this->parserCurrentIndex + 1; $this->parserCurrentIndex < $this->input_len; $this->parserCurrentIndex++) {
+						$cc2 = $this->CharCode($this->parserCurrentIndex);
+						if ($cc2 > 96) { continue; }
+						if ($cc2 == $cc) { $matched = 1; break; }
+						if ($cc2 == 92) {        // \
+							if ($this->parserCurrentIndex == $this->input_len - 1) {
+								return $this->fail("unescaped `\\`");
+							}
+							$this->parserCurrentIndex++;
+						}
+					}
+					if ($matched) { continue; }
+					return $this->fail("unmatched `" + chr($cc) + "`", $currentChunkStartIndex);
+
+				// /, check for comment
+				case 47:
+					if ($parenLevel || ($this->parserCurrentIndex == $this->input_len - 1)) { continue; }
+					$cc2 = $this->CharCode($this->parserCurrentIndex+1);
+					if ($cc2 == 47) {
+						// //, find lnfeed
+						for ($this->parserCurrentIndex = $this->parserCurrentIndex + 2; $this->parserCurrentIndex < $this->input_len; $this->parserCurrentIndex++) {
+							$cc2 = $this->CharCode($this->parserCurrentIndex);
+							if (($cc2 <= 13) && (($cc2 == 10) || ($cc2 == 13))) { break; }
+						}
+					} else if ($cc2 == 42) {
+						// /*, find */
+						$lastMultiComment = $currentChunkStartIndex = $this->parserCurrentIndex;
+						for ($this->parserCurrentIndex = $this->parserCurrentIndex + 2; $this->parserCurrentIndex < $this->input_len - 1; $this->parserCurrentIndex++) {
+							$cc2 = $this->CharCode($this->parserCurrentIndex);
+							if ($cc2 == 125) { $lastMultiCommentEndBrace = $this->parserCurrentIndex; }
+							if ($cc2 != 42) { continue; }
+							if ($this->CharCode($this->parserCurrentIndex+1) == 47) { break; }
+						}
+						if ($this->parserCurrentIndex == $this->input_len - 1) {
+							return $this->fail("missing closing `*/`", $currentChunkStartIndex);
+						}
+					}
+					continue;
+
+				// *, check for unmatched */
+				case 42:
+					if (($this->parserCurrentIndex < $this->input_len - 1) && ($this->CharCode($this->parserCurrentIndex+1) == 47)) {
+						return $this->fail("unmatched `/*`");
+					}
+					continue;
+			}
+		}
+
+		if( $level !== 0 ){
+			if( ($lastMultiComment > $lastOpening) && ($lastMultiCommentEndBrace > $lastMultiComment) ){
+				return $this->fail("missing closing `}` or `*/`", $lastOpening);
+			} else {
+				return $this->fail("missing closing `}`", $lastOpening);
+			}
+		} else if ( $parenLevel !== 0 ){
+			return $this->fail("missing closing `)`", $lastParen);
+		}
 
-	public function __construct($message = null, $code = 0, Exception $previous = null, $filename = null ){
-		parent::__construct($message, $code);
-		$this->filename = $filename;
+		//$this->emitChunk(true);
 	}
 
-	public function getFilename() {
-		return $this->filename;
+	function CharCode($pos){
+		return ord($this->input[$pos]);
 	}
 
-	public function __toString() {
-		return $this->message . " (" . $this->filename . ")";
+
+	function fail( $msg, $index = null ){
+
+		if( !$index ){
+			$this->index = $this->parserCurrentIndex;
+		}else{
+			$this->index = $index;
+		}
+		$this->message = 'ParseError: '.$msg;
+	}
+
+
+	/*
+	function emitChunk( $force = false ){
+		$len = $this->parserCurrentIndex - $this->emitFrom;
+		if ((($len < 512) && !$force) || !$len) {
+			return;
+		}
+		$chunks[] = substr($this->input, $this->emitFrom, $this->parserCurrentIndex + 1 - $this->emitFrom );
+		$this->emitFrom = $this->parserCurrentIndex + 1;
 	}
+	*/
+
 }
  
 
 
-class Less_Exception_Parser extends Exception{
+class Less_Exception_Compiler extends Less_Exception_Parser{
 
 } 
 
+
+class Less_Exception_Parser extends Exception{
+
+	/**
+	 * The current file
+	 *
+	 * @var Less_ImportedFile
+	 */
+	protected $currentFile;
+
+	/**
+	 * The current parser index
+	 *
+	 * @var integer
+	 */
+	protected $index;
+
+	protected $input;
+
+	protected $details = array();
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $message
+	 * @param Exception $previous Previous exception
+	 * @param integer $index The current parser index
+	 * @param Less_FileInfo|string $currentFile The file
+	 * @param integer $code The exception code
+	 */
+	public function __construct($message = null, Exception $previous = null, $index = null, $currentFile = null, $code = 0){
+
+		if (PHP_VERSION_ID < 50300) {
+			$this->previous = $previous;
+			parent::__construct($message, $code);
+		} else {
+			parent::__construct($message, $code, $previous);
+		}
+
+		$this->currentFile = $currentFile;
+		$this->index = $index;
+
+		$this->genMessage();
+	}
+
+
+	protected function getInput(){
+
+		if( !$this->input && $this->currentFile && $this->currentFile['filename'] ){
+			$this->input = file_get_contents( $this->currentFile['filename'] );
+		}
+	}
+
+
+
+	/**
+	 * Converts the exception to string
+	 *
+	 * @return string
+	 */
+	public function genMessage(){
+
+		if( $this->currentFile && $this->currentFile['filename'] ){
+			$this->message .= ' in '.basename($this->currentFile['filename']);
+		}
+
+		if( $this->index !== null ){
+			$this->getInput();
+			if( $this->input ){
+				$line = self::getLineNumber();
+				$this->message .= ' on line '.$line.', column '.self::getColumn();
+
+				$lines = explode("\n",$this->input);
+
+				$count = count($lines);
+				$start_line = max(0, $line-3);
+				$last_line = min($count, $start_line+6);
+				for( $i = $start_line; $i < $last_line; $i++ ){
+					$this->message .= "\n".($i+1).') '.$lines[$i];
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Returns the line number the error was encountered
+	 *
+	 * @return integer
+	 */
+	public function getLineNumber(){
+		return substr_count($this->input, "\n", 0, $this->index) + 1;
+	}
+
+
+	/**
+	 * Returns the column the error was encountered
+	 *
+	 * @return integer
+	 */
+	public function getColumn(){
+
+		$part = substr($this->input, 0, $this->index);
+		$pos = strrpos($part,"\n");
+		return $this->index - $pos;
+	}
+
+}
+ 
+
 /**
  * Parser output with source map
  *
@@ -7646,14 +8795,16 @@ public function add($chunk, $fileInfo = null, $index = 0, $mapLines = null){
 		$sourceColumns = ' ';
 
 
-		if( $fileInfo && !empty($fileInfo['filename']) ){
+		if( $fileInfo ){
+
+			$url = $fileInfo['currentUri'];
 
-			if( isset($this->contentsMap[$fileInfo['filename']]) ){
-				$inputSource = substr($this->contentsMap[$fileInfo['filename']], 0, $index);
+			if( isset($this->contentsMap[$url]) ){
+				$inputSource = substr($this->contentsMap[$url], 0, $index);
 				$sourceLines = explode("\n", $inputSource);
 				$sourceColumns = end($sourceLines);
 			}else{
-				throw new Exception('Filename '.$fileInfo['filename'].' not in contentsMap');
+				throw new Exception('Filename '.$url.' not in contentsMap');
 			}
 
 		}
@@ -7669,7 +8820,7 @@ public function add($chunk, $fileInfo = null, $index = 0, $mapLines = null){
 						$this->column,							// generated_column
 						count($sourceLines),					// original_line
 						strlen($sourceColumns),					// original_column
-						$fileInfo['filename']
+						$fileInfo['currentUri']
 				);
 			}else{
 				for($i = 0, $count = count($lines); $i < $count; $i++){
@@ -7678,7 +8829,7 @@ public function add($chunk, $fileInfo = null, $index = 0, $mapLines = null){
 						$i === 0 ? $this->column : 0,			// generated_column
 						count($sourceLines) + $i,				// original_line
 						$i === 0 ? strlen($sourceColumns) : 0, 	// original_column
-						$fileInfo['filename']
+						$fileInfo['currentUri']
 					);
 				}
 			}
@@ -7780,6 +8931,7 @@ public function __construct(){
 	 *	 2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
 	 * We generate the value for 32 bit machines, hence -2147483648 becomes 1, not 4294967297,
 	 * even on a 64 bit machine.
+	 * @param string $aValue
 	 */
 	public function toVLQSigned($aValue){
 		return 0xffffffff & ($aValue < 0 ? ((-$aValue) << 1) + 1 : ($aValue << 1) + 0);
@@ -7794,6 +8946,7 @@ public function toVLQSigned($aValue){
 	 * Hence
 	 *	 1 becomes -2147483648
 	 * even on a 64 bit machine.
+	 * @param integer $aValue
 	 */
 	public function fromVLQSigned($aValue){
 		return $aValue & 1 ? $this->zeroFill(~$aValue + 2, 1) | (-1 - 0x7fffffff) : $this->zeroFill($aValue, 1);
@@ -7825,7 +8978,7 @@ public function encode($aValue){
 	 * Return the value decoded from base 64 VLQ.
 	 *
 	 * @param string $encoded The encoded value to decode
-	 * @return string The decoded value
+	 * @return integer The decoded value
 	 */
 	public function decode($encoded){
 		$vlq = 0;
@@ -7843,9 +8996,9 @@ public function decode($encoded){
 	/**
 	 * Right shift with zero fill.
 	 *
-	 * @param number $a number to shift
-	 * @param nunber $b number of bits to shift
-	 * @return number
+	 * @param integer $a number to shift
+	 * @param integer $b number of bits to shift
+	 * @return integer
 	 */
 	public function zeroFill($a, $b){
 		return ($a >= 0) ? ($a >> $b) : ($a >> $b) & (PHP_INT_MAX >> ($b - 1));
@@ -7854,13 +9007,13 @@ public function zeroFill($a, $b){
 	/**
 	 * Encode single 6-bit digit as base64.
 	 *
-	 * @param number $number
+	 * @param integer $number
 	 * @return string
-	 * @throws InvalidArgumentException If the number is invalid
+	 * @throws Exception If the number is invalid
 	 */
 	public function base64Encode($number){
 		if($number < 0 || $number > 63){
-			throw new InvalidArgumentException(sprintf('Invalid number "%s" given. Must be between 0 and 63.', $number));
+			throw new Exception(sprintf('Invalid number "%s" given. Must be between 0 and 63.', $number));
 		}
 		return $this->intToCharMap[$number];
 	}
@@ -7870,11 +9023,11 @@ public function base64Encode($number){
 	 *
 	 * @param string $char
 	 * @return number
-	 * @throws InvalidArgumentException If the number is invalid
+	 * @throws Exception If the number is invalid
 	 */
 	public function base64Decode($char){
 		if(!array_key_exists($char, $this->charToIntMap)){
-			throw new InvalidArgumentException(sprintf('Invalid base 64 digit "%s" given.', $char));
+			throw new Exception(sprintf('Invalid base 64 digit "%s" given.', $char));
 		}
 		return $this->charToIntMap[$char];
 	}
@@ -7962,7 +9115,6 @@ class Less_SourceMap_Generator extends Less_Configurable {
 	 *
 	 * @param Less_Tree_Ruleset $root The root node
 	 * @param array $options Array of options
-	 * @param Less_SourceMap_Base64VLQ $encoder The encoder
 	 */
 	public function __construct(Less_Tree_Ruleset $root, $contentsMap, $options = array()){
 		$this->root = $root;
@@ -7981,14 +9133,13 @@ public function __construct(Less_Tree_Ruleset $root, $contentsMap, $options = ar
 	/**
 	 * Generates the CSS
 	 *
-	 * @param Less_Environment $env
 	 * @return string
 	 */
-	public function generateCSS($env){
+	public function generateCSS(){
 		$output = new Less_Output_Mapped($this->contentsMap, $this);
 
 		// catch the output
-		$this->root->genCSS($env, $output);
+		$this->root->genCSS($output);
 
 
 		$sourceMapUrl				= $this->getOption('sourceMapURL');
@@ -8186,16 +9337,19 @@ public function generateMappings(){
 				$lastGeneratedColumn = $m['generated_column'];
 
 				// find the index
-				if( $m['source_file'] && ($index = $this->findFileIndex($this->normalizeFilename($m['source_file']))) !== false ){
-					$mapEncoded .= $this->encoder->encode($index - $lastOriginalIndex);
-					$lastOriginalIndex = $index;
-
-					// lines are stored 0-based in SourceMap spec version 3
-					$mapEncoded .= $this->encoder->encode($m['original_line'] - 1 - $lastOriginalLine);
-					$lastOriginalLine = $m['original_line'] - 1;
-
-					$mapEncoded .= $this->encoder->encode($m['original_column'] - $lastOriginalColumn);
-					$lastOriginalColumn = $m['original_column'];
+				if( $m['source_file'] ){
+					$index = $this->findFileIndex($this->normalizeFilename($m['source_file']));
+					if( $index !== false ){
+						$mapEncoded .= $this->encoder->encode($index - $lastOriginalIndex);
+						$lastOriginalIndex = $index;
+
+						// lines are stored 0-based in SourceMap spec version 3
+						$mapEncoded .= $this->encoder->encode($m['original_line'] - 1 - $lastOriginalLine);
+						$lastOriginalLine = $m['original_line'] - 1;
+
+						$mapEncoded .= $this->encoder->encode($m['original_column'] - $lastOriginalColumn);
+						$lastOriginalColumn = $m['original_column'];
+					}
 				}
 
 				$lineMapEncoded[] = $mapEncoded;
diff --git a/plugins/system/t3/includes/lessphp/less/lesscache.php b/plugins/system/t3/includes/lessphp/less/lesscache.php
deleted file mode 100644
index bda659e..0000000
--- a/plugins/system/t3/includes/lessphp/less/lesscache.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-
-class Less_Cache{
-
-	public static $cache_dir = false;		// directory less.php can use for storing data
-	public static $import_dirs = array();
-	public static $error;
-
-    const cache_version = '1424';
-	protected static $clean_cache = true;
-
-
-	public static function Get( $less_files, $parser_options = array() ){
-
-		//check $cache_dir
-		if( empty(self::$cache_dir) ){
-			throw new Exception('cache_dir not set');
-			return false;
-		}
-
-		self::$cache_dir = str_replace('\\','/',self::$cache_dir);
-		self::$cache_dir = rtrim(self::$cache_dir,'/').'/';
-
-		if( !is_dir(self::$cache_dir) ){
-			throw new Exception('cache_dir does not exist');
-			return false;
-		}
-
-
-		// generate name for compiled css file
-		$less_files = (array)$less_files;
-		$hash = md5(json_encode($less_files));
- 		$list_file = self::$cache_dir.'lessphp_'.$hash.'.list';
-
-
- 		// check cached content
-		$compiled_file = false;
-		$less_cache = false;
- 		if( file_exists($list_file) ){
-
-			//get info about the list file
-			$compiled_name = self::CompiledName( $hash, $list_file );
-			$compiled_file = self::$cache_dir.$compiled_name;
-
-
-			//check modified time of all included files
-			if( file_exists($compiled_file) ){
-
-				$list = explode("\n",file_get_contents($list_file));
-				$list_updated = filemtime($list_file);
-
-				foreach($list as $file ){
-					if( !file_exists($file) || filemtime($file) > $list_updated ){
-						$compiled_file = false;
-						break;
-					}
-				}
-
-
-				// return relative path if we don't need to regenerate
-				if( $compiled_file ){
-
-					//touch the files to extend the cache
-					touch($list_file);
-					touch($compiled_file);
-
-					return $compiled_name;
-				}
-			}
-
-		}
-
-		$compiled = self::Cache( $less_files, $parser_options );
-		if( !$compiled ){
-			return false;
-		}
-
-
-		//save the cache
-		$cache = implode("\n",$less_files);
-		file_put_contents( $list_file, $cache );
-
-
-		//save the css
-		$compiled_name = self::CompiledName( $hash, $list_file );
-		file_put_contents( self::$cache_dir.$compiled_name, $compiled );
-
-
-		//clean up
-		self::CleanCache();
-
-		return $compiled_name;
-
-	}
-
-	public static function Cache( &$less_files, $parser_options = array() ){
-
-		//prepare the processor
-		if( !class_exists('Less_Parser') ){
-			include_once('Less.php');
-		}
-
-
-		$parser = new Less_Parser($parser_options);
-		$parser->SetCacheDir( self::$cache_dir );
-		$parser->SetImportDirs( self::$import_dirs );
-
-
-		// combine files
- 		try{
-			foreach($less_files as $file_path => $uri_or_less ){
-
-				//treat as less markup if there are newline characters
-				if( strpos($uri_or_less,"\n") !== false ){
-					$parser->Parse( $uri_or_less );
-					continue;
-				}
-
-				$parser->ParseFile( $file_path, $uri_or_less );
-			}
-
-			$compiled = $parser->getCss();
-
-		}catch(Exception $e){
-			self::$error = $e;
-			return false;
-		}
-
-		$less_files = $parser->allParsedFiles();
-
-		return $compiled;
-	}
-
-
-	public static function CompiledName( $hash, $list_file ){
-
-		$etag = base_convert( self::cache_version, 10, 36 ) . base_convert( filesize($list_file), 10, 36 );
-
-		return 'lessphp_'.$hash.'_'.$etag.'.css';
-	}
-
-
-	public static function CleanCache(){
-		static $clean = false;
-
-		if( $clean ){
-			return;
-		}
-
-		$files = scandir(self::$cache_dir);
-		if( $files ){
-			$check_time = time() - 604800;
-			foreach($files as $file){
-				if( strpos($file,'lessphp_') !== 0 ){
-					continue;
-				}
-				$full_path = self::$cache_dir.'/'.$file;
-				if( filemtime($full_path) > $check_time ){
-					continue;
-				}
-				unlink($full_path);
-			}
-		}
-
-		$clean = true;
-	}
-
-}
\ No newline at end of file
diff --git a/plugins/system/t3/includes/lessphp/less/version.php b/plugins/system/t3/includes/lessphp/less/version.php
new file mode 100644
index 0000000..bfa44b5
--- /dev/null
+++ b/plugins/system/t3/includes/lessphp/less/version.php
@@ -0,0 +1,9 @@
+<?php
+
+class Less_Version{
+
+	const version = '1.6.1';			// The current build number of less.php
+	const less_version = '1.6.1';		// The less.js version that this build should be compatible with
+  const cache_version = '1612';		// The parser cache version
+  
+}
\ No newline at end of file
diff --git a/plugins/system/t3/includes/menu/megamenu.tpl.php b/plugins/system/t3/includes/menu/megamenu.tpl.php
index 9c24362..8e3ddd8 100644
--- a/plugins/system/t3/includes/menu/megamenu.tpl.php
+++ b/plugins/system/t3/includes/menu/megamenu.tpl.php
@@ -63,7 +63,10 @@ static function beginmega($vars)
 		$cls     = 'nav-child ' . ($item->dropdown ? 'dropdown-menu mega-dropdown-menu' : 'mega-group-ct');
 		$style   = '';
 		$data    = '';
-		if (isset($setting['class'])) $data .= " data-class=\"{$setting['class']}\"";
+		if (isset($sub['class'])) {
+			$data .= " data-class=\"{$sub['class']}\"";
+			$cls  .= " {$sub['class']}";
+		}
 		if (isset($setting['alignsub']) && $setting['alignsub'] == 'justify') {
 			$cls  .= ' ' . ($vars['menu']->editmode ? 'span' : T3_BASE_NONRSP_WIDTH_PREFIX) . '12';
 		} else {
diff --git a/plugins/system/t3/language/en-GB/en-GB.plg_system_t3.ini b/plugins/system/t3/language/en-GB/en-GB.plg_system_t3.ini
index 7e4177b..a1d6cfb 100644
--- a/plugins/system/t3/language/en-GB/en-GB.plg_system_t3.ini
+++ b/plugins/system/t3/language/en-GB/en-GB.plg_system_t3.ini
@@ -218,7 +218,7 @@ T3_NAVIGATION_MM_POSITIONS_DESC			= "Move menu item to right or left column"
 T3_NAVIGATION_MM_EX_CLASS				= "Extra Class"
 T3_NAVIGATION_MM_EX_CLASS_DESC			= "Add extra class to style megamenu."
 T3_NAVIGATION_MM_ICON					= "Icon"
-T3_NAVIGATION_MM_ICON_DESC				= "Add Icon for Menu Item. Click Icon label to visit bootstrap icons page and get Icon Class. E.g.: icon-search"
+T3_NAVIGATION_MM_ICON_DESC				= "Add Icon for Menu Item. Click Icon label to visit bootstrap icons page and get Icon Class. E.g.: [icon-search], [fa fa-home], [glyphicon glyphicon-heart],... without square brackets. Note: [fa] and [glyphicon] icons support by Bootstrap 3 base theme only"
 T3_NAVIGATION_MM_CAPTION				= "Item caption"
 T3_NAVIGATION_MM_CAPTION_DESC			= "Item caption"
 T3_NAVIGATION_MM_WIDTH_SPAN				= "Width (1-12)"
diff --git a/plugins/system/t3/t3.script.php b/plugins/system/t3/t3.script.php
deleted file mode 100644
index 33512a7..0000000
--- a/plugins/system/t3/t3.script.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * @package      T3
- *
- * @author       JoomlArt
- * @copyright    Copyright (C) 2012-2013. All rights reserved.
- * @license      http://www.gnu.org/licenses/gpl.html GNU/GPL, see LICENSE.txt
- */
-
-defined('_JEXEC') or die();
-
-
-class plgSystemT3InstallerScript
-{
-    /**
-     * Called after any type of action
-     *
-     * @param     string              $route      Which action is happening (install|uninstall|discover_install)
-     * @param     jadapterinstance    $adapter    The object responsible for running this script
-     *
-     * @return    boolean                         True on success
-     */
-    public function postflight($route, JAdapterInstance $adapter)
-    {
-        $db    = JFactory::getDBO();
-        $query = $db->getQuery(true);
-        $query
-            ->update('#__extensions')
-            ->set("`enabled`='1'")
-            ->where("`type`='plugin'")
-            ->where("`folder`='system'")
-            ->where("`element`='t3'");
-        $db->setQuery($query);
-        $db->execute();
-        
-        return true;
-    }
-}
diff --git a/plugins/system/t3/t3.xml b/plugins/system/t3/t3.xml
index 45b3b52..5bd8fce 100644
--- a/plugins/system/t3/t3.xml
+++ b/plugins/system/t3/t3.xml
@@ -2,12 +2,12 @@
 <extension version="2.5" type="plugin" group="system" method="upgrade">
 	<name>T3 Framework</name>
 	<author>JoomlArt.com</author>
-	<creationDate>24 Jan 2014</creationDate>
+	<creationDate>12 Feb 2014</creationDate>
 	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>info@joomlart.com</authorEmail>
 	<authorUrl>http://www.t3-framework.org</authorUrl>
-	<version>2.1.0</version>
+	<version>2.1.1</version>
 	<description>
 	<![CDATA[
 	<div align="center">
diff --git a/plugins/twofactorauth/totp/postinstall/actions.php b/plugins/twofactorauth/totp/postinstall/actions.php
index 550be51..2938eb8 100644
--- a/plugins/twofactorauth/totp/postinstall/actions.php
+++ b/plugins/twofactorauth/totp/postinstall/actions.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.totp
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  *
  * This file contains the functions used by the com_postinstall code to deliver
diff --git a/plugins/twofactorauth/totp/tmpl/form.php b/plugins/twofactorauth/totp/tmpl/form.php
index 9ade484..52c9953 100644
--- a/plugins/twofactorauth/totp/tmpl/form.php
+++ b/plugins/twofactorauth/totp/tmpl/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.totp.tmpl
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/totp/totp.php b/plugins/twofactorauth/totp/totp.php
index 3f5afe8..a7b5ecb 100644
--- a/plugins/twofactorauth/totp/totp.php
+++ b/plugins/twofactorauth/totp/totp.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.totp
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/totp/totp.xml b/plugins/twofactorauth/totp/totp.xml
index 34e2b8d..fe92853 100644
--- a/plugins/twofactorauth/totp/totp.xml
+++ b/plugins/twofactorauth/totp/totp.xml
@@ -3,7 +3,7 @@
 	<name>plg_twofactorauth_totp</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/twofactorauth/yubikey/tmpl/form.php b/plugins/twofactorauth/yubikey/tmpl/form.php
index 1850b03..f1d1799 100644
--- a/plugins/twofactorauth/yubikey/tmpl/form.php
+++ b/plugins/twofactorauth/yubikey/tmpl/form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.totp.tmpl
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/yubikey/yubikey.php b/plugins/twofactorauth/yubikey/yubikey.php
index f4118da..423a8af 100644
--- a/plugins/twofactorauth/yubikey/yubikey.php
+++ b/plugins/twofactorauth/yubikey/yubikey.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  Twofactorauth.yubikey
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/twofactorauth/yubikey/yubikey.xml b/plugins/twofactorauth/yubikey/yubikey.xml
index 7e9fcad..5830b69 100644
--- a/plugins/twofactorauth/yubikey/yubikey.xml
+++ b/plugins/twofactorauth/yubikey/yubikey.xml
@@ -3,7 +3,7 @@
 	<name>plg_twofactorauth_yubikey</name>
 	<author>Joomla! Project</author>
 	<creationDate>September 2013</creationDate>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/user/contactcreator/contactcreator.php b/plugins/user/contactcreator/contactcreator.php
index 8130d16..ca35f81 100644
--- a/plugins/user/contactcreator/contactcreator.php
+++ b/plugins/user/contactcreator/contactcreator.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.contactcreator
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/user/contactcreator/contactcreator.xml b/plugins/user/contactcreator/contactcreator.xml
index 4d19098..bca0bb1 100644
--- a/plugins/user/contactcreator/contactcreator.xml
+++ b/plugins/user/contactcreator/contactcreator.xml
@@ -3,7 +3,7 @@
 	<name>plg_user_contactcreator</name>
 	<author>Joomla! Project</author>
 	<creationDate>August 2009</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/plugins/user/joomla/joomla.php b/plugins/user/joomla/joomla.php
index 810f26e..6fcbe51 100644
--- a/plugins/user/joomla/joomla.php
+++ b/plugins/user/joomla/joomla.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.joomla
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -88,8 +88,22 @@ public function onUserAfterSave($user, $isnew, $success, $msg)
 			{
 				if ($mail_to_user)
 				{
-					// Load user_joomla plugin language (not done automatically).
 					$lang = JFactory::getLanguage();
+					$defaultLocale = $lang->getTag();
+
+					/**
+					 * Look for user language. Priority:
+					 * 	1. User frontend language
+					 * 	2. User backend language
+					 */
+					$userParams = new JRegistry($user['params']);
+					$userLocale = $userParams->get('language', $userParams->get('admin_language', $defaultLocale));
+
+					if ($userLocale != $defaultLocale)
+					{
+						$lang->setLanguage($userLocale);
+					}
+
 					$lang->load('plg_user_joomla', JPATH_ADMINISTRATOR);
 
 					// Compute the mail subject.
@@ -121,6 +135,12 @@ public function onUserAfterSave($user, $isnew, $success, $msg)
 						->setSubject($emailSubject)
 						->setBody($emailBody);
 
+					// Set application language back to default if we changed it
+					if ($userLocale != $defaultLocale)
+					{
+						$lang->setLanguage($defaultLocale);
+					}
+
 					if (!$mail->Send())
 					{
 						$this->app->enqueueMessage(JText::_('JERROR_SENDING_EMAIL'), 'warning');
@@ -290,7 +310,7 @@ protected function _getUser($user, $options = array())
 		{
 			if (!$instance->save())
 			{
-				JLog::add('Error in autoregistration for user ' .  $user['username'] . '.', JLog::WARNING, 'error');
+				JLog::add('Error in autoregistration for user ' . $user['username'] . '.', JLog::WARNING, 'error');
 			}
 		}
 		else
@@ -307,7 +327,7 @@ protected function _getUser($user, $options = array())
 	 * We set a new cookie either for a user with no cookies or one
 	 * where the user used a cookie to authenticate.
 	 *
-	 * @param   array  options  Array holding options
+	 * @param   array  $options  Array holding options
 	 *
 	 * @return  boolean  True on success
 	 *
@@ -361,6 +381,7 @@ public function onUserAfterLogin($options)
 				$unique = true;
 			}
 		}
+
 		while ($unique === false);
 
 		// If a user logs in with non cookie login and remember me checked we will
diff --git a/plugins/user/profile/fields/tos.php b/plugins/user/profile/fields/tos.php
index df39688..c607d88 100644
--- a/plugins/user/profile/fields/tos.php
+++ b/plugins/user/profile/fields/tos.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.profile
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
diff --git a/plugins/user/profile/profile.php b/plugins/user/profile/profile.php
index 86b00de..315db66 100644
--- a/plugins/user/profile/profile.php
+++ b/plugins/user/profile/profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Plugin
  * @subpackage  User.profile
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/plugins/user/profile/profile.xml b/plugins/user/profile/profile.xml
index 4589e33..46ce404 100644
--- a/plugins/user/profile/profile.xml
+++ b/plugins/user/profile/profile.xml
@@ -3,7 +3,7 @@
 	<name>plg_user_profile</name>
 	<author>Joomla! Project</author>
 	<creationDate>January 2008</creationDate>
-	<copyright>(C) 2005 - 2013 Open Source Matters. All rights reserved.</copyright>
+	<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>admin@joomla.org</authorEmail>
 	<authorUrl>www.joomla.org</authorUrl>
diff --git a/templates/beez3/component.php b/templates/beez3/component.php
index ea58537..b1c1b97 100644
--- a/templates/beez3/component.php
+++ b/templates/beez3/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/css/general.css b/templates/beez3/css/general.css
index cdff7ea..bf278c4 100644
--- a/templates/beez3/css/general.css
+++ b/templates/beez3/css/general.css
@@ -125,8 +125,19 @@ div.toggle-editor {
 	margin-left:auto;
 	margin-right:auto;
 }
-
-
+/* New captions */
+figure {
+	display: table;
+}
+figure.pull-center,
+img.pull-center {
+	margin-left: auto;
+	margin-right: auto;
+}
+figcaption {
+	display: table-caption;
+	caption-side: bottom;
+}
 /* Calendar */
 #jform_publish_down_img {
 	width: 18px;
@@ -449,3 +460,13 @@ body input[type="text"].search-query {
     border-radius: 4px;
 
 }
+/* Text alignments */
+.text-left {
+	text-align: left;
+}
+.text-right {
+	text-align: right;
+}
+.text-center {
+	text-align: center;
+}
diff --git a/templates/beez3/css/template_rtl.css b/templates/beez3/css/template_rtl.css
index 79828c2..2a6c2cd 100644
--- a/templates/beez3/css/template_rtl.css
+++ b/templates/beez3/css/template_rtl.css
@@ -2,7 +2,7 @@
  * @author Design & Accessible Team ( Angie Radtke  )
  * @package Joomla
  * @subpackage Accessible-Template-Beez
- * @copyright Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+ * @copyright Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
  * @license GNU/GPL, see LICENSE.php
  * Joomla! is free software. This version may have been modified pursuant to the
  * GNU General Public License, and as distributed it includes or is derivative
diff --git a/templates/beez3/error.php b/templates/beez3/error.php
index 1e4dbd2..ca17ca5 100644
--- a/templates/beez3/error.php
+++ b/templates/beez3/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/categories/default.php b/templates/beez3/html/com_contact/categories/default.php
index c211cb8..d4538c9 100644
--- a/templates/beez3/html/com_contact/categories/default.php
+++ b/templates/beez3/html/com_contact/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/categories/default_items.php b/templates/beez3/html/com_contact/categories/default_items.php
index fed00fa..a562578 100644
--- a/templates/beez3/html/com_contact/categories/default_items.php
+++ b/templates/beez3/html/com_contact/categories/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/category/default.php b/templates/beez3/html/com_contact/category/default.php
index 4efd1f1..1c39370 100644
--- a/templates/beez3/html/com_contact/category/default.php
+++ b/templates/beez3/html/com_contact/category/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/category/default_children.php b/templates/beez3/html/com_contact/category/default_children.php
index 4271c72..ca4da28 100644
--- a/templates/beez3/html/com_contact/category/default_children.php
+++ b/templates/beez3/html/com_contact/category/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/category/default_items.php b/templates/beez3/html/com_contact/category/default_items.php
index 5ddb1eb..3220bb2 100644
--- a/templates/beez3/html/com_contact/category/default_items.php
+++ b/templates/beez3/html/com_contact/category/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/contact/default.php b/templates/beez3/html/com_contact/contact/default.php
index 09f5459..8ce000c 100644
--- a/templates/beez3/html/com_contact/contact/default.php
+++ b/templates/beez3/html/com_contact/contact/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/contact/default_address.php b/templates/beez3/html/com_contact/contact/default_address.php
index 3110803..97abbf6 100644
--- a/templates/beez3/html/com_contact/contact/default_address.php
+++ b/templates/beez3/html/com_contact/contact/default_address.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/contact/default_articles.php b/templates/beez3/html/com_contact/contact/default_articles.php
index 3442fdf..e5d196f 100644
--- a/templates/beez3/html/com_contact/contact/default_articles.php
+++ b/templates/beez3/html/com_contact/contact/default_articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/contact/default_form.php b/templates/beez3/html/com_contact/contact/default_form.php
index dc9b96e..8364701 100644
--- a/templates/beez3/html/com_contact/contact/default_form.php
+++ b/templates/beez3/html/com_contact/contact/default_form.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/contact/default_links.php b/templates/beez3/html/com_contact/contact/default_links.php
index b7d1083..7cb984d 100644
--- a/templates/beez3/html/com_contact/contact/default_links.php
+++ b/templates/beez3/html/com_contact/contact/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/contact/default_profile.php b/templates/beez3/html/com_contact/contact/default_profile.php
index 7d5e17b..70fe8b0 100644
--- a/templates/beez3/html/com_contact/contact/default_profile.php
+++ b/templates/beez3/html/com_contact/contact/default_profile.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_contact
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_contact/contact/encyclopedia.php b/templates/beez3/html/com_contact/contact/encyclopedia.php
index 85ae2a4..3df4e98 100644
--- a/templates/beez3/html/com_contact/contact/encyclopedia.php
+++ b/templates/beez3/html/com_contact/contact/encyclopedia.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/archive/default.php b/templates/beez3/html/com_content/archive/default.php
index d15d518..137ad98 100644
--- a/templates/beez3/html/com_content/archive/default.php
+++ b/templates/beez3/html/com_content/archive/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.beez5
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/archive/default_items.php b/templates/beez3/html/com_content/archive/default_items.php
index d9c9ed9..9e58405 100644
--- a/templates/beez3/html/com_content/archive/default_items.php
+++ b/templates/beez3/html/com_content/archive/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.beez5
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -80,12 +80,8 @@
 	<dd class="createdby">
 		<?php $author = $item->author; ?>
 		<?php $author = ($item->created_by_alias ? $item->created_by_alias : $author);?>
-
-			<?php if (!empty($item->contactid ) &&  $params->get('link_author') == true):?>
-				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY',
-					JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id=' . $item->contactid), $author)
-				); ?>
-
+			<?php if (!empty($item->contact_link ) &&  $params->get('link_author') == true):?>
+				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $item->contact_link, $author)); ?>
 			<?php else :?>
 				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 			<?php endif; ?>
diff --git a/templates/beez3/html/com_content/article/default.php b/templates/beez3/html/com_content/article/default.php
index 21ee2da..d09d35b 100644
--- a/templates/beez3/html/com_content/article/default.php
+++ b/templates/beez3/html/com_content/article/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -127,15 +127,11 @@
 	<dd class="createdby">
 		<?php $author = $this->item->author; ?>
 		<?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author);?>
-
-			<?php if (!empty($this->item->contactid ) &&  $params->get('link_author') == true):?>
-				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY',
-					JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id=' . $this->item->contactid), $author)
-				); ?>
-
-			<?php else :?>
-				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
-			<?php endif; ?>
+		<?php if (!empty($this->item->contact_link ) &&  $params->get('link_author') == true) : ?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+		<?php else :?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+		<?php endif; ?>
 	</dd>
 <?php endif; ?>
 <?php if ($params->get('show_hits')) : ?>
diff --git a/templates/beez3/html/com_content/article/default_links.php b/templates/beez3/html/com_content/article/default_links.php
index cb7e281..5b15f0b 100644
--- a/templates/beez3/html/com_content/article/default_links.php
+++ b/templates/beez3/html/com_content/article/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/categories/default.php b/templates/beez3/html/com_content/categories/default.php
index 3096d36..2b9975a 100644
--- a/templates/beez3/html/com_content/categories/default.php
+++ b/templates/beez3/html/com_content/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.beez5
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/category/blog.php b/templates/beez3/html/com_content/category/blog.php
index cea9309..8ed775c 100644
--- a/templates/beez3/html/com_content/category/blog.php
+++ b/templates/beez3/html/com_content/category/blog.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/category/blog_children.php b/templates/beez3/html/com_content/category/blog_children.php
index fef2e07..458e5eb 100644
--- a/templates/beez3/html/com_content/category/blog_children.php
+++ b/templates/beez3/html/com_content/category/blog_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/category/blog_item.php b/templates/beez3/html/com_content/category/blog_item.php
index 571406b..b99b733 100644
--- a/templates/beez3/html/com_content/category/blog_item.php
+++ b/templates/beez3/html/com_content/category/blog_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 defined('_JEXEC') or die;
@@ -17,7 +17,8 @@
 ?>
 
 
-<?php if ($this->item->state == 0) : ?>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
 <div class="system-unpublished">
 <?php endif; ?>
 <?php if ($params->get('show_title')) : ?>
@@ -104,15 +105,11 @@
 	<dd class="createdby">
 		<?php $author = $this->item->author; ?>
 		<?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author);?>
-
-			<?php if (!empty($this->item->contactid ) &&  $params->get('link_author') == true):?>
-				<?php 	echo JText::sprintf('COM_CONTENT_WRITTEN_BY',
-					JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id=' . $this->item->contactid), $author)
-				); ?>
-
-			<?php else :?>
-				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
-			<?php endif; ?>
+		<?php if (!empty($this->item->contact_link ) &&  $params->get('link_author') == true) : ?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+		<?php else :?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+		<?php endif; ?>
 	</dd>
 <?php endif; ?>
 <?php if ($params->get('show_hits')) : ?>
@@ -166,7 +163,8 @@
 		</p>
 <?php endif; ?>
 
-<?php if ($this->item->state == 0) : ?>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
 </div>
 <?php endif; ?>
 
diff --git a/templates/beez3/html/com_content/category/blog_links.php b/templates/beez3/html/com_content/category/blog_links.php
index 0eb7348..b8666cc 100644
--- a/templates/beez3/html/com_content/category/blog_links.php
+++ b/templates/beez3/html/com_content/category/blog_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/category/default.php b/templates/beez3/html/com_content/category/default.php
index 9e38009..ae53437 100644
--- a/templates/beez3/html/com_content/category/default.php
+++ b/templates/beez3/html/com_content/category/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/category/default_articles.php b/templates/beez3/html/com_content/category/default_articles.php
index df223b7..e6ee13f 100644
--- a/templates/beez3/html/com_content/category/default_articles.php
+++ b/templates/beez3/html/com_content/category/default_articles.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -118,14 +118,8 @@
 						<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
 							<?php $author = $article->author ?>
 							<?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
-
-							<?php if (!empty($article->contactid ) &&  $this->params->get('link_author') == true):?>
-								<?php echo JHtml::_(
-										'link',
-										JRoute::_('index.php?option=com_contact&view=contact&id='.$article->contactid),
-										$author
-								); ?>
-
+							<?php if (!empty($article->contact_link ) &&  $this->params->get('link_author') == true):?>
+								<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
 							<?php else :?>
 								<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
 							<?php endif; ?>
diff --git a/templates/beez3/html/com_content/category/default_children.php b/templates/beez3/html/com_content/category/default_children.php
index 1710b16..5f0c3db 100644
--- a/templates/beez3/html/com_content/category/default_children.php
+++ b/templates/beez3/html/com_content/category/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/featured/default.php b/templates/beez3/html/com_content/featured/default.php
index 77473aa..e80d5bf 100644
--- a/templates/beez3/html/com_content/featured/default.php
+++ b/templates/beez3/html/com_content/featured/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/featured/default_item.php b/templates/beez3/html/com_content/featured/default_item.php
index fa00b1f..04fc64f 100644
--- a/templates/beez3/html/com_content/featured/default_item.php
+++ b/templates/beez3/html/com_content/featured/default_item.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -18,7 +18,8 @@
 
 ?>
 
-<?php if ($this->item->state == 0) : ?>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
 <div class="system-unpublished">
 <?php endif; ?>
 <?php if ($params->get('show_title')) : ?>
@@ -108,15 +109,11 @@
 	<dd class="createdby">
 		<?php $author = $this->item->author; ?>
 		<?php $author = ($this->item->created_by_alias ? $this->item->created_by_alias : $author);?>
-
-			<?php if (!empty($this->item->contactid ) &&  $params->get('link_author') == true):?>
-				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY',
-					JHtml::_('link', JRoute::_('index.php?option=com_contact&view=contact&id=' . $this->item->contactid), $author)
-				); ?>
-
-			<?php else :?>
-				<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
-			<?php endif; ?>
+		<?php if (!empty($this->item->contact_link ) &&  $params->get('link_author') == true) : ?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author)); ?>
+		<?php else :?>
+			<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', $author); ?>
+		<?php endif; ?>
 	</dd>
 <?php endif; ?>
 <?php if ($params->get('show_hits')) : ?>
@@ -172,7 +169,8 @@
 		</p>
 <?php endif; ?>
 
-<?php if ($this->item->state == 0) : ?>
+<?php if ($this->item->state == 0 || strtotime($this->item->publish_up) > strtotime(JFactory::getDate())
+	|| ((strtotime($this->item->publish_down) < strtotime(JFactory::getDate())) && $this->item->publish_down != '0000-00-00 00:00:00' )) : ?>
 </div>
 <?php endif; ?>
 
diff --git a/templates/beez3/html/com_content/featured/default_links.php b/templates/beez3/html/com_content/featured/default_links.php
index 7e5589e..9652db9 100644
--- a/templates/beez3/html/com_content/featured/default_links.php
+++ b/templates/beez3/html/com_content/featured/default_links.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_content/form/edit.php b/templates/beez3/html/com_content/form/edit.php
index 00f0cd2..25aab59 100644
--- a/templates/beez3/html/com_content/form/edit.php
+++ b/templates/beez3/html/com_content/form/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -45,7 +45,7 @@
 
 <form action="<?php echo JRoute::_('index.php?option=com_content&a_id='.(int) $this->item->id); ?>" method="post" name="adminForm" id="adminForm" class="form-validate">
 	<fieldset>
-		<legend><?php echo JText::_('JEDITOR'); ?></legend>
+		<legend><?php echo JText::_('COM_CONTENT_ARTICLE_CONTENT'); ?></legend>
 
 			<div class="control-group">
 				<div class="control-label">
diff --git a/templates/beez3/html/com_newsfeeds/categories/default.php b/templates/beez3/html/com_newsfeeds/categories/default.php
index 1c7c906..e3135c2 100644
--- a/templates/beez3/html/com_newsfeeds/categories/default.php
+++ b/templates/beez3/html/com_newsfeeds/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_newsfeeds/categories/default_items.php b/templates/beez3/html/com_newsfeeds/categories/default_items.php
index 77b2a87..6d97bc5 100644
--- a/templates/beez3/html/com_newsfeeds/categories/default_items.php
+++ b/templates/beez3/html/com_newsfeeds/categories/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_newsfeeds/category/default.php b/templates/beez3/html/com_newsfeeds/category/default.php
index 6346e27..4d29f41 100644
--- a/templates/beez3/html/com_newsfeeds/category/default.php
+++ b/templates/beez3/html/com_newsfeeds/category/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_newsfeeds/category/default_children.php b/templates/beez3/html/com_newsfeeds/category/default_children.php
index 9dc847d..a8dd348 100644
--- a/templates/beez3/html/com_newsfeeds/category/default_children.php
+++ b/templates/beez3/html/com_newsfeeds/category/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_newsfeeds/category/default_items.php b/templates/beez3/html/com_newsfeeds/category/default_items.php
index bd3d81a..0f6ab79 100644
--- a/templates/beez3/html/com_newsfeeds/category/default_items.php
+++ b/templates/beez3/html/com_newsfeeds/category/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_newsfeeds
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_weblinks/categories/default.php b/templates/beez3/html/com_weblinks/categories/default.php
index a9172cf..20c282b 100644
--- a/templates/beez3/html/com_weblinks/categories/default.php
+++ b/templates/beez3/html/com_weblinks/categories/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_weblinks/categories/default_items.php b/templates/beez3/html/com_weblinks/categories/default_items.php
index e90dfdf..eeca1e8 100644
--- a/templates/beez3/html/com_weblinks/categories/default_items.php
+++ b/templates/beez3/html/com_weblinks/categories/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_weblinks/category/default.php b/templates/beez3/html/com_weblinks/category/default.php
index 3718fa3..b1f5609 100644
--- a/templates/beez3/html/com_weblinks/category/default.php
+++ b/templates/beez3/html/com_weblinks/category/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_weblinks/category/default_children.php b/templates/beez3/html/com_weblinks/category/default_children.php
index 7178517..9a80d61 100644
--- a/templates/beez3/html/com_weblinks/category/default_children.php
+++ b/templates/beez3/html/com_weblinks/category/default_children.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_weblinks/category/default_items.php b/templates/beez3/html/com_weblinks/category/default_items.php
index 78e84e1..b0bb724 100644
--- a/templates/beez3/html/com_weblinks/category/default_items.php
+++ b/templates/beez3/html/com_weblinks/category/default_items.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/com_weblinks/form/edit.php b/templates/beez3/html/com_weblinks/form/edit.php
index 7c47c5f..53ce274 100644
--- a/templates/beez3/html/com_weblinks/form/edit.php
+++ b/templates/beez3/html/com_weblinks/form/edit.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  com_weblinks
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/message.php b/templates/beez3/html/message.php
index aaff438..5dbee9f 100644
--- a/templates/beez3/html/message.php
+++ b/templates/beez3/html/message.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.Beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/mod_breadcrumbs/default.php b/templates/beez3/html/mod_breadcrumbs/default.php
index 4d2eaf8..27fe6f3 100644
--- a/templates/beez3/html/mod_breadcrumbs/default.php
+++ b/templates/beez3/html/mod_breadcrumbs/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/mod_login/default.php b/templates/beez3/html/mod_login/default.php
index f1a5aa6..5d4eda2 100644
--- a/templates/beez3/html/mod_login/default.php
+++ b/templates/beez3/html/mod_login/default.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/html/modules.php b/templates/beez3/html/modules.php
index a1f3b27..4361c4e 100644
--- a/templates/beez3/html/modules.php
+++ b/templates/beez3/html/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/index.php b/templates/beez3/index.php
index 2ac4660..0500140 100644
--- a/templates/beez3/index.php
+++ b/templates/beez3/index.php
@@ -2,7 +2,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/javascript/template.js b/templates/beez3/javascript/template.js
index 79b3883..7324398 100644
--- a/templates/beez3/javascript/template.js
+++ b/templates/beez3/javascript/template.js
@@ -1,7 +1,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  Templates.protostar
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       3.2
  */
diff --git a/templates/beez3/jsstrings.php b/templates/beez3/jsstrings.php
index 386e35e..f23db8f 100644
--- a/templates/beez3/jsstrings.php
+++ b/templates/beez3/jsstrings.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.beez3
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini b/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini
index 89e7531..2f057d9 100644
--- a/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini
+++ b/templates/beez3/language/en-GB/en-GB.tpl_beez3.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini b/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini
index 66dc8ea..9cba413 100644
--- a/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini
+++ b/templates/beez3/language/en-GB/en-GB.tpl_beez3.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/templates/beez3/templateDetails.xml b/templates/beez3/templateDetails.xml
index 1fcc1a1..12735d3 100644
--- a/templates/beez3/templateDetails.xml
+++ b/templates/beez3/templateDetails.xml
@@ -6,7 +6,7 @@
 	<author>Angie Radtke</author>
 	<authorEmail>a.radtke@derauftritt.de</authorEmail>
 	<authorUrl>http://www.der-auftritt.de</authorUrl>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<version>3.1.0</version>
 	<description>TPL_BEEZ3_XML_DESCRIPTION</description>
diff --git a/templates/protostar/component.php b/templates/protostar/component.php
index b32a615..7a4af36 100644
--- a/templates/protostar/component.php
+++ b/templates/protostar/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.protostar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/protostar/css/template.css b/templates/protostar/css/template.css
index bcaef2b..4a460c4 100644
--- a/templates/protostar/css/template.css
+++ b/templates/protostar/css/template.css
@@ -6129,7 +6129,7 @@ div.modal {
 	top: 10%;
 	left: 50%;
 	z-index: 1050;
-	width: 560px;
+	width: 580px;
 	margin-left: -280px;
 	background-color: #fff;
 	border: 1px solid #999;
@@ -6156,6 +6156,9 @@ div.modal.fade {
 div.modal.fade.in {
 	top: 10%;
 }
+.modal-batch {
+	overflow-y: visible;
+}
 @media (max-width: 767px) {
 	div.modal {
 		position: fixed;
@@ -7091,6 +7094,18 @@ h6 {
 	margin-left: auto;
 	margin-right: auto;
 }
+figure {
+	display: table;
+}
+figure.pull-center,
+img.pull-center {
+	margin-left: auto;
+	margin-right: auto;
+}
+figcaption {
+	display: table-caption;
+	caption-side: bottom;
+}
 #aside .nav .nav-child {
 	border-left: 2px solid #ddd;
 	padding-left: 5px;
diff --git a/templates/protostar/error.php b/templates/protostar/error.php
index 32b900a..5d393e9 100644
--- a/templates/protostar/error.php
+++ b/templates/protostar/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.protostar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -207,9 +207,14 @@
 		<div class="container<?php echo ($params->get('fluidContainer') ? '-fluid' : '');?>">
 			<hr />
 			<?php echo $doc->getBuffer('modules', 'footer', array('style' => 'none')); ?>
-
-			<p class="pull-right"><a href="#top" id="back-top"><?php echo JText::_('TPL_PROTOSTAR_BACKTOTOP'); ?></a></p>
-			<p>&copy; <?php echo $sitename; ?> <?php echo date('Y');?></p>
+			<p class="pull-right">
+				<a href="#top" id="back-top">
+					<?php echo JText::_('TPL_PROTOSTAR_BACKTOTOP'); ?>
+				</a>
+			</p>
+			<p>
+				&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+			</p>
 		</div>
 	</div>
 	<?php echo $doc->getBuffer('modules', 'debug', array('style' => 'none')); ?>
diff --git a/templates/protostar/html/modules.php b/templates/protostar/html/modules.php
index e06358c..9d411af 100644
--- a/templates/protostar/html/modules.php
+++ b/templates/protostar/html/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.protostar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/protostar/html/pagination.php b/templates/protostar/html/pagination.php
index 01e1e71..8a06652 100644
--- a/templates/protostar/html/pagination.php
+++ b/templates/protostar/html/pagination.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.protostar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/protostar/index.php b/templates/protostar/index.php
index f144298..14204b9 100644
--- a/templates/protostar/index.php
+++ b/templates/protostar/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.protostar
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -194,8 +194,14 @@
 		<div class="container<?php echo ($params->get('fluidContainer') ? '-fluid' : '');?>">
 			<hr />
 			<jdoc:include type="modules" name="footer" style="none" />
-			<p class="pull-right"><a href="#top" id="back-top"><?php echo JText::_('TPL_PROTOSTAR_BACKTOTOP'); ?></a></p>
-			<p>&copy; <?php echo $sitename; ?> <?php echo date('Y');?></p>
+			<p class="pull-right">
+				<a href="#top" id="back-top">
+					<?php echo JText::_('TPL_PROTOSTAR_BACKTOTOP'); ?>
+				</a>
+			</p>
+			<p>
+				&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
+			</p>
 		</div>
 	</footer>
 	<jdoc:include type="modules" name="debug" style="none" />
diff --git a/templates/protostar/js/template.js b/templates/protostar/js/template.js
index 79b3883..7324398 100644
--- a/templates/protostar/js/template.js
+++ b/templates/protostar/js/template.js
@@ -1,7 +1,7 @@
 /**
  * @package     Joomla.Site
  * @subpackage  Templates.protostar
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  * @since       3.2
  */
diff --git a/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini b/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
index f186fd8..7e1ebcd 100644
--- a/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
+++ b/templates/protostar/language/en-GB/en-GB.tpl_protostar.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini b/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
index c5811c4..4b270dd 100644
--- a/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
+++ b/templates/protostar/language/en-GB/en-GB.tpl_protostar.sys.ini
@@ -1,5 +1,5 @@
 ; Joomla! Project
-; Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved.
+; Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
 ; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
 ; Note : All ini files need to be saved as UTF-8 - No BOM
 
diff --git a/templates/protostar/less/template.less b/templates/protostar/less/template.less
index 6184807..95a7ecc 100644
--- a/templates/protostar/less/template.less
+++ b/templates/protostar/less/template.less
@@ -251,6 +251,19 @@ h6 { font-size: 12px; line-height: 14px; }
 	margin-left:auto;
 	margin-right:auto;
 }
+/* New captions */
+figure {
+	display: table;
+}
+figure.pull-center,
+img.pull-center {
+	margin-left: auto;
+	margin-right: auto;
+}
+figcaption {
+	display: table-caption;
+	caption-side: bottom;
+}
 /* Aside Subnavs */
 #aside .nav .nav-child {
 	border-left: 2px solid @tableBorder;
diff --git a/templates/protostar/templateDetails.xml b/templates/protostar/templateDetails.xml
index 6c797bf..f9086d9 100644
--- a/templates/protostar/templateDetails.xml
+++ b/templates/protostar/templateDetails.xml
@@ -6,7 +6,7 @@
 	<creationDate>4/30/2012</creationDate>
 	<author>Kyle Ledbetter</author>
 	<authorEmail>admin@joomla.org</authorEmail>
-	<copyright>Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.</copyright>
 	<description>TPL_PROTOSTAR_XML_DESCRIPTION</description>
 	<files>
 		<filename>component.php</filename>
diff --git a/templates/system/component.php b/templates/system/component.php
index 88651f1..9c728c4 100644
--- a/templates/system/component.php
+++ b/templates/system/component.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/editor.css b/templates/system/css/editor.css
index 9af5708..f21308b 100644
--- a/templates/system/css/editor.css
+++ b/templates/system/css/editor.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/error.css b/templates/system/css/error.css
index 93911a9..d0f87a6 100644
--- a/templates/system/css/error.css
+++ b/templates/system/css/error.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/error_rtl.css b/templates/system/css/error_rtl.css
index bb65fc9..746ff25 100644
--- a/templates/system/css/error_rtl.css
+++ b/templates/system/css/error_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/general.css b/templates/system/css/general.css
index 38b02f7..0bf884d 100644
--- a/templates/system/css/general.css
+++ b/templates/system/css/general.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/offline.css b/templates/system/css/offline.css
index d0c026c..f4c459f 100644
--- a/templates/system/css/offline.css
+++ b/templates/system/css/offline.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/offline_rtl.css b/templates/system/css/offline_rtl.css
index 81479af..cffdc56 100644
--- a/templates/system/css/offline_rtl.css
+++ b/templates/system/css/offline_rtl.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/system.css b/templates/system/css/system.css
index ba9788a..6bfab23 100644
--- a/templates/system/css/system.css
+++ b/templates/system/css/system.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/css/toolbar.css b/templates/system/css/toolbar.css
index 71ebc3e..d5c501d 100644
--- a/templates/system/css/toolbar.css
+++ b/templates/system/css/toolbar.css
@@ -1,5 +1,5 @@
 /**
- * @copyright	Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright	Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license		GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/error.php b/templates/system/error.php
index 94980b2..568c5d9 100644
--- a/templates/system/error.php
+++ b/templates/system/error.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/html/modules.php b/templates/system/html/modules.php
index 3b35594..673339e 100644
--- a/templates/system/html/modules.php
+++ b/templates/system/html/modules.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/index.php b/templates/system/index.php
index a63e55f..abab967 100644
--- a/templates/system/index.php
+++ b/templates/system/index.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/system/offline.php b/templates/system/offline.php
index 0a544d2..413411a 100644
--- a/templates/system/offline.php
+++ b/templates/system/offline.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Template.system
  *
- * @copyright   Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
+ * @copyright   Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/templates/t3_blank/css/template.css b/templates/t3_blank/css/template.css
index beb5aec..185f171 100644
--- a/templates/t3_blank/css/template.css
+++ b/templates/t3_blank/css/template.css
@@ -2710,6 +2710,9 @@ article aside .btn-group > .dropdown-toggle:focus {
   float: left;
   margin: 0 10px 20px;
 }
+table.adminlist th a {
+  color: #07b;
+}
 .article-content .pagination ul {
   border-left: 1px solid #ddd;
 }
diff --git a/templates/t3_blank/css/themes/dark/template.css b/templates/t3_blank/css/themes/dark/template.css
index d4bd48b..2c7ab13 100644
--- a/templates/t3_blank/css/themes/dark/template.css
+++ b/templates/t3_blank/css/themes/dark/template.css
@@ -2777,6 +2777,9 @@ article aside .btn-group > .dropdown-toggle:focus {
   float: left;
   margin: 0 10px 20px;
 }
+table.adminlist th a {
+  color: #22afff;
+}
 .article-content .pagination ul {
   border-left: 1px solid #444;
 }
diff --git a/templates/t3_blank/css/themes/green/template.css b/templates/t3_blank/css/themes/green/template.css
index e8e37c0..56d4f93 100644
--- a/templates/t3_blank/css/themes/green/template.css
+++ b/templates/t3_blank/css/themes/green/template.css
@@ -2710,6 +2710,9 @@ article aside .btn-group > .dropdown-toggle:focus {
   float: left;
   margin: 0 10px 20px;
 }
+table.adminlist th a {
+  color: #690;
+}
 .article-content .pagination ul {
   border-left: 1px solid #ddd;
 }
diff --git a/templates/t3_blank/css/themes/orange/template.css b/templates/t3_blank/css/themes/orange/template.css
index d115259..42216cf 100644
--- a/templates/t3_blank/css/themes/orange/template.css
+++ b/templates/t3_blank/css/themes/orange/template.css
@@ -2710,6 +2710,9 @@ article aside .btn-group > .dropdown-toggle:focus {
   float: left;
   margin: 0 10px 20px;
 }
+table.adminlist th a {
+  color: #f80;
+}
 .article-content .pagination ul {
   border-left: 1px solid #ddd;
 }
diff --git a/templates/t3_blank/css/themes/red/template.css b/templates/t3_blank/css/themes/red/template.css
index 687594a..dd6c09d 100644
--- a/templates/t3_blank/css/themes/red/template.css
+++ b/templates/t3_blank/css/themes/red/template.css
@@ -2777,6 +2777,9 @@ article aside .btn-group > .dropdown-toggle:focus {
   float: left;
   margin: 0 10px 20px;
 }
+table.adminlist th a {
+  color: #c00;
+}
 .article-content .pagination ul {
   border-left: 1px solid #ddd;
 }
diff --git a/templates/t3_blank/less/joomla.less b/templates/t3_blank/less/joomla.less
index a150a9d..6b8946c 100644
--- a/templates/t3_blank/less/joomla.less
+++ b/templates/t3_blank/less/joomla.less
@@ -782,6 +782,12 @@ article aside .btn-group {
   }  
 }
 
+// Addmin list table
+// -------------------
+table.adminlist th a {
+  color: @linkColor;
+}
+
 
 
 
diff --git a/templates/t3_blank/templateDetails.xml b/templates/t3_blank/templateDetails.xml
index 64ba1cc..02ee049 100644
--- a/templates/t3_blank/templateDetails.xml
+++ b/templates/t3_blank/templateDetails.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
 <extension version="2.5" type="template" method="upgrade" client="site">
 	<name>t3_blank</name>
-	<version>2.1.0</version>
-	<creationDate>24 Jan 2014</creationDate>
+	<version>2.1.1</version>
+	<creationDate>12 Feb 2014</creationDate>
 	<author>JoomlArt.com</author>
 	<authorEmail>webmaster@joomlart.com</authorEmail>
 	<authorUrl>http://www.t3-framework.org</authorUrl>
diff --git a/templates/t3_bs3_blank/css/bootstrap.css b/templates/t3_bs3_blank/css/bootstrap.css
index 9614e9b..aaf14fb 100644
--- a/templates/t3_bs3_blank/css/bootstrap.css
+++ b/templates/t3_bs3_blank/css/bootstrap.css
@@ -1,5 +1,13 @@
 
 
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -16,8 +24,10 @@ summary {
 }
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
 audio:not([controls]) {
   display: none;
@@ -27,28 +37,13 @@ audio:not([controls]) {
 template {
   display: none;
 }
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
 a {
   background: transparent;
 }
-a:focus {
-  outline: thin dotted;
-}
 a:active,
 a:hover {
   outline: 0;
 }
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 abbr[title] {
   border-bottom: 1px dotted;
 }
@@ -59,28 +54,14 @@ strong {
 dfn {
   font-style: italic;
 }
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 mark {
   background: #ff0;
   color: #000;
 }
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-}
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
 small {
   font-size: 80%;
 }
@@ -104,28 +85,34 @@ svg:not(:root) {
   overflow: hidden;
 }
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
-legend {
-  border: 0;
-  padding: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit;
-  font-size: 100%;
+  color: inherit;
+  font: inherit;
   margin: 0;
 }
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 button,
 select {
@@ -142,11 +129,23 @@ button[disabled],
 html input[disabled] {
   cursor: default;
 }
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   padding: 0;
 }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
 input[type="search"] {
   -webkit-appearance: textfield;
   -moz-box-sizing: content-box;
@@ -157,19 +156,29 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
   border: 0;
   padding: 0;
 }
 textarea {
   overflow: auto;
-  vertical-align: top;
+}
+optgroup {
+  font-weight: bold;
 }
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+td,
+th {
+  padding: 0;
+}
 @media print {
   * {
     text-shadow: none !important;
@@ -206,9 +215,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -244,7 +250,11 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-*,
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
@@ -284,6 +294,9 @@ a:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
@@ -340,6 +353,14 @@ code {
   white-space: nowrap;
   border-radius: 4px;
 }
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #ffffff;
+  background-color: #333333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -371,22 +392,6 @@ pre code {
   padding-left: 15px;
   padding-right: 15px;
 }
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .container {
     width: 750px;
@@ -402,26 +407,16 @@ pre code {
     width: 1170px;
   }
 }
+.container-fluid {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left: 15px;
+  padding-right: 15px;
+}
 .row {
   margin-left: -15px;
   margin-right: -15px;
 }
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
@@ -1136,73 +1131,110 @@ table col[class*="col-"] {
 }
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   float: none;
   display: table-cell;
 }
-.table > thead > tr > .active,
-.table > tbody > tr > .active,
-.table > tfoot > tr > .active,
-.table > thead > .active > td,
-.table > tbody > .active > td,
-.table > tfoot > .active > td,
-.table > thead > .active > th,
-.table > tbody > .active > th,
-.table > tfoot > .active > th {
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
-.table-hover > tbody > tr > .active:hover,
-.table-hover > tbody > .active:hover > td,
-.table-hover > tbody > .active:hover > th {
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
   background-color: #e8e8e8;
 }
-.table > thead > tr > .success,
-.table > tbody > tr > .success,
-.table > tfoot > tr > .success,
-.table > thead > .success > td,
-.table > tbody > .success > td,
-.table > tfoot > .success > td,
-.table > thead > .success > th,
-.table > tbody > .success > th,
-.table > tfoot > .success > th {
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
   background-color: #dff0d8;
 }
-.table-hover > tbody > tr > .success:hover,
-.table-hover > tbody > .success:hover > td,
-.table-hover > tbody > .success:hover > th {
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-.table > thead > tr > .danger,
-.table > tbody > tr > .danger,
-.table > tfoot > tr > .danger,
-.table > thead > .danger > td,
-.table > tbody > .danger > td,
-.table > tfoot > .danger > td,
-.table > thead > .danger > th,
-.table > tbody > .danger > th,
-.table > tfoot > .danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > .danger:hover,
-.table-hover > tbody > .danger:hover > td,
-.table-hover > tbody > .danger:hover > th {
-  background-color: #ebcccc;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-.table > thead > tr > .warning,
-.table > tbody > tr > .warning,
-.table > tfoot > tr > .warning,
-.table > thead > .warning > td,
-.table > tbody > .warning > td,
-.table > tfoot > .warning > td,
-.table > thead > .warning > th,
-.table > tbody > .warning > th,
-.table > tfoot > .warning > th {
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
   background-color: #fcf8e3;
 }
-.table-hover > tbody > tr > .warning:hover,
-.table-hover > tbody > .warning:hover > td,
-.table-hover > tbody > .warning:hover > th {
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
@@ -1275,7 +1307,6 @@ input[type="color"],
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -1437,6 +1468,7 @@ fieldset[disabled] input[type="color"],
 fieldset[disabled] .inputbox {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textareaselect,
 textareatextarea,
@@ -1685,7 +1717,8 @@ selectinput.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textareainput.input-sm {
+textareainput.input-sm,
+select[multiple]input.input-sm {
   height: auto;
 }
 input.input-lg {
@@ -1699,7 +1732,8 @@ selectinput.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textareainput.input-lg {
+textareainput.input-lg,
+select[multiple]input.input-lg {
   height: auto;
 }
 @media (min-width: 768px) {
@@ -1928,6 +1962,7 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  min-width: 0;
 }
 legend {
   display: block;
@@ -1960,15 +1995,14 @@ input[type="checkbox"] {
 input[type="file"] {
   display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
@@ -1976,17 +2010,12 @@ input[type="checkbox"]:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
 }
 .form-control {
   display: block;
@@ -1996,7 +2025,6 @@ output {
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -2030,10 +2058,14 @@ output {
 fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textarea.form-control {
   height: auto;
 }
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
@@ -2044,12 +2076,10 @@ textarea.form-control {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 20px;
-  vertical-align: middle;
 }
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
@@ -2103,7 +2133,8 @@ select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
 .input-lg {
@@ -2117,9 +2148,52 @@ select.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-right: 42.5px;
+}
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  right: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #468847;
+}
+.has-success .form-control {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-success .form-control:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+.has-success .input-group-addon {
+  color: #468847;
+  border-color: #468847;
+  background-color: #dff0d8;
+}
+.has-success .form-control-feedback {
+  color: #468847;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
@@ -2143,6 +2217,9 @@ textarea.input-lg {
   border-color: #c09853;
   background-color: #fcf8e3;
 }
+.has-warning .form-control-feedback {
+  color: #c09853;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
@@ -2166,28 +2243,8 @@ textarea.input-lg {
   border-color: #b94a48;
   background-color: #f2dede;
 }
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #468847;
-}
-.has-success .form-control {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-.has-success .input-group-addon {
-  color: #468847;
-  border-color: #468847;
-  background-color: #dff0d8;
+.has-error .form-control-feedback {
+  color: #b94a48;
 }
 .form-control-static {
   margin-bottom: 0;
@@ -2206,9 +2263,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
-  }
-  .form-inline select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -2216,12 +2276,16 @@ textarea.input-lg {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 .form-horizontal .control-label,
 .form-horizontal .radio,
@@ -2240,22 +2304,6 @@ textarea.input-lg {
   margin-left: -15px;
   margin-right: -15px;
 }
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
@@ -2264,6 +2312,10 @@ textarea.input-lg {
     text-align: right;
   }
 }
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  right: 15px;
+}
 .btn {
   display: inline-block;
   margin-bottom: 0;
@@ -2350,7 +2402,7 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-default .badge {
   color: #ffffff;
-  background-color: #fff;
+  background-color: #333333;
 }
 .btn-primary {
   color: #ffffff;
@@ -2391,100 +2443,18 @@ fieldset[disabled] .btn-primary.active {
 }
 .btn-primary .badge {
   color: #428bca;
-  background-color: #fff;
+  background-color: #ffffff;
 }
-.btn-warning {
+.btn-success {
   color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
 }
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
   color: #ffffff;
   background-color: #47a447;
   border-color: #398439;
@@ -2514,7 +2484,7 @@ fieldset[disabled] .btn-success.active {
 }
 .btn-success .badge {
   color: #5cb85c;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-info {
   color: #ffffff;
@@ -2555,7 +2525,89 @@ fieldset[disabled] .btn-info.active {
 }
 .btn-info .badge {
   color: #5bc0de;
-  background-color: #fff;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
 }
 .btn-link {
   color: #428bca;
@@ -2679,7 +2731,7 @@ input[type="button"].btn-block {
 @font-face {
   font-family: 'Glyphicons Halflings';
   src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot');
-  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;
@@ -2692,9 +2744,6 @@ input[type="button"].btn-block {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-.glyphicon:empty {
-  width: 1em;
-}
 .glyphicon-asterisk:before {
   content: "\2a";
 }
@@ -3383,6 +3432,14 @@ input[type="button"].btn-block {
 .open > a {
   outline: 0;
 }
+.dropdown-menu-right {
+  left: auto;
+  right: 0;
+}
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
@@ -3416,8 +3473,12 @@ input[type="button"].btn-block {
 }
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
-    right: 0;
     left: auto;
+    right: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    left: 0;
+    right: auto;
   }
 }
 .btn-group,
@@ -3451,29 +3512,16 @@ input[type="button"].btn-block {
 .btn-group .btn-group + .btn-group {
   margin-left: -1px;
 }
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
+.btn-toolbar {
+  margin-left: -5px;
 }
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: left;
 }
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-left: 5px;
 }
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
@@ -3562,22 +3610,6 @@ input[type="button"].btn-block {
   width: 100%;
   max-width: 100%;
 }
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
@@ -3604,12 +3636,12 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-right-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3643,6 +3675,7 @@ input[type="button"].btn-block {
   padding-right: 0;
 }
 .input-group .form-control {
+  float: left;
   width: 100%;
   margin-bottom: 0;
 }
@@ -3663,7 +3696,10 @@ select.input-group-lg > .input-group-btn > .btn {
 }
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-sm > .form-control,
@@ -3683,7 +3719,10 @@ select.input-group-sm > .input-group-btn > .btn {
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-addon,
@@ -3730,8 +3769,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3741,8 +3782,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3751,45 +3794,33 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-.input-group-btn:first-child > .btn {
-  margin-right: -1px;
-}
-.input-group-btn:last-child > .btn {
-  margin-left: -1px;
-}
 .input-group-btn > .btn {
   position: relative;
 }
 .input-group-btn > .btn + .btn {
-  margin-left: -4px;
+  margin-left: -1px;
 }
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-left: -1px;
+}
 .nav {
   margin-bottom: 0;
   padding-left: 0;
   list-style: none;
 }
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
 .nav > li {
   position: relative;
   display: block;
@@ -3983,43 +4014,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar-header {
     float: left;
@@ -4034,24 +4033,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
 }
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse.in {
-  overflow-y: auto;
+.navbar-collapse.in {
+  overflow-y: auto;
 }
 @media (min-width: 768px) {
   .navbar-collapse {
@@ -4076,13 +4059,17 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
 }
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-right: -15px;
   margin-left: -15px;
 }
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-right: 0;
     margin-left: 0;
   }
@@ -4123,13 +4110,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
+  height: 20px;
 }
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-left: -15px;
   }
 }
@@ -4145,6 +4134,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border: 1px solid transparent;
   border-radius: 4px;
 }
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
@@ -4240,9 +4232,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
-  }
-  .navbar-form select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -4250,12 +4245,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 @media (max-width: 767px) {
   .navbar-form .form-group {
@@ -4286,11 +4285,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-}
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
@@ -4523,6 +4517,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
+  color: #428bca;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   margin-left: -1px;
@@ -4542,7 +4537,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
+  color: #2a6496;
   background-color: #eeeeee;
+  border-color: #dddddd;
 }
 .pagination > .active > a,
 .pagination > .active > span,
@@ -4603,22 +4600,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   list-style: none;
   text-align: center;
 }
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
 .pager li {
   display: inline;
 }
@@ -4739,6 +4720,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
   position: relative;
   top: -1px;
 }
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
   color: #ffffff;
@@ -4756,19 +4741,17 @@ a.list-group-item.active > .badge,
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
   background-color: #eeeeee;
 }
 .jumbotron h1,
 .jumbotron .h1 {
-  line-height: 1;
   color: inherit;
 }
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
 .container .jumbotron {
   border-radius: 6px;
@@ -5051,6 +5034,94 @@ a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #e1edf7;
 }
+.list-group-item-success {
+  color: #468847;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #468847;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #468847;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #468847;
+  border-color: #468847;
+}
+.list-group-item-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #3a87ad;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #3a87ad;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #3a87ad;
+  border-color: #3a87ad;
+}
+.list-group-item-warning {
+  color: #c09853;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #c09853;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #c09853;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #c09853;
+  border-color: #c09853;
+}
+.list-group-item-danger {
+  color: #b94a48;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #b94a48;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #b94a48;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #b94a48;
+  border-color: #b94a48;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
@@ -5070,35 +5141,27 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-body {
   padding: 15px;
 }
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
 .panel > .list-group {
   margin-bottom: 0;
 }
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
 .panel > .list-group .list-group-item:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
+  border-top: 0;
 }
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
@@ -5106,12 +5169,52 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table {
   margin-bottom: 0;
 }
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-right-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
   border-top: 1px solid #dddddd;
 }
-.panel > .table > tbody:first-child th,
-.panel > .table > tbody:first-child td {
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0;
 }
 .panel > .table-bordered,
@@ -5146,6 +5249,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-right: 0;
 }
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -5189,6 +5306,9 @@ a.list-group-item.active:focus .list-group-item-text {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   border-radius: 4px;
@@ -5251,6 +5371,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
@@ -5279,20 +5413,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -5352,7 +5472,9 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1040;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
 .modal.fade .modal-dialog {
   -webkit-transform: translate(0, -25%);
@@ -5372,7 +5494,6 @@ button.close {
   position: relative;
   width: auto;
   margin: 10px;
-  z-index: 1050;
 }
 .modal-content {
   position: relative;
@@ -5391,7 +5512,7 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1030;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -5424,22 +5545,6 @@ button.close {
   text-align: right;
   border-top: 1px solid #e5e5e5;
 }
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
 .modal-footer .btn + .btn {
   margin-left: 5px;
   margin-bottom: 0;
@@ -5450,7 +5555,7 @@ button.close {
 .modal-footer .btn-block + .btn-block {
   margin-left: 0;
 }
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
     margin: 30px auto;
@@ -5459,6 +5564,12 @@ button.close {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
+  }
 }
 .tooltip {
   position: absolute;
@@ -5859,11 +5970,50 @@ button.close {
   }
 }
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   content: " ";
   display: table;
 }
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
 .center-block {
@@ -5924,72 +6074,12 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  table.visible-xs.visible-sm {
-    display: table;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  table.visible-xs.visible-md {
-    display: table;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  table.visible-xs.visible-lg {
-    display: table;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  table.visible-sm.visible-xs {
-    display: table;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
@@ -6005,72 +6095,12 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  table.visible-sm.visible-md {
-    display: table;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  table.visible-sm.visible-lg {
-    display: table;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  table.visible-md.visible-xs {
-    display: table;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  table.visible-md.visible-sm {
-    display: table;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
@@ -6086,72 +6116,12 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  table.visible-md.visible-lg {
-    display: table;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  table.visible-lg.visible-xs {
-    display: table;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  table.visible-lg.visible-sm {
-    display: table;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  table.visible-lg.visible-md {
-    display: table;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
@@ -6167,19 +6137,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-.hidden-xs {
-  display: block !important;
-}
-table.hidden-xs {
-  display: table;
-}
-tr.hidden-xs {
-  display: table-row !important;
-}
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -6188,51 +6145,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  display: block !important;
-}
-table.hidden-sm {
-  display: table;
-}
-tr.hidden-sm {
-  display: table-row !important;
-}
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -6241,51 +6153,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-md {
-  display: block !important;
-}
-table.hidden-md {
-  display: table;
-}
-tr.hidden-md {
-  display: table-row !important;
-}
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -6294,51 +6161,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  display: block !important;
-}
-table.hidden-lg {
-  display: table;
-}
-tr.hidden-lg {
-  display: table-row !important;
-}
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -6367,10 +6189,12 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
   td.hidden-print {
     display: none !important;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/frontend-edit.css b/templates/t3_bs3_blank/css/frontend-edit.css
index 92100a9..9192e9e 100644
--- a/templates/t3_bs3_blank/css/frontend-edit.css
+++ b/templates/t3_bs3_blank/css/frontend-edit.css
@@ -237,7 +237,7 @@
   left: -100%;
 }
 .t3onoff label.on.active:before {
-  left: 0%;
+  left: -0%;
 }
 .t3onoff label.off:after {
   left: 60%;
@@ -354,4 +354,4 @@ fieldset.radio.btn-group label.active {
 .controls img.calendar {
   cursor: pointer;
   margin-left: 5px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/home.css b/templates/t3_bs3_blank/css/home.css
index 715f6d5..37def34 100644
--- a/templates/t3_bs3_blank/css/home.css
+++ b/templates/t3_bs3_blank/css/home.css
@@ -90,4 +90,4 @@
 .home .t3-sl-5 .jumbotron {
   border-radius: 0;
   margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/legacy-grid.css b/templates/t3_bs3_blank/css/legacy-grid.css
index aaff047..83adcc3 100644
--- a/templates/t3_bs3_blank/css/legacy-grid.css
+++ b/templates/t3_bs3_blank/css/legacy-grid.css
@@ -4,14 +4,6 @@
   margin-left: -15px;
   margin-right: -15px;
 }
-.row-fluid:before,
-.row-fluid:after {
-  content: " ";
-  display: table;
-}
-.row-fluid:after {
-  clear: both;
-}
 [class*="span"] {
   float: left;
 }
@@ -113,7 +105,7 @@
     display: inherit !important;
   }
   .visible-desktop {
-    display: none !important ;
+    display: none !important;
   }
   .visible-tablet {
     display: inherit !important;
@@ -195,4 +187,4 @@
 }
 .height-100 {
   height: 100px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/legacy-navigation.css b/templates/t3_bs3_blank/css/legacy-navigation.css
index 66533bf..250e85e 100644
--- a/templates/t3_bs3_blank/css/legacy-navigation.css
+++ b/templates/t3_bs3_blank/css/legacy-navigation.css
@@ -31,3 +31,4 @@
 .dropdown-submenu:hover > a:after {
   border-left-color: #262626;
 }
+
diff --git a/templates/t3_bs3_blank/css/megamenu.css b/templates/t3_bs3_blank/css/megamenu.css
index 23790c2..6634f50 100644
--- a/templates/t3_bs3_blank/css/megamenu.css
+++ b/templates/t3_bs3_blank/css/megamenu.css
@@ -181,7 +181,7 @@
   .t3-megamenu.animate .mega.animating > .mega-dropdown-menu {
     -webkit-transition: all 400ms;
     transition: all 400ms;
-    display: block!important;
+    display: block !important;
   }
   .t3-megamenu.animate .mega.open > .mega-dropdown-menu,
   .t3-megamenu.animate .mega.animating.open > .mega-dropdown-menu {
@@ -193,6 +193,7 @@
     transform: scale(0, 0);
     -webkit-transform-origin: 20% 20%;
     -moz-transform-origin: 20% 20%;
+    -ms-transform-origin: 20% 20%;
     transform-origin: 20% 20%;
   }
   .t3-megamenu.animate.zoom .mega.open > .mega-dropdown-menu {
@@ -206,6 +207,7 @@
     transform: scale(0, 0) translate(-50%, 0);
     -webkit-transform-origin: 0% 20%;
     -moz-transform-origin: 0% 20%;
+    -ms-transform-origin: 0% 20%;
     transform-origin: 0% 20%;
   }
   .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -219,6 +221,7 @@
     transform: scale(0, 1);
     -webkit-transform-origin: 10% 0;
     -moz-transform-origin: 10% 0;
+    -ms-transform-origin: 10% 0;
     transform-origin: 10% 0;
   }
   .t3-megamenu.animate.elastic .mega.open > .mega-dropdown-menu {
@@ -271,6 +274,7 @@
     min-width: 200px;
     margin-top: 0;
     margin-left: -500px;
+    width: 100%;
   }
   .t3-megamenu.animate.slide .mega .mega.open > .mega-dropdown-menu > div {
     margin-left: 0;
@@ -414,4 +418,4 @@
 .t3-megamenu .nav .input-group-addon [class*=" icon-"],
 .t3-megamenu .nav .input-group-addon .fa {
   margin-right: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/off-canvas.css b/templates/t3_bs3_blank/css/off-canvas.css
index f2540ad..1a1764a 100644
--- a/templates/t3_bs3_blank/css/off-canvas.css
+++ b/templates/t3_bs3_blank/css/off-canvas.css
@@ -586,7 +586,7 @@ body.off-canvas-effect-14.off-canvas-right {
   transform: translate3d(100%, 0, 0) rotateY(0deg);
 }
 .old-ie .t3-off-canvas {
-  z-index: 100!important;
+  z-index: 100 !important;
   left: -250px;
 }
 html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
@@ -651,9 +651,12 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+.t3-off-canvas .t3-off-canvas-body .dropdown-menu .active a {
+  background: transparent;
+}
 .t3-off-canvas .t3-off-canvas-body .t3-module {
   margin-bottom: 20px;
 }
 .t3-off-canvas .t3-off-canvas-body .module-title {
   margin-bottom: 10px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/bootstrap.css b/templates/t3_bs3_blank/css/rtl/bootstrap.css
index 97a58c2..84e76d8 100644
--- a/templates/t3_bs3_blank/css/rtl/bootstrap.css
+++ b/templates/t3_bs3_blank/css/rtl/bootstrap.css
@@ -1,5 +1,13 @@
 
 
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -16,8 +24,10 @@ summary {
 }
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
 audio:not([controls]) {
   display: none;
@@ -27,28 +37,13 @@ audio:not([controls]) {
 template {
   display: none;
 }
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
 a {
   background: transparent;
 }
-a:focus {
-  outline: thin dotted;
-}
 a:active,
 a:hover {
   outline: 0;
 }
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 abbr[title] {
   border-bottom: 1px dotted;
 }
@@ -59,28 +54,14 @@ strong {
 dfn {
   font-style: italic;
 }
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 mark {
   background: #ff0;
   color: #000;
 }
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-}
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
 small {
   font-size: 80%;
 }
@@ -104,28 +85,34 @@ svg:not(:root) {
   overflow: hidden;
 }
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
-legend {
-  border: 0;
-  padding: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit;
-  font-size: 100%;
+  color: inherit;
+  font: inherit;
   margin: 0;
 }
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 button,
 select {
@@ -142,11 +129,23 @@ button[disabled],
 html input[disabled] {
   cursor: default;
 }
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   padding: 0;
 }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
 input[type="search"] {
   -webkit-appearance: textfield;
   -moz-box-sizing: content-box;
@@ -157,19 +156,29 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
   border: 0;
   padding: 0;
 }
 textarea {
   overflow: auto;
-  vertical-align: top;
+}
+optgroup {
+  font-weight: bold;
 }
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+td,
+th {
+  padding: 0;
+}
 @media print {
   * {
     text-shadow: none !important;
@@ -206,9 +215,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -244,7 +250,11 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-*,
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
@@ -284,6 +294,9 @@ a:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
@@ -340,6 +353,14 @@ code {
   white-space: nowrap;
   border-radius: 4px;
 }
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #ffffff;
+  background-color: #333333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -371,22 +392,6 @@ pre code {
   padding-right: 15px;
   padding-left: 15px;
 }
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .container {
     width: 750px;
@@ -402,26 +407,16 @@ pre code {
     width: 1170px;
   }
 }
+.container-fluid {
+  margin-left: auto;
+  margin-right: auto;
+  padding-right: 15px;
+  padding-left: 15px;
+}
 .row {
   margin-right: -15px;
   margin-left: -15px;
 }
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
@@ -1136,73 +1131,110 @@ table col[class*="col-"] {
 }
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   float: none;
   display: table-cell;
 }
-.table > thead > tr > .active,
-.table > tbody > tr > .active,
-.table > tfoot > tr > .active,
-.table > thead > .active > td,
-.table > tbody > .active > td,
-.table > tfoot > .active > td,
-.table > thead > .active > th,
-.table > tbody > .active > th,
-.table > tfoot > .active > th {
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
-.table-hover > tbody > tr > .active:hover,
-.table-hover > tbody > .active:hover > td,
-.table-hover > tbody > .active:hover > th {
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
   background-color: #e8e8e8;
 }
-.table > thead > tr > .success,
-.table > tbody > tr > .success,
-.table > tfoot > tr > .success,
-.table > thead > .success > td,
-.table > tbody > .success > td,
-.table > tfoot > .success > td,
-.table > thead > .success > th,
-.table > tbody > .success > th,
-.table > tfoot > .success > th {
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
   background-color: #dff0d8;
 }
-.table-hover > tbody > tr > .success:hover,
-.table-hover > tbody > .success:hover > td,
-.table-hover > tbody > .success:hover > th {
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-.table > thead > tr > .danger,
-.table > tbody > tr > .danger,
-.table > tfoot > tr > .danger,
-.table > thead > .danger > td,
-.table > tbody > .danger > td,
-.table > tfoot > .danger > td,
-.table > thead > .danger > th,
-.table > tbody > .danger > th,
-.table > tfoot > .danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > .danger:hover,
-.table-hover > tbody > .danger:hover > td,
-.table-hover > tbody > .danger:hover > th {
-  background-color: #ebcccc;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-.table > thead > tr > .warning,
-.table > tbody > tr > .warning,
-.table > tfoot > tr > .warning,
-.table > thead > .warning > td,
-.table > tbody > .warning > td,
-.table > tfoot > .warning > td,
-.table > thead > .warning > th,
-.table > tbody > .warning > th,
-.table > tfoot > .warning > th {
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
   background-color: #fcf8e3;
 }
-.table-hover > tbody > tr > .warning:hover,
-.table-hover > tbody > .warning:hover > td,
-.table-hover > tbody > .warning:hover > th {
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
@@ -1275,7 +1307,6 @@ input[type="color"],
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -1437,6 +1468,7 @@ fieldset[disabled] input[type="color"],
 fieldset[disabled] .inputbox {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textareaselect,
 textareatextarea,
@@ -1685,7 +1717,8 @@ selectinput.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textareainput.input-sm {
+textareainput.input-sm,
+select[multiple]input.input-sm {
   height: auto;
 }
 input.input-lg {
@@ -1699,7 +1732,8 @@ selectinput.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textareainput.input-lg {
+textareainput.input-lg,
+select[multiple]input.input-lg {
   height: auto;
 }
 @media (min-width: 768px) {
@@ -1928,6 +1962,7 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  min-width: 0;
 }
 legend {
   display: block;
@@ -1960,15 +1995,14 @@ input[type="checkbox"] {
 input[type="file"] {
   display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
@@ -1976,17 +2010,12 @@ input[type="checkbox"]:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
 }
 .form-control {
   display: block;
@@ -1996,7 +2025,6 @@ output {
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -2030,10 +2058,14 @@ output {
 fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textarea.form-control {
   height: auto;
 }
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
@@ -2044,12 +2076,10 @@ textarea.form-control {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-right: 20px;
-  vertical-align: middle;
 }
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
@@ -2103,7 +2133,8 @@ select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
 .input-lg {
@@ -2117,9 +2148,52 @@ select.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-left: 42.5px;
+}
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  left: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #468847;
+}
+.has-success .form-control {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-success .form-control:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+.has-success .input-group-addon {
+  color: #468847;
+  border-color: #468847;
+  background-color: #dff0d8;
+}
+.has-success .form-control-feedback {
+  color: #468847;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
@@ -2143,6 +2217,9 @@ textarea.input-lg {
   border-color: #c09853;
   background-color: #fcf8e3;
 }
+.has-warning .form-control-feedback {
+  color: #c09853;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
@@ -2166,28 +2243,8 @@ textarea.input-lg {
   border-color: #b94a48;
   background-color: #f2dede;
 }
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #468847;
-}
-.has-success .form-control {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-.has-success .input-group-addon {
-  color: #468847;
-  border-color: #468847;
-  background-color: #dff0d8;
+.has-error .form-control-feedback {
+  color: #b94a48;
 }
 .form-control-static {
   margin-bottom: 0;
@@ -2206,9 +2263,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
-  }
-  .form-inline select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -2216,12 +2276,16 @@ textarea.input-lg {
     margin-top: 0;
     margin-bottom: 0;
     padding-right: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-right: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 .form-horizontal .control-label,
 .form-horizontal .radio,
@@ -2240,22 +2304,6 @@ textarea.input-lg {
   margin-right: -15px;
   margin-left: -15px;
 }
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
@@ -2264,6 +2312,10 @@ textarea.input-lg {
     text-align: left;
   }
 }
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  left: 15px;
+}
 .btn {
   display: inline-block;
   margin-bottom: 0;
@@ -2350,7 +2402,7 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-default .badge {
   color: #ffffff;
-  background-color: #fff;
+  background-color: #333333;
 }
 .btn-primary {
   color: #ffffff;
@@ -2391,100 +2443,18 @@ fieldset[disabled] .btn-primary.active {
 }
 .btn-primary .badge {
   color: #428bca;
-  background-color: #fff;
+  background-color: #ffffff;
 }
-.btn-warning {
+.btn-success {
   color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
 }
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
   color: #ffffff;
   background-color: #47a447;
   border-color: #398439;
@@ -2514,7 +2484,7 @@ fieldset[disabled] .btn-success.active {
 }
 .btn-success .badge {
   color: #5cb85c;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-info {
   color: #ffffff;
@@ -2555,7 +2525,89 @@ fieldset[disabled] .btn-info.active {
 }
 .btn-info .badge {
   color: #5bc0de;
-  background-color: #fff;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
 }
 .btn-link {
   color: #428bca;
@@ -2679,7 +2731,7 @@ input[type="button"].btn-block {
 @font-face {
   font-family: 'Glyphicons Halflings';
   src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot');
-  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;
@@ -2692,9 +2744,6 @@ input[type="button"].btn-block {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-.glyphicon:empty {
-  width: 1em;
-}
 .glyphicon-asterisk:before {
   content: "\2a";
 }
@@ -3383,6 +3432,14 @@ input[type="button"].btn-block {
 .open > a {
   outline: 0;
 }
+.dropdown-menu-right {
+  right: auto;
+  left: 0;
+}
+.dropdown-menu-left {
+  right: 0;
+  left: auto;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
@@ -3416,8 +3473,12 @@ input[type="button"].btn-block {
 }
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
-    left: 0;
     right: auto;
+    left: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    right: 0;
+    left: auto;
   }
 }
 .btn-group,
@@ -3451,29 +3512,16 @@ input[type="button"].btn-block {
 .btn-group .btn-group + .btn-group {
   margin-right: -1px;
 }
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
+.btn-toolbar {
+  margin-right: -5px;
 }
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: right;
 }
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-right: 5px;
 }
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
@@ -3562,22 +3610,6 @@ input[type="button"].btn-block {
   width: 100%;
   max-width: 100%;
 }
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
@@ -3604,12 +3636,12 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3643,6 +3675,7 @@ input[type="button"].btn-block {
   padding-left: 0;
 }
 .input-group .form-control {
+  float: right;
   width: 100%;
   margin-bottom: 0;
 }
@@ -3663,7 +3696,10 @@ select.input-group-lg > .input-group-btn > .btn {
 }
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-sm > .form-control,
@@ -3683,7 +3719,10 @@ select.input-group-sm > .input-group-btn > .btn {
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-addon,
@@ -3730,8 +3769,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3741,8 +3782,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3751,45 +3794,33 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-.input-group-btn:first-child > .btn {
-  margin-left: -1px;
-}
-.input-group-btn:last-child > .btn {
-  margin-right: -1px;
-}
 .input-group-btn > .btn {
   position: relative;
 }
 .input-group-btn > .btn + .btn {
-  margin-right: -4px;
+  margin-right: -1px;
 }
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-left: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-right: -1px;
+}
 .nav {
   margin-bottom: 0;
   padding-right: 0;
   list-style: none;
 }
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
 .nav > li {
   position: relative;
   display: block;
@@ -3983,43 +4014,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar-header {
     float: right;
@@ -4034,24 +4033,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
 }
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse.in {
-  overflow-y: auto;
+.navbar-collapse.in {
+  overflow-y: auto;
 }
 @media (min-width: 768px) {
   .navbar-collapse {
@@ -4076,13 +4059,17 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
 }
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-left: -15px;
   margin-right: -15px;
 }
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-left: 0;
     margin-right: 0;
   }
@@ -4123,13 +4110,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
+  height: 20px;
 }
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-right: -15px;
   }
 }
@@ -4145,6 +4134,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border: 1px solid transparent;
   border-radius: 4px;
 }
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
@@ -4240,9 +4232,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
-  }
-  .navbar-form select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -4250,12 +4245,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-top: 0;
     margin-bottom: 0;
     padding-right: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-right: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 @media (max-width: 767px) {
   .navbar-form .form-group {
@@ -4286,11 +4285,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  right: auto;
-  left: 0;
-}
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
@@ -4523,6 +4517,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
+  color: #428bca;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   margin-right: -1px;
@@ -4542,7 +4537,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
+  color: #2a6496;
   background-color: #eeeeee;
+  border-color: #dddddd;
 }
 .pagination > .active > a,
 .pagination > .active > span,
@@ -4603,22 +4600,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   list-style: none;
   text-align: center;
 }
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
 .pager li {
   display: inline;
 }
@@ -4739,6 +4720,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
   position: relative;
   top: -1px;
 }
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
   color: #ffffff;
@@ -4756,19 +4741,17 @@ a.list-group-item.active > .badge,
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
   background-color: #eeeeee;
 }
 .jumbotron h1,
 .jumbotron .h1 {
-  line-height: 1;
   color: inherit;
 }
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
 .container .jumbotron {
   border-radius: 6px;
@@ -5051,6 +5034,94 @@ a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #e1edf7;
 }
+.list-group-item-success {
+  color: #468847;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #468847;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #468847;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #468847;
+  border-color: #468847;
+}
+.list-group-item-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #3a87ad;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #3a87ad;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #3a87ad;
+  border-color: #3a87ad;
+}
+.list-group-item-warning {
+  color: #c09853;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #c09853;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #c09853;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #c09853;
+  border-color: #c09853;
+}
+.list-group-item-danger {
+  color: #b94a48;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #b94a48;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #b94a48;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #b94a48;
+  border-color: #b94a48;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
@@ -5070,35 +5141,27 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-body {
   padding: 15px;
 }
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
 .panel > .list-group {
   margin-bottom: 0;
 }
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
 .panel > .list-group .list-group-item:first-child {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  border-top: 0;
 }
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
@@ -5106,12 +5169,52 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table {
   margin-bottom: 0;
 }
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-left-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
   border-top: 1px solid #dddddd;
 }
-.panel > .table > tbody:first-child th,
-.panel > .table > tbody:first-child td {
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0;
 }
 .panel > .table-bordered,
@@ -5146,6 +5249,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-left: 0;
 }
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -5189,6 +5306,9 @@ a.list-group-item.active:focus .list-group-item-text {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   border-radius: 4px;
@@ -5251,6 +5371,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
@@ -5279,20 +5413,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -5352,7 +5472,9 @@ button.close {
   left: 0;
   bottom: 0;
   right: 0;
-  z-index: 1040;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
 .modal.fade .modal-dialog {
   -webkit-transform: translate(0, -25%);
@@ -5372,7 +5494,6 @@ button.close {
   position: relative;
   width: auto;
   margin: 10px;
-  z-index: 1050;
 }
 .modal-content {
   position: relative;
@@ -5391,7 +5512,7 @@ button.close {
   left: 0;
   bottom: 0;
   right: 0;
-  z-index: 1030;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -5424,22 +5545,6 @@ button.close {
   text-align: left;
   border-top: 1px solid #e5e5e5;
 }
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
 .modal-footer .btn + .btn {
   margin-right: 5px;
   margin-bottom: 0;
@@ -5450,7 +5555,7 @@ button.close {
 .modal-footer .btn-block + .btn-block {
   margin-right: 0;
 }
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
     margin: 30px auto;
@@ -5459,6 +5564,12 @@ button.close {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
+  }
 }
 .tooltip {
   position: absolute;
@@ -5859,11 +5970,50 @@ button.close {
   }
 }
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   content: " ";
   display: table;
 }
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
 .center-block {
@@ -5924,72 +6074,12 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  table.visible-xs.visible-sm {
-    display: table;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  table.visible-xs.visible-md {
-    display: table;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  table.visible-xs.visible-lg {
-    display: table;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  table.visible-sm.visible-xs {
-    display: table;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
@@ -6005,72 +6095,12 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  table.visible-sm.visible-md {
-    display: table;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  table.visible-sm.visible-lg {
-    display: table;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  table.visible-md.visible-xs {
-    display: table;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  table.visible-md.visible-sm {
-    display: table;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
@@ -6086,72 +6116,12 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  table.visible-md.visible-lg {
-    display: table;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  table.visible-lg.visible-xs {
-    display: table;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  table.visible-lg.visible-sm {
-    display: table;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  table.visible-lg.visible-md {
-    display: table;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
@@ -6167,19 +6137,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-.hidden-xs {
-  display: block !important;
-}
-table.hidden-xs {
-  display: table;
-}
-tr.hidden-xs {
-  display: table-row !important;
-}
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -6188,51 +6145,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  display: block !important;
-}
-table.hidden-sm {
-  display: table;
-}
-tr.hidden-sm {
-  display: table-row !important;
-}
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -6241,51 +6153,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-md {
-  display: block !important;
-}
-table.hidden-md {
-  display: table;
-}
-tr.hidden-md {
-  display: table-row !important;
-}
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -6294,51 +6161,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  display: block !important;
-}
-table.hidden-lg {
-  display: table;
-}
-tr.hidden-lg {
-  display: table-row !important;
-}
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -6367,10 +6189,12 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
   td.hidden-print {
     display: none !important;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/bootstrap.css b/templates/t3_bs3_blank/css/rtl/dark/bootstrap.css
index 0ddce81..2a4165e 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/bootstrap.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/bootstrap.css
@@ -1,5 +1,13 @@
 
 
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -16,8 +24,10 @@ summary {
 }
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
 audio:not([controls]) {
   display: none;
@@ -27,28 +37,13 @@ audio:not([controls]) {
 template {
   display: none;
 }
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
 a {
   background: transparent;
 }
-a:focus {
-  outline: thin dotted;
-}
 a:active,
 a:hover {
   outline: 0;
 }
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 abbr[title] {
   border-bottom: 1px dotted;
 }
@@ -59,28 +54,14 @@ strong {
 dfn {
   font-style: italic;
 }
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 mark {
   background: #ff0;
   color: #000;
 }
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-}
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
 small {
   font-size: 80%;
 }
@@ -104,28 +85,34 @@ svg:not(:root) {
   overflow: hidden;
 }
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
-legend {
-  border: 0;
-  padding: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit;
-  font-size: 100%;
+  color: inherit;
+  font: inherit;
   margin: 0;
 }
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 button,
 select {
@@ -142,11 +129,23 @@ button[disabled],
 html input[disabled] {
   cursor: default;
 }
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   padding: 0;
 }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
 input[type="search"] {
   -webkit-appearance: textfield;
   -moz-box-sizing: content-box;
@@ -157,19 +156,29 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
   border: 0;
   padding: 0;
 }
 textarea {
   overflow: auto;
-  vertical-align: top;
+}
+optgroup {
+  font-weight: bold;
 }
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+td,
+th {
+  padding: 0;
+}
 @media print {
   * {
     text-shadow: none !important;
@@ -206,9 +215,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -244,7 +250,11 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-*,
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
@@ -284,6 +294,9 @@ a:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
@@ -340,6 +353,14 @@ code {
   white-space: nowrap;
   border-radius: 4px;
 }
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #ffffff;
+  background-color: #333333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -371,22 +392,6 @@ pre code {
   padding-right: 15px;
   padding-left: 15px;
 }
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .container {
     width: 750px;
@@ -402,26 +407,16 @@ pre code {
     width: 1170px;
   }
 }
+.container-fluid {
+  margin-left: auto;
+  margin-right: auto;
+  padding-right: 15px;
+  padding-left: 15px;
+}
 .row {
   margin-right: -15px;
   margin-left: -15px;
 }
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
@@ -1136,73 +1131,110 @@ table col[class*="col-"] {
 }
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   float: none;
   display: table-cell;
 }
-.table > thead > tr > .active,
-.table > tbody > tr > .active,
-.table > tfoot > tr > .active,
-.table > thead > .active > td,
-.table > tbody > .active > td,
-.table > tfoot > .active > td,
-.table > thead > .active > th,
-.table > tbody > .active > th,
-.table > tfoot > .active > th {
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
-.table-hover > tbody > tr > .active:hover,
-.table-hover > tbody > .active:hover > td,
-.table-hover > tbody > .active:hover > th {
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
   background-color: #e8e8e8;
 }
-.table > thead > tr > .success,
-.table > tbody > tr > .success,
-.table > tfoot > tr > .success,
-.table > thead > .success > td,
-.table > tbody > .success > td,
-.table > tfoot > .success > td,
-.table > thead > .success > th,
-.table > tbody > .success > th,
-.table > tfoot > .success > th {
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
   background-color: #dff0d8;
 }
-.table-hover > tbody > tr > .success:hover,
-.table-hover > tbody > .success:hover > td,
-.table-hover > tbody > .success:hover > th {
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-.table > thead > tr > .danger,
-.table > tbody > tr > .danger,
-.table > tfoot > tr > .danger,
-.table > thead > .danger > td,
-.table > tbody > .danger > td,
-.table > tfoot > .danger > td,
-.table > thead > .danger > th,
-.table > tbody > .danger > th,
-.table > tfoot > .danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > .danger:hover,
-.table-hover > tbody > .danger:hover > td,
-.table-hover > tbody > .danger:hover > th {
-  background-color: #ebcccc;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-.table > thead > tr > .warning,
-.table > tbody > tr > .warning,
-.table > tfoot > tr > .warning,
-.table > thead > .warning > td,
-.table > tbody > .warning > td,
-.table > tfoot > .warning > td,
-.table > thead > .warning > th,
-.table > tbody > .warning > th,
-.table > tfoot > .warning > th {
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
   background-color: #fcf8e3;
 }
-.table-hover > tbody > tr > .warning:hover,
-.table-hover > tbody > .warning:hover > td,
-.table-hover > tbody > .warning:hover > th {
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
@@ -1275,7 +1307,6 @@ input[type="color"],
   font-size: 14px;
   line-height: 1.428571429;
   color: #4b4b4b;
-  vertical-align: middle;
   background-color: #2d2d2d;
   background-image: none;
   border: 1px solid #1f1f1f;
@@ -1437,6 +1468,7 @@ fieldset[disabled] input[type="color"],
 fieldset[disabled] .inputbox {
   cursor: not-allowed;
   background-color: #878787;
+  opacity: 1;
 }
 textareaselect,
 textareatextarea,
@@ -1685,7 +1717,8 @@ selectinput.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textareainput.input-sm {
+textareainput.input-sm,
+select[multiple]input.input-sm {
   height: auto;
 }
 input.input-lg {
@@ -1699,7 +1732,8 @@ selectinput.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textareainput.input-lg {
+textareainput.input-lg,
+select[multiple]input.input-lg {
   height: auto;
 }
 @media (min-width: 768px) {
@@ -1928,6 +1962,7 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  min-width: 0;
 }
 legend {
   display: block;
@@ -1960,15 +1995,14 @@ input[type="checkbox"] {
 input[type="file"] {
   display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
@@ -1976,17 +2010,12 @@ input[type="checkbox"]:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #4b4b4b;
-  vertical-align: middle;
 }
 .form-control {
   display: block;
@@ -1996,7 +2025,6 @@ output {
   font-size: 14px;
   line-height: 1.428571429;
   color: #4b4b4b;
-  vertical-align: middle;
   background-color: #2d2d2d;
   background-image: none;
   border: 1px solid #1f1f1f;
@@ -2030,10 +2058,14 @@ output {
 fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #878787;
+  opacity: 1;
 }
 textarea.form-control {
   height: auto;
 }
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
@@ -2044,12 +2076,10 @@ textarea.form-control {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-right: 20px;
-  vertical-align: middle;
 }
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
@@ -2103,7 +2133,8 @@ select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
 .input-lg {
@@ -2117,9 +2148,52 @@ select.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-left: 42.5px;
+}
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  left: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #468847;
+}
+.has-success .form-control {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-success .form-control:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+.has-success .input-group-addon {
+  color: #468847;
+  border-color: #468847;
+  background-color: #dff0d8;
+}
+.has-success .form-control-feedback {
+  color: #468847;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
@@ -2143,6 +2217,9 @@ textarea.input-lg {
   border-color: #c09853;
   background-color: #fcf8e3;
 }
+.has-warning .form-control-feedback {
+  color: #c09853;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
@@ -2166,28 +2243,8 @@ textarea.input-lg {
   border-color: #b94a48;
   background-color: #f2dede;
 }
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #468847;
-}
-.has-success .form-control {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-.has-success .input-group-addon {
-  color: #468847;
-  border-color: #468847;
-  background-color: #dff0d8;
+.has-error .form-control-feedback {
+  color: #b94a48;
 }
 .form-control-static {
   margin-bottom: 0;
@@ -2206,9 +2263,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
-  }
-  .form-inline select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -2216,12 +2276,16 @@ textarea.input-lg {
     margin-top: 0;
     margin-bottom: 0;
     padding-right: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-right: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 .form-horizontal .control-label,
 .form-horizontal .radio,
@@ -2240,22 +2304,6 @@ textarea.input-lg {
   margin-right: -15px;
   margin-left: -15px;
 }
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
@@ -2264,6 +2312,10 @@ textarea.input-lg {
     text-align: left;
   }
 }
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  left: 15px;
+}
 .btn {
   display: inline-block;
   margin-bottom: 0;
@@ -2350,7 +2402,7 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-default .badge {
   color: #2d2d2d;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-primary {
   color: #ffffff;
@@ -2391,100 +2443,18 @@ fieldset[disabled] .btn-primary.active {
 }
 .btn-primary .badge {
   color: #0077bb;
-  background-color: #fff;
+  background-color: #ffffff;
 }
-.btn-warning {
+.btn-success {
   color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
 }
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
   color: #ffffff;
   background-color: #47a447;
   border-color: #398439;
@@ -2514,7 +2484,7 @@ fieldset[disabled] .btn-success.active {
 }
 .btn-success .badge {
   color: #5cb85c;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-info {
   color: #ffffff;
@@ -2555,7 +2525,89 @@ fieldset[disabled] .btn-info.active {
 }
 .btn-info .badge {
   color: #5bc0de;
-  background-color: #fff;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
 }
 .btn-link {
   color: #ffffff;
@@ -2679,7 +2731,7 @@ input[type="button"].btn-block {
 @font-face {
   font-family: 'Glyphicons Halflings';
   src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot');
-  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;
@@ -2692,9 +2744,6 @@ input[type="button"].btn-block {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-.glyphicon:empty {
-  width: 1em;
-}
 .glyphicon-asterisk:before {
   content: "\2a";
 }
@@ -3383,6 +3432,14 @@ input[type="button"].btn-block {
 .open > a {
   outline: 0;
 }
+.dropdown-menu-right {
+  right: auto;
+  left: 0;
+}
+.dropdown-menu-left {
+  right: 0;
+  left: auto;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
@@ -3416,8 +3473,12 @@ input[type="button"].btn-block {
 }
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
-    left: 0;
     right: auto;
+    left: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    right: 0;
+    left: auto;
   }
 }
 .btn-group,
@@ -3451,29 +3512,16 @@ input[type="button"].btn-block {
 .btn-group .btn-group + .btn-group {
   margin-right: -1px;
 }
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
+.btn-toolbar {
+  margin-right: -5px;
 }
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: right;
 }
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-right: 5px;
 }
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
@@ -3562,22 +3610,6 @@ input[type="button"].btn-block {
   width: 100%;
   max-width: 100%;
 }
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
@@ -3604,12 +3636,12 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3643,6 +3675,7 @@ input[type="button"].btn-block {
   padding-left: 0;
 }
 .input-group .form-control {
+  float: right;
   width: 100%;
   margin-bottom: 0;
 }
@@ -3663,7 +3696,10 @@ select.input-group-lg > .input-group-btn > .btn {
 }
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-sm > .form-control,
@@ -3683,7 +3719,10 @@ select.input-group-sm > .input-group-btn > .btn {
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-addon,
@@ -3730,8 +3769,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3741,8 +3782,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3751,45 +3794,33 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-.input-group-btn:first-child > .btn {
-  margin-left: -1px;
-}
-.input-group-btn:last-child > .btn {
-  margin-right: -1px;
-}
 .input-group-btn > .btn {
   position: relative;
 }
 .input-group-btn > .btn + .btn {
-  margin-right: -4px;
+  margin-right: -1px;
 }
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-left: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-right: -1px;
+}
 .nav {
   margin-bottom: 0;
   padding-right: 0;
   list-style: none;
 }
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
 .nav > li {
   position: relative;
   display: block;
@@ -3983,43 +4014,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar-header {
     float: right;
@@ -4034,24 +4033,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
 }
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse.in {
-  overflow-y: auto;
+.navbar-collapse.in {
+  overflow-y: auto;
 }
 @media (min-width: 768px) {
   .navbar-collapse {
@@ -4076,13 +4059,17 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
 }
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-left: -15px;
   margin-right: -15px;
 }
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-left: 0;
     margin-right: 0;
   }
@@ -4123,13 +4110,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
+  height: 20px;
 }
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-right: -15px;
   }
 }
@@ -4145,6 +4134,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border: 1px solid transparent;
   border-radius: 4px;
 }
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
@@ -4240,9 +4232,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
-  }
-  .navbar-form select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -4250,12 +4245,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-top: 0;
     margin-bottom: 0;
     padding-right: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-right: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 @media (max-width: 767px) {
   .navbar-form .form-group {
@@ -4286,11 +4285,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  right: auto;
-  left: 0;
-}
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
@@ -4523,6 +4517,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
+  color: #ffffff;
   background-color: #2d2d2d;
   border: 1px solid #1f1f1f;
   margin-right: -1px;
@@ -4542,7 +4537,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
+  color: #d9d9d9;
   background-color: #4b4b4b;
+  border-color: #dddddd;
 }
 .pagination > .active > a,
 .pagination > .active > span,
@@ -4563,8 +4560,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
   color: #4b4b4b;
-  background-color: #2d2d2d;
-  border-color: #1f1f1f;
+  background-color: #ffffff;
+  border-color: #dddddd;
   cursor: not-allowed;
 }
 .pagination-lg > li > a,
@@ -4603,22 +4600,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   list-style: none;
   text-align: center;
 }
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
 .pager li {
   display: inline;
 }
@@ -4739,6 +4720,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
   position: relative;
   top: -1px;
 }
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
   color: #ffffff;
@@ -4756,19 +4741,17 @@ a.list-group-item.active > .badge,
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
   background-color: #878787;
 }
 .jumbotron h1,
 .jumbotron .h1 {
-  line-height: 1;
   color: #ffffff;
 }
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
 .container .jumbotron {
   border-radius: 6px;
@@ -5051,6 +5034,94 @@ a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #88d4ff;
 }
+.list-group-item-success {
+  color: #468847;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #468847;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #468847;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #468847;
+  border-color: #468847;
+}
+.list-group-item-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #3a87ad;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #3a87ad;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #3a87ad;
+  border-color: #3a87ad;
+}
+.list-group-item-warning {
+  color: #c09853;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #c09853;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #c09853;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #c09853;
+  border-color: #c09853;
+}
+.list-group-item-danger {
+  color: #b94a48;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #b94a48;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #b94a48;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #b94a48;
+  border-color: #b94a48;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
@@ -5070,35 +5141,27 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-body {
   padding: 15px;
 }
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
 .panel > .list-group {
   margin-bottom: 0;
 }
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
 .panel > .list-group .list-group-item:first-child {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  border-top: 0;
 }
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
@@ -5106,12 +5169,52 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table {
   margin-bottom: 0;
 }
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-left-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
   border-top: 1px solid #dddddd;
 }
-.panel > .table > tbody:first-child th,
-.panel > .table > tbody:first-child td {
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0;
 }
 .panel > .table-bordered,
@@ -5146,6 +5249,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-left: 0;
 }
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -5189,6 +5306,9 @@ a.list-group-item.active:focus .list-group-item-text {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   border-radius: 4px;
@@ -5251,6 +5371,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
@@ -5279,20 +5413,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -5352,7 +5472,9 @@ button.close {
   left: 0;
   bottom: 0;
   right: 0;
-  z-index: 1040;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
 .modal.fade .modal-dialog {
   -webkit-transform: translate(0, -25%);
@@ -5372,7 +5494,6 @@ button.close {
   position: relative;
   width: auto;
   margin: 10px;
-  z-index: 1050;
 }
 .modal-content {
   position: relative;
@@ -5391,7 +5512,7 @@ button.close {
   left: 0;
   bottom: 0;
   right: 0;
-  z-index: 1030;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -5424,22 +5545,6 @@ button.close {
   text-align: left;
   border-top: 1px solid #e5e5e5;
 }
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
 .modal-footer .btn + .btn {
   margin-right: 5px;
   margin-bottom: 0;
@@ -5450,7 +5555,7 @@ button.close {
 .modal-footer .btn-block + .btn-block {
   margin-right: 0;
 }
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
     margin: 30px auto;
@@ -5459,6 +5564,12 @@ button.close {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
+  }
 }
 .tooltip {
   position: absolute;
@@ -5859,11 +5970,50 @@ button.close {
   }
 }
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   content: " ";
   display: table;
 }
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
 .center-block {
@@ -5924,72 +6074,12 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  table.visible-xs.visible-sm {
-    display: table;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  table.visible-xs.visible-md {
-    display: table;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  table.visible-xs.visible-lg {
-    display: table;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  table.visible-sm.visible-xs {
-    display: table;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
@@ -6005,72 +6095,12 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  table.visible-sm.visible-md {
-    display: table;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  table.visible-sm.visible-lg {
-    display: table;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  table.visible-md.visible-xs {
-    display: table;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  table.visible-md.visible-sm {
-    display: table;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
@@ -6086,72 +6116,12 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  table.visible-md.visible-lg {
-    display: table;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  table.visible-lg.visible-xs {
-    display: table;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  table.visible-lg.visible-sm {
-    display: table;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  table.visible-lg.visible-md {
-    display: table;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
@@ -6167,19 +6137,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-.hidden-xs {
-  display: block !important;
-}
-table.hidden-xs {
-  display: table;
-}
-tr.hidden-xs {
-  display: table-row !important;
-}
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -6188,51 +6145,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  display: block !important;
-}
-table.hidden-sm {
-  display: table;
-}
-tr.hidden-sm {
-  display: table-row !important;
-}
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -6241,51 +6153,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-md {
-  display: block !important;
-}
-table.hidden-md {
-  display: table;
-}
-tr.hidden-md {
-  display: table-row !important;
-}
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -6294,51 +6161,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  display: block !important;
-}
-table.hidden-lg {
-  display: table;
-}
-tr.hidden-lg {
-  display: table-row !important;
-}
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -6367,10 +6189,12 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
   td.hidden-print {
     display: none !important;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/frontend-edit.css b/templates/t3_bs3_blank/css/rtl/dark/frontend-edit.css
index 8619fca..c39e0fc 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/frontend-edit.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/frontend-edit.css
@@ -237,7 +237,7 @@
   right: -100%;
 }
 .t3onoff label.on.active:before {
-  right: 0%;
+  right: -0%;
 }
 .t3onoff label.off:after {
   right: 60%;
@@ -354,4 +354,4 @@ fieldset.radio.btn-group label.active {
 .controls img.calendar {
   cursor: pointer;
   margin-right: 5px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/home.css b/templates/t3_bs3_blank/css/rtl/dark/home.css
index 7dad11a..62d7775 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/home.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/home.css
@@ -90,4 +90,4 @@
 .home .t3-sl-5 .jumbotron {
   border-radius: 0;
   margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/legacy-grid.css b/templates/t3_bs3_blank/css/rtl/dark/legacy-grid.css
index 45bfb5a..a2153f3 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/legacy-grid.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/legacy-grid.css
@@ -4,14 +4,6 @@
   margin-right: -15px;
   margin-left: -15px;
 }
-.row-fluid:before,
-.row-fluid:after {
-  content: " ";
-  display: table;
-}
-.row-fluid:after {
-  clear: both;
-}
 [class*="span"] {
   float: right;
 }
@@ -113,7 +105,7 @@
     display: inherit !important;
   }
   .visible-desktop {
-    display: none !important ;
+    display: none !important;
   }
   .visible-tablet {
     display: inherit !important;
@@ -195,4 +187,4 @@
 }
 .height-100 {
   height: 100px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/legacy-navigation.css b/templates/t3_bs3_blank/css/rtl/dark/legacy-navigation.css
index 98ec952..eb1029b 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/legacy-navigation.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/legacy-navigation.css
@@ -31,3 +31,4 @@
 .dropdown-submenu:hover > a:after {
   border-right-color: #ffffff;
 }
+
diff --git a/templates/t3_bs3_blank/css/rtl/dark/megamenu.css b/templates/t3_bs3_blank/css/rtl/dark/megamenu.css
index d79cd4d..303eaa0 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/megamenu.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/megamenu.css
@@ -181,7 +181,7 @@
   .t3-megamenu.animate .mega.animating > .mega-dropdown-menu {
     -webkit-transition: all 400ms;
     transition: all 400ms;
-    display: block!important;
+    display: block !important;
   }
   .t3-megamenu.animate .mega.open > .mega-dropdown-menu,
   .t3-megamenu.animate .mega.animating.open > .mega-dropdown-menu {
@@ -193,6 +193,7 @@
     transform: scale(0, 0);
     -webkit-transform-origin: 20% 20%;
     -moz-transform-origin: 20% 20%;
+    -ms-transform-origin: 20% 20%;
     transform-origin: 20% 20%;
   }
   .t3-megamenu.animate.zoom .mega.open > .mega-dropdown-menu {
@@ -206,6 +207,7 @@
     transform: scale(0, 0) translate(-50%, 0);
     -webkit-transform-origin: 0% 20%;
     -moz-transform-origin: 0% 20%;
+    -ms-transform-origin: 0% 20%;
     transform-origin: 0% 20%;
   }
   .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -219,6 +221,7 @@
     transform: scale(0, 1);
     -webkit-transform-origin: 10% 0;
     -moz-transform-origin: 10% 0;
+    -ms-transform-origin: 10% 0;
     transform-origin: 10% 0;
   }
   .t3-megamenu.animate.elastic .mega.open > .mega-dropdown-menu {
@@ -271,6 +274,7 @@
     min-width: 200px;
     margin-top: 0;
     margin-right: -500px;
+    width: 100%;
   }
   .t3-megamenu.animate.slide .mega .mega.open > .mega-dropdown-menu > div {
     margin-right: 0;
@@ -427,6 +431,7 @@ html[dir="rtl"] .t3-megamenu .mega-nav .dropdown-submenu > a:after {
 html[dir="rtl"] .t3-megamenu.animate.zoom .mega > .mega-dropdown-menu {
   -webkit-transform-origin: 80% 20%;
   -moz-transform-origin: 80% 20%;
+  -ms-transform-origin: 80% 20%;
   transform-origin: 80% 20%;
 }
 html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center > .mega-dropdown-menu {
@@ -435,6 +440,7 @@ html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center > .mega-d
   transform: scale(0, 0) translate(50%, 0);
   -webkit-transform-origin: 100% 20%;
   -moz-transform-origin: 100% 20%;
+  -ms-transform-origin: 100% 20%;
   transform-origin: 100% 20%;
 }
 html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -451,4 +457,4 @@ html[dir="rtl"] .t3-megamenu.animate.elastic .level0 > .mega-align-center.open >
   transform: scale(1, 1) translate(50%, 0);
   -webkit-transform: scale(1, 1) translate(50%, 0);
   -ms-transform: scale(1, 1) translate(50%, 0);
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/off-canvas.css b/templates/t3_bs3_blank/css/rtl/dark/off-canvas.css
index 2350c6c..6e07fdb 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/off-canvas.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/off-canvas.css
@@ -586,7 +586,7 @@ body.off-canvas-effect-14.off-canvas-right {
   transform: translate3d(100%, 0, 0) rotateY(0deg);
 }
 .old-ie .t3-off-canvas {
-  z-index: 100!important;
+  z-index: 100 !important;
   right: -250px;
 }
 html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
@@ -651,6 +651,9 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+.t3-off-canvas .t3-off-canvas-body .dropdown-menu .active a {
+  background: transparent;
+}
 .t3-off-canvas .t3-off-canvas-body .t3-module {
   margin-bottom: 20px;
 }
@@ -683,4 +686,4 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
 .off-canvas-left.old-ie .t3-off-canvas {
   left: -250px;
   right: auto;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/template.css b/templates/t3_bs3_blank/css/rtl/dark/template.css
index ad5fefa..de746bd 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/template.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/template.css
@@ -145,7 +145,8 @@ p {
     font-size: 21px;
   }
 }
-small {
+small,
+.small {
   font-size: 85%;
 }
 cite {
@@ -532,7 +533,7 @@ fieldset[disabled] .btn-inverse.active {
 }
 .btn-inverse .badge {
   color: #2d2d2d;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-block + .btn-block {
   margin-top: 5px;
@@ -735,6 +736,13 @@ input.invalid {
 .breadcrumb > .active {
   color: #ffffff;
 }
+.breadcrumb > .active + li:before {
+  content: "";
+  padding: 0;
+}
+.breadcrumb > .active .hasTooltip {
+  padding-left: 10px;
+}
 .breadcrumb .divider {
   display: none;
 }
@@ -1294,6 +1302,7 @@ article aside .btn-group > .dropdown-toggle .caret {
   vertical-align: middle;
   border-top: 1px solid #dddddd;
   margin-right: 0;
+  padding-right: 0;
 }
 .list-striped li,
 .list-striped dd,
@@ -1562,6 +1571,10 @@ article aside .btn-group > .dropdown-toggle .caret {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.search-results .result-url {
+  color: #4b4b4b;
+  margin-top: 20px;
+}
 .search-results .result-created {
   font-size: 12px;
   color: #5a5a5a;
@@ -1574,7 +1587,7 @@ div.finder {
   margin-top: 3px;
 }
 @media (max-width: 768px) {
-  .contact .thumbnail.pull-right {
+  .contact .thumbnail {
     width: 100%;
   }
 }
@@ -1590,34 +1603,30 @@ div.finder {
     margin-right: 0;
   }
 }
-.contact .accordion-heading .accordion-toggle {
-  font-weight: bold;
+.contact-form #jform_contact_emailmsg {
+  width: 100%;
+}
+.contact-form #jform_contact_message {
+  width: 100%;
+  height: auto;
 }
 @media (max-width: 768px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 65%;
+  .contact-form #jform_captcha-lbl {
+    display: none;
   }
-}
-@media (max-width: 480px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 55%;
+  .contact-form #recaptcha_image {
+    width: 220px;
   }
-}
-@media (max-width: 768px) {
-  .contact-form legend {
-    font-size: 17px;
-    max-width: 90%;
+  .contact-form #recaptcha_image img {
+    max-width: 220px;
   }
-}
-@media (max-width: 480px) {
-  .contact-form legend {
-    max-width: 60%;
+  .contact-form #recaptcha_response_field {
+    max-width: 220px;
   }
 }
+.contact .accordion-toggle {
+  font-weight: bold;
+}
 #archive-items > li {
   line-height: normal;
   margin: 0;
@@ -2324,16 +2333,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .article-content .pull-right.item-image {
   margin: 0 0 20px 30px;
 }
-article img[align=left],
-.img_caption.left,
-.pull-left.item-image {
-  margin: 0 30px 20px 0;
+@media (max-width: 768px) {
+  article img[align=left],
+  .img_caption.left,
+  .pull-left.item-image {
+    margin: 0 30px 20px 0;
+  }
 }
-article img[align=right],
-.img_caption.right,
-.pull-right.item-image {
-  margin: 0 0 20px 30px;
+@media (max-width: 768px) {
+  article img[align=right],
+  .img_caption.right,
+  .pull-right.item-image {
+    margin: 0 0 20px 30px;
+  }
 }
 .languageswitcherload ul {
   float: left;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/dark/windows.css b/templates/t3_bs3_blank/css/rtl/dark/windows.css
index 66cf453..df21821 100644
--- a/templates/t3_bs3_blank/css/rtl/dark/windows.css
+++ b/templates/t3_bs3_blank/css/rtl/dark/windows.css
@@ -7,4 +7,4 @@
 }
 .window .window-mainbody {
   padding: 20px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/frontend-edit.css b/templates/t3_bs3_blank/css/rtl/frontend-edit.css
index e8f7d5e..b03a4be 100644
--- a/templates/t3_bs3_blank/css/rtl/frontend-edit.css
+++ b/templates/t3_bs3_blank/css/rtl/frontend-edit.css
@@ -237,7 +237,7 @@
   right: -100%;
 }
 .t3onoff label.on.active:before {
-  right: 0%;
+  right: -0%;
 }
 .t3onoff label.off:after {
   right: 60%;
@@ -354,4 +354,4 @@ fieldset.radio.btn-group label.active {
 .controls img.calendar {
   cursor: pointer;
   margin-right: 5px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/home.css b/templates/t3_bs3_blank/css/rtl/home.css
index 715f6d5..37def34 100644
--- a/templates/t3_bs3_blank/css/rtl/home.css
+++ b/templates/t3_bs3_blank/css/rtl/home.css
@@ -90,4 +90,4 @@
 .home .t3-sl-5 .jumbotron {
   border-radius: 0;
   margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/legacy-grid.css b/templates/t3_bs3_blank/css/rtl/legacy-grid.css
index 45bfb5a..a2153f3 100644
--- a/templates/t3_bs3_blank/css/rtl/legacy-grid.css
+++ b/templates/t3_bs3_blank/css/rtl/legacy-grid.css
@@ -4,14 +4,6 @@
   margin-right: -15px;
   margin-left: -15px;
 }
-.row-fluid:before,
-.row-fluid:after {
-  content: " ";
-  display: table;
-}
-.row-fluid:after {
-  clear: both;
-}
 [class*="span"] {
   float: right;
 }
@@ -113,7 +105,7 @@
     display: inherit !important;
   }
   .visible-desktop {
-    display: none !important ;
+    display: none !important;
   }
   .visible-tablet {
     display: inherit !important;
@@ -195,4 +187,4 @@
 }
 .height-100 {
   height: 100px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/legacy-navigation.css b/templates/t3_bs3_blank/css/rtl/legacy-navigation.css
index fcea9d1..feaf685 100644
--- a/templates/t3_bs3_blank/css/rtl/legacy-navigation.css
+++ b/templates/t3_bs3_blank/css/rtl/legacy-navigation.css
@@ -31,3 +31,4 @@
 .dropdown-submenu:hover > a:after {
   border-right-color: #262626;
 }
+
diff --git a/templates/t3_bs3_blank/css/rtl/megamenu.css b/templates/t3_bs3_blank/css/rtl/megamenu.css
index 9e53062..284378a 100644
--- a/templates/t3_bs3_blank/css/rtl/megamenu.css
+++ b/templates/t3_bs3_blank/css/rtl/megamenu.css
@@ -181,7 +181,7 @@
   .t3-megamenu.animate .mega.animating > .mega-dropdown-menu {
     -webkit-transition: all 400ms;
     transition: all 400ms;
-    display: block!important;
+    display: block !important;
   }
   .t3-megamenu.animate .mega.open > .mega-dropdown-menu,
   .t3-megamenu.animate .mega.animating.open > .mega-dropdown-menu {
@@ -193,6 +193,7 @@
     transform: scale(0, 0);
     -webkit-transform-origin: 20% 20%;
     -moz-transform-origin: 20% 20%;
+    -ms-transform-origin: 20% 20%;
     transform-origin: 20% 20%;
   }
   .t3-megamenu.animate.zoom .mega.open > .mega-dropdown-menu {
@@ -206,6 +207,7 @@
     transform: scale(0, 0) translate(-50%, 0);
     -webkit-transform-origin: 0% 20%;
     -moz-transform-origin: 0% 20%;
+    -ms-transform-origin: 0% 20%;
     transform-origin: 0% 20%;
   }
   .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -219,6 +221,7 @@
     transform: scale(0, 1);
     -webkit-transform-origin: 10% 0;
     -moz-transform-origin: 10% 0;
+    -ms-transform-origin: 10% 0;
     transform-origin: 10% 0;
   }
   .t3-megamenu.animate.elastic .mega.open > .mega-dropdown-menu {
@@ -271,6 +274,7 @@
     min-width: 200px;
     margin-top: 0;
     margin-right: -500px;
+    width: 100%;
   }
   .t3-megamenu.animate.slide .mega .mega.open > .mega-dropdown-menu > div {
     margin-right: 0;
@@ -427,6 +431,7 @@ html[dir="rtl"] .t3-megamenu .mega-nav .dropdown-submenu > a:after {
 html[dir="rtl"] .t3-megamenu.animate.zoom .mega > .mega-dropdown-menu {
   -webkit-transform-origin: 80% 20%;
   -moz-transform-origin: 80% 20%;
+  -ms-transform-origin: 80% 20%;
   transform-origin: 80% 20%;
 }
 html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center > .mega-dropdown-menu {
@@ -435,6 +440,7 @@ html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center > .mega-d
   transform: scale(0, 0) translate(50%, 0);
   -webkit-transform-origin: 100% 20%;
   -moz-transform-origin: 100% 20%;
+  -ms-transform-origin: 100% 20%;
   transform-origin: 100% 20%;
 }
 html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -451,4 +457,4 @@ html[dir="rtl"] .t3-megamenu.animate.elastic .level0 > .mega-align-center.open >
   transform: scale(1, 1) translate(50%, 0);
   -webkit-transform: scale(1, 1) translate(50%, 0);
   -ms-transform: scale(1, 1) translate(50%, 0);
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/off-canvas.css b/templates/t3_bs3_blank/css/rtl/off-canvas.css
index 589942e..34864aa 100644
--- a/templates/t3_bs3_blank/css/rtl/off-canvas.css
+++ b/templates/t3_bs3_blank/css/rtl/off-canvas.css
@@ -586,7 +586,7 @@ body.off-canvas-effect-14.off-canvas-right {
   transform: translate3d(100%, 0, 0) rotateY(0deg);
 }
 .old-ie .t3-off-canvas {
-  z-index: 100!important;
+  z-index: 100 !important;
   right: -250px;
 }
 html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
@@ -651,6 +651,9 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+.t3-off-canvas .t3-off-canvas-body .dropdown-menu .active a {
+  background: transparent;
+}
 .t3-off-canvas .t3-off-canvas-body .t3-module {
   margin-bottom: 20px;
 }
@@ -683,4 +686,4 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
 .off-canvas-left.old-ie .t3-off-canvas {
   left: -250px;
   right: auto;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/bootstrap.css b/templates/t3_bs3_blank/css/rtl/red/bootstrap.css
index b5b9163..251fc76 100644
--- a/templates/t3_bs3_blank/css/rtl/red/bootstrap.css
+++ b/templates/t3_bs3_blank/css/rtl/red/bootstrap.css
@@ -1,5 +1,13 @@
 
 
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -16,8 +24,10 @@ summary {
 }
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
 audio:not([controls]) {
   display: none;
@@ -27,28 +37,13 @@ audio:not([controls]) {
 template {
   display: none;
 }
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
 a {
   background: transparent;
 }
-a:focus {
-  outline: thin dotted;
-}
 a:active,
 a:hover {
   outline: 0;
 }
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 abbr[title] {
   border-bottom: 1px dotted;
 }
@@ -59,28 +54,14 @@ strong {
 dfn {
   font-style: italic;
 }
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 mark {
   background: #ff0;
   color: #000;
 }
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-}
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
 small {
   font-size: 80%;
 }
@@ -104,28 +85,34 @@ svg:not(:root) {
   overflow: hidden;
 }
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
-legend {
-  border: 0;
-  padding: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit;
-  font-size: 100%;
+  color: inherit;
+  font: inherit;
   margin: 0;
 }
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 button,
 select {
@@ -142,11 +129,23 @@ button[disabled],
 html input[disabled] {
   cursor: default;
 }
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   padding: 0;
 }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
 input[type="search"] {
   -webkit-appearance: textfield;
   -moz-box-sizing: content-box;
@@ -157,19 +156,29 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
   border: 0;
   padding: 0;
 }
 textarea {
   overflow: auto;
-  vertical-align: top;
+}
+optgroup {
+  font-weight: bold;
 }
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+td,
+th {
+  padding: 0;
+}
 @media print {
   * {
     text-shadow: none !important;
@@ -206,9 +215,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -244,7 +250,11 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-*,
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
@@ -284,6 +294,9 @@ a:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
@@ -340,6 +353,14 @@ code {
   white-space: nowrap;
   border-radius: 4px;
 }
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #ffffff;
+  background-color: #333333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -371,22 +392,6 @@ pre code {
   padding-right: 15px;
   padding-left: 15px;
 }
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .container {
     width: 750px;
@@ -402,26 +407,16 @@ pre code {
     width: 1170px;
   }
 }
+.container-fluid {
+  margin-left: auto;
+  margin-right: auto;
+  padding-right: 15px;
+  padding-left: 15px;
+}
 .row {
   margin-right: -15px;
   margin-left: -15px;
 }
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
@@ -1136,73 +1131,110 @@ table col[class*="col-"] {
 }
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   float: none;
   display: table-cell;
 }
-.table > thead > tr > .active,
-.table > tbody > tr > .active,
-.table > tfoot > tr > .active,
-.table > thead > .active > td,
-.table > tbody > .active > td,
-.table > tfoot > .active > td,
-.table > thead > .active > th,
-.table > tbody > .active > th,
-.table > tfoot > .active > th {
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
-.table-hover > tbody > tr > .active:hover,
-.table-hover > tbody > .active:hover > td,
-.table-hover > tbody > .active:hover > th {
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
   background-color: #e8e8e8;
 }
-.table > thead > tr > .success,
-.table > tbody > tr > .success,
-.table > tfoot > tr > .success,
-.table > thead > .success > td,
-.table > tbody > .success > td,
-.table > tfoot > .success > td,
-.table > thead > .success > th,
-.table > tbody > .success > th,
-.table > tfoot > .success > th {
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
   background-color: #dff0d8;
 }
-.table-hover > tbody > tr > .success:hover,
-.table-hover > tbody > .success:hover > td,
-.table-hover > tbody > .success:hover > th {
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-.table > thead > tr > .danger,
-.table > tbody > tr > .danger,
-.table > tfoot > tr > .danger,
-.table > thead > .danger > td,
-.table > tbody > .danger > td,
-.table > tfoot > .danger > td,
-.table > thead > .danger > th,
-.table > tbody > .danger > th,
-.table > tfoot > .danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > .danger:hover,
-.table-hover > tbody > .danger:hover > td,
-.table-hover > tbody > .danger:hover > th {
-  background-color: #ebcccc;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-.table > thead > tr > .warning,
-.table > tbody > tr > .warning,
-.table > tfoot > tr > .warning,
-.table > thead > .warning > td,
-.table > tbody > .warning > td,
-.table > tfoot > .warning > td,
-.table > thead > .warning > th,
-.table > tbody > .warning > th,
-.table > tfoot > .warning > th {
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
   background-color: #fcf8e3;
 }
-.table-hover > tbody > tr > .warning:hover,
-.table-hover > tbody > .warning:hover > td,
-.table-hover > tbody > .warning:hover > th {
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
@@ -1275,7 +1307,6 @@ input[type="color"],
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -1437,6 +1468,7 @@ fieldset[disabled] input[type="color"],
 fieldset[disabled] .inputbox {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textareaselect,
 textareatextarea,
@@ -1685,7 +1717,8 @@ selectinput.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textareainput.input-sm {
+textareainput.input-sm,
+select[multiple]input.input-sm {
   height: auto;
 }
 input.input-lg {
@@ -1699,7 +1732,8 @@ selectinput.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textareainput.input-lg {
+textareainput.input-lg,
+select[multiple]input.input-lg {
   height: auto;
 }
 @media (min-width: 768px) {
@@ -1928,6 +1962,7 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  min-width: 0;
 }
 legend {
   display: block;
@@ -1960,15 +1995,14 @@ input[type="checkbox"] {
 input[type="file"] {
   display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
@@ -1976,17 +2010,12 @@ input[type="checkbox"]:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
 }
 .form-control {
   display: block;
@@ -1996,7 +2025,6 @@ output {
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -2030,10 +2058,14 @@ output {
 fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textarea.form-control {
   height: auto;
 }
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
@@ -2044,12 +2076,10 @@ textarea.form-control {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-right: 20px;
-  vertical-align: middle;
 }
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
@@ -2103,7 +2133,8 @@ select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
 .input-lg {
@@ -2117,9 +2148,52 @@ select.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-left: 42.5px;
+}
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  left: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #468847;
+}
+.has-success .form-control {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-success .form-control:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+.has-success .input-group-addon {
+  color: #468847;
+  border-color: #468847;
+  background-color: #dff0d8;
+}
+.has-success .form-control-feedback {
+  color: #468847;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
@@ -2143,6 +2217,9 @@ textarea.input-lg {
   border-color: #c09853;
   background-color: #fcf8e3;
 }
+.has-warning .form-control-feedback {
+  color: #c09853;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
@@ -2166,28 +2243,8 @@ textarea.input-lg {
   border-color: #b94a48;
   background-color: #f2dede;
 }
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #468847;
-}
-.has-success .form-control {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-.has-success .input-group-addon {
-  color: #468847;
-  border-color: #468847;
-  background-color: #dff0d8;
+.has-error .form-control-feedback {
+  color: #b94a48;
 }
 .form-control-static {
   margin-bottom: 0;
@@ -2206,9 +2263,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
-  }
-  .form-inline select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -2216,12 +2276,16 @@ textarea.input-lg {
     margin-top: 0;
     margin-bottom: 0;
     padding-right: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-right: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 .form-horizontal .control-label,
 .form-horizontal .radio,
@@ -2240,22 +2304,6 @@ textarea.input-lg {
   margin-right: -15px;
   margin-left: -15px;
 }
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
@@ -2264,6 +2312,10 @@ textarea.input-lg {
     text-align: left;
   }
 }
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  left: 15px;
+}
 .btn {
   display: inline-block;
   margin-bottom: 0;
@@ -2350,7 +2402,7 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-default .badge {
   color: #ffffff;
-  background-color: #fff;
+  background-color: #333333;
 }
 .btn-primary {
   color: #ffffff;
@@ -2391,100 +2443,18 @@ fieldset[disabled] .btn-primary.active {
 }
 .btn-primary .badge {
   color: #cc0000;
-  background-color: #fff;
+  background-color: #ffffff;
 }
-.btn-warning {
+.btn-success {
   color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
 }
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
   color: #ffffff;
   background-color: #47a447;
   border-color: #398439;
@@ -2514,7 +2484,7 @@ fieldset[disabled] .btn-success.active {
 }
 .btn-success .badge {
   color: #5cb85c;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-info {
   color: #ffffff;
@@ -2555,7 +2525,89 @@ fieldset[disabled] .btn-info.active {
 }
 .btn-info .badge {
   color: #5bc0de;
-  background-color: #fff;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
 }
 .btn-link {
   color: #cc0000;
@@ -2679,7 +2731,7 @@ input[type="button"].btn-block {
 @font-face {
   font-family: 'Glyphicons Halflings';
   src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot');
-  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;
@@ -2692,9 +2744,6 @@ input[type="button"].btn-block {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-.glyphicon:empty {
-  width: 1em;
-}
 .glyphicon-asterisk:before {
   content: "\2a";
 }
@@ -3383,6 +3432,14 @@ input[type="button"].btn-block {
 .open > a {
   outline: 0;
 }
+.dropdown-menu-right {
+  right: auto;
+  left: 0;
+}
+.dropdown-menu-left {
+  right: 0;
+  left: auto;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
@@ -3416,8 +3473,12 @@ input[type="button"].btn-block {
 }
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
-    left: 0;
     right: auto;
+    left: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    right: 0;
+    left: auto;
   }
 }
 .btn-group,
@@ -3451,29 +3512,16 @@ input[type="button"].btn-block {
 .btn-group .btn-group + .btn-group {
   margin-right: -1px;
 }
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
+.btn-toolbar {
+  margin-right: -5px;
 }
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: right;
 }
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-right: 5px;
 }
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
@@ -3562,22 +3610,6 @@ input[type="button"].btn-block {
   width: 100%;
   max-width: 100%;
 }
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
@@ -3604,12 +3636,12 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-left-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3643,6 +3675,7 @@ input[type="button"].btn-block {
   padding-left: 0;
 }
 .input-group .form-control {
+  float: right;
   width: 100%;
   margin-bottom: 0;
 }
@@ -3663,7 +3696,10 @@ select.input-group-lg > .input-group-btn > .btn {
 }
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-sm > .form-control,
@@ -3683,7 +3719,10 @@ select.input-group-sm > .input-group-btn > .btn {
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-addon,
@@ -3730,8 +3769,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3741,8 +3782,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3751,45 +3794,33 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-.input-group-btn:first-child > .btn {
-  margin-left: -1px;
-}
-.input-group-btn:last-child > .btn {
-  margin-right: -1px;
-}
 .input-group-btn > .btn {
   position: relative;
 }
 .input-group-btn > .btn + .btn {
-  margin-right: -4px;
+  margin-right: -1px;
 }
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-left: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-right: -1px;
+}
 .nav {
   margin-bottom: 0;
   padding-right: 0;
   list-style: none;
 }
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
 .nav > li {
   position: relative;
   display: block;
@@ -3983,43 +4014,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar-header {
     float: right;
@@ -4034,24 +4033,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
 }
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse.in {
-  overflow-y: auto;
+.navbar-collapse.in {
+  overflow-y: auto;
 }
 @media (min-width: 768px) {
   .navbar-collapse {
@@ -4076,13 +4059,17 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
 }
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-left: -15px;
   margin-right: -15px;
 }
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-left: 0;
     margin-right: 0;
   }
@@ -4123,13 +4110,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
+  height: 20px;
 }
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-right: -15px;
   }
 }
@@ -4145,6 +4134,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border: 1px solid transparent;
   border-radius: 4px;
 }
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
@@ -4240,9 +4232,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
-  }
-  .navbar-form select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -4250,12 +4245,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-top: 0;
     margin-bottom: 0;
     padding-right: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-right: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 @media (max-width: 767px) {
   .navbar-form .form-group {
@@ -4286,11 +4285,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-bottom-left-radius: 0;
   border-bottom-right-radius: 0;
 }
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  right: auto;
-  left: 0;
-}
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
@@ -4523,6 +4517,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
+  color: #cc0000;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   margin-right: -1px;
@@ -4542,7 +4537,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
+  color: #800000;
   background-color: #eeeeee;
+  border-color: #dddddd;
 }
 .pagination > .active > a,
 .pagination > .active > span,
@@ -4603,22 +4600,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   list-style: none;
   text-align: center;
 }
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
 .pager li {
   display: inline;
 }
@@ -4739,6 +4720,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
   position: relative;
   top: -1px;
 }
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
   color: #ffffff;
@@ -4756,19 +4741,17 @@ a.list-group-item.active > .badge,
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
   background-color: #eeeeee;
 }
 .jumbotron h1,
 .jumbotron .h1 {
-  line-height: 1;
   color: inherit;
 }
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
 .container .jumbotron {
   border-radius: 6px;
@@ -5051,6 +5034,94 @@ a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #ff9999;
 }
+.list-group-item-success {
+  color: #468847;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #468847;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #468847;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #468847;
+  border-color: #468847;
+}
+.list-group-item-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #3a87ad;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #3a87ad;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #3a87ad;
+  border-color: #3a87ad;
+}
+.list-group-item-warning {
+  color: #c09853;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #c09853;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #c09853;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #c09853;
+  border-color: #c09853;
+}
+.list-group-item-danger {
+  color: #b94a48;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #b94a48;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #b94a48;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #b94a48;
+  border-color: #b94a48;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
@@ -5070,35 +5141,27 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-body {
   padding: 15px;
 }
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
 .panel > .list-group {
   margin-bottom: 0;
 }
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
 .panel > .list-group .list-group-item:first-child {
-  border-top-left-radius: 0;
-  border-top-right-radius: 0;
+  border-top: 0;
 }
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
@@ -5106,12 +5169,52 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table {
   margin-bottom: 0;
 }
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-left-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
   border-top: 1px solid #dddddd;
 }
-.panel > .table > tbody:first-child th,
-.panel > .table > tbody:first-child td {
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0;
 }
 .panel > .table-bordered,
@@ -5146,6 +5249,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-left: 0;
 }
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -5189,6 +5306,9 @@ a.list-group-item.active:focus .list-group-item-text {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
 }
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   border-radius: 4px;
@@ -5251,6 +5371,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
@@ -5279,20 +5413,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -5352,7 +5472,9 @@ button.close {
   left: 0;
   bottom: 0;
   right: 0;
-  z-index: 1040;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
 .modal.fade .modal-dialog {
   -webkit-transform: translate(0, -25%);
@@ -5372,7 +5494,6 @@ button.close {
   position: relative;
   width: auto;
   margin: 10px;
-  z-index: 1050;
 }
 .modal-content {
   position: relative;
@@ -5391,7 +5512,7 @@ button.close {
   left: 0;
   bottom: 0;
   right: 0;
-  z-index: 1030;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -5424,22 +5545,6 @@ button.close {
   text-align: left;
   border-top: 1px solid #e5e5e5;
 }
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
 .modal-footer .btn + .btn {
   margin-right: 5px;
   margin-bottom: 0;
@@ -5450,7 +5555,7 @@ button.close {
 .modal-footer .btn-block + .btn-block {
   margin-right: 0;
 }
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
     margin: 30px auto;
@@ -5459,6 +5564,12 @@ button.close {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
+  }
 }
 .tooltip {
   position: absolute;
@@ -5859,11 +5970,50 @@ button.close {
   }
 }
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   content: " ";
   display: table;
 }
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
 .center-block {
@@ -5924,72 +6074,12 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  table.visible-xs.visible-sm {
-    display: table;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  table.visible-xs.visible-md {
-    display: table;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  table.visible-xs.visible-lg {
-    display: table;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  table.visible-sm.visible-xs {
-    display: table;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
@@ -6005,72 +6095,12 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  table.visible-sm.visible-md {
-    display: table;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  table.visible-sm.visible-lg {
-    display: table;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  table.visible-md.visible-xs {
-    display: table;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  table.visible-md.visible-sm {
-    display: table;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
@@ -6086,72 +6116,12 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  table.visible-md.visible-lg {
-    display: table;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  table.visible-lg.visible-xs {
-    display: table;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  table.visible-lg.visible-sm {
-    display: table;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  table.visible-lg.visible-md {
-    display: table;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
@@ -6167,19 +6137,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-.hidden-xs {
-  display: block !important;
-}
-table.hidden-xs {
-  display: table;
-}
-tr.hidden-xs {
-  display: table-row !important;
-}
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -6188,51 +6145,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  display: block !important;
-}
-table.hidden-sm {
-  display: table;
-}
-tr.hidden-sm {
-  display: table-row !important;
-}
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -6241,51 +6153,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-md {
-  display: block !important;
-}
-table.hidden-md {
-  display: table;
-}
-tr.hidden-md {
-  display: table-row !important;
-}
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -6294,51 +6161,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  display: block !important;
-}
-table.hidden-lg {
-  display: table;
-}
-tr.hidden-lg {
-  display: table-row !important;
-}
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -6367,10 +6189,12 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
   td.hidden-print {
     display: none !important;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/frontend-edit.css b/templates/t3_bs3_blank/css/rtl/red/frontend-edit.css
index 8ceeb28..956b16b 100644
--- a/templates/t3_bs3_blank/css/rtl/red/frontend-edit.css
+++ b/templates/t3_bs3_blank/css/rtl/red/frontend-edit.css
@@ -237,7 +237,7 @@
   right: -100%;
 }
 .t3onoff label.on.active:before {
-  right: 0%;
+  right: -0%;
 }
 .t3onoff label.off:after {
   right: 60%;
@@ -354,4 +354,4 @@ fieldset.radio.btn-group label.active {
 .controls img.calendar {
   cursor: pointer;
   margin-right: 5px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/home.css b/templates/t3_bs3_blank/css/rtl/red/home.css
index 6725517..b1d3f84 100644
--- a/templates/t3_bs3_blank/css/rtl/red/home.css
+++ b/templates/t3_bs3_blank/css/rtl/red/home.css
@@ -90,4 +90,4 @@
 .home .t3-sl-5 .jumbotron {
   border-radius: 0;
   margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/legacy-grid.css b/templates/t3_bs3_blank/css/rtl/red/legacy-grid.css
index 45bfb5a..a2153f3 100644
--- a/templates/t3_bs3_blank/css/rtl/red/legacy-grid.css
+++ b/templates/t3_bs3_blank/css/rtl/red/legacy-grid.css
@@ -4,14 +4,6 @@
   margin-right: -15px;
   margin-left: -15px;
 }
-.row-fluid:before,
-.row-fluid:after {
-  content: " ";
-  display: table;
-}
-.row-fluid:after {
-  clear: both;
-}
 [class*="span"] {
   float: right;
 }
@@ -113,7 +105,7 @@
     display: inherit !important;
   }
   .visible-desktop {
-    display: none !important ;
+    display: none !important;
   }
   .visible-tablet {
     display: inherit !important;
@@ -195,4 +187,4 @@
 }
 .height-100 {
   height: 100px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/legacy-navigation.css b/templates/t3_bs3_blank/css/rtl/red/legacy-navigation.css
index fcea9d1..feaf685 100644
--- a/templates/t3_bs3_blank/css/rtl/red/legacy-navigation.css
+++ b/templates/t3_bs3_blank/css/rtl/red/legacy-navigation.css
@@ -31,3 +31,4 @@
 .dropdown-submenu:hover > a:after {
   border-right-color: #262626;
 }
+
diff --git a/templates/t3_bs3_blank/css/rtl/red/megamenu.css b/templates/t3_bs3_blank/css/rtl/red/megamenu.css
index 9e53062..284378a 100644
--- a/templates/t3_bs3_blank/css/rtl/red/megamenu.css
+++ b/templates/t3_bs3_blank/css/rtl/red/megamenu.css
@@ -181,7 +181,7 @@
   .t3-megamenu.animate .mega.animating > .mega-dropdown-menu {
     -webkit-transition: all 400ms;
     transition: all 400ms;
-    display: block!important;
+    display: block !important;
   }
   .t3-megamenu.animate .mega.open > .mega-dropdown-menu,
   .t3-megamenu.animate .mega.animating.open > .mega-dropdown-menu {
@@ -193,6 +193,7 @@
     transform: scale(0, 0);
     -webkit-transform-origin: 20% 20%;
     -moz-transform-origin: 20% 20%;
+    -ms-transform-origin: 20% 20%;
     transform-origin: 20% 20%;
   }
   .t3-megamenu.animate.zoom .mega.open > .mega-dropdown-menu {
@@ -206,6 +207,7 @@
     transform: scale(0, 0) translate(-50%, 0);
     -webkit-transform-origin: 0% 20%;
     -moz-transform-origin: 0% 20%;
+    -ms-transform-origin: 0% 20%;
     transform-origin: 0% 20%;
   }
   .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -219,6 +221,7 @@
     transform: scale(0, 1);
     -webkit-transform-origin: 10% 0;
     -moz-transform-origin: 10% 0;
+    -ms-transform-origin: 10% 0;
     transform-origin: 10% 0;
   }
   .t3-megamenu.animate.elastic .mega.open > .mega-dropdown-menu {
@@ -271,6 +274,7 @@
     min-width: 200px;
     margin-top: 0;
     margin-right: -500px;
+    width: 100%;
   }
   .t3-megamenu.animate.slide .mega .mega.open > .mega-dropdown-menu > div {
     margin-right: 0;
@@ -427,6 +431,7 @@ html[dir="rtl"] .t3-megamenu .mega-nav .dropdown-submenu > a:after {
 html[dir="rtl"] .t3-megamenu.animate.zoom .mega > .mega-dropdown-menu {
   -webkit-transform-origin: 80% 20%;
   -moz-transform-origin: 80% 20%;
+  -ms-transform-origin: 80% 20%;
   transform-origin: 80% 20%;
 }
 html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center > .mega-dropdown-menu {
@@ -435,6 +440,7 @@ html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center > .mega-d
   transform: scale(0, 0) translate(50%, 0);
   -webkit-transform-origin: 100% 20%;
   -moz-transform-origin: 100% 20%;
+  -ms-transform-origin: 100% 20%;
   transform-origin: 100% 20%;
 }
 html[dir="rtl"] .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -451,4 +457,4 @@ html[dir="rtl"] .t3-megamenu.animate.elastic .level0 > .mega-align-center.open >
   transform: scale(1, 1) translate(50%, 0);
   -webkit-transform: scale(1, 1) translate(50%, 0);
   -ms-transform: scale(1, 1) translate(50%, 0);
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/off-canvas.css b/templates/t3_bs3_blank/css/rtl/red/off-canvas.css
index 7611299..70678f7 100644
--- a/templates/t3_bs3_blank/css/rtl/red/off-canvas.css
+++ b/templates/t3_bs3_blank/css/rtl/red/off-canvas.css
@@ -586,7 +586,7 @@ body.off-canvas-effect-14.off-canvas-right {
   transform: translate3d(100%, 0, 0) rotateY(0deg);
 }
 .old-ie .t3-off-canvas {
-  z-index: 100!important;
+  z-index: 100 !important;
   right: -250px;
 }
 html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
@@ -651,6 +651,9 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+.t3-off-canvas .t3-off-canvas-body .dropdown-menu .active a {
+  background: transparent;
+}
 .t3-off-canvas .t3-off-canvas-body .t3-module {
   margin-bottom: 20px;
 }
@@ -683,4 +686,4 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
 .off-canvas-left.old-ie .t3-off-canvas {
   left: -250px;
   right: auto;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/template.css b/templates/t3_bs3_blank/css/rtl/red/template.css
index c8a2c10..8bfdf84 100644
--- a/templates/t3_bs3_blank/css/rtl/red/template.css
+++ b/templates/t3_bs3_blank/css/rtl/red/template.css
@@ -145,7 +145,8 @@ p {
     font-size: 21px;
   }
 }
-small {
+small,
+.small {
   font-size: 85%;
 }
 cite {
@@ -532,7 +533,7 @@ fieldset[disabled] .btn-inverse.active {
 }
 .btn-inverse .badge {
   color: #333333;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-block + .btn-block {
   margin-top: 5px;
@@ -735,6 +736,13 @@ input.invalid {
 .breadcrumb > .active {
   color: #999999;
 }
+.breadcrumb > .active + li:before {
+  content: "";
+  padding: 0;
+}
+.breadcrumb > .active .hasTooltip {
+  padding-left: 10px;
+}
 .breadcrumb .divider {
   display: none;
 }
@@ -1294,6 +1302,7 @@ article aside .btn-group > .dropdown-toggle .caret {
   vertical-align: middle;
   border-top: 1px solid #dddddd;
   margin-right: 0;
+  padding-right: 0;
 }
 .list-striped li,
 .list-striped dd,
@@ -1562,6 +1571,10 @@ article aside .btn-group > .dropdown-toggle .caret {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.search-results .result-url {
+  color: #555555;
+  margin-top: 20px;
+}
 .search-results .result-created {
   font-size: 12px;
   color: #999999;
@@ -1574,7 +1587,7 @@ div.finder {
   margin-top: 3px;
 }
 @media (max-width: 768px) {
-  .contact .thumbnail.pull-right {
+  .contact .thumbnail {
     width: 100%;
   }
 }
@@ -1590,34 +1603,30 @@ div.finder {
     margin-right: 0;
   }
 }
-.contact .accordion-heading .accordion-toggle {
-  font-weight: bold;
+.contact-form #jform_contact_emailmsg {
+  width: 100%;
+}
+.contact-form #jform_contact_message {
+  width: 100%;
+  height: auto;
 }
 @media (max-width: 768px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 65%;
+  .contact-form #jform_captcha-lbl {
+    display: none;
   }
-}
-@media (max-width: 480px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 55%;
+  .contact-form #recaptcha_image {
+    width: 220px;
   }
-}
-@media (max-width: 768px) {
-  .contact-form legend {
-    font-size: 17px;
-    max-width: 90%;
+  .contact-form #recaptcha_image img {
+    max-width: 220px;
   }
-}
-@media (max-width: 480px) {
-  .contact-form legend {
-    max-width: 60%;
+  .contact-form #recaptcha_response_field {
+    max-width: 220px;
   }
 }
+.contact .accordion-toggle {
+  font-weight: bold;
+}
 #archive-items > li {
   line-height: normal;
   margin: 0;
@@ -2324,16 +2333,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .article-content .pull-right.item-image {
   margin: 0 0 20px 30px;
 }
-article img[align=left],
-.img_caption.left,
-.pull-left.item-image {
-  margin: 0 30px 20px 0;
+@media (max-width: 768px) {
+  article img[align=left],
+  .img_caption.left,
+  .pull-left.item-image {
+    margin: 0 30px 20px 0;
+  }
 }
-article img[align=right],
-.img_caption.right,
-.pull-right.item-image {
-  margin: 0 0 20px 30px;
+@media (max-width: 768px) {
+  article img[align=right],
+  .img_caption.right,
+  .pull-right.item-image {
+    margin: 0 0 20px 30px;
+  }
 }
 .languageswitcherload ul {
   float: left;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/red/windows.css b/templates/t3_bs3_blank/css/rtl/red/windows.css
index 66cf453..df21821 100644
--- a/templates/t3_bs3_blank/css/rtl/red/windows.css
+++ b/templates/t3_bs3_blank/css/rtl/red/windows.css
@@ -7,4 +7,4 @@
 }
 .window .window-mainbody {
   padding: 20px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/template.css b/templates/t3_bs3_blank/css/rtl/template.css
index 29474b4..22a17e8 100644
--- a/templates/t3_bs3_blank/css/rtl/template.css
+++ b/templates/t3_bs3_blank/css/rtl/template.css
@@ -145,7 +145,8 @@ p {
     font-size: 21px;
   }
 }
-small {
+small,
+.small {
   font-size: 85%;
 }
 cite {
@@ -532,7 +533,7 @@ fieldset[disabled] .btn-inverse.active {
 }
 .btn-inverse .badge {
   color: #333333;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-block + .btn-block {
   margin-top: 5px;
@@ -735,6 +736,13 @@ input.invalid {
 .breadcrumb > .active {
   color: #999999;
 }
+.breadcrumb > .active + li:before {
+  content: "";
+  padding: 0;
+}
+.breadcrumb > .active .hasTooltip {
+  padding-left: 10px;
+}
 .breadcrumb .divider {
   display: none;
 }
@@ -1294,6 +1302,7 @@ article aside .btn-group > .dropdown-toggle .caret {
   vertical-align: middle;
   border-top: 1px solid #dddddd;
   margin-right: 0;
+  padding-right: 0;
 }
 .list-striped li,
 .list-striped dd,
@@ -1562,6 +1571,10 @@ article aside .btn-group > .dropdown-toggle .caret {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.search-results .result-url {
+  color: #555555;
+  margin-top: 20px;
+}
 .search-results .result-created {
   font-size: 12px;
   color: #999999;
@@ -1574,7 +1587,7 @@ div.finder {
   margin-top: 3px;
 }
 @media (max-width: 768px) {
-  .contact .thumbnail.pull-right {
+  .contact .thumbnail {
     width: 100%;
   }
 }
@@ -1590,34 +1603,30 @@ div.finder {
     margin-right: 0;
   }
 }
-.contact .accordion-heading .accordion-toggle {
-  font-weight: bold;
+.contact-form #jform_contact_emailmsg {
+  width: 100%;
+}
+.contact-form #jform_contact_message {
+  width: 100%;
+  height: auto;
 }
 @media (max-width: 768px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 65%;
+  .contact-form #jform_captcha-lbl {
+    display: none;
   }
-}
-@media (max-width: 480px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 55%;
+  .contact-form #recaptcha_image {
+    width: 220px;
   }
-}
-@media (max-width: 768px) {
-  .contact-form legend {
-    font-size: 17px;
-    max-width: 90%;
+  .contact-form #recaptcha_image img {
+    max-width: 220px;
   }
-}
-@media (max-width: 480px) {
-  .contact-form legend {
-    max-width: 60%;
+  .contact-form #recaptcha_response_field {
+    max-width: 220px;
   }
 }
+.contact .accordion-toggle {
+  font-weight: bold;
+}
 #archive-items > li {
   line-height: normal;
   margin: 0;
@@ -2316,16 +2325,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .article-content .pull-right.item-image {
   margin: 0 0 20px 30px;
 }
-article img[align=left],
-.img_caption.left,
-.pull-left.item-image {
-  margin: 0 30px 20px 0;
+@media (max-width: 768px) {
+  article img[align=left],
+  .img_caption.left,
+  .pull-left.item-image {
+    margin: 0 30px 20px 0;
+  }
 }
-article img[align=right],
-.img_caption.right,
-.pull-right.item-image {
-  margin: 0 0 20px 30px;
+@media (max-width: 768px) {
+  article img[align=right],
+  .img_caption.right,
+  .pull-right.item-image {
+    margin: 0 0 20px 30px;
+  }
 }
 .languageswitcherload ul {
   float: left;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/rtl/windows.css b/templates/t3_bs3_blank/css/rtl/windows.css
index 66cf453..df21821 100644
--- a/templates/t3_bs3_blank/css/rtl/windows.css
+++ b/templates/t3_bs3_blank/css/rtl/windows.css
@@ -7,4 +7,4 @@
 }
 .window .window-mainbody {
   padding: 20px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/template.css b/templates/t3_bs3_blank/css/template.css
index 5df739e..0a3d9b9 100644
--- a/templates/t3_bs3_blank/css/template.css
+++ b/templates/t3_bs3_blank/css/template.css
@@ -145,7 +145,8 @@ p {
     font-size: 21px;
   }
 }
-small {
+small,
+.small {
   font-size: 85%;
 }
 cite {
@@ -532,7 +533,7 @@ fieldset[disabled] .btn-inverse.active {
 }
 .btn-inverse .badge {
   color: #333333;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-block + .btn-block {
   margin-top: 5px;
@@ -735,6 +736,13 @@ input.invalid {
 .breadcrumb > .active {
   color: #999999;
 }
+.breadcrumb > .active + li:before {
+  content: "";
+  padding: 0;
+}
+.breadcrumb > .active .hasTooltip {
+  padding-right: 10px;
+}
 .breadcrumb .divider {
   display: none;
 }
@@ -1294,6 +1302,7 @@ article aside .btn-group > .dropdown-toggle .caret {
   vertical-align: middle;
   border-top: 1px solid #dddddd;
   margin-left: 0;
+  padding-left: 0;
 }
 .list-striped li,
 .list-striped dd,
@@ -1562,6 +1571,10 @@ article aside .btn-group > .dropdown-toggle .caret {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.search-results .result-url {
+  color: #555555;
+  margin-top: 20px;
+}
 .search-results .result-created {
   font-size: 12px;
   color: #999999;
@@ -1574,7 +1587,7 @@ div.finder {
   margin-top: 3px;
 }
 @media (max-width: 768px) {
-  .contact .thumbnail.pull-right {
+  .contact .thumbnail {
     width: 100%;
   }
 }
@@ -1590,34 +1603,30 @@ div.finder {
     margin-left: 0;
   }
 }
-.contact .accordion-heading .accordion-toggle {
-  font-weight: bold;
+.contact-form #jform_contact_emailmsg {
+  width: 100%;
+}
+.contact-form #jform_contact_message {
+  width: 100%;
+  height: auto;
 }
 @media (max-width: 768px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 65%;
+  .contact-form #jform_captcha-lbl {
+    display: none;
   }
-}
-@media (max-width: 480px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 55%;
+  .contact-form #recaptcha_image {
+    width: 220px;
   }
-}
-@media (max-width: 768px) {
-  .contact-form legend {
-    font-size: 17px;
-    max-width: 90%;
+  .contact-form #recaptcha_image img {
+    max-width: 220px;
   }
-}
-@media (max-width: 480px) {
-  .contact-form legend {
-    max-width: 60%;
+  .contact-form #recaptcha_response_field {
+    max-width: 220px;
   }
 }
+.contact .accordion-toggle {
+  font-weight: bold;
+}
 #archive-items > li {
   line-height: normal;
   margin: 0;
@@ -2294,4 +2303,4 @@ a.list-group-item.active:focus .list-group-item-text {
 .poweredby .t3-logo-small {
   opacity: .8;
   display: inline-block;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/bootstrap.css b/templates/t3_bs3_blank/css/themes/dark/bootstrap.css
index 63a5f8e..ab4cc87 100644
--- a/templates/t3_bs3_blank/css/themes/dark/bootstrap.css
+++ b/templates/t3_bs3_blank/css/themes/dark/bootstrap.css
@@ -1,5 +1,13 @@
 
 
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -16,8 +24,10 @@ summary {
 }
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
 audio:not([controls]) {
   display: none;
@@ -27,28 +37,13 @@ audio:not([controls]) {
 template {
   display: none;
 }
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
 a {
   background: transparent;
 }
-a:focus {
-  outline: thin dotted;
-}
 a:active,
 a:hover {
   outline: 0;
 }
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 abbr[title] {
   border-bottom: 1px dotted;
 }
@@ -59,28 +54,14 @@ strong {
 dfn {
   font-style: italic;
 }
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 mark {
   background: #ff0;
   color: #000;
 }
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-}
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
 small {
   font-size: 80%;
 }
@@ -104,28 +85,34 @@ svg:not(:root) {
   overflow: hidden;
 }
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
-legend {
-  border: 0;
-  padding: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit;
-  font-size: 100%;
+  color: inherit;
+  font: inherit;
   margin: 0;
 }
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 button,
 select {
@@ -142,11 +129,23 @@ button[disabled],
 html input[disabled] {
   cursor: default;
 }
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   padding: 0;
 }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
 input[type="search"] {
   -webkit-appearance: textfield;
   -moz-box-sizing: content-box;
@@ -157,19 +156,29 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
   border: 0;
   padding: 0;
 }
 textarea {
   overflow: auto;
-  vertical-align: top;
+}
+optgroup {
+  font-weight: bold;
 }
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+td,
+th {
+  padding: 0;
+}
 @media print {
   * {
     text-shadow: none !important;
@@ -206,9 +215,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -244,7 +250,11 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-*,
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
@@ -284,6 +294,9 @@ a:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
@@ -340,6 +353,14 @@ code {
   white-space: nowrap;
   border-radius: 4px;
 }
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #ffffff;
+  background-color: #333333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -371,22 +392,6 @@ pre code {
   padding-left: 15px;
   padding-right: 15px;
 }
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .container {
     width: 750px;
@@ -402,26 +407,16 @@ pre code {
     width: 1170px;
   }
 }
+.container-fluid {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left: 15px;
+  padding-right: 15px;
+}
 .row {
   margin-left: -15px;
   margin-right: -15px;
 }
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
@@ -1136,73 +1131,110 @@ table col[class*="col-"] {
 }
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   float: none;
   display: table-cell;
 }
-.table > thead > tr > .active,
-.table > tbody > tr > .active,
-.table > tfoot > tr > .active,
-.table > thead > .active > td,
-.table > tbody > .active > td,
-.table > tfoot > .active > td,
-.table > thead > .active > th,
-.table > tbody > .active > th,
-.table > tfoot > .active > th {
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
-.table-hover > tbody > tr > .active:hover,
-.table-hover > tbody > .active:hover > td,
-.table-hover > tbody > .active:hover > th {
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
   background-color: #e8e8e8;
 }
-.table > thead > tr > .success,
-.table > tbody > tr > .success,
-.table > tfoot > tr > .success,
-.table > thead > .success > td,
-.table > tbody > .success > td,
-.table > tfoot > .success > td,
-.table > thead > .success > th,
-.table > tbody > .success > th,
-.table > tfoot > .success > th {
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
   background-color: #dff0d8;
 }
-.table-hover > tbody > tr > .success:hover,
-.table-hover > tbody > .success:hover > td,
-.table-hover > tbody > .success:hover > th {
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-.table > thead > tr > .danger,
-.table > tbody > tr > .danger,
-.table > tfoot > tr > .danger,
-.table > thead > .danger > td,
-.table > tbody > .danger > td,
-.table > tfoot > .danger > td,
-.table > thead > .danger > th,
-.table > tbody > .danger > th,
-.table > tfoot > .danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > .danger:hover,
-.table-hover > tbody > .danger:hover > td,
-.table-hover > tbody > .danger:hover > th {
-  background-color: #ebcccc;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-.table > thead > tr > .warning,
-.table > tbody > tr > .warning,
-.table > tfoot > tr > .warning,
-.table > thead > .warning > td,
-.table > tbody > .warning > td,
-.table > tfoot > .warning > td,
-.table > thead > .warning > th,
-.table > tbody > .warning > th,
-.table > tfoot > .warning > th {
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
   background-color: #fcf8e3;
 }
-.table-hover > tbody > tr > .warning:hover,
-.table-hover > tbody > .warning:hover > td,
-.table-hover > tbody > .warning:hover > th {
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
@@ -1275,7 +1307,6 @@ input[type="color"],
   font-size: 14px;
   line-height: 1.428571429;
   color: #4b4b4b;
-  vertical-align: middle;
   background-color: #2d2d2d;
   background-image: none;
   border: 1px solid #1f1f1f;
@@ -1437,6 +1468,7 @@ fieldset[disabled] input[type="color"],
 fieldset[disabled] .inputbox {
   cursor: not-allowed;
   background-color: #878787;
+  opacity: 1;
 }
 textareaselect,
 textareatextarea,
@@ -1685,7 +1717,8 @@ selectinput.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textareainput.input-sm {
+textareainput.input-sm,
+select[multiple]input.input-sm {
   height: auto;
 }
 input.input-lg {
@@ -1699,7 +1732,8 @@ selectinput.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textareainput.input-lg {
+textareainput.input-lg,
+select[multiple]input.input-lg {
   height: auto;
 }
 @media (min-width: 768px) {
@@ -1928,6 +1962,7 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  min-width: 0;
 }
 legend {
   display: block;
@@ -1960,15 +1995,14 @@ input[type="checkbox"] {
 input[type="file"] {
   display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
@@ -1976,17 +2010,12 @@ input[type="checkbox"]:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #4b4b4b;
-  vertical-align: middle;
 }
 .form-control {
   display: block;
@@ -1996,7 +2025,6 @@ output {
   font-size: 14px;
   line-height: 1.428571429;
   color: #4b4b4b;
-  vertical-align: middle;
   background-color: #2d2d2d;
   background-image: none;
   border: 1px solid #1f1f1f;
@@ -2030,10 +2058,14 @@ output {
 fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #878787;
+  opacity: 1;
 }
 textarea.form-control {
   height: auto;
 }
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
@@ -2044,12 +2076,10 @@ textarea.form-control {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 20px;
-  vertical-align: middle;
 }
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
@@ -2103,7 +2133,8 @@ select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
 .input-lg {
@@ -2117,9 +2148,52 @@ select.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-right: 42.5px;
+}
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  right: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #468847;
+}
+.has-success .form-control {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-success .form-control:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+.has-success .input-group-addon {
+  color: #468847;
+  border-color: #468847;
+  background-color: #dff0d8;
+}
+.has-success .form-control-feedback {
+  color: #468847;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
@@ -2143,6 +2217,9 @@ textarea.input-lg {
   border-color: #c09853;
   background-color: #fcf8e3;
 }
+.has-warning .form-control-feedback {
+  color: #c09853;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
@@ -2166,28 +2243,8 @@ textarea.input-lg {
   border-color: #b94a48;
   background-color: #f2dede;
 }
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #468847;
-}
-.has-success .form-control {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-.has-success .input-group-addon {
-  color: #468847;
-  border-color: #468847;
-  background-color: #dff0d8;
+.has-error .form-control-feedback {
+  color: #b94a48;
 }
 .form-control-static {
   margin-bottom: 0;
@@ -2206,9 +2263,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
-  }
-  .form-inline select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -2216,12 +2276,16 @@ textarea.input-lg {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 .form-horizontal .control-label,
 .form-horizontal .radio,
@@ -2240,22 +2304,6 @@ textarea.input-lg {
   margin-left: -15px;
   margin-right: -15px;
 }
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
@@ -2264,6 +2312,10 @@ textarea.input-lg {
     text-align: right;
   }
 }
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  right: 15px;
+}
 .btn {
   display: inline-block;
   margin-bottom: 0;
@@ -2350,7 +2402,7 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-default .badge {
   color: #2d2d2d;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-primary {
   color: #ffffff;
@@ -2391,100 +2443,18 @@ fieldset[disabled] .btn-primary.active {
 }
 .btn-primary .badge {
   color: #0077bb;
-  background-color: #fff;
+  background-color: #ffffff;
 }
-.btn-warning {
+.btn-success {
   color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
 }
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
   color: #ffffff;
   background-color: #47a447;
   border-color: #398439;
@@ -2514,7 +2484,7 @@ fieldset[disabled] .btn-success.active {
 }
 .btn-success .badge {
   color: #5cb85c;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-info {
   color: #ffffff;
@@ -2555,7 +2525,89 @@ fieldset[disabled] .btn-info.active {
 }
 .btn-info .badge {
   color: #5bc0de;
-  background-color: #fff;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
 }
 .btn-link {
   color: #ffffff;
@@ -2679,7 +2731,7 @@ input[type="button"].btn-block {
 @font-face {
   font-family: 'Glyphicons Halflings';
   src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot');
-  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;
@@ -2692,9 +2744,6 @@ input[type="button"].btn-block {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-.glyphicon:empty {
-  width: 1em;
-}
 .glyphicon-asterisk:before {
   content: "\2a";
 }
@@ -3383,6 +3432,14 @@ input[type="button"].btn-block {
 .open > a {
   outline: 0;
 }
+.dropdown-menu-right {
+  left: auto;
+  right: 0;
+}
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
@@ -3416,8 +3473,12 @@ input[type="button"].btn-block {
 }
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
-    right: 0;
     left: auto;
+    right: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    left: 0;
+    right: auto;
   }
 }
 .btn-group,
@@ -3451,29 +3512,16 @@ input[type="button"].btn-block {
 .btn-group .btn-group + .btn-group {
   margin-left: -1px;
 }
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
+.btn-toolbar {
+  margin-left: -5px;
 }
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: left;
 }
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-left: 5px;
 }
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
@@ -3562,22 +3610,6 @@ input[type="button"].btn-block {
   width: 100%;
   max-width: 100%;
 }
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
@@ -3604,12 +3636,12 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-right-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3643,6 +3675,7 @@ input[type="button"].btn-block {
   padding-right: 0;
 }
 .input-group .form-control {
+  float: left;
   width: 100%;
   margin-bottom: 0;
 }
@@ -3663,7 +3696,10 @@ select.input-group-lg > .input-group-btn > .btn {
 }
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-sm > .form-control,
@@ -3683,7 +3719,10 @@ select.input-group-sm > .input-group-btn > .btn {
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-addon,
@@ -3730,8 +3769,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3741,8 +3782,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3751,45 +3794,33 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-.input-group-btn:first-child > .btn {
-  margin-right: -1px;
-}
-.input-group-btn:last-child > .btn {
-  margin-left: -1px;
-}
 .input-group-btn > .btn {
   position: relative;
 }
 .input-group-btn > .btn + .btn {
-  margin-left: -4px;
+  margin-left: -1px;
 }
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-left: -1px;
+}
 .nav {
   margin-bottom: 0;
   padding-left: 0;
   list-style: none;
 }
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
 .nav > li {
   position: relative;
   display: block;
@@ -3983,43 +4014,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar-header {
     float: left;
@@ -4034,24 +4033,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
 }
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse.in {
-  overflow-y: auto;
+.navbar-collapse.in {
+  overflow-y: auto;
 }
 @media (min-width: 768px) {
   .navbar-collapse {
@@ -4076,13 +4059,17 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
 }
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-right: -15px;
   margin-left: -15px;
 }
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-right: 0;
     margin-left: 0;
   }
@@ -4123,13 +4110,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
+  height: 20px;
 }
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-left: -15px;
   }
 }
@@ -4145,6 +4134,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border: 1px solid transparent;
   border-radius: 4px;
 }
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
@@ -4240,9 +4232,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
-  }
-  .navbar-form select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -4250,12 +4245,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 @media (max-width: 767px) {
   .navbar-form .form-group {
@@ -4286,11 +4285,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-}
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
@@ -4523,6 +4517,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
+  color: #ffffff;
   background-color: #2d2d2d;
   border: 1px solid #1f1f1f;
   margin-left: -1px;
@@ -4542,7 +4537,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
+  color: #d9d9d9;
   background-color: #4b4b4b;
+  border-color: #dddddd;
 }
 .pagination > .active > a,
 .pagination > .active > span,
@@ -4563,8 +4560,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > .disabled > a:hover,
 .pagination > .disabled > a:focus {
   color: #4b4b4b;
-  background-color: #2d2d2d;
-  border-color: #1f1f1f;
+  background-color: #ffffff;
+  border-color: #dddddd;
   cursor: not-allowed;
 }
 .pagination-lg > li > a,
@@ -4603,22 +4600,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   list-style: none;
   text-align: center;
 }
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
 .pager li {
   display: inline;
 }
@@ -4739,6 +4720,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
   position: relative;
   top: -1px;
 }
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
   color: #ffffff;
@@ -4756,19 +4741,17 @@ a.list-group-item.active > .badge,
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
   background-color: #878787;
 }
 .jumbotron h1,
 .jumbotron .h1 {
-  line-height: 1;
   color: #ffffff;
 }
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
 .container .jumbotron {
   border-radius: 6px;
@@ -5051,6 +5034,94 @@ a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #88d4ff;
 }
+.list-group-item-success {
+  color: #468847;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #468847;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #468847;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #468847;
+  border-color: #468847;
+}
+.list-group-item-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #3a87ad;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #3a87ad;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #3a87ad;
+  border-color: #3a87ad;
+}
+.list-group-item-warning {
+  color: #c09853;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #c09853;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #c09853;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #c09853;
+  border-color: #c09853;
+}
+.list-group-item-danger {
+  color: #b94a48;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #b94a48;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #b94a48;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #b94a48;
+  border-color: #b94a48;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
@@ -5070,35 +5141,27 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-body {
   padding: 15px;
 }
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
 .panel > .list-group {
   margin-bottom: 0;
 }
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
 .panel > .list-group .list-group-item:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
+  border-top: 0;
 }
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
@@ -5106,12 +5169,52 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table {
   margin-bottom: 0;
 }
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-right-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
   border-top: 1px solid #dddddd;
 }
-.panel > .table > tbody:first-child th,
-.panel > .table > tbody:first-child td {
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0;
 }
 .panel > .table-bordered,
@@ -5146,6 +5249,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-right: 0;
 }
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -5189,6 +5306,9 @@ a.list-group-item.active:focus .list-group-item-text {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   border-radius: 4px;
@@ -5251,6 +5371,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
@@ -5279,20 +5413,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -5352,7 +5472,9 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1040;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
 .modal.fade .modal-dialog {
   -webkit-transform: translate(0, -25%);
@@ -5372,7 +5494,6 @@ button.close {
   position: relative;
   width: auto;
   margin: 10px;
-  z-index: 1050;
 }
 .modal-content {
   position: relative;
@@ -5391,7 +5512,7 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1030;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -5424,22 +5545,6 @@ button.close {
   text-align: right;
   border-top: 1px solid #e5e5e5;
 }
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
 .modal-footer .btn + .btn {
   margin-left: 5px;
   margin-bottom: 0;
@@ -5450,7 +5555,7 @@ button.close {
 .modal-footer .btn-block + .btn-block {
   margin-left: 0;
 }
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
     margin: 30px auto;
@@ -5459,6 +5564,12 @@ button.close {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
+  }
 }
 .tooltip {
   position: absolute;
@@ -5859,11 +5970,50 @@ button.close {
   }
 }
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   content: " ";
   display: table;
 }
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
 .center-block {
@@ -5924,72 +6074,12 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  table.visible-xs.visible-sm {
-    display: table;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  table.visible-xs.visible-md {
-    display: table;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  table.visible-xs.visible-lg {
-    display: table;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  table.visible-sm.visible-xs {
-    display: table;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
@@ -6005,72 +6095,12 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  table.visible-sm.visible-md {
-    display: table;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  table.visible-sm.visible-lg {
-    display: table;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  table.visible-md.visible-xs {
-    display: table;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  table.visible-md.visible-sm {
-    display: table;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
@@ -6086,72 +6116,12 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  table.visible-md.visible-lg {
-    display: table;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  table.visible-lg.visible-xs {
-    display: table;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  table.visible-lg.visible-sm {
-    display: table;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  table.visible-lg.visible-md {
-    display: table;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
@@ -6167,19 +6137,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-.hidden-xs {
-  display: block !important;
-}
-table.hidden-xs {
-  display: table;
-}
-tr.hidden-xs {
-  display: table-row !important;
-}
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -6188,51 +6145,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  display: block !important;
-}
-table.hidden-sm {
-  display: table;
-}
-tr.hidden-sm {
-  display: table-row !important;
-}
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -6241,51 +6153,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-md {
-  display: block !important;
-}
-table.hidden-md {
-  display: table;
-}
-tr.hidden-md {
-  display: table-row !important;
-}
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -6294,51 +6161,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  display: block !important;
-}
-table.hidden-lg {
-  display: table;
-}
-tr.hidden-lg {
-  display: table-row !important;
-}
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -6367,10 +6189,12 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
   td.hidden-print {
     display: none !important;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/frontend-edit.css b/templates/t3_bs3_blank/css/themes/dark/frontend-edit.css
index 057192a..eb74881 100644
--- a/templates/t3_bs3_blank/css/themes/dark/frontend-edit.css
+++ b/templates/t3_bs3_blank/css/themes/dark/frontend-edit.css
@@ -237,7 +237,7 @@
   left: -100%;
 }
 .t3onoff label.on.active:before {
-  left: 0%;
+  left: -0%;
 }
 .t3onoff label.off:after {
   left: 60%;
@@ -354,4 +354,4 @@ fieldset.radio.btn-group label.active {
 .controls img.calendar {
   cursor: pointer;
   margin-left: 5px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/home.css b/templates/t3_bs3_blank/css/themes/dark/home.css
index 7dad11a..62d7775 100644
--- a/templates/t3_bs3_blank/css/themes/dark/home.css
+++ b/templates/t3_bs3_blank/css/themes/dark/home.css
@@ -90,4 +90,4 @@
 .home .t3-sl-5 .jumbotron {
   border-radius: 0;
   margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/legacy-grid.css b/templates/t3_bs3_blank/css/themes/dark/legacy-grid.css
index aaff047..83adcc3 100644
--- a/templates/t3_bs3_blank/css/themes/dark/legacy-grid.css
+++ b/templates/t3_bs3_blank/css/themes/dark/legacy-grid.css
@@ -4,14 +4,6 @@
   margin-left: -15px;
   margin-right: -15px;
 }
-.row-fluid:before,
-.row-fluid:after {
-  content: " ";
-  display: table;
-}
-.row-fluid:after {
-  clear: both;
-}
 [class*="span"] {
   float: left;
 }
@@ -113,7 +105,7 @@
     display: inherit !important;
   }
   .visible-desktop {
-    display: none !important ;
+    display: none !important;
   }
   .visible-tablet {
     display: inherit !important;
@@ -195,4 +187,4 @@
 }
 .height-100 {
   height: 100px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/legacy-navigation.css b/templates/t3_bs3_blank/css/themes/dark/legacy-navigation.css
index 7a4e2de..edd5014 100644
--- a/templates/t3_bs3_blank/css/themes/dark/legacy-navigation.css
+++ b/templates/t3_bs3_blank/css/themes/dark/legacy-navigation.css
@@ -31,3 +31,4 @@
 .dropdown-submenu:hover > a:after {
   border-left-color: #ffffff;
 }
+
diff --git a/templates/t3_bs3_blank/css/themes/dark/megamenu.css b/templates/t3_bs3_blank/css/themes/dark/megamenu.css
index 7d35bd2..75e5699 100644
--- a/templates/t3_bs3_blank/css/themes/dark/megamenu.css
+++ b/templates/t3_bs3_blank/css/themes/dark/megamenu.css
@@ -181,7 +181,7 @@
   .t3-megamenu.animate .mega.animating > .mega-dropdown-menu {
     -webkit-transition: all 400ms;
     transition: all 400ms;
-    display: block!important;
+    display: block !important;
   }
   .t3-megamenu.animate .mega.open > .mega-dropdown-menu,
   .t3-megamenu.animate .mega.animating.open > .mega-dropdown-menu {
@@ -193,6 +193,7 @@
     transform: scale(0, 0);
     -webkit-transform-origin: 20% 20%;
     -moz-transform-origin: 20% 20%;
+    -ms-transform-origin: 20% 20%;
     transform-origin: 20% 20%;
   }
   .t3-megamenu.animate.zoom .mega.open > .mega-dropdown-menu {
@@ -206,6 +207,7 @@
     transform: scale(0, 0) translate(-50%, 0);
     -webkit-transform-origin: 0% 20%;
     -moz-transform-origin: 0% 20%;
+    -ms-transform-origin: 0% 20%;
     transform-origin: 0% 20%;
   }
   .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -219,6 +221,7 @@
     transform: scale(0, 1);
     -webkit-transform-origin: 10% 0;
     -moz-transform-origin: 10% 0;
+    -ms-transform-origin: 10% 0;
     transform-origin: 10% 0;
   }
   .t3-megamenu.animate.elastic .mega.open > .mega-dropdown-menu {
@@ -271,6 +274,7 @@
     min-width: 200px;
     margin-top: 0;
     margin-left: -500px;
+    width: 100%;
   }
   .t3-megamenu.animate.slide .mega .mega.open > .mega-dropdown-menu > div {
     margin-left: 0;
@@ -414,4 +418,4 @@
 .t3-megamenu .nav .input-group-addon [class*=" icon-"],
 .t3-megamenu .nav .input-group-addon .fa {
   margin-right: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/off-canvas.css b/templates/t3_bs3_blank/css/themes/dark/off-canvas.css
index 2e8f75f..ecb6713 100644
--- a/templates/t3_bs3_blank/css/themes/dark/off-canvas.css
+++ b/templates/t3_bs3_blank/css/themes/dark/off-canvas.css
@@ -586,7 +586,7 @@ body.off-canvas-effect-14.off-canvas-right {
   transform: translate3d(100%, 0, 0) rotateY(0deg);
 }
 .old-ie .t3-off-canvas {
-  z-index: 100!important;
+  z-index: 100 !important;
   left: -250px;
 }
 html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
@@ -651,9 +651,12 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+.t3-off-canvas .t3-off-canvas-body .dropdown-menu .active a {
+  background: transparent;
+}
 .t3-off-canvas .t3-off-canvas-body .t3-module {
   margin-bottom: 20px;
 }
 .t3-off-canvas .t3-off-canvas-body .module-title {
   margin-bottom: 10px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/template.css b/templates/t3_bs3_blank/css/themes/dark/template.css
index ae925c3..eb8c3b8 100644
--- a/templates/t3_bs3_blank/css/themes/dark/template.css
+++ b/templates/t3_bs3_blank/css/themes/dark/template.css
@@ -145,7 +145,8 @@ p {
     font-size: 21px;
   }
 }
-small {
+small,
+.small {
   font-size: 85%;
 }
 cite {
@@ -532,7 +533,7 @@ fieldset[disabled] .btn-inverse.active {
 }
 .btn-inverse .badge {
   color: #2d2d2d;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-block + .btn-block {
   margin-top: 5px;
@@ -735,6 +736,13 @@ input.invalid {
 .breadcrumb > .active {
   color: #ffffff;
 }
+.breadcrumb > .active + li:before {
+  content: "";
+  padding: 0;
+}
+.breadcrumb > .active .hasTooltip {
+  padding-right: 10px;
+}
 .breadcrumb .divider {
   display: none;
 }
@@ -1294,6 +1302,7 @@ article aside .btn-group > .dropdown-toggle .caret {
   vertical-align: middle;
   border-top: 1px solid #dddddd;
   margin-left: 0;
+  padding-left: 0;
 }
 .list-striped li,
 .list-striped dd,
@@ -1562,6 +1571,10 @@ article aside .btn-group > .dropdown-toggle .caret {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.search-results .result-url {
+  color: #4b4b4b;
+  margin-top: 20px;
+}
 .search-results .result-created {
   font-size: 12px;
   color: #5a5a5a;
@@ -1574,7 +1587,7 @@ div.finder {
   margin-top: 3px;
 }
 @media (max-width: 768px) {
-  .contact .thumbnail.pull-right {
+  .contact .thumbnail {
     width: 100%;
   }
 }
@@ -1590,34 +1603,30 @@ div.finder {
     margin-left: 0;
   }
 }
-.contact .accordion-heading .accordion-toggle {
-  font-weight: bold;
+.contact-form #jform_contact_emailmsg {
+  width: 100%;
+}
+.contact-form #jform_contact_message {
+  width: 100%;
+  height: auto;
 }
 @media (max-width: 768px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 65%;
+  .contact-form #jform_captcha-lbl {
+    display: none;
   }
-}
-@media (max-width: 480px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 55%;
+  .contact-form #recaptcha_image {
+    width: 220px;
   }
-}
-@media (max-width: 768px) {
-  .contact-form legend {
-    font-size: 17px;
-    max-width: 90%;
+  .contact-form #recaptcha_image img {
+    max-width: 220px;
   }
-}
-@media (max-width: 480px) {
-  .contact-form legend {
-    max-width: 60%;
+  .contact-form #recaptcha_response_field {
+    max-width: 220px;
   }
 }
+.contact .accordion-toggle {
+  font-weight: bold;
+}
 #archive-items > li {
   line-height: normal;
   margin: 0;
@@ -2302,4 +2311,4 @@ a.list-group-item.active:focus .list-group-item-text {
 .img_caption p.img_caption {
   background: #2d2d2d;
   color: #5a5a5a;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/dark/windows.css b/templates/t3_bs3_blank/css/themes/dark/windows.css
index 66cf453..df21821 100644
--- a/templates/t3_bs3_blank/css/themes/dark/windows.css
+++ b/templates/t3_bs3_blank/css/themes/dark/windows.css
@@ -7,4 +7,4 @@
 }
 .window .window-mainbody {
   padding: 20px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/bootstrap.css b/templates/t3_bs3_blank/css/themes/red/bootstrap.css
index 15f87dd..c811751 100644
--- a/templates/t3_bs3_blank/css/themes/red/bootstrap.css
+++ b/templates/t3_bs3_blank/css/themes/red/bootstrap.css
@@ -1,5 +1,13 @@
 
 
+html {
+  font-family: sans-serif;
+  -ms-text-size-adjust: 100%;
+  -webkit-text-size-adjust: 100%;
+}
+body {
+  margin: 0;
+}
 article,
 aside,
 details,
@@ -16,8 +24,10 @@ summary {
 }
 audio,
 canvas,
+progress,
 video {
   display: inline-block;
+  vertical-align: baseline;
 }
 audio:not([controls]) {
   display: none;
@@ -27,28 +37,13 @@ audio:not([controls]) {
 template {
   display: none;
 }
-html {
-  font-family: sans-serif;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-}
 a {
   background: transparent;
 }
-a:focus {
-  outline: thin dotted;
-}
 a:active,
 a:hover {
   outline: 0;
 }
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
 abbr[title] {
   border-bottom: 1px dotted;
 }
@@ -59,28 +54,14 @@ strong {
 dfn {
   font-style: italic;
 }
-hr {
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  height: 0;
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
 }
 mark {
   background: #ff0;
   color: #000;
 }
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, serif;
-  font-size: 1em;
-}
-pre {
-  white-space: pre-wrap;
-}
-q {
-  quotes: "\201C" "\201D" "\2018" "\2019";
-}
 small {
   font-size: 80%;
 }
@@ -104,28 +85,34 @@ svg:not(:root) {
   overflow: hidden;
 }
 figure {
-  margin: 0;
+  margin: 1em 40px;
 }
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
 }
-legend {
-  border: 0;
-  padding: 0;
+pre {
+  overflow: auto;
+}
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
 }
 button,
 input,
+optgroup,
 select,
 textarea {
-  font-family: inherit;
-  font-size: 100%;
+  color: inherit;
+  font: inherit;
   margin: 0;
 }
-button,
-input {
-  line-height: normal;
+button {
+  overflow: visible;
 }
 button,
 select {
@@ -142,11 +129,23 @@ button[disabled],
 html input[disabled] {
   cursor: default;
 }
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+input {
+  line-height: normal;
+}
 input[type="checkbox"],
 input[type="radio"] {
   box-sizing: border-box;
   padding: 0;
 }
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
 input[type="search"] {
   -webkit-appearance: textfield;
   -moz-box-sizing: content-box;
@@ -157,19 +156,29 @@ input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-decoration {
   -webkit-appearance: none;
 }
-button::-moz-focus-inner,
-input::-moz-focus-inner {
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+legend {
   border: 0;
   padding: 0;
 }
 textarea {
   overflow: auto;
-  vertical-align: top;
+}
+optgroup {
+  font-weight: bold;
 }
 table {
   border-collapse: collapse;
   border-spacing: 0;
 }
+td,
+th {
+  padding: 0;
+}
 @media print {
   * {
     text-shadow: none !important;
@@ -206,9 +215,6 @@ table {
   img {
     max-width: 100% !important;
   }
-  @page {
-    margin: 2cm .5cm;
-  }
   p,
   h2,
   h3 {
@@ -244,7 +250,11 @@ table {
     border: 1px solid #ddd !important;
   }
 }
-*,
+* {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
 *:before,
 *:after {
   -webkit-box-sizing: border-box;
@@ -284,6 +294,9 @@ a:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+figure {
+  margin: 0;
+}
 img {
   vertical-align: middle;
 }
@@ -340,6 +353,14 @@ code {
   white-space: nowrap;
   border-radius: 4px;
 }
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: #ffffff;
+  background-color: #333333;
+  border-radius: 3px;
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
 pre {
   display: block;
   padding: 9.5px;
@@ -371,22 +392,6 @@ pre code {
   padding-left: 15px;
   padding-right: 15px;
 }
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
-.container:before,
-.container:after {
-  content: " ";
-  display: table;
-}
-.container:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .container {
     width: 750px;
@@ -402,26 +407,16 @@ pre code {
     width: 1170px;
   }
 }
+.container-fluid {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left: 15px;
+  padding-right: 15px;
+}
 .row {
   margin-left: -15px;
   margin-right: -15px;
 }
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
-.row:before,
-.row:after {
-  content: " ";
-  display: table;
-}
-.row:after {
-  clear: both;
-}
 .col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
   position: relative;
   min-height: 1px;
@@ -1136,73 +1131,110 @@ table col[class*="col-"] {
 }
 table td[class*="col-"],
 table th[class*="col-"] {
+  position: static;
   float: none;
   display: table-cell;
 }
-.table > thead > tr > .active,
-.table > tbody > tr > .active,
-.table > tfoot > tr > .active,
-.table > thead > .active > td,
-.table > tbody > .active > td,
-.table > tfoot > .active > td,
-.table > thead > .active > th,
-.table > tbody > .active > th,
-.table > tfoot > .active > th {
+.table > thead > tr > td.active,
+.table > tbody > tr > td.active,
+.table > tfoot > tr > td.active,
+.table > thead > tr > th.active,
+.table > tbody > tr > th.active,
+.table > tfoot > tr > th.active,
+.table > thead > tr.active > td,
+.table > tbody > tr.active > td,
+.table > tfoot > tr.active > td,
+.table > thead > tr.active > th,
+.table > tbody > tr.active > th,
+.table > tfoot > tr.active > th {
   background-color: #f5f5f5;
 }
-.table-hover > tbody > tr > .active:hover,
-.table-hover > tbody > .active:hover > td,
-.table-hover > tbody > .active:hover > th {
+.table-hover > tbody > tr > td.active:hover,
+.table-hover > tbody > tr > th.active:hover,
+.table-hover > tbody > tr.active:hover > td,
+.table-hover > tbody > tr.active:hover > th {
   background-color: #e8e8e8;
 }
-.table > thead > tr > .success,
-.table > tbody > tr > .success,
-.table > tfoot > tr > .success,
-.table > thead > .success > td,
-.table > tbody > .success > td,
-.table > tfoot > .success > td,
-.table > thead > .success > th,
-.table > tbody > .success > th,
-.table > tfoot > .success > th {
+.table > thead > tr > td.success,
+.table > tbody > tr > td.success,
+.table > tfoot > tr > td.success,
+.table > thead > tr > th.success,
+.table > tbody > tr > th.success,
+.table > tfoot > tr > th.success,
+.table > thead > tr.success > td,
+.table > tbody > tr.success > td,
+.table > tfoot > tr.success > td,
+.table > thead > tr.success > th,
+.table > tbody > tr.success > th,
+.table > tfoot > tr.success > th {
   background-color: #dff0d8;
 }
-.table-hover > tbody > tr > .success:hover,
-.table-hover > tbody > .success:hover > td,
-.table-hover > tbody > .success:hover > th {
+.table-hover > tbody > tr > td.success:hover,
+.table-hover > tbody > tr > th.success:hover,
+.table-hover > tbody > tr.success:hover > td,
+.table-hover > tbody > tr.success:hover > th {
   background-color: #d0e9c6;
 }
-.table > thead > tr > .danger,
-.table > tbody > tr > .danger,
-.table > tfoot > tr > .danger,
-.table > thead > .danger > td,
-.table > tbody > .danger > td,
-.table > tfoot > .danger > td,
-.table > thead > .danger > th,
-.table > tbody > .danger > th,
-.table > tfoot > .danger > th {
-  background-color: #f2dede;
-}
-.table-hover > tbody > tr > .danger:hover,
-.table-hover > tbody > .danger:hover > td,
-.table-hover > tbody > .danger:hover > th {
-  background-color: #ebcccc;
+.table > thead > tr > td.info,
+.table > tbody > tr > td.info,
+.table > tfoot > tr > td.info,
+.table > thead > tr > th.info,
+.table > tbody > tr > th.info,
+.table > tfoot > tr > th.info,
+.table > thead > tr.info > td,
+.table > tbody > tr.info > td,
+.table > tfoot > tr.info > td,
+.table > thead > tr.info > th,
+.table > tbody > tr.info > th,
+.table > tfoot > tr.info > th {
+  background-color: #d9edf7;
 }
-.table > thead > tr > .warning,
-.table > tbody > tr > .warning,
-.table > tfoot > tr > .warning,
-.table > thead > .warning > td,
-.table > tbody > .warning > td,
-.table > tfoot > .warning > td,
-.table > thead > .warning > th,
-.table > tbody > .warning > th,
-.table > tfoot > .warning > th {
+.table-hover > tbody > tr > td.info:hover,
+.table-hover > tbody > tr > th.info:hover,
+.table-hover > tbody > tr.info:hover > td,
+.table-hover > tbody > tr.info:hover > th {
+  background-color: #c4e3f3;
+}
+.table > thead > tr > td.warning,
+.table > tbody > tr > td.warning,
+.table > tfoot > tr > td.warning,
+.table > thead > tr > th.warning,
+.table > tbody > tr > th.warning,
+.table > tfoot > tr > th.warning,
+.table > thead > tr.warning > td,
+.table > tbody > tr.warning > td,
+.table > tfoot > tr.warning > td,
+.table > thead > tr.warning > th,
+.table > tbody > tr.warning > th,
+.table > tfoot > tr.warning > th {
   background-color: #fcf8e3;
 }
-.table-hover > tbody > tr > .warning:hover,
-.table-hover > tbody > .warning:hover > td,
-.table-hover > tbody > .warning:hover > th {
+.table-hover > tbody > tr > td.warning:hover,
+.table-hover > tbody > tr > th.warning:hover,
+.table-hover > tbody > tr.warning:hover > td,
+.table-hover > tbody > tr.warning:hover > th {
   background-color: #faf2cc;
 }
+.table > thead > tr > td.danger,
+.table > tbody > tr > td.danger,
+.table > tfoot > tr > td.danger,
+.table > thead > tr > th.danger,
+.table > tbody > tr > th.danger,
+.table > tfoot > tr > th.danger,
+.table > thead > tr.danger > td,
+.table > tbody > tr.danger > td,
+.table > tfoot > tr.danger > td,
+.table > thead > tr.danger > th,
+.table > tbody > tr.danger > th,
+.table > tfoot > tr.danger > th {
+  background-color: #f2dede;
+}
+.table-hover > tbody > tr > td.danger:hover,
+.table-hover > tbody > tr > th.danger:hover,
+.table-hover > tbody > tr.danger:hover > td,
+.table-hover > tbody > tr.danger:hover > th {
+  background-color: #ebcccc;
+}
 @media (max-width: 767px) {
   .table-responsive {
     width: 100%;
@@ -1275,7 +1307,6 @@ input[type="color"],
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -1437,6 +1468,7 @@ fieldset[disabled] input[type="color"],
 fieldset[disabled] .inputbox {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textareaselect,
 textareatextarea,
@@ -1685,7 +1717,8 @@ selectinput.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textareainput.input-sm {
+textareainput.input-sm,
+select[multiple]input.input-sm {
   height: auto;
 }
 input.input-lg {
@@ -1699,7 +1732,8 @@ selectinput.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textareainput.input-lg {
+textareainput.input-lg,
+select[multiple]input.input-lg {
   height: auto;
 }
 @media (min-width: 768px) {
@@ -1928,6 +1962,7 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  min-width: 0;
 }
 legend {
   display: block;
@@ -1960,15 +1995,14 @@ input[type="checkbox"] {
 input[type="file"] {
   display: block;
 }
+input[type="range"] {
+  display: block;
+  width: 100%;
+}
 select[multiple],
 select[size] {
   height: auto;
 }
-select optgroup {
-  font-size: inherit;
-  font-style: inherit;
-  font-family: inherit;
-}
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
@@ -1976,17 +2010,12 @@ input[type="checkbox"]:focus {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
-input[type="number"]::-webkit-outer-spin-button,
-input[type="number"]::-webkit-inner-spin-button {
-  height: auto;
-}
 output {
   display: block;
   padding-top: 7px;
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
 }
 .form-control {
   display: block;
@@ -1996,7 +2025,6 @@ output {
   font-size: 14px;
   line-height: 1.428571429;
   color: #555555;
-  vertical-align: middle;
   background-color: #ffffff;
   background-image: none;
   border: 1px solid #cccccc;
@@ -2030,10 +2058,14 @@ output {
 fieldset[disabled] .form-control {
   cursor: not-allowed;
   background-color: #eeeeee;
+  opacity: 1;
 }
 textarea.form-control {
   height: auto;
 }
+input[type="date"] {
+  line-height: 34px;
+}
 .form-group {
   margin-bottom: 15px;
 }
@@ -2044,12 +2076,10 @@ textarea.form-control {
   margin-top: 10px;
   margin-bottom: 10px;
   padding-left: 20px;
-  vertical-align: middle;
 }
 .radio label,
 .checkbox label {
   display: inline;
-  margin-bottom: 0;
   font-weight: normal;
   cursor: pointer;
 }
@@ -2103,7 +2133,8 @@ select.input-sm {
   height: 30px;
   line-height: 30px;
 }
-textarea.input-sm {
+textarea.input-sm,
+select[multiple].input-sm {
   height: auto;
 }
 .input-lg {
@@ -2117,9 +2148,52 @@ select.input-lg {
   height: 45px;
   line-height: 45px;
 }
-textarea.input-lg {
+textarea.input-lg,
+select[multiple].input-lg {
   height: auto;
 }
+.has-feedback {
+  position: relative;
+}
+.has-feedback .form-control {
+  padding-right: 42.5px;
+}
+.has-feedback .form-control-feedback {
+  position: absolute;
+  top: 25px;
+  right: 0;
+  display: block;
+  width: 34px;
+  height: 34px;
+  line-height: 34px;
+  text-align: center;
+}
+.has-success .help-block,
+.has-success .control-label,
+.has-success .radio,
+.has-success .checkbox,
+.has-success .radio-inline,
+.has-success .checkbox-inline {
+  color: #468847;
+}
+.has-success .form-control {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.has-success .form-control:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+.has-success .input-group-addon {
+  color: #468847;
+  border-color: #468847;
+  background-color: #dff0d8;
+}
+.has-success .form-control-feedback {
+  color: #468847;
+}
 .has-warning .help-block,
 .has-warning .control-label,
 .has-warning .radio,
@@ -2143,6 +2217,9 @@ textarea.input-lg {
   border-color: #c09853;
   background-color: #fcf8e3;
 }
+.has-warning .form-control-feedback {
+  color: #c09853;
+}
 .has-error .help-block,
 .has-error .control-label,
 .has-error .radio,
@@ -2166,28 +2243,8 @@ textarea.input-lg {
   border-color: #b94a48;
   background-color: #f2dede;
 }
-.has-success .help-block,
-.has-success .control-label,
-.has-success .radio,
-.has-success .checkbox,
-.has-success .radio-inline,
-.has-success .checkbox-inline {
-  color: #468847;
-}
-.has-success .form-control {
-  border-color: #468847;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-}
-.has-success .form-control:focus {
-  border-color: #356635;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
-}
-.has-success .input-group-addon {
-  color: #468847;
-  border-color: #468847;
-  background-color: #dff0d8;
+.has-error .form-control-feedback {
+  color: #b94a48;
 }
 .form-control-static {
   margin-bottom: 0;
@@ -2206,9 +2263,12 @@ textarea.input-lg {
   }
   .form-inline .form-control {
     display: inline-block;
-  }
-  .form-inline select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .form-inline .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .form-inline .radio,
   .form-inline .checkbox {
@@ -2216,12 +2276,16 @@ textarea.input-lg {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .form-inline .radio input[type="radio"],
   .form-inline .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .form-inline .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 .form-horizontal .control-label,
 .form-horizontal .radio,
@@ -2240,22 +2304,6 @@ textarea.input-lg {
   margin-left: -15px;
   margin-right: -15px;
 }
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-.form-horizontal .form-group:before,
-.form-horizontal .form-group:after {
-  content: " ";
-  display: table;
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
 .form-horizontal .form-control-static {
   padding-top: 7px;
 }
@@ -2264,6 +2312,10 @@ textarea.input-lg {
     text-align: right;
   }
 }
+.form-horizontal .has-feedback .form-control-feedback {
+  top: 0;
+  right: 15px;
+}
 .btn {
   display: inline-block;
   margin-bottom: 0;
@@ -2350,7 +2402,7 @@ fieldset[disabled] .btn-default.active {
 }
 .btn-default .badge {
   color: #ffffff;
-  background-color: #fff;
+  background-color: #333333;
 }
 .btn-primary {
   color: #ffffff;
@@ -2391,100 +2443,18 @@ fieldset[disabled] .btn-primary.active {
 }
 .btn-primary .badge {
   color: #cc0000;
-  background-color: #fff;
+  background-color: #ffffff;
 }
-.btn-warning {
+.btn-success {
   color: #ffffff;
-  background-color: #f0ad4e;
-  border-color: #eea236;
+  background-color: #5cb85c;
+  border-color: #4cae4c;
 }
-.btn-warning:hover,
-.btn-warning:focus,
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  color: #ffffff;
-  background-color: #ed9c28;
-  border-color: #d58512;
-}
-.btn-warning:active,
-.btn-warning.active,
-.open .dropdown-toggle.btn-warning {
-  background-image: none;
-}
-.btn-warning.disabled,
-.btn-warning[disabled],
-fieldset[disabled] .btn-warning,
-.btn-warning.disabled:hover,
-.btn-warning[disabled]:hover,
-fieldset[disabled] .btn-warning:hover,
-.btn-warning.disabled:focus,
-.btn-warning[disabled]:focus,
-fieldset[disabled] .btn-warning:focus,
-.btn-warning.disabled:active,
-.btn-warning[disabled]:active,
-fieldset[disabled] .btn-warning:active,
-.btn-warning.disabled.active,
-.btn-warning[disabled].active,
-fieldset[disabled] .btn-warning.active {
-  background-color: #f0ad4e;
-  border-color: #eea236;
-}
-.btn-warning .badge {
-  color: #f0ad4e;
-  background-color: #fff;
-}
-.btn-danger {
-  color: #ffffff;
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger:hover,
-.btn-danger:focus,
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  color: #ffffff;
-  background-color: #d2322d;
-  border-color: #ac2925;
-}
-.btn-danger:active,
-.btn-danger.active,
-.open .dropdown-toggle.btn-danger {
-  background-image: none;
-}
-.btn-danger.disabled,
-.btn-danger[disabled],
-fieldset[disabled] .btn-danger,
-.btn-danger.disabled:hover,
-.btn-danger[disabled]:hover,
-fieldset[disabled] .btn-danger:hover,
-.btn-danger.disabled:focus,
-.btn-danger[disabled]:focus,
-fieldset[disabled] .btn-danger:focus,
-.btn-danger.disabled:active,
-.btn-danger[disabled]:active,
-fieldset[disabled] .btn-danger:active,
-.btn-danger.disabled.active,
-.btn-danger[disabled].active,
-fieldset[disabled] .btn-danger.active {
-  background-color: #d9534f;
-  border-color: #d43f3a;
-}
-.btn-danger .badge {
-  color: #d9534f;
-  background-color: #fff;
-}
-.btn-success {
-  color: #ffffff;
-  background-color: #5cb85c;
-  border-color: #4cae4c;
-}
-.btn-success:hover,
-.btn-success:focus,
-.btn-success:active,
-.btn-success.active,
-.open .dropdown-toggle.btn-success {
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.open .dropdown-toggle.btn-success {
   color: #ffffff;
   background-color: #47a447;
   border-color: #398439;
@@ -2514,7 +2484,7 @@ fieldset[disabled] .btn-success.active {
 }
 .btn-success .badge {
   color: #5cb85c;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-info {
   color: #ffffff;
@@ -2555,7 +2525,89 @@ fieldset[disabled] .btn-info.active {
 }
 .btn-info .badge {
   color: #5bc0de;
-  background-color: #fff;
+  background-color: #ffffff;
+}
+.btn-warning {
+  color: #ffffff;
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  color: #ffffff;
+  background-color: #ed9c28;
+  border-color: #d58512;
+}
+.btn-warning:active,
+.btn-warning.active,
+.open .dropdown-toggle.btn-warning {
+  background-image: none;
+}
+.btn-warning.disabled,
+.btn-warning[disabled],
+fieldset[disabled] .btn-warning,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:hover,
+fieldset[disabled] .btn-warning:hover,
+.btn-warning.disabled:focus,
+.btn-warning[disabled]:focus,
+fieldset[disabled] .btn-warning:focus,
+.btn-warning.disabled:active,
+.btn-warning[disabled]:active,
+fieldset[disabled] .btn-warning:active,
+.btn-warning.disabled.active,
+.btn-warning[disabled].active,
+fieldset[disabled] .btn-warning.active {
+  background-color: #f0ad4e;
+  border-color: #eea236;
+}
+.btn-warning .badge {
+  color: #f0ad4e;
+  background-color: #ffffff;
+}
+.btn-danger {
+  color: #ffffff;
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  color: #ffffff;
+  background-color: #d2322d;
+  border-color: #ac2925;
+}
+.btn-danger:active,
+.btn-danger.active,
+.open .dropdown-toggle.btn-danger {
+  background-image: none;
+}
+.btn-danger.disabled,
+.btn-danger[disabled],
+fieldset[disabled] .btn-danger,
+.btn-danger.disabled:hover,
+.btn-danger[disabled]:hover,
+fieldset[disabled] .btn-danger:hover,
+.btn-danger.disabled:focus,
+.btn-danger[disabled]:focus,
+fieldset[disabled] .btn-danger:focus,
+.btn-danger.disabled:active,
+.btn-danger[disabled]:active,
+fieldset[disabled] .btn-danger:active,
+.btn-danger.disabled.active,
+.btn-danger[disabled].active,
+fieldset[disabled] .btn-danger.active {
+  background-color: #d9534f;
+  border-color: #d43f3a;
+}
+.btn-danger .badge {
+  color: #d9534f;
+  background-color: #ffffff;
 }
 .btn-link {
   color: #cc0000;
@@ -2679,7 +2731,7 @@ input[type="button"].btn-block {
 @font-face {
   font-family: 'Glyphicons Halflings';
   src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot');
-  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons-halflingsregular') format('svg');
+  src: url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.eot?#iefix') format('embedded-opentype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.woff') format('woff'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.ttf') format('truetype'), url('../../../plugins/system/t3/base-bs3/bootstrap/fonts/glyphicons-halflings-regular.svg#glyphicons_halflingsregular') format('svg');
 }
 .glyphicon {
   position: relative;
@@ -2692,9 +2744,6 @@ input[type="button"].btn-block {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
 }
-.glyphicon:empty {
-  width: 1em;
-}
 .glyphicon-asterisk:before {
   content: "\2a";
 }
@@ -3383,6 +3432,14 @@ input[type="button"].btn-block {
 .open > a {
   outline: 0;
 }
+.dropdown-menu-right {
+  left: auto;
+  right: 0;
+}
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
 .dropdown-header {
   display: block;
   padding: 3px 20px;
@@ -3416,8 +3473,12 @@ input[type="button"].btn-block {
 }
 @media (min-width: 768px) {
   .navbar-right .dropdown-menu {
-    right: 0;
     left: auto;
+    right: 0;
+  }
+  .navbar-right .dropdown-menu-left {
+    left: 0;
+    right: auto;
   }
 }
 .btn-group,
@@ -3451,29 +3512,16 @@ input[type="button"].btn-block {
 .btn-group .btn-group + .btn-group {
   margin-left: -1px;
 }
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
-}
-.btn-toolbar:before,
-.btn-toolbar:after {
-  content: " ";
-  display: table;
-}
-.btn-toolbar:after {
-  clear: both;
+.btn-toolbar {
+  margin-left: -5px;
 }
-.btn-toolbar .btn-group {
+.btn-toolbar .btn-group,
+.btn-toolbar .input-group {
   float: left;
 }
-.btn-toolbar > .btn + .btn,
-.btn-toolbar > .btn-group + .btn,
-.btn-toolbar > .btn + .btn-group,
-.btn-toolbar > .btn-group + .btn-group {
+.btn-toolbar > .btn,
+.btn-toolbar > .btn-group,
+.btn-toolbar > .input-group {
   margin-left: 5px;
 }
 .btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
@@ -3562,22 +3610,6 @@ input[type="button"].btn-block {
   width: 100%;
   max-width: 100%;
 }
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
-.btn-group-vertical > .btn-group:before,
-.btn-group-vertical > .btn-group:after {
-  content: " ";
-  display: table;
-}
-.btn-group-vertical > .btn-group:after {
-  clear: both;
-}
 .btn-group-vertical > .btn-group > .btn {
   float: none;
 }
@@ -3604,12 +3636,12 @@ input[type="button"].btn-block {
 .btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group-vertical > .btn-group:first-child > .btn:last-child,
-.btn-group-vertical > .btn-group:first-child > .dropdown-toggle {
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .btn:last-child,
+.btn-group-vertical > .btn-group:first-child:not(:last-child) > .dropdown-toggle {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.btn-group-vertical > .btn-group:last-child > .btn:first-child {
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
   border-top-right-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3643,6 +3675,7 @@ input[type="button"].btn-block {
   padding-right: 0;
 }
 .input-group .form-control {
+  float: left;
   width: 100%;
   margin-bottom: 0;
 }
@@ -3663,7 +3696,10 @@ select.input-group-lg > .input-group-btn > .btn {
 }
 textarea.input-group-lg > .form-control,
 textarea.input-group-lg > .input-group-addon,
-textarea.input-group-lg > .input-group-btn > .btn {
+textarea.input-group-lg > .input-group-btn > .btn,
+select[multiple].input-group-lg > .form-control,
+select[multiple].input-group-lg > .input-group-addon,
+select[multiple].input-group-lg > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-sm > .form-control,
@@ -3683,7 +3719,10 @@ select.input-group-sm > .input-group-btn > .btn {
 }
 textarea.input-group-sm > .form-control,
 textarea.input-group-sm > .input-group-addon,
-textarea.input-group-sm > .input-group-btn > .btn {
+textarea.input-group-sm > .input-group-btn > .btn,
+select[multiple].input-group-sm > .form-control,
+select[multiple].input-group-sm > .input-group-addon,
+select[multiple].input-group-sm > .input-group-btn > .btn {
   height: auto;
 }
 .input-group-addon,
@@ -3730,8 +3769,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
-.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle) {
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
@@ -3741,8 +3782,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
 .input-group-btn:last-child > .dropdown-toggle,
-.input-group-btn:first-child > .btn:not(:first-child) {
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
@@ -3751,45 +3794,33 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .input-group-btn {
   position: relative;
+  font-size: 0;
   white-space: nowrap;
 }
-.input-group-btn:first-child > .btn {
-  margin-right: -1px;
-}
-.input-group-btn:last-child > .btn {
-  margin-left: -1px;
-}
 .input-group-btn > .btn {
   position: relative;
 }
 .input-group-btn > .btn + .btn {
-  margin-left: -4px;
+  margin-left: -1px;
 }
 .input-group-btn > .btn:hover,
+.input-group-btn > .btn:focus,
 .input-group-btn > .btn:active {
   z-index: 2;
 }
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group {
+  margin-right: -1px;
+}
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group {
+  margin-left: -1px;
+}
 .nav {
   margin-bottom: 0;
   padding-left: 0;
   list-style: none;
 }
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
-.nav:before,
-.nav:after {
-  content: " ";
-  display: table;
-}
-.nav:after {
-  clear: both;
-}
 .nav > li {
   position: relative;
   display: block;
@@ -3983,43 +4014,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   margin-bottom: 20px;
   border: 1px solid transparent;
 }
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
-.navbar:before,
-.navbar:after {
-  content: " ";
-  display: table;
-}
-.navbar:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar {
     border-radius: 4px;
   }
 }
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
-.navbar-header:before,
-.navbar-header:after {
-  content: " ";
-  display: table;
-}
-.navbar-header:after {
-  clear: both;
-}
 @media (min-width: 768px) {
   .navbar-header {
     float: left;
@@ -4034,24 +4033,8 @@ textarea.input-group-sm > .input-group-btn > .btn {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1);
   -webkit-overflow-scrolling: touch;
 }
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse:before,
-.navbar-collapse:after {
-  content: " ";
-  display: table;
-}
-.navbar-collapse:after {
-  clear: both;
-}
-.navbar-collapse.in {
-  overflow-y: auto;
+.navbar-collapse.in {
+  overflow-y: auto;
 }
 @media (min-width: 768px) {
   .navbar-collapse {
@@ -4076,13 +4059,17 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
 }
 .container > .navbar-header,
-.container > .navbar-collapse {
+.container-fluid > .navbar-header,
+.container > .navbar-collapse,
+.container-fluid > .navbar-collapse {
   margin-right: -15px;
   margin-left: -15px;
 }
 @media (min-width: 768px) {
   .container > .navbar-header,
-  .container > .navbar-collapse {
+  .container-fluid > .navbar-header,
+  .container > .navbar-collapse,
+  .container-fluid > .navbar-collapse {
     margin-right: 0;
     margin-left: 0;
   }
@@ -4123,13 +4110,15 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 15px 15px;
   font-size: 18px;
   line-height: 20px;
+  height: 20px;
 }
 .navbar-brand:hover,
 .navbar-brand:focus {
   text-decoration: none;
 }
 @media (min-width: 768px) {
-  .navbar > .container .navbar-brand {
+  .navbar > .container .navbar-brand,
+  .navbar > .container-fluid .navbar-brand {
     margin-left: -15px;
   }
 }
@@ -4145,6 +4134,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border: 1px solid transparent;
   border-radius: 4px;
 }
+.navbar-toggle:focus {
+  outline: none;
+}
 .navbar-toggle .icon-bar {
   display: block;
   width: 22px;
@@ -4240,9 +4232,12 @@ textarea.input-group-sm > .input-group-btn > .btn {
   }
   .navbar-form .form-control {
     display: inline-block;
-  }
-  .navbar-form select.form-control {
     width: auto;
+    vertical-align: middle;
+  }
+  .navbar-form .control-label {
+    margin-bottom: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio,
   .navbar-form .checkbox {
@@ -4250,12 +4245,16 @@ textarea.input-group-sm > .input-group-btn > .btn {
     margin-top: 0;
     margin-bottom: 0;
     padding-left: 0;
+    vertical-align: middle;
   }
   .navbar-form .radio input[type="radio"],
   .navbar-form .checkbox input[type="checkbox"] {
     float: none;
     margin-left: 0;
   }
+  .navbar-form .has-feedback .form-control-feedback {
+    top: 0;
+  }
 }
 @media (max-width: 767px) {
   .navbar-form .form-group {
@@ -4286,11 +4285,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   border-bottom-right-radius: 0;
   border-bottom-left-radius: 0;
 }
-.navbar-nav.pull-right > li > .dropdown-menu,
-.navbar-nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-}
 .navbar-btn {
   margin-top: 8px;
   margin-bottom: 8px;
@@ -4523,6 +4517,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
   padding: 6px 12px;
   line-height: 1.428571429;
   text-decoration: none;
+  color: #cc0000;
   background-color: #ffffff;
   border: 1px solid #dddddd;
   margin-left: -1px;
@@ -4542,7 +4537,9 @@ textarea.input-group-sm > .input-group-btn > .btn {
 .pagination > li > span:hover,
 .pagination > li > a:focus,
 .pagination > li > span:focus {
+  color: #800000;
   background-color: #eeeeee;
+  border-color: #dddddd;
 }
 .pagination > .active > a,
 .pagination > .active > span,
@@ -4603,22 +4600,6 @@ textarea.input-group-sm > .input-group-btn > .btn {
   list-style: none;
   text-align: center;
 }
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
-.pager:before,
-.pager:after {
-  content: " ";
-  display: table;
-}
-.pager:after {
-  clear: both;
-}
 .pager li {
   display: inline;
 }
@@ -4739,6 +4720,10 @@ textarea.input-group-sm > .input-group-btn > .btn {
   position: relative;
   top: -1px;
 }
+.btn-xs .badge {
+  top: 0;
+  padding: 1px 5px;
+}
 a.badge:hover,
 a.badge:focus {
   color: #ffffff;
@@ -4756,19 +4741,17 @@ a.list-group-item.active > .badge,
 .jumbotron {
   padding: 30px;
   margin-bottom: 30px;
-  font-size: 21px;
-  font-weight: 200;
-  line-height: 2.1428571435;
   color: inherit;
   background-color: #eeeeee;
 }
 .jumbotron h1,
 .jumbotron .h1 {
-  line-height: 1;
   color: inherit;
 }
 .jumbotron p {
-  line-height: 1.4;
+  margin-bottom: 15px;
+  font-size: 21px;
+  font-weight: 200;
 }
 .container .jumbotron {
   border-radius: 6px;
@@ -5051,6 +5034,94 @@ a.list-group-item.active:hover .list-group-item-text,
 a.list-group-item.active:focus .list-group-item-text {
   color: #ff9999;
 }
+.list-group-item-success {
+  color: #468847;
+  background-color: #dff0d8;
+}
+a.list-group-item-success {
+  color: #468847;
+}
+a.list-group-item-success .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-success:hover,
+a.list-group-item-success:focus {
+  color: #468847;
+  background-color: #d0e9c6;
+}
+a.list-group-item-success.active,
+a.list-group-item-success.active:hover,
+a.list-group-item-success.active:focus {
+  color: #fff;
+  background-color: #468847;
+  border-color: #468847;
+}
+.list-group-item-info {
+  color: #3a87ad;
+  background-color: #d9edf7;
+}
+a.list-group-item-info {
+  color: #3a87ad;
+}
+a.list-group-item-info .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-info:hover,
+a.list-group-item-info:focus {
+  color: #3a87ad;
+  background-color: #c4e3f3;
+}
+a.list-group-item-info.active,
+a.list-group-item-info.active:hover,
+a.list-group-item-info.active:focus {
+  color: #fff;
+  background-color: #3a87ad;
+  border-color: #3a87ad;
+}
+.list-group-item-warning {
+  color: #c09853;
+  background-color: #fcf8e3;
+}
+a.list-group-item-warning {
+  color: #c09853;
+}
+a.list-group-item-warning .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-warning:hover,
+a.list-group-item-warning:focus {
+  color: #c09853;
+  background-color: #faf2cc;
+}
+a.list-group-item-warning.active,
+a.list-group-item-warning.active:hover,
+a.list-group-item-warning.active:focus {
+  color: #fff;
+  background-color: #c09853;
+  border-color: #c09853;
+}
+.list-group-item-danger {
+  color: #b94a48;
+  background-color: #f2dede;
+}
+a.list-group-item-danger {
+  color: #b94a48;
+}
+a.list-group-item-danger .list-group-item-heading {
+  color: inherit;
+}
+a.list-group-item-danger:hover,
+a.list-group-item-danger:focus {
+  color: #b94a48;
+  background-color: #ebcccc;
+}
+a.list-group-item-danger.active,
+a.list-group-item-danger.active:hover,
+a.list-group-item-danger.active:focus {
+  color: #fff;
+  background-color: #b94a48;
+  border-color: #b94a48;
+}
 .list-group-item-heading {
   margin-top: 0;
   margin-bottom: 5px;
@@ -5070,35 +5141,27 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-body {
   padding: 15px;
 }
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
-.panel-body:before,
-.panel-body:after {
-  content: " ";
-  display: table;
-}
-.panel-body:after {
-  clear: both;
-}
 .panel > .list-group {
   margin-bottom: 0;
 }
 .panel > .list-group .list-group-item {
   border-width: 1px 0;
+  border-radius: 0;
 }
 .panel > .list-group .list-group-item:first-child {
-  border-top-right-radius: 0;
-  border-top-left-radius: 0;
+  border-top: 0;
 }
 .panel > .list-group .list-group-item:last-child {
   border-bottom: 0;
 }
+.panel > .list-group:first-child .list-group-item:first-child {
+  border-top-right-radius: 3px;
+  border-top-left-radius: 3px;
+}
+.panel > .list-group:last-child .list-group-item:last-child {
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
 .panel-heading + .list-group .list-group-item:first-child {
   border-top-width: 0;
 }
@@ -5106,12 +5169,52 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table {
   margin-bottom: 0;
 }
+.panel > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child {
+  border-top-left-radius: 3px;
+}
+.panel > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child,
+.panel > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child,
+.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child,
+.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child {
+  border-top-right-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child {
+  border-bottom-left-radius: 3px;
+}
+.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child,
+.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child,
+.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child,
+.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child {
+  border-bottom-right-radius: 3px;
+}
 .panel > .panel-body + .table,
 .panel > .panel-body + .table-responsive {
   border-top: 1px solid #dddddd;
 }
-.panel > .table > tbody:first-child th,
-.panel > .table > tbody:first-child td {
+.panel > .table > tbody:first-child > tr:first-child th,
+.panel > .table > tbody:first-child > tr:first-child td {
   border-top: 0;
 }
 .panel > .table-bordered,
@@ -5146,6 +5249,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child {
   border-right: 0;
 }
+.panel > .table-bordered > thead > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > th,
+.panel > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > th,
+.panel > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > th,
+.panel > .table-bordered > thead > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > thead > tr:first-child > td,
+.panel > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tbody > tr:first-child > td,
+.panel > .table-bordered > tfoot > tr:first-child > td,
+.panel > .table-responsive > .table-bordered > tfoot > tr:first-child > td {
+  border-top: 0;
+}
 .panel > .table-bordered > thead > tr:last-child > th,
 .panel > .table-responsive > .table-bordered > thead > tr:last-child > th,
 .panel > .table-bordered > tbody > tr:last-child > th,
@@ -5189,6 +5306,9 @@ a.list-group-item.active:focus .list-group-item-text {
   border-bottom-right-radius: 3px;
   border-bottom-left-radius: 3px;
 }
+.panel-group {
+  margin-bottom: 20px;
+}
 .panel-group .panel {
   margin-bottom: 0;
   border-radius: 4px;
@@ -5251,6 +5371,20 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-success > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #d6e9c6;
 }
+.panel-info {
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.panel-info > .panel-heading + .panel-collapse .panel-body {
+  border-top-color: #bce8f1;
+}
+.panel-info > .panel-footer + .panel-collapse .panel-body {
+  border-bottom-color: #bce8f1;
+}
 .panel-warning {
   border-color: #faebcc;
 }
@@ -5279,20 +5413,6 @@ a.list-group-item.active:focus .list-group-item-text {
 .panel-danger > .panel-footer + .panel-collapse .panel-body {
   border-bottom-color: #ebccd1;
 }
-.panel-info {
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading {
-  color: #3a87ad;
-  background-color: #d9edf7;
-  border-color: #bce8f1;
-}
-.panel-info > .panel-heading + .panel-collapse .panel-body {
-  border-top-color: #bce8f1;
-}
-.panel-info > .panel-footer + .panel-collapse .panel-body {
-  border-bottom-color: #bce8f1;
-}
 .well {
   min-height: 20px;
   padding: 19px;
@@ -5352,7 +5472,9 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1040;
+  z-index: 1050;
+  -webkit-overflow-scrolling: touch;
+  outline: 0;
 }
 .modal.fade .modal-dialog {
   -webkit-transform: translate(0, -25%);
@@ -5372,7 +5494,6 @@ button.close {
   position: relative;
   width: auto;
   margin: 10px;
-  z-index: 1050;
 }
 .modal-content {
   position: relative;
@@ -5391,7 +5512,7 @@ button.close {
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: 1030;
+  z-index: 1040;
   background-color: #000000;
 }
 .modal-backdrop.fade {
@@ -5424,22 +5545,6 @@ button.close {
   text-align: right;
   border-top: 1px solid #e5e5e5;
 }
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
-.modal-footer:before,
-.modal-footer:after {
-  content: " ";
-  display: table;
-}
-.modal-footer:after {
-  clear: both;
-}
 .modal-footer .btn + .btn {
   margin-left: 5px;
   margin-bottom: 0;
@@ -5450,7 +5555,7 @@ button.close {
 .modal-footer .btn-block + .btn-block {
   margin-left: 0;
 }
-@media screen and (min-width: 768px) {
+@media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
     margin: 30px auto;
@@ -5459,6 +5564,12 @@ button.close {
     -webkit-box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
     box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
   }
+  .modal-sm {
+    width: 300px;
+  }
+  .modal-lg {
+    width: 900px;
+  }
 }
 .tooltip {
   position: absolute;
@@ -5859,11 +5970,50 @@ button.close {
   }
 }
 .clearfix:before,
-.clearfix:after {
+.clearfix:after,
+.container:before,
+.container:after,
+.container-fluid:before,
+.container-fluid:after,
+.row:before,
+.row:after,
+.form-horizontal .form-group:before,
+.form-horizontal .form-group:after,
+.btn-toolbar:before,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:before,
+.btn-group-vertical > .btn-group:after,
+.nav:before,
+.nav:after,
+.navbar:before,
+.navbar:after,
+.navbar-header:before,
+.navbar-header:after,
+.navbar-collapse:before,
+.navbar-collapse:after,
+.pager:before,
+.pager:after,
+.panel-body:before,
+.panel-body:after,
+.modal-footer:before,
+.modal-footer:after {
   content: " ";
   display: table;
 }
-.clearfix:after {
+.clearfix:after,
+.container:after,
+.container-fluid:after,
+.row:after,
+.form-horizontal .form-group:after,
+.btn-toolbar:after,
+.btn-group-vertical > .btn-group:after,
+.nav:after,
+.navbar:after,
+.navbar-header:after,
+.navbar-collapse:after,
+.pager:after,
+.panel-body:after,
+.modal-footer:after {
   clear: both;
 }
 .center-block {
@@ -5924,72 +6074,12 @@ td.visible-xs {
     display: table-cell !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-xs.visible-sm {
-    display: block !important;
-  }
-  table.visible-xs.visible-sm {
-    display: table;
-  }
-  tr.visible-xs.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-sm,
-  td.visible-xs.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-xs.visible-md {
-    display: block !important;
-  }
-  table.visible-xs.visible-md {
-    display: table;
-  }
-  tr.visible-xs.visible-md {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-md,
-  td.visible-xs.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-xs.visible-lg {
-    display: block !important;
-  }
-  table.visible-xs.visible-lg {
-    display: table;
-  }
-  tr.visible-xs.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-xs.visible-lg,
-  td.visible-xs.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-sm,
 tr.visible-sm,
 th.visible-sm,
 td.visible-sm {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-sm.visible-xs {
-    display: block !important;
-  }
-  table.visible-sm.visible-xs {
-    display: table;
-  }
-  tr.visible-sm.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-xs,
-  td.visible-sm.visible-xs {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .visible-sm {
     display: block !important;
@@ -6005,72 +6095,12 @@ td.visible-sm {
     display: table-cell !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-sm.visible-md {
-    display: block !important;
-  }
-  table.visible-sm.visible-md {
-    display: table;
-  }
-  tr.visible-sm.visible-md {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-md,
-  td.visible-sm.visible-md {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 1200px) {
-  .visible-sm.visible-lg {
-    display: block !important;
-  }
-  table.visible-sm.visible-lg {
-    display: table;
-  }
-  tr.visible-sm.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-sm.visible-lg,
-  td.visible-sm.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-md,
 tr.visible-md,
 th.visible-md,
 td.visible-md {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-md.visible-xs {
-    display: block !important;
-  }
-  table.visible-md.visible-xs {
-    display: table;
-  }
-  tr.visible-md.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-md.visible-xs,
-  td.visible-md.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-md.visible-sm {
-    display: block !important;
-  }
-  table.visible-md.visible-sm {
-    display: table;
-  }
-  tr.visible-md.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-md.visible-sm,
-  td.visible-md.visible-sm {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .visible-md {
     display: block !important;
@@ -6086,72 +6116,12 @@ td.visible-md {
     display: table-cell !important;
   }
 }
-@media (min-width: 1200px) {
-  .visible-md.visible-lg {
-    display: block !important;
-  }
-  table.visible-md.visible-lg {
-    display: table;
-  }
-  tr.visible-md.visible-lg {
-    display: table-row !important;
-  }
-  th.visible-md.visible-lg,
-  td.visible-md.visible-lg {
-    display: table-cell !important;
-  }
-}
 .visible-lg,
 tr.visible-lg,
 th.visible-lg,
 td.visible-lg {
   display: none !important;
 }
-@media (max-width: 767px) {
-  .visible-lg.visible-xs {
-    display: block !important;
-  }
-  table.visible-lg.visible-xs {
-    display: table;
-  }
-  tr.visible-lg.visible-xs {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-xs,
-  td.visible-lg.visible-xs {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .visible-lg.visible-sm {
-    display: block !important;
-  }
-  table.visible-lg.visible-sm {
-    display: table;
-  }
-  tr.visible-lg.visible-sm {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-sm,
-  td.visible-lg.visible-sm {
-    display: table-cell !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .visible-lg.visible-md {
-    display: block !important;
-  }
-  table.visible-lg.visible-md {
-    display: table;
-  }
-  tr.visible-lg.visible-md {
-    display: table-row !important;
-  }
-  th.visible-lg.visible-md,
-  td.visible-lg.visible-md {
-    display: table-cell !important;
-  }
-}
 @media (min-width: 1200px) {
   .visible-lg {
     display: block !important;
@@ -6167,19 +6137,6 @@ td.visible-lg {
     display: table-cell !important;
   }
 }
-.hidden-xs {
-  display: block !important;
-}
-table.hidden-xs {
-  display: table;
-}
-tr.hidden-xs {
-  display: table-row !important;
-}
-th.hidden-xs,
-td.hidden-xs {
-  display: table-cell !important;
-}
 @media (max-width: 767px) {
   .hidden-xs,
   tr.hidden-xs,
@@ -6188,51 +6145,6 @@ td.hidden-xs {
     display: none !important;
   }
 }
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-xs.hidden-sm,
-  tr.hidden-xs.hidden-sm,
-  th.hidden-xs.hidden-sm,
-  td.hidden-xs.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-xs.hidden-md,
-  tr.hidden-xs.hidden-md,
-  th.hidden-xs.hidden-md,
-  td.hidden-xs.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-xs.hidden-lg,
-  tr.hidden-xs.hidden-lg,
-  th.hidden-xs.hidden-lg,
-  td.hidden-xs.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-sm {
-  display: block !important;
-}
-table.hidden-sm {
-  display: table;
-}
-tr.hidden-sm {
-  display: table-row !important;
-}
-th.hidden-sm,
-td.hidden-sm {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-sm.hidden-xs,
-  tr.hidden-sm.hidden-xs,
-  th.hidden-sm.hidden-xs,
-  td.hidden-sm.hidden-xs {
-    display: none !important;
-  }
-}
 @media (min-width: 768px) and (max-width: 991px) {
   .hidden-sm,
   tr.hidden-sm,
@@ -6241,51 +6153,6 @@ td.hidden-sm {
     display: none !important;
   }
 }
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-sm.hidden-md,
-  tr.hidden-sm.hidden-md,
-  th.hidden-sm.hidden-md,
-  td.hidden-sm.hidden-md {
-    display: none !important;
-  }
-}
-@media (min-width: 1200px) {
-  .hidden-sm.hidden-lg,
-  tr.hidden-sm.hidden-lg,
-  th.hidden-sm.hidden-lg,
-  td.hidden-sm.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-md {
-  display: block !important;
-}
-table.hidden-md {
-  display: table;
-}
-tr.hidden-md {
-  display: table-row !important;
-}
-th.hidden-md,
-td.hidden-md {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-md.hidden-xs,
-  tr.hidden-md.hidden-xs,
-  th.hidden-md.hidden-xs,
-  td.hidden-md.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-md.hidden-sm,
-  tr.hidden-md.hidden-sm,
-  th.hidden-md.hidden-sm,
-  td.hidden-md.hidden-sm {
-    display: none !important;
-  }
-}
 @media (min-width: 992px) and (max-width: 1199px) {
   .hidden-md,
   tr.hidden-md,
@@ -6294,51 +6161,6 @@ td.hidden-md {
     display: none !important;
   }
 }
-@media (min-width: 1200px) {
-  .hidden-md.hidden-lg,
-  tr.hidden-md.hidden-lg,
-  th.hidden-md.hidden-lg,
-  td.hidden-md.hidden-lg {
-    display: none !important;
-  }
-}
-.hidden-lg {
-  display: block !important;
-}
-table.hidden-lg {
-  display: table;
-}
-tr.hidden-lg {
-  display: table-row !important;
-}
-th.hidden-lg,
-td.hidden-lg {
-  display: table-cell !important;
-}
-@media (max-width: 767px) {
-  .hidden-lg.hidden-xs,
-  tr.hidden-lg.hidden-xs,
-  th.hidden-lg.hidden-xs,
-  td.hidden-lg.hidden-xs {
-    display: none !important;
-  }
-}
-@media (min-width: 768px) and (max-width: 991px) {
-  .hidden-lg.hidden-sm,
-  tr.hidden-lg.hidden-sm,
-  th.hidden-lg.hidden-sm,
-  td.hidden-lg.hidden-sm {
-    display: none !important;
-  }
-}
-@media (min-width: 992px) and (max-width: 1199px) {
-  .hidden-lg.hidden-md,
-  tr.hidden-lg.hidden-md,
-  th.hidden-lg.hidden-md,
-  td.hidden-lg.hidden-md {
-    display: none !important;
-  }
-}
 @media (min-width: 1200px) {
   .hidden-lg,
   tr.hidden-lg,
@@ -6367,10 +6189,12 @@ td.visible-print {
   td.visible-print {
     display: table-cell !important;
   }
+}
+@media print {
   .hidden-print,
   tr.hidden-print,
   th.hidden-print,
   td.hidden-print {
     display: none !important;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/frontend-edit.css b/templates/t3_bs3_blank/css/themes/red/frontend-edit.css
index 6371729..e4d05aa 100644
--- a/templates/t3_bs3_blank/css/themes/red/frontend-edit.css
+++ b/templates/t3_bs3_blank/css/themes/red/frontend-edit.css
@@ -237,7 +237,7 @@
   left: -100%;
 }
 .t3onoff label.on.active:before {
-  left: 0%;
+  left: -0%;
 }
 .t3onoff label.off:after {
   left: 60%;
@@ -354,4 +354,4 @@ fieldset.radio.btn-group label.active {
 .controls img.calendar {
   cursor: pointer;
   margin-left: 5px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/home.css b/templates/t3_bs3_blank/css/themes/red/home.css
index 6725517..b1d3f84 100644
--- a/templates/t3_bs3_blank/css/themes/red/home.css
+++ b/templates/t3_bs3_blank/css/themes/red/home.css
@@ -90,4 +90,4 @@
 .home .t3-sl-5 .jumbotron {
   border-radius: 0;
   margin-bottom: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/legacy-grid.css b/templates/t3_bs3_blank/css/themes/red/legacy-grid.css
index aaff047..83adcc3 100644
--- a/templates/t3_bs3_blank/css/themes/red/legacy-grid.css
+++ b/templates/t3_bs3_blank/css/themes/red/legacy-grid.css
@@ -4,14 +4,6 @@
   margin-left: -15px;
   margin-right: -15px;
 }
-.row-fluid:before,
-.row-fluid:after {
-  content: " ";
-  display: table;
-}
-.row-fluid:after {
-  clear: both;
-}
 [class*="span"] {
   float: left;
 }
@@ -113,7 +105,7 @@
     display: inherit !important;
   }
   .visible-desktop {
-    display: none !important ;
+    display: none !important;
   }
   .visible-tablet {
     display: inherit !important;
@@ -195,4 +187,4 @@
 }
 .height-100 {
   height: 100px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/legacy-navigation.css b/templates/t3_bs3_blank/css/themes/red/legacy-navigation.css
index 66533bf..250e85e 100644
--- a/templates/t3_bs3_blank/css/themes/red/legacy-navigation.css
+++ b/templates/t3_bs3_blank/css/themes/red/legacy-navigation.css
@@ -31,3 +31,4 @@
 .dropdown-submenu:hover > a:after {
   border-left-color: #262626;
 }
+
diff --git a/templates/t3_bs3_blank/css/themes/red/megamenu.css b/templates/t3_bs3_blank/css/themes/red/megamenu.css
index 23790c2..6634f50 100644
--- a/templates/t3_bs3_blank/css/themes/red/megamenu.css
+++ b/templates/t3_bs3_blank/css/themes/red/megamenu.css
@@ -181,7 +181,7 @@
   .t3-megamenu.animate .mega.animating > .mega-dropdown-menu {
     -webkit-transition: all 400ms;
     transition: all 400ms;
-    display: block!important;
+    display: block !important;
   }
   .t3-megamenu.animate .mega.open > .mega-dropdown-menu,
   .t3-megamenu.animate .mega.animating.open > .mega-dropdown-menu {
@@ -193,6 +193,7 @@
     transform: scale(0, 0);
     -webkit-transform-origin: 20% 20%;
     -moz-transform-origin: 20% 20%;
+    -ms-transform-origin: 20% 20%;
     transform-origin: 20% 20%;
   }
   .t3-megamenu.animate.zoom .mega.open > .mega-dropdown-menu {
@@ -206,6 +207,7 @@
     transform: scale(0, 0) translate(-50%, 0);
     -webkit-transform-origin: 0% 20%;
     -moz-transform-origin: 0% 20%;
+    -ms-transform-origin: 0% 20%;
     transform-origin: 0% 20%;
   }
   .t3-megamenu.animate.zoom .level0 > .mega-align-center.open > .mega-dropdown-menu {
@@ -219,6 +221,7 @@
     transform: scale(0, 1);
     -webkit-transform-origin: 10% 0;
     -moz-transform-origin: 10% 0;
+    -ms-transform-origin: 10% 0;
     transform-origin: 10% 0;
   }
   .t3-megamenu.animate.elastic .mega.open > .mega-dropdown-menu {
@@ -271,6 +274,7 @@
     min-width: 200px;
     margin-top: 0;
     margin-left: -500px;
+    width: 100%;
   }
   .t3-megamenu.animate.slide .mega .mega.open > .mega-dropdown-menu > div {
     margin-left: 0;
@@ -414,4 +418,4 @@
 .t3-megamenu .nav .input-group-addon [class*=" icon-"],
 .t3-megamenu .nav .input-group-addon .fa {
   margin-right: 0;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/off-canvas.css b/templates/t3_bs3_blank/css/themes/red/off-canvas.css
index bbed76a..8f1b0e3 100644
--- a/templates/t3_bs3_blank/css/themes/red/off-canvas.css
+++ b/templates/t3_bs3_blank/css/themes/red/off-canvas.css
@@ -586,7 +586,7 @@ body.off-canvas-effect-14.off-canvas-right {
   transform: translate3d(100%, 0, 0) rotateY(0deg);
 }
 .old-ie .t3-off-canvas {
-  z-index: 100!important;
+  z-index: 100 !important;
   left: -250px;
 }
 html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
@@ -651,9 +651,12 @@ html[dir="ltr"] .off-canvas-right.old-ie .t3-off-canvas {
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
+.t3-off-canvas .t3-off-canvas-body .dropdown-menu .active a {
+  background: transparent;
+}
 .t3-off-canvas .t3-off-canvas-body .t3-module {
   margin-bottom: 20px;
 }
 .t3-off-canvas .t3-off-canvas-body .module-title {
   margin-bottom: 10px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/template.css b/templates/t3_bs3_blank/css/themes/red/template.css
index 633e0be..22647c7 100644
--- a/templates/t3_bs3_blank/css/themes/red/template.css
+++ b/templates/t3_bs3_blank/css/themes/red/template.css
@@ -145,7 +145,8 @@ p {
     font-size: 21px;
   }
 }
-small {
+small,
+.small {
   font-size: 85%;
 }
 cite {
@@ -532,7 +533,7 @@ fieldset[disabled] .btn-inverse.active {
 }
 .btn-inverse .badge {
   color: #333333;
-  background-color: #fff;
+  background-color: #ffffff;
 }
 .btn-block + .btn-block {
   margin-top: 5px;
@@ -735,6 +736,13 @@ input.invalid {
 .breadcrumb > .active {
   color: #999999;
 }
+.breadcrumb > .active + li:before {
+  content: "";
+  padding: 0;
+}
+.breadcrumb > .active .hasTooltip {
+  padding-right: 10px;
+}
 .breadcrumb .divider {
   display: none;
 }
@@ -1294,6 +1302,7 @@ article aside .btn-group > .dropdown-toggle .caret {
   vertical-align: middle;
   border-top: 1px solid #dddddd;
   margin-left: 0;
+  padding-left: 0;
 }
 .list-striped li,
 .list-striped dd,
@@ -1562,6 +1571,10 @@ article aside .btn-group > .dropdown-toggle .caret {
   margin-top: 5px;
   margin-bottom: 5px;
 }
+.search-results .result-url {
+  color: #555555;
+  margin-top: 20px;
+}
 .search-results .result-created {
   font-size: 12px;
   color: #999999;
@@ -1574,7 +1587,7 @@ div.finder {
   margin-top: 3px;
 }
 @media (max-width: 768px) {
-  .contact .thumbnail.pull-right {
+  .contact .thumbnail {
     width: 100%;
   }
 }
@@ -1590,34 +1603,30 @@ div.finder {
     margin-left: 0;
   }
 }
-.contact .accordion-heading .accordion-toggle {
-  font-weight: bold;
+.contact-form #jform_contact_emailmsg {
+  width: 100%;
+}
+.contact-form #jform_contact_message {
+  width: 100%;
+  height: auto;
 }
 @media (max-width: 768px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 65%;
+  .contact-form #jform_captcha-lbl {
+    display: none;
   }
-}
-@media (max-width: 480px) {
-  .contact-form .form-group input[type="text"],
-  .contact-form .form-group input[type="email"],
-  .contact-form .form-group textarea {
-    max-width: 55%;
+  .contact-form #recaptcha_image {
+    width: 220px;
   }
-}
-@media (max-width: 768px) {
-  .contact-form legend {
-    font-size: 17px;
-    max-width: 90%;
+  .contact-form #recaptcha_image img {
+    max-width: 220px;
   }
-}
-@media (max-width: 480px) {
-  .contact-form legend {
-    max-width: 60%;
+  .contact-form #recaptcha_response_field {
+    max-width: 220px;
   }
 }
+.contact .accordion-toggle {
+  font-weight: bold;
+}
 #archive-items > li {
   line-height: normal;
   margin: 0;
@@ -2302,4 +2311,4 @@ a.list-group-item.active:focus .list-group-item-text {
 }
 .t3-mainnav {
   border-bottom: none;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/themes/red/windows.css b/templates/t3_bs3_blank/css/themes/red/windows.css
index 66cf453..df21821 100644
--- a/templates/t3_bs3_blank/css/themes/red/windows.css
+++ b/templates/t3_bs3_blank/css/themes/red/windows.css
@@ -7,4 +7,4 @@
 }
 .window .window-mainbody {
   padding: 20px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/css/windows.css b/templates/t3_bs3_blank/css/windows.css
index 66cf453..df21821 100644
--- a/templates/t3_bs3_blank/css/windows.css
+++ b/templates/t3_bs3_blank/css/windows.css
@@ -7,4 +7,4 @@
 }
 .window .window-mainbody {
   padding: 20px;
-}
\ No newline at end of file
+}
diff --git a/templates/t3_bs3_blank/less/joomla.less b/templates/t3_bs3_blank/less/joomla.less
index 7a1966f..1823706 100644
--- a/templates/t3_bs3_blank/less/joomla.less
+++ b/templates/t3_bs3_blank/less/joomla.less
@@ -301,6 +301,7 @@ article aside .btn-group {
   vertical-align: middle;
   border-top: 1px solid @table-border-color;
   margin-left: 0;
+  padding-left: 0;
 }
 
 .list-striped li,
@@ -729,6 +730,12 @@ article aside .btn-group {
     margin-bottom: 5px;
   }
 
+  // Result URL
+  .result-url {
+    color: @gray;
+    margin-top: @line-height-computed;
+  }
+
   // Date
   .result-created {
     font-size: @t3-font-size-smaller;
@@ -774,16 +781,16 @@ div.finder {
 }
 
 
+
 //
 // CONTACT
 // ---------------------------------------------------------
 .contact {
-  .thumbnail.pull-right {
+  .thumbnail {
     @media (max-width: @screen-sm) {    
       width: 100%;
     }
   }
-
   .dl-horizontal {
     > dt {
       @media (max-width: @screen-sm) {          
@@ -792,8 +799,7 @@ div.finder {
         width: auto;
       }
     }
-
-    >dd {
+    > dd {
       @media (max-width: @screen-sm) {          
         margin-left: 0;
       }
@@ -801,38 +807,40 @@ div.finder {
   }
 }
 
-.contact .accordion-heading .accordion-toggle {
-  font-weight: bold;
-}
-
 .contact-form {
-  .form-group  {
-    input[type="text"],
-    input[type="email"],
-    textarea {
-      @media (max-width: @screen-sm) {    
-        max-width: 65%;
-      }
-
-      @media (max-width: @screen-xs){
-        max-width: 55%;
-      }
-    }
-    
+  // Fixed for Input and Text Area not display properly
+  #jform_contact_emailmsg {
+    width: 100%;
   }
-
-  legend {
-    @media (max-width: @screen-sm) {
-      font-size: 17px;
-      max-width: 90%;
+  #jform_contact_message {
+    width: 100%;
+    height: auto;
+  }
+  // Fixed for Capcha on Small Screen
+  @media (max-width: @screen-sm) {
+    // Hide the Capcha Label on Small Screen
+    #jform_captcha-lbl {
+      display: none;
     }
-
-    @media (max-width: @screen-xs){
-      max-width: 60%;
+    // The capcha image
+    #recaptcha_image {
+      width: 220px;
+    }
+    #recaptcha_image img {
+      max-width: 220px;
+    }
+    #recaptcha_response_field {
+      max-width: 220px;
     }
   }
 }
 
+// The Accordion Title
+.contact .accordion-toggle {
+  font-weight: bold;
+}
+
+
 
 //
 // ARCHIVED ITEMS
diff --git a/templates/t3_bs3_blank/less/navigation.less b/templates/t3_bs3_blank/less/navigation.less
index e49d52b..0b95288 100644
--- a/templates/t3_bs3_blank/less/navigation.less
+++ b/templates/t3_bs3_blank/less/navigation.less
@@ -268,6 +268,15 @@
   // Active
   > .active {
     color: @breadcrumb-active-color;
+
+    + li:before {
+      content: "";
+      padding: 0;
+    }
+
+    .hasTooltip {
+      padding-right: (@t3-global-padding / 2);
+    }
   }
 
   // T3 Note: Hide default Joomla! arrow in breadcrum
diff --git a/templates/t3_bs3_blank/less/off-canvas.less b/templates/t3_bs3_blank/less/off-canvas.less
index 51337d1..6e0d389 100644
--- a/templates/t3_bs3_blank/less/off-canvas.less
+++ b/templates/t3_bs3_blank/less/off-canvas.less
@@ -109,6 +109,10 @@
       }
     }
 
+    .dropdown-menu .active a {
+      background: transparent;
+    }
+
 
     // Navigations
     // ------------
diff --git a/templates/t3_bs3_blank/less/rtl/style.less b/templates/t3_bs3_blank/less/rtl/style.less
index c4af922..7dd8a26 100644
--- a/templates/t3_bs3_blank/less/rtl/style.less
+++ b/templates/t3_bs3_blank/less/rtl/style.less
@@ -6,13 +6,17 @@
 article img[align=left],
 .img_caption.left,
 .pull-left.item-image {
-  margin: 0 @grid-gutter-width @t3-global-margin 0;
+  @media (max-width: @screen-sm) {
+    margin: 0 @grid-gutter-width @t3-global-margin 0;
+  }
 }
 
 article img[align=right],
 .img_caption.right,
 .pull-right.item-image {
-  margin: 0 0 @t3-global-margin @grid-gutter-width;
+  @media (max-width: @screen-sm) {
+    margin: 0 0 @t3-global-margin @grid-gutter-width;
+  }
 }
 
 .languageswitcherload {
diff --git a/templates/t3_bs3_blank/less/typography.less b/templates/t3_bs3_blank/less/typography.less
index faf1bff..fa13cc7 100644
--- a/templates/t3_bs3_blank/less/typography.less
+++ b/templates/t3_bs3_blank/less/typography.less
@@ -41,7 +41,7 @@ p {
 // ---------------
 
 // Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
+small, .small   { font-size: 85%; }
 
 // Undo browser default styling
 cite    { font-style: normal; }
@@ -99,12 +99,12 @@ h6 {
   margin-bottom: (@line-height-computed / 2);
 }
 
-h1, .h1 { font-size: floor(@font-size-base * 2.60); } // ~36px
-h2, .h2 { font-size: floor(@font-size-base * 2.15); } // ~30px
-h3, .h3 { font-size: ceil(@font-size-base * 1.70); } // ~24px
-h4, .h4 { font-size: ceil(@font-size-base * 1.25); } // ~18px
-h5, .h5 { font-size:  @font-size-base; }
-h6, .h6 { font-size: ceil(@font-size-base * 0.85); } // ~12px
+h1, .h1 { font-size: @font-size-h1; }
+h2, .h2 { font-size: @font-size-h2; }
+h3, .h3 { font-size: @font-size-h3; }
+h4, .h4 { font-size: @font-size-h4; }
+h5, .h5 { font-size: @font-size-h5; }
+h6, .h6 { font-size: @font-size-h6; }
 
 h1 small, .h1 small { font-size: ceil(@font-size-base * 1.70); } // ~24px
 h2 small, .h2 small { font-size: ceil(@font-size-base * 1.25); } // ~18px
diff --git a/templates/t3_bs3_blank/templateDetails.xml b/templates/t3_bs3_blank/templateDetails.xml
index 7ebbbeb..d5018c8 100644
--- a/templates/t3_bs3_blank/templateDetails.xml
+++ b/templates/t3_bs3_blank/templateDetails.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
 <extension version="2.5" type="template" method="upgrade" client="site">
 	<name>t3_bs3_blank</name>
-	<version>2.1.0</version>
-	<creationDate>24 Jan 2014</creationDate>
+	<version>2.1.1</version>
+	<creationDate>12 Feb 2014</creationDate>
 	<author>JoomlArt.com</author>
 	<authorEmail>webmaster@joomlart.com</authorEmail>
 	<authorUrl>http://www.t3-framework.org</authorUrl>